#5204 Include demo portlets in demo package; portlet configuration files are no longer generated at build, cleaned up manually maintained versions

svn changeset:13806/svn branch:6.4

4 files changed, 188 insertions, 288 deletions

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index 0e88c0e862..903f441d8b 100644
--- a/WebContent/WEB-INF/liferay-display.xml
+++ b/WebContent/WEB-INF/liferay-display.xml
@@ -2,26 +2,16 @@
 <!DOCTYPE display PUBLIC "-//Liferay//DTD Display 4.0.0//EN" "http://www.liferay.com/dtd/liferay-display_4_0_0.dtd">
 
 <display>
-        <category name="Vaadin">
-                <portlet id="PortletDemoPortlet" />
-                <portlet id="SelectDemoPortlet" />
-                <portlet id="TableDemoPortlet" />
-                <portlet id="FilterSelectPortlet" />
-                <portlet id="FeatureBrowserPortlet" />
-                <portlet id="ModalWindowPortlet" />
-                <portlet id="CalcPortlet" />
-                <portlet id="NotificationDemoPortlet" />
-                <portlet id="ChatServletPortlet" />
-                <portlet id="BrowserDemoPortlet" />
-				<portlet id="HelloWorldPortlet" />
-				<portlet id="AddressBookPortlet" />
-				<portlet id="CalcPortlet"/>
-				<portlet id="SamplerPortlet"/>
-				<!--
-				<portlet id="InterPortletEventPortlet" />
-				<portlet id="VaadinInterPortletEventPortlet" />
-				-->
-                <portlet id="Portlet Mode Example"/>
-                <portlet id="Portlet HTML Mode Example"/>
-        </category>
+    <category name="Vaadin">
+        <portlet id="PortletDemoPortlet" />
+        <portlet id="CalcPortlet" />
+        <portlet id="SamplerPortlet" />
+        <portlet id="Portlet Mode Example" />
+        <portlet id="Portlet HTML Mode Example" />
+        <portlet id="AddressBookPortlet" />
+
+        <!-- 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 f3c18e57d0..559592a48a 100644
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/WebContent/WEB-INF/liferay-portlet.xml
@@ -2,102 +2,52 @@
 <!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
 
 <liferay-portlet-app>
-        <portlet>
-                <portlet-name>PortletDemoPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>SelectDemoPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>TableDemoPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>FilterSelectPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>FeatureBrowserPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>ModalWindowPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>CalcPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>NotificationDemoPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>ChatServletPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>BrowserDemoPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>HelloWorldPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
-                <portlet-name>AddressBookPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>          
-        <portlet>
-                <portlet-name>CalcPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>          
-        <portlet>
-                <portlet-name>SamplerPortlet</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>
-            <ajaxable>false</ajaxable>
-        </portlet>
-        
-        <role-mapper>
-                <role-name>administrator</role-name>
-                <role-link>Administrator</role-link>
-        </role-mapper>
-        <role-mapper>
-                <role-name>guest</role-name>
-                <role-link>Guest</role-link>
-        </role-mapper>
-        <role-mapper>
-                <role-name>power-user</role-name>
-                <role-link>Power User</role-link>
-        </role-mapper>
-        <role-mapper>
-                <role-name>user</role-name>
-                <role-link>User</role-link>
-        </role-mapper>
-        
+    <portlet>
+        <portlet-name>PortletDemoPortlet</portlet-name>
+        <instanceable>true</instanceable>       
+        <ajaxable>false</ajaxable>
+    </portlet>
+    <portlet>
+        <portlet-name>CalcPortlet</portlet-name>
+        <instanceable>true</instanceable>       
+        <ajaxable>false</ajaxable>
+    </portlet>
+    <portlet>
+        <portlet-name>SamplerPortlet</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>
+        <ajaxable>false</ajaxable>
+    </portlet>
+    <portlet>
+        <portlet-name>AddressBookPortlet</portlet-name>
+        <instanceable>true</instanceable>       
+        <ajaxable>false</ajaxable>
+    </portlet>      
+    
+    <role-mapper>
+        <role-name>administrator</role-name>
+        <role-link>Administrator</role-link>
+    </role-mapper>
+    <role-mapper>
+        <role-name>guest</role-name>
+        <role-link>Guest</role-link>
+    </role-mapper>
+    <role-mapper>
+        <role-name>power-user</role-name>
+        <role-link>Power User</role-link>
+    </role-mapper>
+    <role-mapper>
+        <role-name>user</role-name>
+        <role-link>User</role-link>
+    </role-mapper>
+    
 </liferay-portlet-app>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 265c3b3869..2b107d5ae2 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -11,10 +11,9 @@
 			<name>application</name>
 			<value>PortletDemo</value>
 		</init-param>
