From 7a57f91892e8ed0d43a725e123c6ca132568256a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Petter=20Holmstr=C3=B6m?= <petter.holmstrom@itmill.com>
Date: Wed, 4 Nov 2009 11:57:39 +0000
Subject: [PATCH] Added more demo portlets.

svn changeset:9618/svn branch:portlet_2.0
---
 WebContent/WEB-INF/liferay-display.xml |  1 +
 WebContent/WEB-INF/liferay-portlet.xml |  6 ++++++
 WebContent/WEB-INF/portlet.xml         | 24 +++++++++++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index 73e43478ef..288a4638c1 100644
--- a/WebContent/WEB-INF/liferay-display.xml
+++ b/WebContent/WEB-INF/liferay-display.xml
@@ -17,5 +17,6 @@
 				<portlet id="HelloWorldPortlet" />
 				<portlet id="AddressBookPortlet" />
 				<portlet id="CalcPortlet"/>
+				<portlet id="SamplerPortlet"/>
         </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 eecb32eb15..696afaaee8 100644
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/WebContent/WEB-INF/liferay-portlet.xml
@@ -72,6 +72,12 @@
                 <instanceable>true</instanceable>       
                 <ajaxable>false</ajaxable>
         </portlet>          
+        <portlet>
+                <portlet-name>SamplerPortlet</portlet-name>
+                <instanceable>true</instanceable>       
+                <ajaxable>false</ajaxable>
+        </portlet>
+        
         <role-mapper>
                 <role-name>administrator</role-name>
                 <role-link>Administrator</role-link>
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 719560852c..f097509c87 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -153,7 +153,29 @@
 			<short-title>Address Book</short-title>
 		</portlet-info>		
 	</portlet>	
-	<!-- TODO -->
+	
+	<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>
-- 
2.39.5