Merge branch 'JWS-29' into JABAWS_Release_2_0
[jabaws.git] / build.xml
index 05137d6..426e3ca 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,33 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 \r
 <project default="minimal-jaba-client-jar" name="Build minimal client for Java Bioinformatics Analysis Web Services" basedir=".">\r
-       \r
+\r
        <property name="basedir" location="${basedir}/log" />\r
        <property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx24-amd64"/>\r
-       \r
+\r
        <!-- 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
+       \r
+       <!-- projects details -->\r
+       <property name="project.url" value="http://www.compbio.dundee.ac.uk/jabaws"/>\r
+       <property name="product" value="Java Bioinformatics Analyses Web Services"/>\r
+       <property name="author" value="Peter Troshin"/>\r
+       \r
+       <!-- dependencies on other compbio projects  -->\r
+       <property name="compbio-annotation" value="compbio-annotations-1.0.jar"/>\r
+       <property name="compbio-util" value="compbio-util-1.4.jar"/>\r
+       <property name="compbio-ga" value="compbio-ga-1.0.jar"/>\r
+       \r
+       <!-- products -->\r
+       <property name="jaba_version" value="2.0"/>\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="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="jaba-no-jaxws" value="${distdir}/jaba-no-jaxws.war"/>\r
-       <property name="jaba-no-jaxws-windows" value="${distdir}/jaba-no-jaxws-windows.war"/>\r
        <property name="jaba" value="${distdir}/jaba.war"/>\r
+       <!-- TODO  \r
        <property name="jaba-dundee" value="${distdir}/jaba-dundee.war"/>\r
-       <property name="jaba-no-jaxws-no-binaries" value="${distdir}/jaba-no-jaxws-no-binaries.war"/>\r
+        -->\r
        <property name="jaba-no-binaries" value="${distdir}/jaba-no-binaries.war"/>\r
-       <property name="jaba-windows" value="${distdir}/jaba-windows.war"/>\r
        <property name="binaries" value="${distdir}/binaries.zip"/>\r
-       <property name="win-binaries" value="${distdir}/win-binaries.zip"/>\r
        <property name="jaba-devel-web" value="${distdir}/jaba-devel-website.zip"/>\r
-       <property name="jaxws-lib" value="${distdir}/jaxws-lib.zip"/>\r
+\r
        <!--Whole project archive -->\r
        <property name="jaba-project" value="${distdir}/jaba-project.zip"/>\r
-       \r
-       \r
+\r
+\r
        <!-- java -->\r
        <property name="test.src" location="${basedir}/testsrc" />\r
        <property name="classes" location="${basedir}/WEB-INF/classes" />\r
@@ -42,7 +56,7 @@
                        <include name="*.jar" />\r
                </fileset>\r
                <fileset dir="${web.lib.path}">\r
-                                       <include name="*.jar" />\r
+                       <include name="*.jar" />\r
                </fileset>\r
        </path>\r
 \r
@@ -55,6 +69,7 @@
                <pathelement location="${classes}" />\r
        </path>\r
 \r
+\r
        <!-- The compilation order is \r
        1. datamodel \r
        2. engine\r
                <!-- Complile the datamodel first -->\r
                <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6"\r
                                source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
+                       <compilerarg value="-Xlint:unchecked"/>\r
+                       <classpath refid="project.classpath" />\r
                </javac>\r
                <!-- Complile the engines -->\r
                <javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6"\r
                                source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
+                       <compilerarg value="-Xlint:unchecked"/>\r
+                       <classpath refid="project.classpath" />\r
                </javac>\r
                <!-- Complile the runners -->\r
                <javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6"\r
                                source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
-               </javac>\r
-               <!-- Complile the tests -->\r
-               <javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.6"\r
-                               source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
-                               <classpath refid="test.classpath" />\r
+                       <compilerarg value="-Xlint:unchecked"/>\r
+                       <classpath refid="project.classpath" />\r
                </javac>\r
                <!-- Complile the webservices -->\r
                <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6"\r
                                source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
+                       <compilerarg value="-Xlint:unchecked"/>\r
+                       <classpath refid="project.classpath" />\r
+               </javac>\r
+               <!-- Complile the tests -->\r
+               <javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.6"\r
+                               source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
+                       <compilerarg value="-Xlint:unchecked"/>\r
+                       <classpath refid="project.classpath" />\r
+                       <classpath refid="test.classpath" />\r
                </javac>\r
        </target>\r
 \r
- <!-- Clean temp directories -->\r
-    <target name="clean">\r
-        <delete dir="${classes}" />\r
-        <mkdir dir="${classes}" />\r
-    </target>\r
+       <!-- Clean temp directories -->\r
+       <target name="clean">\r
+               <delete dir="${classes}" />\r
+               <mkdir dir="${classes}" />\r
+       </target>\r
 \r
        <!--\r
        Compile with optimisation. Do not compile testsrc \r
                <!-- copy files to class path-->\r
                <copy file="${basedir}/conf/log4j.properties" tofile="${classes}/log4j.properties" />\r
                <!-- Complile the datamodel first -->\r
-               <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6"\r
-                               source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
+               <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6" source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">\r
+                       <compilerarg value="-Xlint:-unchecked" />\r
+                       <classpath refid="project.classpath" />\r
                </javac>\r
                <!-- Complile the engines -->\r
