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

diff --git a/build.xml b/build.xml
index 884ee5e..426e3ca 100644
--- a/build.xml
+++ b/build.xml
@@ -17,12 +17,15 @@
 	<!-- dependencies on other compbio projects  -->
 	<property name="compbio-annotation" value="compbio-annotations-1.0.jar"/>
 	<property name="compbio-util" value="compbio-util-1.4.jar"/>
+	<property name="compbio-ga" value="compbio-ga-1.0.jar"/>
 	
 	<!-- products -->
 	<property name="jaba_version" value="2.0"/>
 	<property name="datamodel" value="${distdir}/datamodel-${jaba_version}.jar"/>
 	<property name="datamodel-src" value="${distdir}/datamodel-src-${jaba_version}.jar"/>
 	<property name="min-jaba-client" value="${distdir}/min-jaba-client-${jaba_version}.jar"/>
+	<property name="jaba-client-src" value="${distdir}/jaba-client-src-${jaba_version}.jar"/>
+	
 	<property name="aacon-ws-client" value="${distdir}/aacon-ws-client.jar"/>
 	<property name="full-jaba-client" value="${distdir}/full-jaba-client-${jaba_version}.jar"/>
 	<property name="jaba-source-jar" value="${distdir}/jabaws-src-${jaba_version}.jar"/>
@@ -181,7 +184,28 @@
 		</jar>
 	</target>
 
-
+	<target name="jaba-client-src-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="datamodel-source-jar">
+		<echo>Jar file: JABAWS client source</echo>
+		<delete file="${jaba-client-src}">
+		</delete>
+		<jar jarfile="${jaba-client-src}">
+			<zipgroupfileset  excludes="META-INF/*.MF" file="${datamodel-src}"/>
+				<fileset dir="${basedir}/webservices">
+					<!-- This will include JAXWS artifacts. Alternatively they can be generated on the fly. -->
+					<include name="compbio/data/msa/**"/>
+					<exclude name="compbio/ws/client/ServicesUtil**"/>
+					<exclude name="compbio/ws/client/AAConClient**"/>
+					<include name="compbio/ws/client/**"/>
+				</fileset>
+				<manifest>
+					<attribute name="Built-By" value="${author}" />
+					<attribute name="Implementation-Title" value="${product} Client Source Code" />
+					<attribute name="Implementation-Vendor" value="${author}" />
+					<attribute name="Implementation-URL" value="${project.url}" />
+				</manifest>
+			</jar>
+	</target>
+	
 	<target name="minimal-jaba-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile, datamodel-jar">
 		<echo>Jar file: Minimal WS client jar</echo>
 		<delete file="${basedir}/${min-jaba-client}">
@@ -306,14 +330,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 +370,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 +395,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 +413,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>
 
@@ -433,7 +460,7 @@
  
 	<target name="build-all" description="Build-all the distributives"
 		depends="full-jaba-client, minimal-jaba-client-jar, jaba-no-binaries,
-		 jaba-complete, datamodel-jar, datamodel-source-jar, source-jar"/>
+		 jaba-complete, datamodel-jar, datamodel-source-jar, source-jar, jaba-client-src-jar"/>
 
 	<!-- This task does not really depends on compile, but it is better to make sure that the code is sound -->
 	<target name="archive-project" description="Pack everything in the project for those who do not have access to SVN" depends="compile">