diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-09-30 11:20:12 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-09-30 11:20:12 +0000 |
| commit | 3d266de566ee2b4bc8758906c6c487848bea120f (patch) | |
| tree | a193fc544dea55fddf083558329fdae5a10ad23f | |
| parent | 1191e837ecd6779dca869cecce8687ca6dd24987 (diff) | |
| download | vaadin-framework-3d266de566ee2b4bc8758906c6c487848bea120f.tar.gz vaadin-framework-3d266de566ee2b4bc8758906c6c487848bea120f.zip | |
Make sure the issue behind #7692 is detected in integration tests by serving basic static resources from the Vaadin JAR
svn changeset:21468/svn branch:6.6
| -rw-r--r-- | build/build.xml | 6 | ||||
| -rw-r--r-- | build/package/WebContent/WEB-INF/web.xml | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/build/build.xml b/build/build.xml index 7883cb5112..c17bbe41f2 100644 --- a/build/build.xml +++ b/build/build.xml @@ -252,6 +252,12 @@ <war warfile="${result-path}/${product-file}-demo-${version.full}.war"> <fileset dir="${output-dir}/WebContent"> <include name="**/*" /> + <!-- In Vaadin JAR --> + <exclude name="VAADIN/themes/base/**/*" /> + <exclude name="VAADIN/themes/liferay/**/*" /> + <exclude name="VAADIN/themes/reindeer/**/*" /> + <exclude name="VAADIN/themes/runo/**/*" /> + <exclude name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" /> </fileset> </war> </target> diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml index e508df1d28..fafc3adf89 100644 --- a/build/package/WebContent/WEB-INF/web.xml +++ b/build/package/WebContent/WEB-INF/web.xml @@ -202,6 +202,10 @@ <servlet-name>RunoTheme</servlet-name> <url-pattern>/RunoTheme/*</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>Sampler</servlet-name> + <url-pattern>/VAADIN/*</url-pattern> + </servlet-mapping> <welcome-file-list> <welcome-file>index.jsp</welcome-file> <welcome-file>index.html</welcome-file> |