-               <javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6"\r
-                               source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
+               <javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6" source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">\r
+                       <compilerarg value="-Xlint:-all" />\r
+                       <compilerarg value="-Xlint:-unchecked" />\r
+                       <classpath refid="project.classpath" />\r
                </javac>\r
                <!-- Complile the runners -->\r
-               <javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6"\r
-                               source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
+               <javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6" source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">\r
+                       <compilerarg value="-Xlint:-unchecked" />\r
+                       <classpath refid="project.classpath" />\r
                </javac>\r
                <!-- Complile the webservices -->\r
-               <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6"\r
-                               source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
-                               <compilerarg value="-Xlint:unchecked"/>\r
-                               <classpath refid="project.classpath" />\r
+               <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6" source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">\r
+                       <compilerarg value="-Xlint:-unchecked" />\r
+                       <classpath refid="project.classpath" />\r
                </javac>\r
+\r
        </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.3.jar"/>\r
-                               </zipgroupfileset>\r
-                               <fileset dir="${basedir}/WEB-INF/classes/"> \r
-                                       <include name="compbio/data/sequence/*.class"/>\r
-                                       <include name="compbio/metadata/*.class"/>\r
+               <echo>Jar file: Minimal WS client jar</echo>\r
+               <delete file="${basedir}/${datamodel}">\r
+               </delete>\r
+               <jar jarfile="${basedir}/${datamodel}">\r
+                       <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >\r
+                               <include name="${compbio-util}"/>\r
+                               <include name="${compbio-annotation}"/>\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="${author}" />\r
+                               <attribute name="Class-Path" value="." />\r
+                               <attribute name="Implementation-Title" value="Datamodel for ${product} " />\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="jaba-client-src-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="datamodel-source-jar">\r
+               <echo>Jar file: JABAWS client source</echo>\r
+               <delete file="${jaba-client-src}">\r
+               </delete>\r
+               <jar jarfile="${jaba-client-src}">\r
+                       <zipgroupfileset  excludes="META-INF/*.MF" file="${datamodel-src}"/>\r
+                               <fileset dir="${basedir}/webservices">\r
+                                       <!-- This will include JAXWS artifacts. Alternatively they can be generated on the fly. -->\r
+                                       <include name="compbio/data/msa/**"/>\r
+                                       <exclude name="compbio/ws/client/ServicesUtil**"/>\r
+                                       <exclude name="compbio/ws/client/AAConClient**"/>\r
+                                       <include name="compbio/ws/client/**"/>\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
+                                       <attribute name="Built-By" value="${author}" />\r
+                                       <attribute name="Implementation-Title" value="${product} Client Source Code" />\r
+                                       <attribute name="Implementation-Vendor" value="${author}" />\r
+                                       <attribute name="Implementation-URL" value="${project.url}" />\r
                                </manifest>\r
                        </jar>\r
-               </target>\r
-       \r
+       </target>\r
        \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
+               <delete file="${basedir}/${min-jaba-client}">\r
+               </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
+                       <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="Peter Troshin" />\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 Java Bioinformatics Analyses Web Services Client" />\r
-                               <attribute name="Implementation-Vendor" value="Peter Troshin" />\r
-                               <attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />\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="source-jar" description="Pack java sources" depends="compile">\r
-               <delete file="${basedir}/${jaba-source-jar}"></delete>\r
-               <jar jarfile="${basedir}/${jaba-source-jar}">\r
-                       <fileset dir="${basedir}/datamodel"> \r
-                               <include name="**"/>\r
+       <target name="aacon-ws-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile, datamodel-jar">\r
+               <echo>Jar file: AAConWS client jar</echo>\r
+               <delete file="${basedir}/${aacon-ws-client}">\r
+               </delete>\r
+               <jar jarfile="${basedir}/${aacon-ws-client}">\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
-                       <fileset dir="${basedir}/runner"> \r
+                       <manifest>\r
+                               <attribute name="Built-By" value="${author}" />\r
+                               <attribute name="Main-Class" value="compbio.ws.client.AAConClient" />\r
+                               <attribute name="Class-Path" value="." />\r
+                               <attribute name="Implementation-Title" value="AACon Client" />\r
+                               <attribute name="Implementation-Vendor" value="${author}" />\r
+                               <attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk/aacon" />\r
+                       </manifest>\r
+               </jar>\r
+       </target>\r
+\r
+       <target name="source-jar" description="Pack java sources" depends="datamodel-source-jar">\r
+               <delete file="${basedir}/${jaba-source-jar}">\r
+               </delete>\r
+               <jar jarfile="${basedir}/${jaba-source-jar}">\r
+                       <zipgroupfileset  excludes="META-INF/*.MF" file="${datamodel-src}"/>\r
+                       <fileset dir="${basedir}/runner">\r
                                <include name="**"/>\r
                        </fileset>\r
-                       <fileset dir="${basedir}/engine"> \r
+                       <fileset dir="${basedir}/engine">\r
                                <include name="**"/>\r
                        </fileset>\r
-                       <fileset dir="${basedir}/webservices/"> \r
+                       <fileset dir="${basedir}/webservices/">\r
                                <include name="**"/>\r
                        </fileset>\r
                        <manifest>\r
-                               <attribute name="Built-By" value="Peter Troshin" />\r
+                               <attribute name="Built-By" value="${author}" />\r
                                <attribute name="Class-Path" value="." />\r