-
 		<init-param>
 			<name>widgetset</name>
-			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
+			<value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value>
 		</init-param>
 		<supports>
 			<mime-type>text/html</mime-type>
@@ -40,31 +39,26 @@
 			<role-name>user</role-name>
 		</security-role-ref>
 	</portlet>
+
 	<portlet>
-		<portlet-name>FeatureBrowserPortlet</portlet-name>
-		<display-name>Vaadin FeatureBrowser</display-name>
+		<portlet-name>CalcPortlet</portlet-name>
+		<display-name>Calc</display-name>
 		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
 		<init-param>
 			<name>application</name>
-			<value>com.vaadin.tests.featurebrowser.FeaturesApplication</value>
-		</init-param>
-		<init-param>
-			<name>style</name>
-			<value>height:650px</value>
+			<value>com.vaadin.demo.Calc</value>
 		</init-param>
 		<init-param>
 			<name>widgetset</name>
-			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
+			<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>
 		</supports>
 		<portlet-info>
-			<title>FeatureBrowser</title>
-			<short-title>FeatureBrowser</short-title>
+			<title>Calc</title>
+			<short-title>Calc</short-title>
 		</portlet-info>
 
 		<security-role-ref>
@@ -82,76 +76,56 @@
 	</portlet>
 
 	<portlet>
-		<portlet-name>HelloWorldPortlet</portlet-name>
-		<display-name>Hello World</display-name>
+		<portlet-name>SamplerPortlet</portlet-name>
+		<display-name>Sampler</display-name>
 		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
 		<init-param>
 			<name>application</name>
-			<value>com.vaadin.demo.HelloWorld</value>
+			<value>com.vaadin.demo.sampler.SamplerApplication</value>
+		</init-param>
+		<init-param>
+			<name>widgetset</name>
+			<value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value>
+		</init-param>
+		<init-param>
+			<name>style</name>
+			<value>height:650px</value>
 		</init-param>
 		<supports>
 			<mime-type>text/html</mime-type>
 			<portlet-mode>view</portlet-mode>
 		</supports>
 		<portlet-info>
-			<title>HelloWorld</title>
-			<short-title>HelloWorld</short-title>
+			<title>Sampler</title>
+			<short-title>Sampler</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>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>
-		</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://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>
+		<init-param>
+			<name>widgetset</name>
+			<value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value>
+		</init-param>
         
 		<supports>
 			<mime-type>text/html</mime-type>
@@ -164,12 +138,29 @@
 			<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>
@@ -181,6 +172,19 @@
             <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>
@@ -191,81 +195,17 @@
 			<name>application</name>
 			<value>com.vaadin.demo.tutorial.addressbook.AddressBookApplication</value>
 		</init-param>
