Merged portlet mode and windowing changes from 6.2. For #4143

svn changeset:11297/svn branch:6.3

1 files changed, 75 insertions, 92 deletions

diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index b1a6d4722d..bab08d4eb1 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -2,7 +2,7 @@
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
 	version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
-	
+
 	<portlet>
 		<portlet-name>PortletDemoPortlet</portlet-name>
 		<display-name>Vaadin PortletDemo</display-name>
@@ -120,7 +120,7 @@
 			<role-name>user</role-name>
 		</security-role-ref>
 	</portlet>
-	
+
 	<portlet>
 		<portlet-name>HelloWorldPortlet</portlet-name>
 		<display-name>Hello World</display-name>
@@ -136,92 +136,75 @@
 		<portlet-info>
 			<title>HelloWorld</title>
 			<short-title>HelloWorld</short-title>
-		</portlet-info>		
+		</portlet-info>
 	</portlet>
 
-	<!--	
-	<portlet>
-		<portlet-name>VaadinInterPortletEventPortlet</portlet-name>
+	<!--
+		<portlet> <portlet-name>VaadinInterPortletEventPortlet</portlet-name>
 		<display-name>Hello World Event</display-name>
 		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
-		<init-param>
-			<name>application</name>
-			<value>com.vaadin.demo.portlet.VaadinInterPortletEventPortlet</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>
-		</supports>
-		<portlet-info>
-			<title>Inter-portlet events</title>
-			<short-title>Inter-portlet events</short-title>
-		</portlet-info>
-		<supported-processing-event>
-         	<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname>
-		</supported-processing-event>
-		<supported-processing-event>
-         	<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname>
-		</supported-processing-event>
-		<supported-publishing-event>
-         	<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname>
-		</supported-publishing-event>
-		<supported-publishing-event>
-         	<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname>
+		<init-param> <name>application</name>
+		<value>com.vaadin.demo.portlet.VaadinInterPortletEventPortlet</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> </supports> <portlet-info>
+		<title>Inter-portlet events</title> <short-title>Inter-portlet
+		events</short-title> </portlet-info> <supported-processing-event>
+		<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname>
+		</supported-processing-event> <supported-processing-event> <qname
+		xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname>
+		</supported-processing-event> <supported-publishing-event> <qname
+		xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname>
+		</supported-publishing-event> <supported-publishing-event> <qname
+		xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname>
 		</supported-publishing-event>
-		<supported-public-render-parameter>HelloState</supported-public-render-parameter>		
-	</portlet>
-	
-	<portlet>
+		<supported-public-render-parameter>HelloState</supported-public-render-parameter>
+		</portlet> <portlet>
 		<portlet-name>InterPortletEventPortlet</portlet-name>
 		<display-name>Hello World Event (non-Vaadin)</display-name>
 		<portlet-class>com.vaadin.demo.portlet.InterPortletEventPortlet</portlet-class>
+		<supports> <mime-type>text/html</mime-type>
+		<portlet-mode>view</portlet-mode> </supports> <portlet-info>
+		<title>Inter-portlet events (non-Vaadin)</title>
+		<short-title>Inter-portlet events (non-Vaadin)</short-title>
+		</portlet-info> <supported-processing-event> <qname
+		xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname>
+		</supported-processing-event> <supported-processing-event> <qname
+		xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname>
+		</supported-processing-event> <supported-publishing-event> <qname
+		xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname>
+		</supported-publishing-event> <supported-publishing-event> <qname
+		xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname>
+		</supported-publishing-event>
+		<supported-public-render-parameter>HelloState</supported-public-render-parameter>
+		</portlet>
+	-->
+	<portlet>
+		<portlet-name>Portlet Mode Example</portlet-name>
+		<display-name>Portlet Mode Example</display-name>
+		<portlet-class>com.vaadin.demo.portlet.PortletModePortlet</portlet-class>
+		<init-param>
+			<name>widgetset</name>
+			<value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value>
+		</init-param>
+		<init-param>
+			<name>application</name>
+			<value>com.vaadin.demo.portlet.PortletModeExample</value>
+		</init-param>
+        
 		<supports>
 			<mime-type>text/html</mime-type>
 			<portlet-mode>view</portlet-mode>
