diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-01-04 15:56:08 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-01-04 15:56:08 +0200 |
| commit | 8e04f2383db71a33f185636558fee77e98dbd18d (patch) | |
| tree | 61bd3099548a94851bc2a580442efdf37f568a90 /WebContent | |
| parent | 63bf051247461cff44c9f23d19d2e1064266d55f (diff) | |
| download | vaadin-framework-8e04f2383db71a33f185636558fee77e98dbd18d.tar.gz vaadin-framework-8e04f2383db71a33f185636558fee77e98dbd18d.zip | |
Restore serlvet configs that were disabled during Window -> Root split
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 12 |
1 files changed, 6 insertions, 6 deletions
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>
|