aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Kerola <henri.kerola@itmill.com>2010-09-20 14:47:01 +0000
committerHenri Kerola <henri.kerola@itmill.com>2010-09-20 14:47:01 +0000
commite46903fc8b5dafb35f8d8641693cb1674d64b2f1 (patch)
treeb2da0244b2b34affba1165beea504a1a0f6a6830
parent311e97de1e9fc390d4ece587baedacf009be1abe (diff)
downloadvaadin-framework-e46903fc8b5dafb35f8d8641693cb1674d64b2f1.tar.gz
vaadin-framework-e46903fc8b5dafb35f8d8641693cb1674d64b2f1.zip
#5581: LiferayThemeDemo portlet
svn changeset:15078/svn branch:6.4
-rw-r--r--WebContent/WEB-INF/liferay-display.xml1
-rw-r--r--WebContent/WEB-INF/liferay-portlet.xml5
-rw-r--r--WebContent/WEB-INF/portlet.xml34
3 files changed, 40 insertions, 0 deletions
diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index 903f441d8b..c4da4c96bd 100644
--- a/WebContent/WEB-INF/liferay-display.xml
+++ b/WebContent/WEB-INF/liferay-display.xml
@@ -9,6 +9,7 @@
<portlet id="Portlet Mode Example" />
<portlet id="Portlet HTML Mode Example" />
<portlet id="AddressBookPortlet" />
+ <portlet id="Vaadin Liferay Theme Portlet"/>
<!-- These should be used together -->
<portlet id="InterPortletEventPortlet" />
diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml
index 559592a48a..1cfb3d05f2 100644
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/WebContent/WEB-INF/liferay-portlet.xml
@@ -32,6 +32,11 @@
<instanceable>true</instanceable>
<ajaxable>false</ajaxable>
</portlet>
+ <portlet>
+ <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
+ <instanceable>true</instanceable>
+ <ajaxable>false</ajaxable>
+ </portlet>
<role-mapper>
<role-name>administrator</role-name>
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 54c99c5af9..7c565584d7 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -225,6 +225,40 @@
<role-name>user</role-name>
</security-role-ref>
</portlet>
+
+ <portlet>
+ <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
+ <display-name>Vaadin Liferay Theme</display-name>
+
+ <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
+ <init-param>
+ <name>application</name>
+ <value>com.vaadin.demo.themes.LiferayTheme</value>
+ </init-param>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>view</portlet-mode>
+ </supports>
+
+ <portlet-info>
+ <title>Vaadin Liferay Theme</title>
+ <short-title>Vaadin Liferay Theme</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>
<!-- A Vaadin portlet and a non-Vaadin portlet that can communicate with each other -->
<portlet>