+			<portlet-mode>edit</portlet-mode>
+			<portlet-mode>help</portlet-mode>
+			<portlet-mode>config</portlet-mode>
 		</supports>
 		<portlet-info>
-			<title>Inter-portlet events (non-Vaadin)</title>
-			<short-title>Inter-portlet events (non-Vaadin)</short-title>
+			<title>PortletModeExample</title>
+			<short-title>PortletModeExample</short-title>
 		</portlet-info>
-		<supported-processing-event>
-         	<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname>
-		</supported-processing-event>
-		<supported-processing-event>
-         	<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname>
-		</supported-processing-event>
-		<supported-publishing-event>
-         	<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname>
-		</supported-publishing-event>
-		<supported-publishing-event>
-         	<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname>
-		</supported-publishing-event>
-		<supported-public-render-parameter>HelloState</supported-public-render-parameter>		
 	</portlet>
-    -->
-    <portlet>
-        <portlet-name>Portlet Mode Example</portlet-name>
-        <display-name>Portlet Mode Example</display-name>
-        <portlet-class>com.vaadin.demo.portlet.PortletModePortlet</portlet-class>
-        <init-param>
-            <name>widgetset</name>
-            <value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value>
-        </init-param>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>view</portlet-mode>
-            <portlet-mode>edit</portlet-mode>
-            <portlet-mode>help</portlet-mode>
-            <portlet-mode>config</portlet-mode>
-        </supports>
-        <portlet-info>
-            <title>PortletModeExample</title>
-            <short-title>PortletModeExample</short-title>
-        </portlet-info>
-    </portlet>
 
 	<portlet>
 		<portlet-name>AddressBookPortlet</portlet-name>
@@ -238,9 +221,9 @@
 		<portlet-info>
 			<title>Address Book</title>
 			<short-title>Address Book</short-title>
-		</portlet-info>		
-	</portlet>	
-	
+		</portlet-info>
+	</portlet>
+
 	<portlet>
 		<portlet-name>SamplerPortlet</portlet-name>
 		<display-name>Sampler</display-name>
@@ -260,9 +243,9 @@
 		<portlet-info>
 			<title>Sampler</title>
 			<short-title>Sampler</short-title>
-		</portlet-info>		
+		</portlet-info>
 	</portlet>
-	
+
 	<portlet>
 		<portlet-name>CalcPortlet</portlet-name>
 		<display-name>Calc</display-name>
@@ -274,7 +257,7 @@
 		<init-param>
 			<name>widgetset</name>
 			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
-		</init-param>		
+		</init-param>
 		<supports>
 			<mime-type>text/html</mime-type>
 			<portlet-mode>view</portlet-mode>
@@ -282,8 +265,8 @@
 		<portlet-info>
 			<title>Calc</title>
 			<short-title>Calc</short-title>
-		</portlet-info>		
-	</portlet>		
+		</portlet-info>
+	</portlet>
 	<portlet>
 		<portlet-name>ChatServletPortlet</portlet-name>
 		<display-name>Vaadin ChatServlet</display-name>
@@ -361,23 +344,23 @@
 			<role-name>user</role-name>
 		</security-role-ref>
 	</portlet>
-	
+
 	<!-- Used by the Portlet mode demo -->
-    <custom-portlet-mode>
-        <description>Custom mode</description>
-        <portlet-mode>config</portlet-mode>
-        <portal-managed>false</portal-managed>
-    </custom-portlet-mode>
+	<custom-portlet-mode>
+		<description>Custom mode</description>
+		<portlet-mode>config</portlet-mode>
+		<portal-managed>false</portal-managed>
+	</custom-portlet-mode>
 
 	<!--
-		These can be used to customize the event object types.
-		The types must be serializable and have JAXB binding.
+		These can be used to customize the event object types. The types must
+		be serializable and have JAXB binding.
 	-->
 	<event-definition>
 		<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname>
 		<value-type>java.lang.String</value-type>
-	</event-definition>	
-	
+	</event-definition>
+
 	<event-definition>
 		<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname>
 		<value-type>java.lang.String</value-type>
@@ -387,7 +370,7 @@
 		<identifier>HelloState</identifier>
 		<qname xmlns:vaadin="http://www.vaadin.com/params">vaadin:HelloState</qname>
 	</public-render-parameter>
-	
+
 	<!--
 		This can be used to work around an issue in liferay 5.0-5.1.1