From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 4 Jan 2012 13:56:08 +0000 (+0200)
Subject: Restore serlvet configs that were disabled during Window -> Root split
X-Git-Tag: 7.0.0.alpha2~541^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8e04f2383db71a33f185636558fee77e98dbd18d;p=vaadin-framework.git

Restore serlvet configs that were disabled during Window -> Root split
---

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 6b40c31d96..b83979acc6 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -30,29 +30,29 @@
 	</servlet>
 
 	<!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->
-<!-- 	<servlet>
+	<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>
 
 	<servlet-mapping>
 		<servlet-name>VaadinApplicationRunner</servlet-name>
 		<url-pattern>/run/*</url-pattern>
 	</servlet-mapping>
 
-<!--	<servlet-mapping>
+	<servlet-mapping>
 		<servlet-name>IntegrationTest</servlet-name>
 		<url-pattern>/integration/*</url-pattern>
-	</servlet-mapping>  -->
+	</servlet-mapping>
 
-<!-- 	<servlet-mapping>
+	<servlet-mapping>
 		<servlet-name>IntegrationTest</servlet-name>
 		<url-pattern>/VAADIN/*</url-pattern>
-	</servlet-mapping>  -->
+	</servlet-mapping>
 
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>