diff options
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/liferay-display.xml | 2 | ||||
| -rw-r--r-- | WebContent/WEB-INF/liferay-portlet.xml | 6 | ||||
| -rw-r--r-- | WebContent/WEB-INF/portlet.xml | 116 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 232 |
4 files changed, 175 insertions, 181 deletions
diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml index 12a8e4315b..014ed31b47 100644 --- a/WebContent/WEB-INF/liferay-display.xml +++ b/WebContent/WEB-INF/liferay-display.xml @@ -4,6 +4,6 @@ <display> <category name="Vaadin"> <portlet id="JSR286TestPortlet" /> - <portlet id="Vaadin Liferay Theme Portlet"/> + <portlet id="Vaadin Liferay Theme Portlet" /> </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 5a8d6fac8e..ea060ce44a 100644 --- a/WebContent/WEB-INF/liferay-portlet.xml +++ b/WebContent/WEB-INF/liferay-portlet.xml @@ -4,7 +4,7 @@ <liferay-portlet-app> <portlet> <portlet-name>JSR286TestPortlet</portlet-name> - <instanceable>false</instanceable> + <instanceable>false</instanceable> <ajaxable>false</ajaxable> </portlet> <portlet> @@ -12,7 +12,7 @@ <instanceable>false</instanceable> <ajaxable>false</ajaxable> </portlet> - + <role-mapper> <role-name>administrator</role-name> <role-link>Administrator</role-link> @@ -29,5 +29,5 @@ <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 45ce1eee83..3a603c43ae 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -1,85 +1,79 @@ <?xml version="1.0" encoding="UTF-8"?> <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"> + 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>JSR286TestPortlet</portlet-name> - <display-name>Vaadin Portlet 2.0 Test</display-name> - <portlet-class>com.vaadin.server.VaadinPortlet</portlet-class> - <init-param> - <name>ui</name> - <value>com.vaadin.tests.integration.JSR286Portlet</value> - </init-param> - <init-param> - <name>widgetset</name> - <value>com.vaadin.DefaultWidgetSet</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>Vaadin Portlet 2.0 Test</title> - <short-title>Vaadin Portlet 2.0 Test</short-title> - </portlet-info> + <portlet> + <portlet-name>JSR286TestPortlet</portlet-name> + <display-name>Vaadin Portlet 2.0 Test</display-name> + <portlet-class>com.vaadin.server.VaadinPortlet</portlet-class> + <init-param> + <name>ui</name> + <value>com.vaadin.tests.integration.JSR286Portlet</value> + </init-param> + <init-param> + <name>widgetset</name> + <value>com.vaadin.DefaultWidgetSet</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>Vaadin Portlet 2.0 Test</title> + <short-title>Vaadin Portlet 2.0 Test</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> + <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> <portlet-name>Vaadin Liferay Theme Portlet</portlet-name> <display-name>Vaadin Liferay Theme</display-name> - + <portlet-class>com.vaadin.server.LegacyVaadinPortlet</portlet-class> <init-param> <name>application</name> <value>com.vaadin.tests.integration.LiferayThemeDemo</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>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> + <role-name>power-user</role-name> + </security-role-ref> + <security-role-ref> + <role-name>user</role-name> + </security-role-ref> </portlet> - <!-- - 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> - --> + <!-- 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> --> </portlet-app>
\ No newline at end of file diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 848baea318..ba948968e2 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -1,134 +1,134 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app id="vaadin-uitest" version="3.0" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - <!-- THIS IS A DEVELOPMENT AND TESTING web.xml . --> + <!-- THIS IS A DEVELOPMENT AND TESTING web.xml . --> - <display-name>Vaadin</display-name> - <description>Vaadin examples</description> + <display-name>Vaadin</display-name> + <description>Vaadin examples</description> - <context-param> - <param-name>productionMode</param-name> - <param-value>false</param-value> - </context-param> + <context-param> + <param-name>productionMode</param-name> + <param-value>false</param-value> + </context-param> - <context-param> - <param-name>resourceCacheTime</param-name> - <param-value>3600</param-value> - </context-param> - <servlet> - <servlet-name>Embed App 1</servlet-name> - <servlet-class>com.vaadin.server.LegacyVaadinServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>com.vaadin.tests.components.button.Buttons</param-value> - </init-param> - </servlet> - <servlet> - <servlet-name>Embed App 2</servlet-name> - <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> - <init-param> - <param-name>UI</param-name> - <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value> - </init-param> - </servlet> - <servlet> - <servlet-name>UI provider app</servlet-name> - <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> - <init-param> - <param-name>UIProvider</param-name> - <param-value>com.vaadin.tests.applicationservlet.InitParamUIProvider</param-value> - </init-param> - <init-param> - <param-name>UI</param-name> - <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value> - </init-param> - </servlet> + <context-param> + <param-name>resourceCacheTime</param-name> + <param-value>3600</param-value> + </context-param> + <servlet> + <servlet-name>Embed App 1</servlet-name> + <servlet-class>com.vaadin.server.LegacyVaadinServlet</servlet-class> + <init-param> + <param-name>application</param-name> + <param-value>com.vaadin.tests.components.button.Buttons</param-value> + </init-param> + </servlet> + <servlet> + <servlet-name>Embed App 2</servlet-name> + <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> + <init-param> + <param-name>UI</param-name> + <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value> + </init-param> + </servlet> + <servlet> + <servlet-name>UI provider app</servlet-name> + <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> + <init-param> + <param-name>UIProvider</param-name> + <param-value>com.vaadin.tests.applicationservlet.InitParamUIProvider</param-value> + </init-param> + <init-param> + <param-name>UI</param-name> + <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value> + </init-param> + </servlet> - <servlet> - <servlet-name>VaadinApplicationRunner</servlet-name> - <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> - <!-- Non-default values for testing purposes --> - <init-param> - <param-name>legacyPropertyToString</param-name> - <param-value>false</param-value> - </init-param> - <init-param> - <param-name>heartbeatInterval</param-name> - <param-value>301</param-value> - </init-param> - <init-param> - <param-name>resourceCacheTime</param-name> - <param-value>3601</param-value> - </init-param> - <init-param> - <param-name>closeIdleSessions</param-name> - <param-value>true</param-value> - </init-param> - <init-param> - <param-name>testParam</param-name> - <param-value>42</param-value> - </init-param> - </servlet> + <servlet> + <servlet-name>VaadinApplicationRunner</servlet-name> + <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> + <!-- Non-default values for testing purposes --> + <init-param> + <param-name>legacyPropertyToString</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>heartbeatInterval</param-name> + <param-value>301</param-value> + </init-param> + <init-param> + <param-name>resourceCacheTime</param-name> + <param-value>3601</param-value> + </init-param> + <init-param> + <param-name>closeIdleSessions</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>testParam</param-name> + <param-value>42</param-value> + </init-param> + </servlet> - <servlet> - <servlet-name>VaadinApplicationRunnerWithPush</servlet-name> - <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> - <init-param> - <param-name>pushmode</param-name> - <param-value>automatic</param-value> - </init-param> - <async-supported>true</async-supported> - </servlet> + <servlet> + <servlet-name>VaadinApplicationRunnerWithPush</servlet-name> + <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> + <init-param> + <param-name>pushmode</param-name> + <param-value>automatic</param-value> + </init-param> + <async-supported>true</async-supported> + </servlet> - <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet --> - <servlet> - <servlet-name>IntegrationTest</servlet-name> - <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> - <init-param> - <param-name>UI</param-name> - <param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value> - </init-param> - <async-supported>true</async-supported> - </servlet> - <servlet-mapping> - <servlet-name>Embed App 1</servlet-name> - <url-pattern>/embed1/*</url-pattern> - </servlet-mapping> + <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet --> + <servlet> + <servlet-name>IntegrationTest</servlet-name> + <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> + <init-param> + <param-name>UI</param-name> + <param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value> + </init-param> + <async-supported>true</async-supported> + </servlet> + <servlet-mapping> + <servlet-name>Embed App 1</servlet-name> + <url-pattern>/embed1/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>Embed App 2</servlet-name> - <url-pattern>/embed2/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>Embed App 2</servlet-name> + <url-pattern>/embed2/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>UI provider app</servlet-name> - <url-pattern>/uiprovider/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>UI provider app</servlet-name> + <url-pattern>/uiprovider/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>VaadinApplicationRunner</servlet-name> - <url-pattern>/run/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>VaadinApplicationRunner</servlet-name> + <url-pattern>/run/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>VaadinApplicationRunnerWithPush</servlet-name> - <url-pattern>/run-push/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>VaadinApplicationRunnerWithPush</servlet-name> + <url-pattern>/run-push/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>IntegrationTest</servlet-name> - <url-pattern>/integration/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>IntegrationTest</servlet-name> + <url-pattern>/integration/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>IntegrationTest</servlet-name> - <url-pattern>/VAADIN/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>IntegrationTest</servlet-name> + <url-pattern>/VAADIN/*</url-pattern> + </servlet-mapping> - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> </web-app> |