From 3d266de566ee2b4bc8758906c6c487848bea120f Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Fri, 30 Sep 2011 11:20:12 +0000
Subject: [PATCH] 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
---
 build/build.xml                          | 6 ++++++
 build/package/WebContent/WEB-INF/web.xml | 4 ++++
 2 files changed, 10 insertions(+)

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>
-- 
2.39.5