X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=02298e0b565b273629f7bcf3ee33a8bbd38809c9;hb=27b0fee53379f33ed89e260ba639d3fc38b38ce8;hp=1448e35fe6ce107a6ed38930e6137227b052ef07;hpb=535359a3d592ee41bda72e7356f0181f6cee9d07;p=jabaws.git

diff --git a/build.xml b/build.xml
index 1448e35..02298e0 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,9 @@
 	<!-- Distributive file names-->
 	<property name="distdir" value="website/archive"/>
 	<mkdir dir="${distdir}" />
+	<property name="datamodel" value="${distdir}/datamodel-1.0.jar"/>
 	<property name="min-jaba-client" value="${distdir}/min-jaba-client.jar"/>
+	<property name="aacon-ws-client" value="${distdir}/aacon-ws-client.jar"/>
 	<property name="full-jaba-client" value="${distdir}/full-jaba-client.jar"/>
 	<property name="jaba-source-jar" value="${distdir}/jaba-source.jar"/>
 	<property name="full-jaba-client-pack" value="${distdir}/full-jaba-client-pack.zip"/>
@@ -147,18 +149,34 @@
 	</target>
 
 
+	<target name="datamodel-jar" description="Pack data model classes" depends="compile">
+			<echo>Jar file: Minimal WS client jar</echo>
+			<delete file="${basedir}/${datamodel}"></delete>
+			<jar jarfile="${basedir}/${datamodel}">
+				<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
+					<include name="compbio-util-1.3.jar"/>
+				</zipgroupfileset>
+				<fileset dir="${basedir}/WEB-INF/classes/"> 
+					<include name="compbio/data/sequence/*.class"/>
+					<include name="compbio/metadata/*.class"/>
+				</fileset>
+				<manifest>
+					<attribute name="Built-By" value="Peter Troshin" />
+					<attribute name="Class-Path" value="." />
+					<attribute name="Implementation-Title" value="Datamodel for Java Bioinformatics Analyses Web Services " />
+					<attribute name="Implementation-Vendor" value="Peter Troshin" />
+					<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />
+				</manifest>
+			</jar>
+		</target>
 	
 	
-	<target name="minimal-jaba-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile">
+	<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}"></delete>
 		<jar jarfile="${basedir}/${min-jaba-client}">
-			<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
-				<include name="compbio-util-1.2.jar"/>
-			</zipgroupfileset>
+			<zipgroupfileset excludes="META-INF/*.SF" dir="" includes="${datamodel}" />
 			<fileset dir="${basedir}/WEB-INF/classes/"> 
-				<include name="compbio/data/sequence/*.class"/>
-				<include name="compbio/metadata/*.class"/>
 				<!-- This will include JAXWS artifacts. Alternatively they can be generated on the fly. -->
 				<include name="compbio/data/msa/**"/>
 				<include name="compbio/ws/client/**"/>
@@ -173,6 +191,27 @@
 			</manifest>
 		</jar>
 	</target>
+	
+	<target name="aacon-ws-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile, datamodel-jar">
+			<echo>Jar file: AAConWS client jar</echo>
+			<delete file="${basedir}/${aacon-ws-client}"></delete>
+			<jar jarfile="${basedir}/${aacon-ws-client}">
+				<zipgroupfileset excludes="META-INF/*.SF" dir="" includes="${datamodel}" />
+				<fileset dir="${basedir}/WEB-INF/classes/"> 
+					<!-- This will include JAXWS artifacts. Alternatively they can be generated on the fly. -->
+					<include name="compbio/data/msa/**"/>
+					<include name="compbio/ws/client/**"/>
+				</fileset>
+				<manifest>
+					<attribute name="Built-By" value="Peter Troshin" />
+					<attribute name="Main-Class" value="compbio.ws.client.AAConClient" />
+					<attribute name="Class-Path" value="." />
+					<attribute name="Implementation-Title" value="AACon Client" />
+					<attribute name="Implementation-Vendor" value="Peter Troshin" />
+					<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk/aacon" />
+				</manifest>
+			</jar>
+	</target>
 
 	<target name="source-jar" description="Pack java sources" depends="compile">
 		<delete file="${basedir}/${jaba-source-jar}"></delete>
@@ -216,7 +255,7 @@
 			<jar jarfile="${full-jaba-client}">
 				<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
 					<include name="log4j-1.2.15.jar"/>
-					<include name="compbio-util-1.2.jar"/>
+					<include name="compbio-util-1.3.jar"/>
 					<include name="compbio-annotations-1.0.jar"/>
 					<include name="drmaa.jar"/>
 				</zipgroupfileset>
@@ -231,7 +270,8 @@
 			</jar>
 		</target>
 	
-	<target name="full-jaba-client" description="Pack binaries with sources and configuration files" depends="full-jaba-client-jar, pack-binaries">
+	<target name="full-jaba-client" description="Pack binaries with sources and configuration files" 
+			depends="full-jaba-client-jar, pack-binaries">
 		<echo>Packing binaries, and configuration files</echo>
 		<zip destfile="${full-jaba-client-pack}" >
 			<zipgroupfileset file="${binaries}" />
@@ -247,7 +287,7 @@
 			<jar jarfile="${full-jaba-client}">
 				<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
 					<include name="log4j-1.2.15.jar"/>
-					<include name="compbio-util-1.2.jar"/>
+					<include name="compbio-util-1.3.jar"/>
 					<include name="compbio-annotations-1.0.jar"/>
 					<include name="drmaa.jar"/>
 				</zipgroupfileset>