summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-10-01 21:46:26 +0300
committerArtur Signell <artur@vaadin.com>2012-10-01 22:09:00 +0300
commit9e853dd5c69e1f7841e3695c3f3bc6bbb19cf554 (patch)
tree6b05a450ade8fd5f9213466bb666dcaf2c38d6ce /WebContent/WEB-INF
parentcf20da29cf87994e2f9bd0f6957585196e792abd (diff)
downloadvaadin-framework-9e853dd5c69e1f7841e3695c3f3bc6bbb19cf554.tar.gz
vaadin-framework-9e853dd5c69e1f7841e3695c3f3bc6bbb19cf554.zip
Updated GAE test to be UI based (#9816)
Change-Id: I50a0ac7a8aca239e04806a8d6f9be1d9263e71dd
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r--WebContent/WEB-INF/web.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 67eaba0cca..ea15e2d2a1 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -18,7 +18,7 @@
<context-param>
<param-name>resourceCacheTime</param-name>
<param-value>3600</param-value>
- </context-param>
+ </context-param>
<servlet>
<servlet-name>Embed App 1</servlet-name>
<servlet-class>com.vaadin.server.LegacyVaadinServlet</servlet-class>
@@ -58,8 +58,8 @@
<servlet-name>IntegrationTest</servlet-name>
<servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
<init-param>
- <param-name>application</param-name>
- <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>
+ <param-name>UI</param-name>
+ <param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value>
</init-param>
</servlet>
<servlet-mapping>
@@ -71,12 +71,12 @@
<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>VaadinApplicationRunner</servlet-name>
<url-pattern>/run/*</url-pattern>