diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-11-01 17:05:56 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-11-01 17:05:56 +0200 |
| commit | be1d3c336573fe461ca66d4c91597febadb4e58f (patch) | |
| tree | e033d64a6588d546c6d2479e41abaf1931b472d4 /WebContent/WEB-INF | |
| parent | 822aa7c87c01500031c5d94ef7f84b2959e7e5b0 (diff) | |
| download | vaadin-framework-be1d3c336573fe461ca66d4c91597febadb4e58f.tar.gz vaadin-framework-be1d3c336573fe461ca66d4c91597febadb4e58f.zip | |
Split Window to Root and Window
Everything related to top level windows disabled in Window, introduced
basic Root for top level windows and disabled everything that isn't
required to get a simple hard coded example to run.
Diffstat (limited to 'WebContent/WEB-INF')
| -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 b83979acc6..6b40c31d96 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>
|