-                               <attribute name="Implementation-Title" value="Java Bioinformatics Analyses Web Services Source Code Archive" />\r
-                               <attribute name="Implementation-Vendor" value="Peter Troshin" />\r
-                               <attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />\r
+                               <attribute name="Implementation-Title" value="${product} Source Code Archive" />\r
+                               <attribute name="Implementation-Vendor" value="${author}" />\r
+                               <attribute name="Implementation-URL" value="${project.url}" />\r
                        </manifest>\r
                </jar>\r
-               \r
        </target>\r
        \r
-       <fileset dir="${basedir}/WEB-INF/classes/" id="fullclient"> \r
+       <target name="datamodel-source-jar" description="Pack java sources" depends="compile">\r
+                       <delete file="${datamodel-src}">\r
+                       </delete>\r
+                       <jar jarfile="${datamodel-src}">\r
+                               <fileset dir="${basedir}/datamodel">\r
+                                       <include name="**"/>\r
+                               </fileset>\r
+                               <zipgroupfileset excludes="META-INF/*.MF" dir="${lib.path}/src">\r
+                                       <include name="**"/>\r
+                               </zipgroupfileset>\r
+                               <manifest>\r
+                                       <attribute name="Built-By" value="${author}" />\r
+                                       <attribute name="Implementation-Title" value="${product} Datamodel Source Code Archive" />\r
+                                       <attribute name="Implementation-Vendor" value="${author}" />\r
+                                       <attribute name="Implementation-URL" value="${project.url}" />\r
+                               </manifest>\r
+                       </jar>\r
+               </target>\r
+\r
+       <fileset dir="${basedir}/WEB-INF/classes/" id="fullclient">\r
                <!-- Datamodel -->\r
                <include name="compbio/data/**"/>\r
                <include name="compbio/metadata/**"/>\r
        </fileset>\r
 \r
        <target name="full-jaba-client-jar" description="Pack datamodel, engine and runners" depends="compile">\r
-                       <echo>Jar file: Full WS client jar</echo>\r
-                       <delete file="${full-jaba-client}"></delete>\r
-                       <jar jarfile="${full-jaba-client}">\r
-                               <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >\r
-                                       <include name="log4j-1.2.15.jar"/>\r
-                                       <include name="compbio-util-1.3.jar"/>\r
-                                       <include name="compbio-annotations-1.0.jar"/>\r
-                                       <include name="drmaa.jar"/>\r
-                               </zipgroupfileset>\r
-                               <fileset refid="fullclient"/>\r
-                               <manifest>\r
-                                       <attribute name="Built-By" value="Peter Troshin" />\r
-                                       <attribute name="Class-Path" value="." />\r
-                                       <attribute name="Implementation-Title" value="Full Java Bioinformatics Analyses Web Services Client" />\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
+               <echo>Jar file: Full WS client jar</echo>\r
+               <delete file="${full-jaba-client}">\r
+               </delete>\r
+               <jar jarfile="${full-jaba-client}">\r
+                       <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >\r
+                               <include name="log4j-1.2.15.jar"/>\r
+                               <include name="${compbio-util}"/>\r
+                               <include name="${compbio-annotation}"/>\r
+                               <include name="drmaa.jar"/>\r
+                       </zipgroupfileset>\r
+                       <fileset refid="fullclient"/>\r
+                       <manifest>\r
+                               <attribute name="Built-By" value="${author}" />\r
+                               <attribute name="Class-Path" value="." />\r
+                               <attribute name="Implementation-Title" value="Full ${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" description="Pack binaries with sources and configuration files" \r
                        depends="full-jaba-client-jar, pack-binaries">\r
                <echo>Packing binaries, and configuration files</echo>\r
                <zip destfile="${full-jaba-client-pack}" >\r
                        <zipgroupfileset file="${binaries}" />\r
-                       <zipfileset dir="${basedir}/conf" prefix="conf"/>\r
-                       <fileset dir="." includes="${full-jaba-client}" />\r
+                       <zipfileset dir="conf" prefix="conf" >\r
+                               <exclude name="**/temp/**"/>\r
+                       </zipfileset>\r
+                       <fileset file="${full-jaba-client}" />\r
                </zip>\r
        </target>\r
 \r
        \r
        <target name="full-jaba-jar" description="Pack datamodel, engine, runners, configuration, binaries and webservices" depends="compile">\r
