diff options
| author | Henri Sara <hesara@vaadin.com> | 2014-07-07 14:09:42 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2014-07-07 14:10:19 +0300 |
| commit | be819fcbe19750fc0c390fbb55819376af047188 (patch) | |
| tree | e35e6a889f2e261f645de1c1fb04f82b2fbda29c /WebContent/WEB-INF | |
| parent | a91d4ed98b86fbf61138723d5903c63867194d12 (diff) | |
| parent | 8c36375edb9cadfec64a67f034d2a6828242df6f (diff) | |
| download | vaadin-framework-7.3.0.beta1.tar.gz vaadin-framework-7.3.0.beta1.zip | |
Merge branch 'master' into 7.37.3.0.beta1
Change-Id: I0efe8538f2472d1a6cf5ec10aadcde13ed39f9ad
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 268fe1ea66..fb2ddbd998 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -44,6 +44,11 @@ <async-supported>true</async-supported> </servlet> <servlet> + <servlet-name>GwtRpcTest</servlet-name> + <servlet-class>com.vaadin.tests.widgetset.server.gwtrpc.GwtRpcServletTest</servlet-class> + </servlet> + + <servlet> <servlet-name>UI provider app</servlet-name> <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> <init-param> @@ -134,15 +139,19 @@ <param-value>false</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>GwtRpcTest</servlet-name> + <url-pattern>/VAADIN/widgetsets/com.vaadin.tests.widgetset.TestingWidgetSet/GwtRpcTest/*</url-pattern> + </servlet-mapping> <servlet-mapping> <servlet-name>UI provider app</servlet-name> |