]> source.dussan.org Git - vaadin-framework.git/commitdiff
Restore serlvet configs that were disabled during Window -> Root split
authorLeif Åstrand <leif@vaadin.com>
Wed, 4 Jan 2012 13:56:08 +0000 (15:56 +0200)
committerLeif Åstrand <leif@vaadin.com>
Wed, 4 Jan 2012 13:56:08 +0000 (15:56 +0200)
WebContent/WEB-INF/web.xml

index 6b40c31d962696d3425908a388b2f2e72c4ee141..b83979acc6e0509e9410d2520f6b428f96993032 100644 (file)
        </servlet>\r
 \r
        <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->\r
-<!--   <servlet>\r
+       <servlet>\r
                <servlet-name>IntegrationTest</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
                <init-param>\r
                        <param-name>application</param-name>\r
                        <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>\r
                </init-param>\r
-       </servlet>  -->\r
+       </servlet>\r
 \r
        <servlet-mapping>\r
                <servlet-name>VaadinApplicationRunner</servlet-name>\r
                <url-pattern>/run/*</url-pattern>\r
        </servlet-mapping>\r
 \r
-<!--   <servlet-mapping>\r
+       <servlet-mapping>\r
                <servlet-name>IntegrationTest</servlet-name>\r
                <url-pattern>/integration/*</url-pattern>\r
-       </servlet-mapping>  -->\r
+       </servlet-mapping>\r
 \r
-<!--   <servlet-mapping>\r
+       <servlet-mapping>\r
                <servlet-name>IntegrationTest</servlet-name>\r
                <url-pattern>/VAADIN/*</url-pattern>\r
-       </servlet-mapping>  -->\r
+       </servlet-mapping>\r
 \r
        <welcome-file-list>\r
                <welcome-file>index.html</welcome-file>\r