-                       <echo>Jar file: Full WS client jar</echo>\r
-                       <delete file="${full-jaba-client}"></delete>\r
-                       <jar jarfile="${full-jaba-client}">\r
-                               <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >\r
-                                       <include name="log4j-1.2.15.jar"/>\r
-                                       <include name="compbio-util-1.3.jar"/>\r
-                                       <include name="compbio-annotations-1.0.jar"/>\r
-                                       <include name="drmaa.jar"/>\r
-                               </zipgroupfileset>\r
-                               <fileset refid="fullclient"></fileset>\r
-                               <fileset dir="${basedir}/WEB-INF/classes/">\r
-                                       <!-- Web services-->\r
-                                       <include name="compbio/ws/**"/>\r
-                               </fileset>\r
-                               <!-- Set WSTester as main to help user to test their deployments -->\r
-                               <manifest>\r
-                                       <attribute name="Built-By" value="Peter Troshin" />\r
-                                       <attribute name="Class-Path" value="." />\r
-                                       <attribute name="Main-Class" value="compbio.ws.client.WSTester" />\r
-                                       <attribute name="Implementation-Title" value="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
+               <echo>Jar file: Full WS client jar</echo>\r
+               <delete file="${full-jaba-client}">\r
+               </delete>\r
+               <jar jarfile="${full-jaba-client}">\r
+                       <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >\r
+                               <include name="log4j-1.2.15.jar"/>\r
+                               <include name="${compbio-util}"/>\r
+                               <include name="${compbio-annotation}"/>\r
+                               <include name="drmaa.jar"/>\r
+                       </zipgroupfileset>\r
+                       <fileset refid="fullclient">\r
+                       </fileset>\r
+                       <fileset dir="${basedir}/WEB-INF/classes/">\r
+                               <!-- Statistics web application -->\r
+                               <include name="compbio/stat/**"/>\r
+                               <!-- Web services-->\r
+                               <include name="compbio/ws/**"/>\r
+                       </fileset>\r
+                       <!-- Set WSTester as main to help user to test their deployments -->\r
+                       <manifest>\r
+                               <attribute name="Built-By" value="${author}" />\r
+                               <attribute name="Class-Path" value="." />\r
+                               <attribute name="Main-Class" value="compbio.ws.client.WSTester" />\r
+                               <attribute name="Implementation-Title" value="${product}" />\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="pack-binaries" description="Zip all binary files"> \r
+       <target name="clearStatDB" description="Remove all records from statistics database">\r
+                <echo>Cleaning Statistics database</echo>\r
+                <java classname="compbio.stat.collector.StatDB" fork="false" failonerror="true" classpath="${classes}">\r
+                   <classpath refid="project.classpath" />\r
+            </java>\r
+       </target>\r
+       \r
+       <target name="pack-binaries" description="Zip all binary files">\r
                <delete file="${binaries}" failonerror="false"/>\r
                <zip destfile="${binaries}" >\r
                        <zipfileset dir="${basedir}/binaries" prefix="binaries" excludes="**/linux*/**"/>\r
                </zip>\r
        </target>\r
-       \r
-       <target name="pack-jaxws" description="Zip all JAXWS libraries"> \r
-               <delete file="${jaxws-lib}" failonerror="false"/>\r
-               <zip destfile="${jaxws-lib}" update="false" >\r
-                               <zipfileset dir="${web.lib.path}" includes="webservices-tools.jar"  prefix="WEB-INF/lib"  />\r
-                               <zipfileset dir="${web.lib.path}" includes="webservices-rt.jar"   prefix="WEB-INF/lib" />\r
-                               <zipfileset dir="${web.lib.path}" includes="webservices-api.jar"  prefix="WEB-INF/lib" />\r
-               </zip>\r
-       </target>\r
-               \r
-       <target name="pack-windows-binaries" description="Zip only windows binary files"> \r
+\r
+<!-- DEPRICATED \r
+       <target name="pack-windows-binaries" description="Zip only windows binary files">\r
                <delete file="${win-binaries}" failonerror="false" />\r
                <zip destfile="${win-binaries}">\r
                        <zipfileset dir="${basedir}/binaries" prefix="binaries" >\r
-                               <include name="clustalw2.exe"/>\r
-                               <include name="muscle.exe"/>\r
                                <include name="matrices/*" />\r
+                               <include name="windows/*" />\r
                        </zipfileset>\r
                </zip>\r
        </target>\r
+-->\r
 \r
-       <target name="jaba-no-jaxws-no-binaries" description="Prepare JWS2 war file without runtime dependency - JAXWS jars and native binaries" depends="full-jaba-jar">\r
-                               <echo>Preparing war file without JAXWS and binaries</echo>\r
-               <delete file="${jaba}"></delete>        \r
-               <delete file="${jaba-no-jaxws-no-binaries}"></delete>\r
-                               <zip destfile="${jaba-no-jaxws-no-binaries}" whenempty="create">\r
-                                       <zipfileset dir="${basedir}/WEB-INF" prefix="WEB-INF">\r
-                                               <include name="web.xml"/>\r
-                                               <include name="sun-jaxws.xml"/>\r
-                                               <exclude name="classes"/>\r
-                                               <exclude name="lib"/>\r
-                                       </zipfileset>\r
-                                       <zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>\r
-                                       <zipfileset dir="${basedir}/conf" prefix="conf" excludes="**/log4j.properties*"/>\r
-                                       <!-- Add JSW2 web site apart from the binary archive -->\r
-                                       <zipfileset dir="${basedir}/website" excludes="archive/**, full_javadoc/**, devel*.html, tests/**, template.html"/>\r
-                                       <zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>\r
-                                       <!-- Put a copy of log4j configuration file where it can be used  -->\r
-                                       <zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>\r
-                                       <!-- This is runtime dependency must be supplied by the container -->\r
-                                       <!-- zipfileset dir="${web.lib.path}" includes="servlet-api.jar" prefix="WEB-INF/lib" / -->\r
-                               </zip>\r
-       </target> \r
+       <target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar,  clearStatDB">\r
+               <echo>Preparing a war file without binaries</echo>\r
+               <delete file="${jaba-no-binaries}">\r
+               </delete>\r
+               <zip destfile="${jaba-no-binaries}" whenempty="create">\r
+                       <zipfileset dir="${basedir}/WEB-INF" prefix="WEB-INF">\r
+                               <exclude name="classes"/>\r
+                               <!-- These are included into JABA client so exclude the jars -->\r
+                               <exclude name="lib/drmaa.jar"/>\r
+                               <exclude name="lib/log4j-1.2.15.jar"/>\r
+                               <exclude name="lib/${compbio-annotation}"/>\r
+                               <exclude name="lib/${compbio-util}"/>\r
+                               \r
+                               <include name="web.xml"/>\r
+                               <include name="sun-jaxws.xml"/>\r
+                               <include name="lib/*"/>\r
+                       </zipfileset>\r
+                       <zipfileset dir="${basedir}/ExecutionStatistic" prefix="ExecutionStatistic" />\r
+                       <zipfileset dir="${basedir}/statpages" prefix="statpages" />\r
+                       <zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>\r
+                       <zipfileset dir="conf" prefix="conf" >\r
+                               <exclude name="**/temp/**"/>\r
+                               <exclude name="**/log4j.properties*"/>\r
+                       </zipfileset>\r
+                       <!-- Add JABAWS web site apart from the binary archive -->\r
+                       <zipfileset dir="${basedir}/website" excludes="archive/**, devel*.html, tests/**, template.html"/>\r
+                       <zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>\r
+                       <!-- Put a copy of log4j configuration file where it can be used  -->\r
+                       <zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>\r
+               </zip>\r
+       </target>\r
 \r
        <target name="build-devel-website" description="Pack developement related pages, tests, javadoc" >\r
