diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-08-17 10:29:13 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-08-17 10:29:13 +0000 |
| commit | 6d436ce7236114fa5a38ef9ed3dc173d1f28c931 (patch) | |
| tree | fbceeb8c93efc6c8c3a6a21436af2f91f54dea74 /WebContent/WEB-INF | |
| parent | 63411e8a5478aef8316cd270f045d82c83caee68 (diff) | |
| download | vaadin-framework-6d436ce7236114fa5a38ef9ed3dc173d1f28c931.tar.gz vaadin-framework-6d436ce7236114fa5a38ef9ed3dc173d1f28c931.zip | |
Removed unused test servlet from web.xml - problematic for GAE integration test
svn changeset:20446/svn branch:6.7
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 19 |
1 files changed, 1 insertions, 18 deletions
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>
|