From 9071f5a419a668f70cdfce38b95506f992dcb695 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Sat, 13 Aug 2011 06:51:20 +0000
Subject: [PATCH] #7178 Fixed build.xml: launcher configuration must be
 included in the WAR

svn changeset:20369/svn branch:6.7
---
 build/build.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 6017b5d72d..2a7cf67105 100644
--- 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>
-- 
2.39.5