From 89714f80ad93d9aaa161d641d8ff867033046f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Wed, 15 Mar 2017 17:00:58 +0100
Subject: java : vaadin : better use of zipfileset

---
 java/vaadin/build.xml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/java/vaadin/build.xml b/java/vaadin/build.xml
index 0a4304a..3a09f9d 100644
--- a/java/vaadin/build.xml
+++ b/java/vaadin/build.xml
@@ -127,29 +127,25 @@
                 <include name="**/*-javadoc.jar"/>
             </fileset>
         </delete>
-        <copy todir="${classes.dir}" flatten="true">
-            <fileset dir="${resources.dir}"/>
-        </copy>
 
         <delete file="${dist.dir}/${war.name}"/>
         <war destfile="${dist.dir}/${war.name}"
             webxml="${web.dir}/WEB-INF/web.xml">
+            <zipfileset dir="${resources.dir}" prefix="WEB-INF/classes"/>
             <classes dir="${classes.dir}" includes="**" />
+            <zipfileset dir="${build.dir}/VAADIN/themes" prefix="VAADIN/themes"/>
             <fileset dir="${web.dir}">
                 <patternset>
                     <include name="*.html" />
-                    <include name="WEB-INF/lib/*" />
-                    <include name="WEB-INF/*.xml" />
                     <include name="VAADIN/widgetsets/**/*" />
                     <include name="VAADIN/themes/**/fonts/**/*" />
                     <include name="VAADIN/themes/**/icons/**/*" />
                     <include name="VAADIN/themes/**/images/**/*" />
+                    <include name="WEB-INF/lib/*" />
+                    <include name="WEB-INF/*.xml" />
                 </patternset>
             </fileset>
-            <fileset dir="${build.dir}">
-                <include name="WEB-INF/lib/*" />
-                <include name="VAADIN/themes/**/*" />
-            </fileset>
+            <zipfileset dir="${lib.dir}" prefix="WEB-INF/lib"/>
         </war>
     </target>
 
-- 
cgit v1.1-2-g2b99