diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-29 12:22:31 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-29 12:22:31 +0300 |
| commit | 63595217a224b9fbc6de4b8bdc2e6b317e0558d5 (patch) | |
| tree | 9d7bcafc23ef5f4c6aad8bca6555fc04396aa1c6 /WebContent/WEB-INF | |
| parent | e18177bac62e8367829dfc5ec3083a09973e621e (diff) | |
| download | vaadin-framework-63595217a224b9fbc6de4b8bdc2e6b317e0558d5.tar.gz vaadin-framework-63595217a224b9fbc6de4b8bdc2e6b317e0558d5.zip | |
Merged com.vaadin.terminal.gwt.server into com.vaadin.server (#9431)
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/portlet.xml | 4 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index 0b059a69e9..f695551cf2 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.terminal.gwt.server.ApplicationPortlet2</portlet-class> + <portlet-class>com.vaadin.server.ApplicationPortlet2</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.terminal.gwt.server.ApplicationPortlet2</portlet-class> + <portlet-class>com.vaadin.server.ApplicationPortlet2</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 5b250d86f2..58a125c10f 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -28,7 +28,7 @@ <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet --> <servlet> <servlet-name>IntegrationTest</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> + <servlet-class>com.vaadin.server.ApplicationServlet</servlet-class> <init-param> <param-name>application</param-name> <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value> |