summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-03 13:57:20 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-03 14:05:31 +0300
commit6f276f4451cb185919084181b54fb84532a1d984 (patch)
tree698b9459b867349aae9de5f26ebefa7dd1f3b81d /WebContent
parent3dd5a4824cda3dd7842c937a618feebc2b1a0f27 (diff)
downloadvaadin-framework-6f276f4451cb185919084181b54fb84532a1d984.tar.gz
vaadin-framework-6f276f4451cb185919084181b54fb84532a1d984.zip
Combine ApplicationServlet and AAS and rename to VaadinServlet (#9460)
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/WEB-INF/web.xml4
1 files changed, 2 insertions, 2 deletions
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>