Change version number: 2.0 -> 2.0.1

add building min-client without log4j

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