From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 28 Nov 2011 12:43:27 +0000 (+0000)
Subject: #8009 Made war include resources required by the demo launcher
X-Git-Tag: 7.0.0.alpha1~225^2~3^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad47ed7b537acad4a4fa8d1aa68538667bce50bb;p=vaadin-framework.git

#8009 Made war include resources required by the demo launcher

svn changeset:22151/svn branch:6.7
---

diff --git a/build/build.xml b/build/build.xml
index cc7fc5dcba..a038edb139 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -197,9 +197,12 @@
                 <exclude name="**/*.html" />
                 <exclude name="**/*.css" />
                 <exclude name="**/*.xml" />
-               	<!-- Include files required by the DemoLauncher/DevelopmentServerLauncher -->
-        		<include name="{$toolkit-package}/launcher/**/jetty-webdefault.xml" />
-        		<include name="{$toolkit-package}/launcher/**/keystore" />
+            </fileset>
+
+        	<!-- Include files required by the DemoLauncher/DevelopmentServerLauncher -->
+            <fileset dir="tests/testbench">
+        		<include name="${toolkit-package}/launcher/jetty-webdefault.xml" />
+        		<include name="${toolkit-package}/launcher/keystore" />
             </fileset>
         </copy>