summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2011-11-11 13:31:44 +0200
committerLeif Åstrand <leif@vaadin.com>2011-11-11 13:31:44 +0200
commitfe436236e954688e0007a7dbdcf1158e3b746976 (patch)
tree1513b54b133935187d4d66cf95be8c8e32897659 /WebContent
parent7721fe835080973a94f37605bd789dc7c32090e5 (diff)
downloadvaadin-framework-fe436236e954688e0007a7dbdcf1158e3b746976.tar.gz
vaadin-framework-fe436236e954688e0007a7dbdcf1158e3b746976.zip
Add servlet mapping for testing the new root initialization logic
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/WEB-INF/web.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 6b40c31d96..42f3b2df87 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -28,6 +28,15 @@
<param-value>com.vaadin.tests,com.vaadin.tests.tickets,com.vaadin.tests.components,com.vaadin.tests.components.layouts,com.vaadin.tests.components.panel,com.vaadin.tests.components.combobox,com.vaadin.tests.components.popupview,com.vaadin.tests.components.datefield,com.vaadin.tests.components.richtextarea,com.vaadin.tests.components.absolutelayout,com.vaadin.tests.components.embedded,com.vaadin.tests.components.splitpanel,com.vaadin.tests.components.abstractfield,com.vaadin.tests.components.form,com.vaadin.tests.components.table,com.vaadin.tests.components.accordion,com.vaadin.tests.components.label,com.vaadin.tests.components.tabsheet,com.vaadin.tests.components.beanitemcontainer,com.vaadin.tests.components.link,com.vaadin.tests.components.textfield,com.vaadin.tests.components.button,com.vaadin.tests.components.optiongroup,com.vaadin.tests.components.tree,com.vaadin.tests.components.caption,com.vaadin.tests.components.orderedlayout,com.vaadin.tests.components.window,com.vaadin.tests.dd,com.vaadin.tests.validation</param-value>
</init-param>
</servlet>
+
+ <servlet>
+ <servlet-name>RootsTester</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>rootLayout</param-name>
+ <param-value>com.vaadin.RootTestLayout</param-value>
+ </init-param>
+ </servlet>
<!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->
<!-- <servlet>
@@ -44,6 +53,11 @@
<url-pattern>/run/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>RootsTester</servlet-name>
+ <url-pattern>/roots/*</url-pattern>
+ </servlet-mapping>
+
<!-- <servlet-mapping>
<servlet-name>IntegrationTest</servlet-name>
<url-pattern>/integration/*</url-pattern>