JWS-112 Uploaded a new aacon jar, following a minor update made to AAcon's output...

[jabaws.git] / build.xml

diff --git a/build.xml b/build.xml
index c975c2a..0c08975 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project default="jabaws" name="Build Java Bioinformatics Analysis Web Services" basedir=".">
+<project default="build-all" name="Build Java Bioinformatics Analysis Web Services" basedir=".">
 
-       <property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx24-amd64"/>
+       <property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx-amd64"/>
+       <property name="JAVA_TARGET" value="1.7"/>
 
        <!-- Distributive file names-->
        <property name="distdir" value="website/archive"/>
@@ -19,20 +20,20 @@
        <property name="compbio-ga" value="compbio-ga-1.1.jar"/>
 
        <!-- products -->
-       <property name="jabaws_version" value="2.1.0"/>
+       <property name="jabaws_version" value="2.2.0"/>
        <property name="core" value="${distdir}/jabaws-core-${jabaws_version}.jar"/>
        <property name="core-src" value="${distdir}/jabaws-core-src-${jabaws_version}.jar"/>
        <property name="datamodel" value="${distdir}/datamodel-${jabaws_version}.jar"/>
        <property name="datamodel-src" value="${distdir}/datamodel-src-${jabaws_version}.jar"/>
-       <property name="min-jabaws-client" value="${distdir}/min-jabaws-client-${jabaws_version}.jar"/>
-       <property name="min-jabaws-client-nolog" value="${distdir}/min-jabaws-client-nolog-${jabaws_version}.jar"/>
+       <property name="min-jabaws-client" value="${distdir}/jabaws-min-client-${jabaws_version}.jar"/>
+       <property name="min-jabaws-client-nolog" value="${distdir}/jabaws-min-client-nolog-${jabaws_version}.jar"/>
        <property name="jabaws-client-src" value="${distdir}/jabaws-client-src-${jabaws_version}.jar"/>
-       <property name="full-jabaws-client" value="${distdir}/full-jabaws-client-${jabaws_version}.jar"/>
+       <property name="full-jabaws-client" value="${distdir}/jabaws-full-client-${jabaws_version}.jar"/>
        <property name="jabaws-source-jar" value="${distdir}/jabaws-src-${jabaws_version}.jar"/>
-       <property name="full-jabaws-client-pack" value="${distdir}/full-jabaws-client-${jabaws_version}-pack.zip"/>
+       <property name="full-jabaws-client-pack" value="${distdir}/jabaws-full-client-${jabaws_version}-pack.zip"/>
        <property name="jabaws" value="${distdir}/jabaws.war"/>
        <property name="jabaws-no-binaries" value="${distdir}/jabaws-no-binaries.war"/>
-       <property name="binaries" value="${distdir}/binaries.zip"/>
+       <property name="binaries" value="${distdir}/jabaws-binaries.zip"/>
        <property name="jabaws-devel-web" value="${distdir}/jabaws-devel-website.zip"/>
 
        <!--Whole project archive -->
@@ -120,27 +121,27 @@
                <!-- copy files to class path-->
                <copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
                <!-- Complile the datamodel first -->
-               <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+               <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
                        <compilerarg value="-Xlint:unchecked"/>
                        <classpath refid="project.classpath" />
                </javac>
                <!-- Complile the engines -->
-               <javac srcdir="${basedir}/engine" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+               <javac srcdir="${basedir}/engine" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
                        <compilerarg value="-Xlint:unchecked"/>
                        <classpath refid="project.classpath" />
                </javac>
                <!-- Complile the runners -->
-               <javac srcdir="${basedir}/runner" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+               <javac srcdir="${basedir}/runner" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
                        <compilerarg value="-Xlint:unchecked"/>
                        <classpath refid="project.classpath" />
                </javac>
                <!-- Complile the webservices -->
-               <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+               <javac srcdir="${basedir}/webservices" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
                        <compilerarg value="-Xlint:unchecked"/>
                        <classpath refid="project.classpath" />
                </javac>
                <!-- Complile the tests -->
-               <javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+               <javac srcdir="${basedir}/testsrc" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
                        <compilerarg value="-Xlint:unchecked"/>
                        <classpath refid="project.classpath" />
                        <classpath refid="test.classpath" />
@@ -162,23 +163,23 @@
                <!-- copy files to class path-->
                <copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
                <!-- Complile the datamodel first -->
-               <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.7" source="1.7" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+               <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="${JAVA_TARGET}" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
                        <compilerarg value="-Xlint:-unchecked" />
                        <classpath refid="project.classpath" />
                </javac>
                <!-- Complile the engines -->
