#7178 Fixed build.xml: launcher configuration must be included in the WAR

svn changeset:20369/svn branch:6.7

diff --git a/build/build.xml b/build/build.xml
index 6017b5d72d9e77f4ac2adb2aed0b713ec08a5cb1..2a7cf67105e2ec1074f510d1e413aeef1f673c40 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -780,13 +780,16 @@
     <!-- Demos  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <target name="demo" depends="vaadin.jar">
         <echo>Building demos</echo>
-        <echo>Adding demo class files.</echo>
+        <echo>Adding demo class files and launcher configuration.</echo>
         <copy todir="${output-dir}/WebContent/WEB-INF/classes">
             <fileset dir="${result-path}/classes">
                 <include name="${toolkit-package}/tests/integration/**/*" />
-                <!-- user might want to tweak launcher classes -->
                 <include name="${toolkit-package}/launcher/**" />
             </fileset>
+            <fileset dir="${result-path}/src/core">
+                <include name="${toolkit-package}/launcher/**" />
+                <exclude name="${toolkit-package}/launcher/**/*.java" />
+            </fileset>
         </copy>
 
         <echo>Adding test resources.</echo>