-                               <echo>Packing data for internal web site</echo>\r
-                               <delete file="${jaba-devel-web}"></delete>      \r
-                               <zip destfile="${jaba-devel-web}" whenempty="create">\r
-                                       <!-- Add JSW2 web site apart from the binary archive -->\r
-                                       <zipfileset dir="${basedir}/website" excludes="template.html, download.html, index.html, manual.html, howto.html, archive/**, prog_docs/**"/>\r
-                               </zip>\r
-       </target> \r
-       \r
-       <target name="jaba-without-jaxws" description="Prepare JWS2 war file without runtime dependency - JAXWS jars" depends="jaba-no-jaxws-no-binaries, pack-binaries">\r
-                               <echo>Preparing war file without JAXWS</echo>\r
-               <delete file="${jaba-no-jaxws}"></delete>       \r
-               <copy tofile="${jaba-no-jaxws}" file="${jaba-no-jaxws-no-binaries}"/>\r
-               <zip destfile="${jaba-no-jaxws}" update="true" >\r
-                               <zipgroupfileset file="${binaries}" />\r
+               <echo>Packing data for internal web site</echo>\r
+               <delete file="${jaba-devel-web}">\r
+               </delete>\r
+               <zip destfile="${jaba-devel-web}" whenempty="create">\r
+                       <!-- Add JABAWS web site apart from the binary archive -->\r
+                       <zipfileset dir="${basedir}/website" excludes="template.html, download.html, index.html, manual.html, howto.html, archive/**, prog_docs/**"/>\r
                </zip>\r
-       </target> \r
-\r
-       <target name="jaba-without-jaxws-windows" description="Prepare JWS2 war file without runtime dependency - JAXWS jars" \r
-               depends="full-jaba-jar, pack-windows-binaries">\r
-                               <echo>Preparing war file without JAXWS</echo>\r
-               <delete file="${jaba-windows}"></delete>        \r
-               <delete dir="${basedir}/jobsout/*"/>\r
-               <delete file="${jaba-no-jaxws-windows}"></delete>\r
-                               <zip destfile="${jaba-no-jaxws-windows}" >\r
-                                       <zipfileset dir="${basedir}/WEB-INF" prefix="WEB-INF">\r
-                                               <include name="web.xml"/>\r
-                                               <include name="sun-jaxws.xml"/>\r
-                                               <exclude name="classes"/>\r
-                                               <exclude name="lib"/>\r
-                                       </zipfileset>\r
-                                       <zipgroupfileset file="${win-binaries}" />\r
-                                       <zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>\r
-                                       <zipfileset dir="${basedir}/conf" prefix="conf" excludes="**/log4j.properties*"/>\r
-                                       <zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>\r
-                                       <zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>\r
-                                       <!-- Add JSW2 web site apart from the binary archive -->\r
-                                       <zipfileset dir="${basedir}/website" excludes="archive/**, full_javadoc/**, devel*.html, tests/**, template.html"/>\r
-                               </zip>\r
-       </target> \r
+       </target>\r
 \r
