summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2011-11-28 12:43:27 +0000
committerArtur Signell <artur.signell@itmill.com>2011-11-28 12:43:27 +0000
commitad47ed7b537acad4a4fa8d1aa68538667bce50bb (patch)
tree4cbf8448f05638ddd2ac18155fce9167977a7276 /build
parentc63f0db47a2ae65583cde9108fa9f5b852b153e7 (diff)
downloadvaadin-framework-ad47ed7b537acad4a4fa8d1aa68538667bce50bb.tar.gz
vaadin-framework-ad47ed7b537acad4a4fa8d1aa68538667bce50bb.zip
#8009 Made war include resources required by the demo launcher
svn changeset:22151/svn branch:6.7
Diffstat (limited to 'build')
-rw-r--r--build/build.xml9
1 files changed, 6 insertions, 3 deletions
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>