-               <javac srcdir="${basedir}/engine" destdir="${classes}" target="1.7" source="1.7" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+               <javac srcdir="${basedir}/engine" destdir="${classes}" target="${JAVA_TARGET}" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
                        <compilerarg value="-Xlint:all" />
                        <compilerarg value="-Xlint:-unchecked" />
                        <classpath refid="project.classpath" />
                </javac>
                <!-- Complile the runners -->
-               <javac srcdir="${basedir}/runner" destdir="${classes}" target="1.7" source="1.7" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+               <javac srcdir="${basedir}/runner" destdir="${classes}" target="${JAVA_TARGET}" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
                        <compilerarg value="-Xlint:-unchecked" />
                        <classpath refid="project.classpath" />
                </javac>
                <!-- Complile the webservices -->
-               <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.7" source="1.7" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+               <javac srcdir="${basedir}/webservices" destdir="${classes}" target="${JAVA_TARGET}" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
                        <compilerarg value="-Xlint:-unchecked" />
                        <classpath refid="project.classpath" />
                </javac>
@@ -438,13 +439,15 @@
                                <include name="lib/*"/>
                        </zipfileset>
                        <zipfileset dir="${basedir}/ExecutionStatistic" prefix="ExecutionStatistic" />
-                       <zipfileset dir="${basedir}/statpages" prefix="statpages" />
+                       <zipfileset dir="${basedir}/website/statpages" prefix="statpages" />
                        <zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>
                        <zipfileset dir="conf" prefix="conf" >
                                <exclude name="**/temp/**"/>
                        </zipfileset>
                        <!-- Add JABAWS web site apart from the binary archive -->
                        <zipfileset dir="${basedir}/website" excludes="archive/**, devel*.html, tests/**, template.html"/>
+                       <!-- Add JABAWS docs apart from the contents of _build -->
+                       <zipfileset dir="${basedir}/docs" excludes="_build/**"/>
                        <zipfileset dir="." includes="${full-jabaws-client}" fullpath="WEB-INF/lib/jabaws-client.jar"/>
                        <!-- Put a copy of log4j configuration file where it can be used  -->
                        <zipfileset dir="log" includes="log4j.properties" prefix="WEB-INF/classes"/>
@@ -458,6 +461,8 @@
                <zip destfile="${jabaws-devel-web}" whenempty="create">
                        <!-- Add JABAWS web site apart from the binary archive -->
                        <zipfileset dir="${basedir}/website" excludes="template.html, download.html, index.html, manual.html, howto.html, archive/**, prog_docs/**"/>
+                       <!-- Add JABAWS docs apart from the contents of _build -->
+                       <zipfileset dir="${basedir}/docs" excludes="_build/**"/>
                </zip>
        </target>
 
@@ -581,6 +586,21 @@
                </testNG>
        </target>
 
+       <target name="Test_webservices" depends="compile_with_debug">
+               <delete file="${activity.log}"/>
+               <testNG groups="webservices" haltonfailure="true" verbose="3" enableassert="true" >
+                       <jvmarg value="-server" />
+                       <jvmarg value="-enableassertions" />
+                       <jvmarg value="-Xms1024m" />
+                       <jvmarg value="-Xmx1024m" />
+                       <classfileset dir="${classes}" includes="**/*.class" />
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>
+                       <classpath refid="test.classpath" />
+                       <classpath refid="project.classpath" />
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>
+               </testNG>
+       </target>
+
        <target name="All_cluster_independent_windows_only_tests" depends="compile_with_debug">
                <delete file="${activity.log}" failonerror="false"/>
                <testNG excludedgroups="cluster, non_windows" haltonfailure="true" verbose="3" enableassert="true"  >
@@ -623,4 +643,20 @@
                        <sysproperty key="TestingDataPath" value="${data.src}"/>
                </testNG>
        </target>
+
+       <target name="TestAll" depends="compile_with_debug">
+               <delete file="${activity.log}"/>
+               <testNG haltonfailure="true" enableassert="true" verbose="3" >
+                       <jvmarg value="-server" />
+                       <jvmarg value="-enableassertions" />
+                       <jvmarg value="-Xms1024m" />
+                       <jvmarg value="-Xmx1024m" />
+                       <classfileset dir="${classes}" includes="**/*.class" />
+                       <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>
+                       <classpath refid="test.classpath" />
+                       <classpath refid="project.classpath" />
+                       <sysproperty key="TestingDataPath" value="${data.src}"/>
+               </testNG>
+       </target>
+
 </project>