-       \r
-       \r
-       <target name="jaba-complete" description="Prepare JWS2 war file" depends="jaba-without-jaxws, pack-jaxws">\r
-                       <echo>Preparing a complete war file</echo>\r
-                       <copy tofile="${jaba}" file="${jaba-no-jaxws}"/>\r
-                       <zip destfile="${jaba}" update="true" >\r
-                               <zipgroupfileset file="${jaxws-lib}"/>\r
-                       </zip>\r
-       </target> \r
-\r
-       <target name="jaba-no-binaries" description="Prepare JWS2 war file without native binaries" depends="jaba-no-jaxws-no-binaries, pack-jaxws">\r
-                       <echo>Preparing a complete war file</echo>\r
-                       <copy tofile="${jaba-no-binaries}" file="${jaba-no-jaxws-no-binaries}"/>\r
-                       <zip destfile="${jaba-no-binaries}" update="true" >\r
-                                       <zipgroupfileset file="${jaxws-lib}"/>\r
-                       </zip>  \r
-       </target> \r
-\r
-       <target name="jaba-complete-windows" description="Prepare JWS2 war file for windows" depends="jaba-without-jaxws-windows, pack-jaxws">\r
-                               <echo>Preparing a complete war file</echo>\r
-                               <copy tofile="${jaba-windows}" file="${jaba-no-jaxws-windows}"/>\r
-                               <zip destfile="${jaba-windows}" update="true" >\r
-                                       <zipgroupfileset file="${jaxws-lib}"/>\r
-                               </zip>\r
-       </target> \r
-       \r
+       <target name="jaba-complete" description="Prepare JABAWS war file without runtime dependency - JAXWS jars" depends="jaba-no-binaries, pack-binaries">\r
+               <echo>Preparing a complete war file</echo>\r
+               <delete file="${jaba}">\r
+               </delete>\r
+               <copy tofile="${jaba}" file="${jaba-no-binaries}"/>\r
+               <zip destfile="${jaba}" update="true" >\r
+                       <zipgroupfileset file="${binaries}" />\r
+               </zip>\r
+       </target>\r
+\r
+<!-- DEPRICATED - STANDARD JABA WAR WILL WORK FOR WINDOWS JUST FINE, DOWNLOAD SPACE SAVING IS NOT WORTH THE \r
+  ADDITIONAL COMPLEXITY \r
+       <target name="jaba-complete-windows" description="Prepare JABAWS war file for windows" depends="jaba-no-binaries">\r
+               <echo>Preparing a complete war file</echo>\r
+               <copy tofile="${jaba-windows}" file="${jaba-no-binaries}"/>\r
+               <zip destfile="${jaba-windows}" update="true" >\r
+                       <zipgroupfileset file="${win-binaries}" />\r
+               </zip>\r
+       </target>\r
+-->\r
\r
        <target name="build-all" description="Build-all the distributives"\r
-               depends="full-jaba-client, minimal-jaba-client-jar, jaba-no-jaxws-no-binaries, jaba-no-binaries, jaba-complete, jaba-complete-windows"/>\r
+               depends="full-jaba-client, minimal-jaba-client-jar, jaba-no-binaries,\r
+                jaba-complete, datamodel-jar, datamodel-source-jar, source-jar, jaba-client-src-jar"/>\r
 \r
        <!-- This task does not really depends on compile, but it is better to make sure that the code is sound -->\r
        <target name="archive-project" description="Pack everything in the project for those who do not have access to SVN" depends="compile">\r
-               <delete file="${jaba-project}"></delete>        \r
+               <delete file="${jaba-project}">\r
+               </delete>\r
                <zip destfile="${jaba-project}" whenempty="create" >\r
                        <fileset dir="." excludes="${distdir}/**, jobsout/**, test-output/**, **.svn, dundee-conf/**, TODO.txt, IDEAS.txt, ${activity.log}, **/*.zip, **/*.war"/>\r
                        <!-- Add jobsout directory but no content -->\r
                </zip>\r
        </target>\r
 \r
-       <!-- This is JUNIT test \r
-       <target name="testEngine" depends="compileTest">\r
-                       <delete file="${activity.log}"/> \r
-                       <junit filtertrace="false" haltonfailure="true" haltonerror="true" fork="true" forkmode="once">\r
-                       <jvmarg value="-server" />\r
-                       <jvmarg value="-enableassertions" />\r
-                       <jvmarg value="-Xms512m" />\r
-                       <jvmarg value="-Xmx512m" />\r
-                               <env key="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx24-amd64"/>\r
-                       <classpath refid="test.classpath" />\r
-                       <classpath refid="project.classpath" />\r
-                       <formatter type="plain" usefile="false" />\r
-                       <test name="compbio.engine.cluster.AllTestSuit" />\r
-                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                   </junit>\r
-               </target>\r
-       -->\r
-       \r
+\r
        <taskdef name="testNG" classname="org.testng.TestNGAntTask">\r
-               <classpath refid="test.classpath"></classpath>\r
+               <classpath refid="test.classpath">\r
+               </classpath>\r
        </taskdef>\r
-               \r
+\r
        <target name="CustomTest" depends="compile_with_debug">\r
-                       <delete file="${activity.log}"/> \r
-                       <testNG haltonfailure="true" enableassert="true" >\r
-                                       <jvmarg value="-server" />\r
-                                       <jvmarg value="-enableassertions" />\r
-                                       <jvmarg value="-Xms1024m" />\r
-                                       <jvmarg value="-Xmx1024m" />\r
-                                               <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
-                                       <classpath refid="test.classpath" />\r
-                                       <classpath refid="project.classpath" />\r
-                                               <xmlfileset dir="." includes="temp-testng-customsuite.xml"/>\r
-                                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                   </testNG>\r
+               <delete file="${activity.log}"/>\r
+               <testNG haltonfailure="true" enableassert="true" >\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <xmlfileset dir="." includes="temp-testng-customsuite.xml"/>\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
        </target>\r
 \r
        <target name="Run_cluster_dependent_test" depends="compile_with_debug">\r
