From db1501dd9a745eca64384ee4527636d8ccce3629 Mon Sep 17 00:00:00 2001
From: Sasha <Main-laptop2>
Date: Mon, 1 Jul 2013 14:47:59 +0100
Subject: [PATCH] Change version number: 2.0 -> 2.0.1 add building min-client
 without log4j

---
 build.xml |   30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 04f80a4..693e480 100644
--- a/build.xml
+++ b/build.xml
@@ -20,21 +20,21 @@
 	<property name="compbio-ga" value="compbio-ga-1.0.jar"/>
 	
 	<!-- products -->
-	<property name="jaba_version" value="2.1"/>
+	<property name="jaba_version" value="2.0.1"/>
 	<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="min-jaba-client-nolog" value="${distdir}/min-jaba-client-nolog-${jaba_version}.jar"/>
+	<property name="jaba-client-src" value="${distdir}/jabaws-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"/>
-	<property name="full-jaba-client-pack" value="${distdir}/full-jaba-client-pack.zip"/>
+	<property name="full-jaba-client-pack" value="${distdir}/full-jaba-client-${jaba_version}-pack.zip"/>
 	<property name="jaba" value="${distdir}/jabaws.war"/>
 	<!-- TODO  
 	<property name="jaba-dundee" value="${distdir}/jaba-dundee.war"/>
 	 -->
-	<property name="jaba-no-binaries" value="${distdir}/jaba-no-binaries.war"/>
+	<property name="jaba-no-binaries" value="${distdir}/jabaws-no-binaries.war"/>
 	<property name="binaries" value="${distdir}/binaries.zip"/>
 	<property name="jaba-devel-web" value="${distdir}/jaba-devel-website.zip"/>
 
@@ -237,8 +237,7 @@
 
 	<target name="minimal-jaba-client-jar" depends="compile, datamodel-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class">
 		<echo>Jar file: Minimal WS client jar</echo>
-		<delete file="${basedir}/${min-jaba-client}">
-		</delete>
+		<delete file="${basedir}/${min-jaba-client}"></delete>
 		<jar jarfile="${basedir}/${min-jaba-client}">
 			<zipgroupfileset excludes="META-INF/*.SF" dir="" includes="${datamodel}" />
 			<fileset dir="${basedir}/WEB-INF/classes/">
@@ -256,6 +255,23 @@
 				<attribute name="Implementation-URL" value="${project.url}" />
 			</manifest>
 		</jar>
+		<delete file="${basedir}/${min-jaba-client-nolog}"></delete>
+		<jar jarfile="${basedir}/${min-jaba-client-nolog}">
+			<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="${author}" />
+				<attribute name="Main-Class" value="compbio.ws.client.Jws2Client" />
+				<attribute name="Class-Path" value="." />
+				<attribute name="Implementation-Title" value="Minimal ${product} Client" />
+				<attribute name="Implementation-Vendor" value="${author}" />
+				<attribute name="Implementation-URL" value="${project.url}" />
+			</manifest>
+		</jar>
 	</target>
 
 	<target name="full-jaba-client-jar" depends="compile" description="Pack datamodel, engine and runners">
-- 
1.7.10.2