From aaa1b378c923ff52df94963496613c82fbfcf8d9 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 17 Aug 2011 12:34:53 +0000
Subject: #7433 separate servlet configuration in web.xml to enable GAE testing

svn changeset:20449/svn branch:6.7
---
 WebContent/WEB-INF/web.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'WebContent')

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 2f0a69cf5a..b5cd3fa1c8 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -29,11 +29,26 @@
 		</init-param>
 	</servlet>
 
+	<!-- 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>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>
+		</init-param>
+	</servlet>
+
 	<servlet-mapping>
 		<servlet-name>VaadinApplicationRunner</servlet-name>
 		<url-pattern>/run/*</url-pattern>
 	</servlet-mapping>
 
+	<servlet-mapping>
+		<servlet-name>IntegrationTest</servlet-name>
+		<url-pattern>/integration/*</url-pattern>
+	</servlet-mapping>
+
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 	</welcome-file-list>
-- 
cgit v1.2.3