diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-03 14:18:16 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-03 14:18:16 +0300 |
| commit | b6e762dc8408b607568919f518ab2e2f74df7010 (patch) | |
| tree | b6ccf5b5cb1225d6744f20b0292880cd094bbcf1 /WebContent | |
| parent | 1bc93daa34b1094f41cf19f20342c94c4e423244 (diff) | |
| parent | ae2c302f71554f49b3f57b649cec7450c652cf09 (diff) | |
| download | vaadin-framework-b6e762dc8408b607568919f518ab2e2f74df7010.tar.gz vaadin-framework-b6e762dc8408b607568919f518ab2e2f74df7010.zip | |
Merge branch 'master' into layoutgraph
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/portlet.xml | 4 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index f695551cf2..5faafc5c36 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -6,7 +6,7 @@ <portlet> <portlet-name>JSR286TestPortlet</portlet-name> <display-name>Vaadin Portlet 2.0 Test</display-name> - <portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class> + <portlet-class>com.vaadin.server.VaadinPortlet</portlet-class> <init-param> <name>application</name> <value>com.vaadin.tests.integration.JSR286PortletApplication</value> @@ -44,7 +44,7 @@ <portlet-name>Vaadin Liferay Theme Portlet</portlet-name> <display-name>Vaadin Liferay Theme</display-name> - <portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class> + <portlet-class>com.vaadin.server.VaadinPortlet</portlet-class> <init-param> <name>application</name> <value>com.vaadin.tests.integration.LiferayThemeDemo</value> diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 58a125c10f..70c875b10c 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -25,10 +25,10 @@ <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> </servlet> - <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet --> + <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet --> <servlet> <servlet-name>IntegrationTest</servlet-name> - <servlet-class>com.vaadin.server.ApplicationServlet</servlet-class> + <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> <init-param> <param-name>application</param-name> <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value> |