From c93035c9812b33718195c829a7231347e095b549 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 18 Sep 2012 14:24:37 +0300 Subject: Test which embeds two UIs on the same page (#9619) --- WebContent/WEB-INF/web.xml | 25 +++++++ WebContent/statictestfiles/embed-two-uis.html | 93 +++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100755 WebContent/statictestfiles/embed-two-uis.html 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 @@ false Vaadin production mode + + Embed App 1 + com.vaadin.server.LegacyVaadinServlet + + application + com.vaadin.tests.components.absolutelayout.AbsoluteLayoutClipping + + + + Embed App 2 + com.vaadin.server.VaadinServlet + + ui + com.vaadin.tests.components.label.MarginsInLabels + + resourceCacheTime @@ -34,7 +50,16 @@ com.vaadin.tests.integration.IntegrationTestApplication + + Embed App 1 + /embed1/* + + + Embed App 2 + /embed2/* + + VaadinApplicationRunner /run/* diff --git a/WebContent/statictestfiles/embed-two-uis.html b/WebContent/statictestfiles/embed-two-uis.html new file mode 100755 index 0000000000..62dff7d8d0 --- /dev/null +++ b/WebContent/statictestfiles/embed-two-uis.html @@ -0,0 +1,93 @@ + + + + + +com.vaadin.tests.components.embedded.EmbeddedPdf + + + + + + + + Embed 1 (AbsoluteLayoutClipping) +
+
+ +
+ + + + + + Embed 2 (MarginsInLabels) +
+
+ +
+ + + + + \ No newline at end of file -- cgit v1.2.3