diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-18 14:24:37 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-18 14:24:58 +0300 |
| commit | c93035c9812b33718195c829a7231347e095b549 (patch) | |
| tree | 44c57c251794c07e7d4e078be361903970981752 /WebContent/WEB-INF | |
| parent | 959802d73e42904fc1fa3b2e35b7d49c74a36220 (diff) | |
| download | vaadin-framework-c93035c9812b33718195c829a7231347e095b549.tar.gz vaadin-framework-c93035c9812b33718195c829a7231347e095b549.zip | |
Test which embeds two UIs on the same page (#9619)
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 70c875b10c..d752b8eb33 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -14,6 +14,22 @@ <param-value>false</param-value> <description>Vaadin production mode</description> </context-param> + <servlet> + <servlet-name>Embed App 1</servlet-name> + <servlet-class>com.vaadin.server.LegacyVaadinServlet</servlet-class> + <init-param> + <param-name>application</param-name> + <param-value>com.vaadin.tests.components.absolutelayout.AbsoluteLayoutClipping</param-value> + </init-param> + </servlet> + <servlet> + <servlet-name>Embed App 2</servlet-name> + <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> + <init-param> + <param-name>ui</param-name> + <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value> + </init-param> + </servlet> <context-param> <param-name>resourceCacheTime</param-name> @@ -34,8 +50,17 @@ <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value> </init-param> </servlet> + <servlet-mapping> + <servlet-name>Embed App 1</servlet-name> + <url-pattern>/embed1/*</url-pattern> + </servlet-mapping> <servlet-mapping> + <servlet-name>Embed App 2</servlet-name> + <url-pattern>/embed2/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> <servlet-name>VaadinApplicationRunner</servlet-name> <url-pattern>/run/*</url-pattern> </servlet-mapping> |