Add JRonn runner, tester, methods to parse jronn output files.

[jabaws.git] / build.xml

diff --git a/build.xml b/build.xml
index 1448e35..724776f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -8,6 +8,7 @@
        <!-- Distributive file names-->\r
        <property name="distdir" value="website/archive"/>\r
        <mkdir dir="${distdir}" />\r
+       <property name="datamodel" value="${distdir}/datamodel-1.0.jar"/>\r
        <property name="min-jaba-client" value="${distdir}/min-jaba-client.jar"/>\r
        <property name="full-jaba-client" value="${distdir}/full-jaba-client.jar"/>\r
        <property name="jaba-source-jar" value="${distdir}/jaba-source.jar"/>\r
@@ -147,18 +148,34 @@
        </target>\r
 \r
 \r
+       <target name="datamodel-jar" description="Pack data model classes" depends="compile">\r
+                       <echo>Jar file: Minimal WS client jar</echo>\r
+                       <delete file="${basedir}/${datamodel}"></delete>\r
+                       <jar jarfile="${basedir}/${datamodel}">\r
+                               <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >\r
+                                       <include name="compbio-util-1.2.jar"/>\r
+                               </zipgroupfileset>\r
+                               <fileset dir="${basedir}/WEB-INF/classes/"> \r
+                                       <include name="compbio/data/sequence/*.class"/>\r
+                                       <include name="compbio/metadata/*.class"/>\r
+                               </fileset>\r
+                               <manifest>\r
+                                       <attribute name="Built-By" value="Peter Troshin" />\r
+                                       <attribute name="Class-Path" value="." />\r
+                                       <attribute name="Implementation-Title" value="Datamodel for Java Bioinformatics Analyses Web Services " />\r
+                                       <attribute name="Implementation-Vendor" value="Peter Troshin" />\r
+                                       <attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />\r
+                               </manifest>\r
+                       </jar>\r
+               </target>\r
        \r
        \r
-       <target name="minimal-jaba-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile">\r
+       <target name="minimal-jaba-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile, datamodel-jar">\r
                <echo>Jar file: Minimal WS client jar</echo>\r
                <delete file="${basedir}/${min-jaba-client}"></delete>\r
                <jar jarfile="${basedir}/${min-jaba-client}">\r
-                       <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >\r
-                               <include name="compbio-util-1.2.jar"/>\r
-                       </zipgroupfileset>\r
+                       <zipgroupfileset excludes="META-INF/*.SF" dir="" includes="${datamodel}" />\r
                        <fileset dir="${basedir}/WEB-INF/classes/"> \r
-                               <include name="compbio/data/sequence/*.class"/>\r
-                               <include name="compbio/metadata/*.class"/>\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