Build script improvements & updated util

[jabaws.git] / build.xml

diff --git a/build.xml b/build.xml
index 884ee5e..3d55caa 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -306,14 +306,14 @@
                <echo>Packing binaries, and configuration files</echo>\r
                <zip destfile="${full-jaba-client-pack}" >\r
                        <zipgroupfileset file="${binaries}" />\r
-                       <zipfileset dir="conf" prefix="conf">\r
+                       <zipfileset dir="conf" prefix="conf" >\r
                                <exclude name="**/temp/**"/>\r
                        </zipfileset>\r
                        <fileset file="${full-jaba-client}" />\r
                </zip>\r
        </target>\r
 \r
-\r
+       \r
        <target name="full-jaba-jar" description="Pack datamodel, engine, runners, configuration, binaries and webservices" depends="compile">\r
                <echo>Jar file: Full WS client jar</echo>\r
                <delete file="${full-jaba-client}">\r
@@ -389,7 +389,10 @@
                        </zipfileset>\r
                        <zipfileset dir="${basedir}/ExecutionStatistic" prefix="ExecutionStatistic" />\r
                        <zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>\r
-                       <zipfileset dir="${basedir}/conf" prefix="conf" excludes="**/log4j.properties*"/>\r
+                       <zipfileset dir="conf" prefix="conf" >\r
+                               <exclude name="**/temp/**"/>\r
+                               <exclude name="**/log4j.properties*"/>\r
+                       </zipfileset>\r
                        <!-- Add JABAWS web site apart from the binary archive -->\r
                        <zipfileset dir="${basedir}/website" excludes="archive/**, devel*.html, tests/**, template.html"/>\r
                        <zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>\r