-                               <delete file="${activity.log}"/> \r
-                               <testNG groups="cluster" haltonfailure="true" enableassert="true" parallel="false" verbose="3">\r
-                                               <jvmarg value="-server" />\r
-                                               <jvmarg value="-enableassertions" />\r
-                                               <jvmarg value="-Xms1024m" />\r
-                                               <jvmarg value="-Xmx1024m" />\r
-                                                       <classfileset dir="${classes}" includes="**/*.class" />\r
-                                                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
-                                               <classpath refid="test.classpath" />\r
-                                               <classpath refid="project.classpath" />\r
-                                               <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                           </testNG>\r
-               </target>\r
-       \r
+               <delete file="${activity.log}"/>\r
+               <testNG groups="cluster" haltonfailure="true" enableassert="true" parallel="false" verbose="3">\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <classfileset dir="${classes}" includes="**/*.class" />\r
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
+       </target>\r
+\r
        <target name="Test" depends="compile_with_debug">\r
-                               <delete file="${activity.log}"/> \r
-                               <testNG haltonfailure="true" enableassert="true" verbose="3" excludedgroups="performance" >\r
-                                               <jvmarg value="-server" />\r
-                                               <jvmarg value="-enableassertions" />\r
-                                               <jvmarg value="-Xms1024m" />\r
-                                               <jvmarg value="-Xmx1024m" />\r
-                                                       <classfileset dir="${classes}" includes="**/*.class" />\r
-                                                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
-                                               <classpath refid="test.classpath" />\r
-                                               <classpath refid="project.classpath" />\r
-                                               <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                           </testNG>\r
-               </target>\r
+               <delete file="${activity.log}"/>\r
+               <testNG haltonfailure="true" enableassert="true" verbose="3" excludedgroups="performance, webservices" >\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <classfileset dir="${classes}" includes="**/*.class" />\r
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
+       </target>\r
 \r
        <target name="Performance_tests" depends="compile_with_debug">\r
-                                       <delete file="${activity.log}"/> \r
-                                       <testNG haltonfailure="true" enableassert="true" verbose="3" groups="performance" >\r
-                                                       <jvmarg value="-server" />\r
-                                                       <jvmarg value="-enableassertions" />\r
-                                                       <jvmarg value="-Xms1024m" />\r
-                                                       <jvmarg value="-Xmx1024m" />\r
-                                                               <classfileset dir="${classes}" includes="**/*.class" />\r
-                                                               <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
-                                                       <classpath refid="test.classpath" />\r
-                                                       <classpath refid="project.classpath" />\r
-                                                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                                   </testNG>\r
+               <delete file="${activity.log}"/>\r
+               <testNG haltonfailure="true" enableassert="true" verbose="3" groups="performance" >\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <classfileset dir="${classes}" includes="**/*.class" />\r
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
        </target>\r
 \r
        <target name="Test_runners" depends="compile_with_debug">\r
-                       <delete file="${activity.log}"/> \r
-                       <testNG groups="runner" haltonfailure="true" verbose="3" enableassert="true" >\r
-                                       <jvmarg value="-server" />\r
-                                       <jvmarg value="-enableassertions" />\r
-                                       <jvmarg value="-Xms1024m" />\r
-                                       <jvmarg value="-Xmx1024m" />\r
-                                               <classfileset dir="${classes}" includes="**/*.class" />\r
-                                               <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
-                                       <classpath refid="test.classpath" />\r
-                                       <classpath refid="project.classpath" />\r
-                                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                   </testNG>\r
+               <delete file="${activity.log}"/>\r
+               <testNG groups="runner" haltonfailure="true" verbose="3" enableassert="true" >\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <classfileset dir="${classes}" includes="**/*.class" />\r
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
        </target>\r
 \r
        <target name="Test_engines" depends="compile_with_debug">\r
-                       <delete file="${activity.log}"/> \r
-                       <testNG groups="engine" haltonfailure="true" verbose="3" enableassert="true" >\r
-                                       <jvmarg value="-server" />\r
-                                       <jvmarg value="-enableassertions" />\r
-                                       <jvmarg value="-Xms1024m" />\r
-                                       <jvmarg value="-Xmx1024m" />\r
-                                               <classfileset dir="${classes}" includes="**/*.class" />\r
-                                               <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
-                                       <classpath refid="test.classpath" />\r
-                                       <classpath refid="project.classpath" />\r
-                                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                   </testNG>\r
+               <delete file="${activity.log}"/>\r
+               <testNG groups="engine" haltonfailure="true" verbose="3" enableassert="true" >\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <classfileset dir="${classes}" includes="**/*.class" />\r
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
        </target>\r
 \r
        <target name="All_cluster_independent_windows_only_tests" depends="compile_with_debug">\r
-                       <delete file="${activity.log}" failonerror="false"/> \r
-                       <testNG excludedgroups="cluster, non_windows" haltonfailure="true" verbose="3" enableassert="true"  >\r
-                                       <jvmarg value="-server" />\r
-                                       <jvmarg value="-enableassertions" />\r
-                                       <jvmarg value="-Xms1024m" />\r
-                                       <jvmarg value="-Xmx1024m" />\r
-                                               <classfileset dir="${classes}" includes="**/*.class" />\r
-                                               <classpath refid="test.classpath" />\r
-                                       <classpath refid="project.classpath" />\r
-                                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                   </testNG>\r
+               <delete file="${activity.log}" failonerror="false"/>\r
+               <testNG excludedgroups="cluster, non_windows" haltonfailure="true" verbose="3" enableassert="true"  >\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <classfileset dir="${classes}" includes="**/*.class" />\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
        </target>\r
 \r
        <target name="All_cluster_independent_tests" depends="compile_with_debug">\r
