diff options
| author | Artur Signell <artur@vaadin.com> | 2016-10-26 22:35:23 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-10-29 07:34:54 +0000 |
| commit | 1e978a6ba0924c240803543a31d024b7c649f4ce (patch) | |
| tree | 4ebe5a576e2b4c05417b0822c8becb91bd091130 /uitest/src/main/webapp | |
| parent | 334b3f0a4b393f274d171dddc359be605c2cd1b1 (diff) | |
| download | vaadin-framework-1e978a6ba0924c240803543a31d024b7c649f4ce.tar.gz vaadin-framework-1e978a6ba0924c240803543a31d024b7c649f4ce.zip | |
Serve static files also in servletPath/VAADIN (#14398)
Change-Id: I6891827a1fb99216d4e286c761d1384a88000604
Diffstat (limited to 'uitest/src/main/webapp')
| -rw-r--r-- | uitest/src/main/webapp/WEB-INF/web.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/uitest/src/main/webapp/WEB-INF/web.xml b/uitest/src/main/webapp/WEB-INF/web.xml index b96257b1e0..31f535e383 100644 --- a/uitest/src/main/webapp/WEB-INF/web.xml +++ b/uitest/src/main/webapp/WEB-INF/web.xml @@ -146,6 +146,15 @@ </init-param> <async-supported>true</async-supported> </servlet> + <servlet> + <servlet-name>ResourcesFromServlet</servlet-name> + <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> + <init-param> + <param-name>resources</param-name> + <param-value>/servlet-with-resources</param-value> + </init-param> + <async-supported>true</async-supported> + </servlet> <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet --> <servlet> @@ -221,6 +230,11 @@ <url-pattern>/VAADIN/*</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>ResourcesFromServlet</servlet-name> + <url-pattern>/servlet-with-resources/*</url-pattern> + </servlet-mapping> + <welcome-file-list> <welcome-file>index.html</welcome-file> </welcome-file-list> |