Make sure the issue behind #7692 is detected in integration tests by serving basic...

svn changeset:21468/svn branch:6.6

diff --git a/build/build.xml b/build/build.xml
index 7883cb5112b3ad1cdffe28a28200341f99e36418..c17bbe41f20067f252598c1864cc63a584de26b9 100644 (file)
--- 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 e508df1d28556a91e5ad60caae934370e570a6dc..fafc3adf89ebb0cad173c401c38975ab4aaf9478 100644 (file)
--- 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>