dundee executable conf

[jabaws.git] / build.xml

diff --git a/build.xml b/build.xml
index 884ee5e..de21ce4 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
@@ -346,7 +346,8 @@
        </target>\r
 \r
        <target name="clearStatDB" description="Remove all records from statistics database">\r
-                <java classname="compbio.stat.collector.StatDB" fork="true" failonerror="true" classpath="${classes}">\r
+                <echo>Cleaning Statistics database</echo>\r
+                <java classname="compbio.stat.collector.StatDB" fork="false" failonerror="true" classpath="${classes}">\r
                    <classpath refid="project.classpath" />\r
             </java>\r
        </target>\r
@@ -370,7 +371,7 @@
        </target>\r
 -->\r
 \r
-       <target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar">\r
+       <target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar,  clearStatDB">\r
                <echo>Preparing a war file without binaries</echo>\r
                <delete file="${jaba-no-binaries}">\r
                </delete>\r
@@ -388,15 +389,17 @@
                                <include name="lib/*"/>\r
                        </zipfileset>\r
                        <zipfileset dir="${basedir}/ExecutionStatistic" prefix="ExecutionStatistic" />\r
+                       <zipfileset dir="${basedir}/statpages" prefix="statpages" />\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
                        <!-- Put a copy of log4j configuration file where it can be used  -->\r
                        <zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>\r
-                       <!-- This is runtime dependency must be supplied by the container -->\r
-                       <!-- zipfileset dir="${web.lib.path}" includes="servlet-api.jar" prefix="WEB-INF/lib" / -->\r
                </zip>\r
        </target>\r
 \r