From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 17 Aug 2011 10:29:13 +0000 (+0000)
Subject: Removed unused test servlet from web.xml - problematic for GAE integration test
X-Git-Tag: 6.7.0.beta1~62
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d436ce7236114fa5a38ef9ed3dc173d1f28c931;p=vaadin-framework.git

Removed unused test servlet from web.xml - problematic for GAE integration test

svn changeset:20446/svn branch:6.7
---

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 9ba665973a..2f0a69cf5a 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -3,9 +3,7 @@
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
     "http://java.sun.com/dtd/web-app_2_3.dtd">
 
-<!-- THIS IS THE DEVELOPMENT web.xml Package web.xml can be found in build/package, 
-	please update it too when making changes that should affect the package. -->
-
+<!-- THIS IS A DEVELOPMENT AND TESTING web.xml . -->
 
 <web-app>
 	<display-name>Vaadin</display-name>
@@ -31,26 +29,11 @@
 		</init-param>
 	</servlet>
 
-
-	<servlet>
-		<servlet-name>GAESyncTest</servlet-name>
-		<servlet-class>com.vaadin.terminal.gwt.server.GAEApplicationServlet</servlet-class>
-		<init-param>
-			<param-name>application</param-name>
-			<param-value>com.vaadin.tests.appengine.GAESyncTest</param-value>
-		</init-param>
-	</servlet>
-
 	<servlet-mapping>
 		<servlet-name>VaadinApplicationRunner</servlet-name>
 		<url-pattern>/run/*</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>GAESyncTest</servlet-name>
-		<url-pattern>/gaesynctest/*</url-pattern>
-	</servlet-mapping>
-
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 	</welcome-file-list>