#7178 replaced most demo portlets with a test portlet, use it in Liferay 5 integration test

svn changeset:20276/svn branch:6.7

4 files changed, 9 insertions, 201 deletions

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index 232cec07e1..9fe585e7dc 100644
--- a/WebContent/WEB-INF/liferay-display.xml
+++ b/WebContent/WEB-INF/liferay-display.xml
@@ -3,14 +3,8 @@
 
 <display>
     <category name="Vaadin">
-        <portlet id="PortletDemoPortlet" />
-        <portlet id="Portlet Mode Example" />
-        <portlet id="Portlet HTML Mode Example" />
+        <portlet id="JSR286TestPortlet" />
         <portlet id="AddressBookPortlet" />
         <portlet id="Vaadin Liferay Theme Portlet"/>
-
-        <!-- These should be used together -->
-        <portlet id="InterPortletEventPortlet" />
-        <portlet id="VaadinInterPortletEventPortlet" />
     </category>
 </display>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml
index 2ed03113b6..f246e0bc4c 100644
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/WebContent/WEB-INF/liferay-portlet.xml
@@ -3,18 +3,8 @@
 
 <liferay-portlet-app>
     <portlet>
-        <portlet-name>PortletDemoPortlet</portlet-name>
-        <instanceable>true</instanceable>       
-        <ajaxable>false</ajaxable>
-    </portlet>
-    <portlet>
-        <portlet-name>Portlet Mode Example</portlet-name>
-        <instanceable>true</instanceable>
-        <ajaxable>false</ajaxable>
-    </portlet>
-    <portlet>
-        <portlet-name>Portlet HTML Mode Example</portlet-name>
-        <instanceable>true</instanceable>
+        <portlet-name>JSR286TestPortlet</portlet-name>
+        <instanceable>false</instanceable>       
         <ajaxable>false</ajaxable>
     </portlet>
     <portlet>
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 49ed5921b1..5d333da67e 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -4,12 +4,12 @@
 	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>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
+		<portlet-name>JSR286TestPortlet</portlet-name>
+		<display-name>Vaadin Portlet 2.0 Test</display-name>
+		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
 		<init-param>
 			<name>application</name>
-			<value>PortletDemo</value>
+			<value>com.vaadin.tests.integration.JSR286PortletApplication</value>
 		</init-param>
 		<init-param>
 			<name>widgetset</name>
@@ -22,8 +22,8 @@
 			<portlet-mode>help</portlet-mode>
 		</supports>
 		<portlet-info>
-			<title>PortletDemo</title>
-			<short-title>PortletDemo</short-title>
+			<title>Vaadin Portlet 2.0 Test</title>
+			<short-title>Vaadin Portlet 2.0 Test</short-title>
 		</portlet-info>
 
 		<security-role-ref>
@@ -41,79 +41,6 @@
 	</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>application</name>
-			<value>com.vaadin.demo.portlet.PortletModeExample</value>
-		</init-param>
-		<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>
-
-		<security-role-ref>
-			<role-name>administrator</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>guest</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>power-user</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>user</role-name>
-		</security-role-ref>
-	</portlet>
-
-    <portlet>
-        <portlet-name>Portlet HTML Mode Example</portlet-name>
-        <display-name>Portlet HTML Mode Example</display-name>
-        <portlet-class>com.vaadin.demo.portlet.HtmlModePortlet</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>help</portlet-mode>
-        </supports>
-        
-        <portlet-info>
-            <title>Portlet HTML Mode Example</title>
-            <short-title>Portlet HTML Mode Example</short-title>
-        </portlet-info>
-
-		<security-role-ref>
-			<role-name>administrator</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>guest</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>power-user</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>user</role-name>
-		</security-role-ref>
-    </portlet>
-
-	<portlet>
 		<portlet-name>AddressBookPortlet</portlet-name>
 		<display-name>Address Book</display-name>
 		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
@@ -186,95 +113,6 @@
 		</security-role-ref>
     </portlet>
 
-	<!-- A Vaadin portlet and a non-Vaadin portlet that can communicate with each other -->
-	<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.portal.gwt.PortalDefaultWidgetSet</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://vaadin.com/hello">vaadin:Hello</qname>
-		</supported-processing-event>
-		<supported-processing-event>
-			<qname xmlns:vaadin="http://vaadin.com/hello">vaadin:ReplyToVaadin</qname>
-		</supported-processing-event>
-		<supported-publishing-event>
-			<qname xmlns:vaadin="http://vaadin.com/hello">vaadin:Reply</qname>
-		</supported-publishing-event>
-		<supported-publishing-event>
-			<qname xmlns:vaadin="http://vaadin.com/hello">vaadin:FromVaadin</qname>
-		</supported-publishing-event>
-		<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://vaadin.com/hello">vaadin:Reply</qname>
-		</supported-processing-event>
-		<supported-processing-event>
-			<qname xmlns:vaadin="http://vaadin.com/hello">vaadin:FromVaadin</qname>
-		</supported-processing-event>
-		<supported-publishing-event>
-			<qname xmlns:vaadin="http://vaadin.com/hello">vaadin:Hello</qname>
-		</supported-publishing-event>
-		<supported-publishing-event>
-			<qname xmlns:vaadin="http://vaadin.com/hello">vaadin:ReplyToVaadin</qname>
-		</supported-publishing-event>
-		<supported-public-render-parameter>HelloState</supported-public-render-parameter>
-	</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>
-
-	<!--
-		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://vaadin.com/hello">vaadin:Hello</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname xmlns:vaadin="http://vaadin.com/hello">vaadin:Reply</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<public-render-parameter>
-		<identifier>HelloState</identifier>
-		<qname xmlns:vaadin="http://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
 
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index cd2b6eedab..bdf7fe92a4 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -89,15 +89,6 @@
 	</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.portlet.PortletDemo</param-value>

-		</init-param>

-	</servlet>

-

-	<servlet>

 		<servlet-name>Parameters</servlet-name>

 		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

 		<init-param>

@@ -184,11 +175,6 @@
 	</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>

 	</servlet-mapping>