-                       <delete file="${activity.log}" failonerror="false"/> \r
-                       <testNG excludedgroups="cluster, performance" haltonfailure="true" verbose="3" enableassert="true"  >\r
-                                       <jvmarg value="-server" />\r
-                                       <jvmarg value="-enableassertions" />\r
-                                       <jvmarg value="-Xms1024m" />\r
-                                       <jvmarg value="-Xmx1024m" />\r
-                                               <classfileset dir="${classes}" includes="**/*.class" />\r
-                                               <classpath refid="test.classpath" />\r
-                                       <classpath refid="project.classpath" />\r
-                                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                   </testNG>\r
+               <delete file="${activity.log}" failonerror="false"/>\r
+               <testNG excludedgroups="cluster, performance" haltonfailure="true" verbose="3" enableassert="true"  >\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <classfileset dir="${classes}" includes="**/*.class" />\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
        </target>\r
 \r
        <target name="Rerun_failed_tests" depends="compile_with_debug">\r
-                       <delete file="${activity.log}" failonerror="false"/> \r
-                       <testNG haltonfailure="true" enableassert="true" verbose="9" >\r
-                                       <jvmarg value="-server" />\r
-                                       <jvmarg value="-enableassertions" />\r
-                                       <jvmarg value="-Xms1024m" />\r
-                                       <jvmarg value="-Xmx1024m" />\r
-                                               <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
-                                       <classpath refid="test.classpath" />\r
-                                       <classpath refid="project.classpath" />\r
-                                               <xmlfileset dir="." includes="test-output/testng-failed.xml"/>\r
-                                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
-                   </testNG>\r
+               <delete file="${activity.log}" failonerror="false"/>\r
+               <testNG haltonfailure="true" enableassert="true" verbose="9" >\r
+                       <jvmarg value="-server" />\r
+                       <jvmarg value="-enableassertions" />\r
+                       <jvmarg value="-Xms1024m" />\r
+                       <jvmarg value="-Xmx1024m" />\r
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>\r
+                       <classpath refid="test.classpath" />\r
+                       <classpath refid="project.classpath" />\r
+                       <xmlfileset dir="." includes="test-output/testng-failed.xml"/>\r
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>\r
+               </testNG>\r
        </target>\r
 \r
-       <!-- <zipfileset excludes="META-INF/*.SF" src="jarfilename.jar"/> \r
-               \r
-               <target name="build-jar" description="Pack cluster  and runners into a jar" depends="compile">\r
-                       <echo>Jar file: integration</echo>\r
-                       <delete file="${basedir}/.jar"></delete>\r
-                       <copy file="${basedir}/conf/" tofile="${classes}/log4j.properties" />\r
-                       <jar jarfile="${basedir}/.jar">\r
-                               <fileset dir="${basedir}/WEB-INF/classes/" includes="compbio/**" />\r
-                               <manifest>\r
-                                       <attribute name="Built-By" value="Peter Troshin" />\r
-                                       <attribute name="Main-Class" value="compbio.clust..JobStatus" />\r
-                                       <attribute name="Class-Path" value=" . /gridware/sge/lib/drmaa.jar" />\r
-                                       <attribute name="Implementation-Title" value="Cluster Submission Engine" />\r
-                                       <attribute name="Implementation-Vendor" value="Peter Troshin" />\r
-                                       <attribute name="Implementation-URL" value="xxx" />\r
-                               </manifest>\r
-                       </jar>\r
-               </target>\r
-               \r
-               \r
-               <target name="build-jar-local" description="Pack cluster  and runners with dependencies" depends="compile">\r
-                       <echo>Jar file: integration</echo>\r
-                       <delete file="${basedir}/.jar"></delete>\r
-                       <jar jarfile="${basedir}/.jar">\r
-                               <zipgroupfileset excludes="META-INF/*.SF" dir="${lib.path}"></zipgroupfileset>\r
-                               <fileset dir="${basedir}/WEB-INF/classes/" includes="**" />\r
-                               <manifest>\r
-                                       <attribute name="Built-By" value="Peter Troshin" />\r
-                                       <attribute name="Main-Class" value="compbio..cluster.JobStatus" />\r
-                                       <attribute name="Class-Path" value="." />\r
-                                       <attribute name="Implementation-Title" value="Cluster Submission Engine" />\r
-                                       <attribute name="Implementation-Vendor" value="Peter Troshin" />\r
-                                       <attribute name="Implementation-URL" value="xxx" />\r
-                               </manifest>\r
-                       </jar>\r
-               </target>\r
-               \r
-               -->\r
-       \r
-       <!--\r
-               <target name="run-client-jar" description="EXAMPLE TASK ONLY">\r
-                       <java jar="${basedir}/resources/wsclient.jar" fork="true"\r
-                               failonerror="true" maxmemory="256m">\r
-                               <arg\r
-                                       value="C:/Documents and Settings/pvt43/Desktop/Leeds Sequencing/Copy of Files to up load" />\r
-                       </java>\r
-               </target>\r
-               <target name="run-client-class" description="EXAMPLE TASK ONLY">\r
-                       <java classname="org.pimslims.ws.client.FileUploadClient" fork="true"\r
-                               failonerror="true" maxmemory="256m">\r
-                               <classpath refid="project.classpath" />\r
-                               <classpath refid="instrument.classpath" />\r
-                       </java>\r
-               </target>\r
-       -->\r
-       \r
+\r
 </project>
\ No newline at end of file