From: Petter Holmström <petter.holmstrom@itmill.com>
Date: Thu, 12 Nov 2009 12:25:18 +0000 (+0000)
Subject: Should now work somewhat on GateIn portal, in addition to Liferay.
X-Git-Tag: 6.7.0.beta1~2266^2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dbf90eec8dc5378bb460b6f96f83070d9b9270c1;p=vaadin-framework.git

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
index ba4da73c5b..0000000000
--- a/WebContent/WEB-INF/portlet-instances.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<!DOCTYPE deployments PUBLIC
-   "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
-   "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
-<deployments>
-   <deployment>
-      <instance>
-         <instance-id>PortletDemoPortletInstance</instance-id>
-         <portlet-ref>PortletDemoPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>SimpleReserverPortletInstance</instance-id>
-         <portlet-ref>SimpleReserverPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>SelectDemoPortletInstance</instance-id>
-         <portlet-ref>SelectDemoPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>TableDemoPortletInstance</instance-id>
-         <portlet-ref>TableDemoPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>FilterSelectPortletInstance</instance-id>
-         <portlet-ref>FilterSelectPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>FeatureBrowserPortletInstance</instance-id>
-         <portlet-ref>FeatureBrowserPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>ModalWindowPortletInstance</instance-id>
-         <portlet-ref>ModalWindowPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>CalcPortletInstance</instance-id>
-         <portlet-ref>CalcPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>NotificationDemoPortletInstance</instance-id>
-         <portlet-ref>NotificationDemoPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>ChatServletPortletInstance</instance-id>
-         <portlet-ref>ChatServletPortlet</portlet-ref>
-      </instance>
-   </deployment>
-   <deployment>
-      <instance>
-         <instance-id>BrowserDemoPortletInstance</instance-id>
-         <portlet-ref>BrowserDemoPortlet</portlet-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index d05e88e8d7..c91bac7589 100644
--- 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
index 2c70ae2582..0000000000
--- a/WebContent/WEB-INF/vaadin-object.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE deployments PUBLIC
-   "-//JBoss Portal//DTD Portal Object 2.6//EN"
-   "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
-<deployments>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>PortletDemoPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>PortletDemoPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>SimpleReserverPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>SimpleReserverPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>SelectDemoPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>SelectDemoPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>TableDemoPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>TableDemoPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>FilterSelectPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>FilterSelectPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>FeatureBrowserPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>FeatureBrowserPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>ModalWindowPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>ModalWindowPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>CalcPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>CalcPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>NotificationDemoPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>NotificationDemoPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>ChatServletPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>ChatServletPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-   <deployment>
-      <parent-ref>default.default</parent-ref>
-      <if-exists>overwrite</if-exists>      <window>
-         <window-name>BrowserDemoPortletWindow</window-name>
-         <content>
-                <content-type>portlet</content-type>
-                <content-uri>BrowserDemoPortletInstance</content-uri>
-         </content>
-         <region>center</region>
-         <height>1</height>
-      </window>
-   </deployment>
-</deployments>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index a2c51c3646..ecec5fa76f 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -114,6 +114,15 @@
 			<param-value>com.vaadin.tests.RandomLayoutStress</param-value>
 		</init-param>
 	</servlet>
+	
+	<servlet>
+		<servlet-name>PortletDemo</servlet-name>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.vaadin.demo.PortletDemo</param-value>
+		</init-param>
+	</servlet>	
 
 	<servlet>
 		<servlet-name>Reservr</servlet-name>
@@ -504,6 +513,11 @@
 		<!-- portlet -->
 	</servlet-mapping>
 	
+	<servlet-mapping>
+		<servlet-name>PortletDemo</servlet-name>
+		<url-pattern>/PortletDemo/*</url-pattern>
+	</servlet-mapping>
+	
 	<servlet-mapping>
 		<servlet-name>GAESyncTest</servlet-name>
 		<url-pattern>/gaesynctest/*</url-pattern>
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index eabc9f45eb..f66102fc2e 100644
--- 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();
     }