summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-21 16:51:20 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-21 16:51:20 +0300
commitfb8cf5cb457f6fe95bd3b07d2fb1a1fb03a3be8f (patch)
tree60fba1a290003fb9c1d381222d5e83c8d250c170 /WebContent/WEB-INF
parent167ff2bcea28bb5ad4a9ccba4f2b5b9819371390 (diff)
downloadvaadin-framework-fb8cf5cb457f6fe95bd3b07d2fb1a1fb03a3be8f.tar.gz
vaadin-framework-fb8cf5cb457f6fe95bd3b07d2fb1a1fb03a3be8f.zip
Allow specifying UIProvider using a servlet parameter (#9628)
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r--WebContent/WEB-INF/web.xml17
1 files changed, 17 insertions, 0 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index d8a8066edc..6112e5ba1c 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -30,6 +30,18 @@
<param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value>
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>UI provider app</servlet-name>
+ <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
+ <init-param>
+ <param-name>UIProvider</param-name>
+ <param-value>com.vaadin.tests.applicationservlet.InitParamUIProvider</param-value>
+ </init-param>
+ <init-param>
+ <param-name>UI</param-name>
+ <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value>
+ </init-param>
+ </servlet>
<context-param>
<param-name>resourceCacheTime</param-name>
@@ -61,6 +73,11 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>UI provider app</servlet-name>
+ <url-pattern>/uiprovider/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>VaadinApplicationRunner</servlet-name>
<url-pattern>/run/*</url-pattern>
</servlet-mapping>