-		<supports>
-			<mime-type>text/html</mime-type>
-			<portlet-mode>view</portlet-mode>
-		</supports>
-		<portlet-info>
-			<title>Address Book</title>
-			<short-title>Address Book</short-title>
-		</portlet-info>
-	</portlet>
-
-	<portlet>
-		<portlet-name>SamplerPortlet</portlet-name>
-		<display-name>Sampler</display-name>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
-		<init-param>
-			<name>application</name>
-			<value>com.vaadin.demo.sampler.SamplerApplication</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>Sampler</title>
-			<short-title>Sampler</short-title>
-		</portlet-info>
-	</portlet>
-
-	<portlet>
-		<portlet-name>CalcPortlet</portlet-name>
-		<display-name>Calc</display-name>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
-		<init-param>
-			<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>
-		</supports>
-		<portlet-info>
-			<title>Calc</title>
-			<short-title>Calc</short-title>
-		</portlet-info>
-	</portlet>
-	<portlet>
-		<portlet-name>ChatServletPortlet</portlet-name>
-		<display-name>Vaadin ChatServlet</display-name>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
-		<init-param>
-			<name>application</name>
-			<value>chat</value>
-		</init-param>
-
-		<init-param>
-			<name>widgetset</name>
-			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
+			<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>
 		</supports>
 		<portlet-info>
-			<title>ChatServlet</title>
-			<short-title>ChatServlet</short-title>
+			<title>Address Book</title>
+			<short-title>Address Book</short-title>
 		</portlet-info>
 
 		<security-role-ref>
@@ -281,47 +221,70 @@
 			<role-name>user</role-name>
 		</security-role-ref>
 	</portlet>
+
+	<!-- A Vaadin portlet and a non-Vaadin portlet that can communicate with each other -->
 	<portlet>
-		<portlet-name>BrowserDemoPortlet</portlet-name>
-		<display-name>Vaadin BrowserDemo</display-name>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
+		<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>BrowserDemo</value>
-		</init-param>
-		<init-param>
-			<name>style</name>
-			<value>height:650px</value>
+			<value>com.vaadin.demo.portlet.VaadinInterPortletEventPortlet</value>
 		</init-param>
 		<init-param>
 			<name>widgetset</name>
-			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
+			<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>
 		</supports>
 		<portlet-info>
-			<title>BrowserDemo</title>
-			<short-title>BrowserDemo</short-title>
+			<title>Inter-portlet events</title>
+			<short-title>Inter-portlet
+				events</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>
+		<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>
@@ -334,24 +297,26 @@
 		be serializable and have JAXB binding.
 	-->
 	<event-definition>
-		<qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname>
+		<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://www.vaadin.com/hello">vaadin:Reply</qname>
+		<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://www.vaadin.com/params">vaadin:HelloState</qname>
+		<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
 
-		<container-runtime-option> <name>javax.portlet.escapeXml</name>
-		<value>false</value> </container-runtime-option>
+		<container-runtime-option>
+			<name>javax.portlet.escapeXml</name>
+			<value>false</value>
+		</container-runtime-option>
 	-->
 </portlet-app>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 6b6b681525..a30990e896 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -370,13 +370,11 @@
 	<servlet-mapping>

 		<servlet-name>FeatureBrowser</servlet-name>

 		<url-pattern>/FeatureBrowser/*</url-pattern>

-		<!-- portlet style=height:650px -->

 	</servlet-mapping>

 

 	<servlet-mapping>

 		<servlet-name>Sampler</servlet-name>

 		<url-pattern>/sampler/*</url-pattern>

-		<!-- portlet style=height:650px -->

 	</servlet-mapping>

 

 	<servlet-mapping>

@@ -407,7 +405,6 @@
 	<servlet-mapping>

 		<servlet-name>ModalWindow</servlet-name>

 		<url-pattern>/ModalWindow/*</url-pattern>

-		<!-- portlet -->

 	</servlet-mapping>

 

 	<servlet-mapping>

@@ -418,7 +415,6 @@
 	<servlet-mapping>

 		<servlet-name>Calc</servlet-name>

 		<url-pattern>/Calc/*</url-pattern>

-		<!-- portlet -->

 	</servlet-mapping>

 

 	<servlet-mapping>

@@ -437,7 +433,6 @@
 	<servlet-mapping>

 		<servlet-name>ChatServlet</servlet-name>

 		<url-pattern>/chat/*</url-pattern>

-		<!-- portlet -->

 	</servlet-mapping>

 	

 	<servlet-mapping>