Should now work somewhat on GateIn portal, in addition to Liferay.

svn changeset:9745/svn branch:portlet_2.0

diff --git a/WebContent/WEB-INF/portlet-instances.xml b/WebContent/WEB-INF/portlet-instances.xml
deleted file mode 100644 (file)
index ba4da73..0000000
--- a/WebContent/WEB-INF/portlet-instances.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" standalone="yes"?>\r
-<!DOCTYPE deployments PUBLIC\r
-   "-//JBoss Portal//DTD Portlet Instances 2.6//EN"\r
-   "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">\r
-<deployments>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>PortletDemoPortletInstance</instance-id>\r
-         <portlet-ref>PortletDemoPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>SimpleReserverPortletInstance</instance-id>\r
-         <portlet-ref>SimpleReserverPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>SelectDemoPortletInstance</instance-id>\r
-         <portlet-ref>SelectDemoPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>TableDemoPortletInstance</instance-id>\r
-         <portlet-ref>TableDemoPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>FilterSelectPortletInstance</instance-id>\r
-         <portlet-ref>FilterSelectPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>FeatureBrowserPortletInstance</instance-id>\r
-         <portlet-ref>FeatureBrowserPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>ModalWindowPortletInstance</instance-id>\r
-         <portlet-ref>ModalWindowPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>CalcPortletInstance</instance-id>\r
-         <portlet-ref>CalcPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>NotificationDemoPortletInstance</instance-id>\r
-         <portlet-ref>NotificationDemoPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>ChatServletPortletInstance</instance-id>\r
-         <portlet-ref>ChatServletPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-   <deployment>\r
-      <instance>\r
-         <instance-id>BrowserDemoPortletInstance</instance-id>\r
-         <portlet-ref>BrowserDemoPortlet</portlet-ref>\r
-      </instance>\r
-   </deployment>\r
-</deployments>
\ No newline at end of file

diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index d05e88e8d770e35a4a6b33503cdda7f930790068..c91bac7589d5da0a7c9165e08484e78a2d51a4db 100644 (file)
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -5,10 +5,10 @@
        <portlet>
                <portlet-name>PortletDemoPortlet</portlet-name>
                <display-name>Vaadin PortletDemo</display-name>
-               <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
+               <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                <init-param>
                        <name>application</name>
-                       <value>com.vaadin.demo.PortletDemo</value>
+                       <value>PortletDemo</value>
                </init-param>
 
                <init-param>
@@ -212,6 +212,10 @@
                        <name>application</name>
                        <value>com.vaadin.demo.Calc</value>
                </init-param>
+               <init-param>
+                       <name>widgetset</name>
+                       <value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
+               </init-param>           
                <supports>
                        <mime-type>text/html</mime-type>
                        <portlet-mode>view</portlet-mode>

diff --git a/WebContent/WEB-INF/vaadin-object.xml b/WebContent/WEB-INF/vaadin-object.xml
deleted file mode 100644 (file)
index 2c70ae2..0000000
--- a/WebContent/WEB-INF/vaadin-object.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE deployments PUBLIC\r
-   "-//JBoss Portal//DTD Portal Object 2.6//EN"\r
-   "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">\r
-<deployments>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>PortletDemoPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>PortletDemoPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>SimpleReserverPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>SimpleReserverPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>SelectDemoPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>SelectDemoPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>TableDemoPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>TableDemoPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>FilterSelectPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>FilterSelectPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>FeatureBrowserPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>FeatureBrowserPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>ModalWindowPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>ModalWindowPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>CalcPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>CalcPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>NotificationDemoPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>NotificationDemoPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>ChatServletPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>ChatServletPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-   <deployment>\r
-      <parent-ref>default.default</parent-ref>\r
-      <if-exists>overwrite</if-exists>      <window>\r
-         <window-name>BrowserDemoPortletWindow</window-name>\r
-         <content>\r
-                <content-type>portlet</content-type>\r
-                <content-uri>BrowserDemoPortletInstance</content-uri>\r
-         </content>\r
-         <region>center</region>\r
-         <height>1</height>\r
-      </window>\r
-   </deployment>\r
-</deployments>
\ No newline at end of file

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index a2c51c3646556dc4030d3d0be4b5053c7cae185b..ecec5fa76f7adeb542ecad0e266965fbeae70486 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -114,6 +114,15 @@
                        <param-value>com.vaadin.tests.RandomLayoutStress</param-value>\r
                </init-param>\r
        </servlet>\r
+       \r
+       <servlet>\r
+               <servlet-name>PortletDemo</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.demo.PortletDemo</param-value>\r
+               </init-param>\r
+       </servlet>      \r
 \r
        <servlet>\r
                <servlet-name>Reservr</servlet-name>\r
@@ -504,6 +513,11 @@
                <!-- portlet -->
        </servlet-mapping>\r
        \r
+       <servlet-mapping>\r
+               <servlet-name>PortletDemo</servlet-name>\r
+               <url-pattern>/PortletDemo/*</url-pattern>\r
+       </servlet-mapping>\r
+       \r
        <servlet-mapping>\r
                <servlet-name>GAESyncTest</servlet-name>\r
                <url-pattern>/gaesynctest/*</url-pattern>\r

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index eabc9f45eb8dce3d70b18aee559583741e8d9c88..f66102fc2e913727276e164b5b15c4f358ba376e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -426,7 +426,7 @@ public abstract class AbstractCommunicationManager implements
             }
         }
 
-        out.flush();
+        //out.flush(); - this line will cause errors when deployed on GateIn.
         out.close();
     }