X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=de21ce42ad1fb9446033301c8656082adc010f39;hb=79f221c4bce618320fa5b7bdefa36431bc2b3460;hp=884ee5e36b0ae2923e8f0185e5e63d6316300937;hpb=b92afa441493a3c675fa0e63977aa7d5f0e17d8e;p=jabaws.git

diff --git a/build.xml b/build.xml
index 884ee5e..de21ce4 100644
--- a/build.xml
+++ b/build.xml
@@ -306,14 +306,14 @@
 		<echo>Packing binaries, and configuration files</echo>
 		<zip destfile="${full-jaba-client-pack}" >
 			<zipgroupfileset file="${binaries}" />
-			<zipfileset dir="conf" prefix="conf">
+			<zipfileset dir="conf" prefix="conf" >
 				<exclude name="**/temp/**"/>
 			</zipfileset>
 			<fileset file="${full-jaba-client}" />
 		</zip>
 	</target>
 
-
+	
 	<target name="full-jaba-jar" description="Pack datamodel, engine, runners, configuration, binaries and webservices" depends="compile">
 		<echo>Jar file: Full WS client jar</echo>
 		<delete file="${full-jaba-client}">
@@ -346,7 +346,8 @@
 	</target>
 
 	<target name="clearStatDB" description="Remove all records from statistics database">
-		 <java classname="compbio.stat.collector.StatDB" fork="true" failonerror="true" classpath="${classes}">
+		 <echo>Cleaning Statistics database</echo>
+		 <java classname="compbio.stat.collector.StatDB" fork="false" failonerror="true" classpath="${classes}">
 	            <classpath refid="project.classpath" />
 	     </java>
 	</target>
@@ -370,7 +371,7 @@
 	</target>
 -->
 
-	<target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar">
+	<target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar,  clearStatDB">
 		<echo>Preparing a war file without binaries</echo>
 		<delete file="${jaba-no-binaries}">
 		</delete>
@@ -388,15 +389,17 @@
 				<include name="lib/*"/>
 			</zipfileset>
 			<zipfileset dir="${basedir}/ExecutionStatistic" prefix="ExecutionStatistic" />
+			<zipfileset dir="${basedir}/statpages" prefix="statpages" />
 			<zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>
-			<zipfileset dir="${basedir}/conf" prefix="conf" excludes="**/log4j.properties*"/>
+			<zipfileset dir="conf" prefix="conf" >
+				<exclude name="**/temp/**"/>
+				<exclude name="**/log4j.properties*"/>
+			</zipfileset>
 			<!-- Add JABAWS web site apart from the binary archive -->
 			<zipfileset dir="${basedir}/website" excludes="archive/**, devel*.html, tests/**, template.html"/>
 			<zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>
 			<!-- Put a copy of log4j configuration file where it can be used  -->
 			<zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>
-			<!-- This is runtime dependency must be supplied by the container -->
-			<!-- zipfileset dir="${web.lib.path}" includes="servlet-api.jar" prefix="WEB-INF/lib" / -->
 		</zip>
 	</target>