X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=412a049c14aa6ef0561b07c6862b08ef4b2d32ab;hb=70b2b6ad7d60388a11adc9b8a1f59ddc0fc03a31;hp=559745738a81436d8829636dcbdf525003d401e6;hpb=4d6083e0cf39c4989e08bdaf9384e9d44c0da607;p=jabaws.git

diff --git a/build.xml b/build.xml
index 5597457..412a049 100644
--- a/build.xml
+++ b/build.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project default="minimal-jaba-client-jar" name="Build minimal client for Java Bioinformatics Analysis Web Services" basedir=".">
-	
+
 	<property name="basedir" location="${basedir}/log" />
 	<property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx24-amd64"/>
-	
+
 	<!-- Distributive file names-->
 	<property name="distdir" value="website/archive"/>
 	<mkdir dir="${distdir}" />
-	<property name="datamodel" value="${distdir}/datamodel-1.0.jar"/>
+	<property name="datamodel" value="${distdir}/datamodel-1.2.jar"/>
+	<property name="datamodel-src" value="${distdir}/datamodel-src-1.2.jar"/>
 	<property name="min-jaba-client" value="${distdir}/min-jaba-client.jar"/>
 	<property name="aacon-ws-client" value="${distdir}/aacon-ws-client.jar"/>
 	<property name="full-jaba-client" value="${distdir}/full-jaba-client.jar"/>
@@ -27,8 +28,8 @@
 	<property name="jaxws-lib" value="${distdir}/jaxws-lib.zip"/>
 	<!--Whole project archive -->
 	<property name="jaba-project" value="${distdir}/jaba-project.zip"/>
-	
-	
+
+
 	<!-- java -->
 	<property name="test.src" location="${basedir}/testsrc" />
 	<property name="classes" location="${basedir}/WEB-INF/classes" />
@@ -43,7 +44,7 @@
 			<include name="*.jar" />
 		</fileset>
 		<fileset dir="${web.lib.path}">
-					<include name="*.jar" />
+			<include name="*.jar" />
 		</fileset>
 	</path>
 
@@ -72,41 +73,41 @@
 		<!-- Complile the datamodel first -->
 		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6"
 				source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
+			<compilerarg value="-Xlint:unchecked"/>
+			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the engines -->
 		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6"
 				source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
+			<compilerarg value="-Xlint:unchecked"/>
+			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the runners -->
 		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6"
 				source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
+			<compilerarg value="-Xlint:unchecked"/>
+			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the webservices -->
 		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6"
 				source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
+			<compilerarg value="-Xlint:unchecked"/>
+			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the tests -->
 		<javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.6"
 				source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
-				<classpath refid="test.classpath" />
+			<compilerarg value="-Xlint:unchecked"/>
+			<classpath refid="project.classpath" />
+			<classpath refid="test.classpath" />
 		</javac>
 	</target>
 
- <!-- Clean temp directories -->
-    <target name="clean">
-        <delete dir="${classes}" />
-        <mkdir dir="${classes}" />
-    </target>
+	<!-- Clean temp directories -->
+	<target name="clean">
+		<delete dir="${classes}" />
+		<mkdir dir="${classes}" />
+	</target>
 
 	<!--
 	Compile with optimisation. Do not compile testsrc 
@@ -123,60 +124,60 @@
 		<!-- copy files to class path-->
 		<copy file="${basedir}/conf/log4j.properties" tofile="${classes}/log4j.properties" />
 		<!-- Complile the datamodel first -->
-		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6"
-				source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
+		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6" source="1.6" 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.6"
-				source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
+		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6" source="1.6" 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.6"
-				source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
+		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6" source="1.6" 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.6"
-				source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true" >
-				<compilerarg value="-Xlint:unchecked"/>
-				<classpath refid="project.classpath" />
+		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6" source="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+			<compilerarg value="-Xlint:-unchecked" />
+			<classpath refid="project.classpath" />
 		</javac>
+
 	</target>
 
 
 	<target name="datamodel-jar" description="Pack data model classes" depends="compile">
-			<echo>Jar file: Minimal WS client jar</echo>
-			<delete file="${basedir}/${datamodel}"></delete>
-			<jar jarfile="${basedir}/${datamodel}">
-				<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
-					<include name="compbio-util-1.3.jar"/>
-				</zipgroupfileset>
-				<fileset dir="${basedir}/WEB-INF/classes/"> 
-					<include name="compbio/data/sequence/*.class"/>
-					<include name="compbio/metadata/*.class"/>
-				</fileset>
-				<manifest>
-					<attribute name="Built-By" value="Peter Troshin" />
-					<attribute name="Class-Path" value="." />
-					<attribute name="Implementation-Title" value="Datamodel for Java Bioinformatics Analyses Web Services " />
-					<attribute name="Implementation-Vendor" value="Peter Troshin" />
-					<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />
-				</manifest>
-			</jar>
-		</target>
-	
-	
+		<echo>Jar file: Minimal WS client jar</echo>
+		<delete file="${basedir}/${datamodel}">
+		</delete>
+		<jar jarfile="${basedir}/${datamodel}">
+			<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
+				<include name="compbio-util-1.4.jar"/>
+			</zipgroupfileset>
+			<fileset dir="${basedir}/WEB-INF/classes/">
+				<include name="compbio/data/sequence/*.class"/>
+				<include name="compbio/metadata/*.class"/>
+			</fileset>
+			<manifest>
+				<attribute name="Built-By" value="Peter Troshin" />
+				<attribute name="Class-Path" value="." />
+				<attribute name="Implementation-Title" value="Datamodel for Java Bioinformatics Analyses Web Services " />
+				<attribute name="Implementation-Vendor" value="Peter Troshin" />
+				<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />
+			</manifest>
+		</jar>
+	</target>
+
+
 	<target name="minimal-jaba-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile, datamodel-jar">
 		<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/"> 
+			<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/**"/>
@@ -191,41 +192,43 @@
 			</manifest>
 		</jar>
 	</target>
-	
+
 	<target name="aacon-ws-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile, datamodel-jar">
-			<echo>Jar file: AAConWS client jar</echo>
-			<delete file="${basedir}/${aacon-ws-client}"></delete>
-			<jar jarfile="${basedir}/${aacon-ws-client}">
-				<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="Peter Troshin" />
-					<attribute name="Main-Class" value="compbio.ws.client.AAConClient" />
-					<attribute name="Class-Path" value="." />
-					<attribute name="Implementation-Title" value="AACon Client" />
-					<attribute name="Implementation-Vendor" value="Peter Troshin" />
-					<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk/aacon" />
-				</manifest>
-			</jar>
+		<echo>Jar file: AAConWS client jar</echo>
+		<delete file="${basedir}/${aacon-ws-client}">
+		</delete>
+		<jar jarfile="${basedir}/${aacon-ws-client}">
+			<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="Peter Troshin" />
+				<attribute name="Main-Class" value="compbio.ws.client.AAConClient" />
+				<attribute name="Class-Path" value="." />
+				<attribute name="Implementation-Title" value="AACon Client" />
+				<attribute name="Implementation-Vendor" value="Peter Troshin" />
+				<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk/aacon" />
+			</manifest>
+		</jar>
 	</target>
 
 	<target name="source-jar" description="Pack java sources" depends="compile">
-		<delete file="${basedir}/${jaba-source-jar}"></delete>
+		<delete file="${basedir}/${jaba-source-jar}">
+		</delete>
 		<jar jarfile="${basedir}/${jaba-source-jar}">
-			<fileset dir="${basedir}/datamodel"> 
+			<fileset dir="${basedir}/datamodel">
 				<include name="**"/>
 			</fileset>
-			<fileset dir="${basedir}/runner"> 
+			<fileset dir="${basedir}/runner">
 				<include name="**"/>
 			</fileset>
-			<fileset dir="${basedir}/engine"> 
+			<fileset dir="${basedir}/engine">
 				<include name="**"/>
 			</fileset>
-			<fileset dir="${basedir}/webservices/"> 
+			<fileset dir="${basedir}/webservices/">
 				<include name="**"/>
 			</fileset>
 			<manifest>
@@ -236,10 +239,26 @@
 				<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />
 			</manifest>
 		</jar>
-		
+
 	</target>
 	
-	<fileset dir="${basedir}/WEB-INF/classes/" id="fullclient"> 
+	<target name="datamodel-source-jar" description="Pack java sources" depends="compile">
+			<delete file="${datamodel-src}">
+			</delete>
+			<jar jarfile="${datamodel-src}">
+				<fileset dir="${basedir}/datamodel">
+					<include name="**"/>
+				</fileset>
+				<manifest>
+					<attribute name="Built-By" value="Peter Troshin" />
+					<attribute name="Implementation-Title" value="Java Bioinformatics Analyses Web Services Datamodel Source Code Archive" />
+					<attribute name="Implementation-Vendor" value="Peter Troshin" />
+					<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk/jabaws" />
+				</manifest>
+			</jar>
+		</target>
+
+	<fileset dir="${basedir}/WEB-INF/classes/" id="fullclient">
 		<!-- Datamodel -->
 		<include name="compbio/data/**"/>
 		<include name="compbio/metadata/**"/>
@@ -250,26 +269,27 @@
 	</fileset>
 
 	<target name="full-jaba-client-jar" description="Pack datamodel, engine and runners" depends="compile">
-			<echo>Jar file: Full WS client jar</echo>
-			<delete file="${full-jaba-client}"></delete>
-			<jar jarfile="${full-jaba-client}">
-				<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
-					<include name="log4j-1.2.15.jar"/>
-					<include name="compbio-util-1.3.jar"/>
-					<include name="compbio-annotations-1.0.jar"/>
-					<include name="drmaa.jar"/>
-				</zipgroupfileset>
-				<fileset refid="fullclient"/>
-				<manifest>
-					<attribute name="Built-By" value="Peter Troshin" />
-					<attribute name="Class-Path" value="." />
-					<attribute name="Implementation-Title" value="Full Java Bioinformatics Analyses Web Services Client" />
-					<attribute name="Implementation-Vendor" value="Peter Troshin" />
-					<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />
-				</manifest>
-			</jar>
-		</target>
-	
+		<echo>Jar file: Full WS client jar</echo>
+		<delete file="${full-jaba-client}">
+		</delete>
+		<jar jarfile="${full-jaba-client}">
+			<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
+				<include name="log4j-1.2.15.jar"/>
+				<include name="compbio-util-1.3.jar"/>
+				<include name="compbio-annotations-1.0.jar"/>
+				<include name="drmaa.jar"/>
+			</zipgroupfileset>
+			<fileset refid="fullclient"/>
+			<manifest>
+				<attribute name="Built-By" value="Peter Troshin" />
+				<attribute name="Class-Path" value="." />
+				<attribute name="Implementation-Title" value="Full Java Bioinformatics Analyses Web Services Client" />
+				<attribute name="Implementation-Vendor" value="Peter Troshin" />
+				<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />
+			</manifest>
+		</jar>
+	</target>
+
 	<target name="full-jaba-client" description="Pack binaries with sources and configuration files" 
 			depends="full-jaba-client-jar, pack-binaries">
 		<echo>Packing binaries, and configuration files</echo>
@@ -280,51 +300,59 @@
 		</zip>
 	</target>
 
-	
+
 	<target name="full-jaba-jar" description="Pack datamodel, engine, runners, configuration, binaries and webservices" depends="compile">
-			<echo>Jar file: Full WS client jar</echo>
-			<delete file="${full-jaba-client}"></delete>
-			<jar jarfile="${full-jaba-client}">
-				<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
-					<include name="log4j-1.2.15.jar"/>
-					<include name="compbio-util-1.3.jar"/>
-					<include name="compbio-annotations-1.0.jar"/>
-					<include name="drmaa.jar"/>
-				</zipgroupfileset>
-				<fileset refid="fullclient"></fileset>
-				<fileset dir="${basedir}/WEB-INF/classes/">
-					<!-- Web services-->
-					<include name="compbio/ws/**"/>
-				</fileset>
-				<!-- Set WSTester as main to help user to test their deployments -->
-				<manifest>
-					<attribute name="Built-By" value="Peter Troshin" />
-					<attribute name="Class-Path" value="." />
-					<attribute name="Main-Class" value="compbio.ws.client.WSTester" />
-					<attribute name="Implementation-Title" value="Java Bioinformatics Analyses Web Services" />
-					<attribute name="Implementation-Vendor" value="Peter Troshin" />
-					<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />
-				</manifest>
-			</jar>
+		<echo>Jar file: Full WS client jar</echo>
+		<delete file="${full-jaba-client}">
+		</delete>
+		<jar jarfile="${full-jaba-client}">
+			<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
+				<include name="log4j-1.2.15.jar"/>
+				<include name="compbio-util-1.3.jar"/>
+				<include name="compbio-annotations-1.0.jar"/>
+				<include name="drmaa.jar"/>
+			</zipgroupfileset>
+			<fileset refid="fullclient">
+			</fileset>
+			<fileset dir="${basedir}/WEB-INF/classes/">
+				<!-- Web services-->
+				<include name="compbio/ws/**"/>
+			</fileset>
+			<!-- Set WSTester as main to help user to test their deployments -->
+			<manifest>
+				<attribute name="Built-By" value="Peter Troshin" />
+				<attribute name="Class-Path" value="." />
+				<attribute name="Main-Class" value="compbio.ws.client.WSTester" />
+				<attribute name="Implementation-Title" value="Java Bioinformatics Analyses Web Services" />
+				<attribute name="Implementation-Vendor" value="Peter Troshin" />
+				<attribute name="Implementation-URL" value="http://www.compbio.dundee.ac.uk" />
+			</manifest>
+		</jar>
 	</target>
 
-	<target name="pack-binaries" description="Zip all binary files"> 
+	<target name="clearStatDB" description="Remove all records from statistics database">
+		 <java classname="compbio.stat.collector.StatDB" fork="true" failonerror="true" classpath="${classes}">
+	            <classpath refid="project.classpath" />
+	     </java>
+	</target>
+	
+	<target name="pack-binaries" description="Zip all binary files">
 		<delete file="${binaries}" failonerror="false"/>
 		<zip destfile="${binaries}" >
 			<zipfileset dir="${basedir}/binaries" prefix="binaries" excludes="**/linux*/**"/>
 		</zip>
 	</target>
-	
-	<target name="pack-jaxws" description="Zip all JAXWS libraries"> 
+
+	<target name="pack-jaxws" description="Zip all JAXWS libraries">
 		<delete file="${jaxws-lib}" failonerror="false"/>
 		<zip destfile="${jaxws-lib}" update="false" >
-				<zipfileset dir="${web.lib.path}" includes="webservices-tools.jar"  prefix="WEB-INF/lib"  />
-				<zipfileset dir="${web.lib.path}" includes="webservices-rt.jar"   prefix="WEB-INF/lib" />
-				<zipfileset dir="${web.lib.path}" includes="webservices-api.jar"  prefix="WEB-INF/lib" />
+			<zipfileset dir="${web.lib.path}" includes="webservices-tools.jar"  prefix="WEB-INF/lib"  />
+			<zipfileset dir="${web.lib.path}" includes="webservices-rt.jar"   prefix="WEB-INF/lib" />
+			<zipfileset dir="${web.lib.path}" includes="webservices-api.jar"  prefix="WEB-INF/lib" />
 		</zip>
 	</target>
-		
-	<target name="pack-windows-binaries" description="Zip only windows binary files"> 
+
+	<target name="pack-windows-binaries" description="Zip only windows binary files">
 		<delete file="${win-binaries}" failonerror="false" />
 		<zip destfile="${win-binaries}">
 			<zipfileset dir="${basedir}/binaries" prefix="binaries" >
@@ -336,101 +364,109 @@
 	</target>
 
 	<target name="jaba-no-jaxws-no-binaries" description="Prepare JWS2 war file without runtime dependency - JAXWS jars and native binaries" depends="full-jaba-jar">
-				<echo>Preparing war file without JAXWS and binaries</echo>
-		<delete file="${jaba}"></delete>	
-		<delete file="${jaba-no-jaxws-no-binaries}"></delete>
-				<zip destfile="${jaba-no-jaxws-no-binaries}" whenempty="create">
-					<zipfileset dir="${basedir}/WEB-INF" prefix="WEB-INF">
-						<include name="web.xml"/>
-						<include name="sun-jaxws.xml"/>
-						<exclude name="classes"/>
-						<exclude name="lib"/>
-					</zipfileset>
-					<zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>
-					<zipfileset dir="${basedir}/conf" prefix="conf" excludes="**/log4j.properties*"/>
-					<!-- Add JSW2 web site apart from the binary archive -->
-					<zipfileset dir="${basedir}/website" excludes="archive/**, full_javadoc/**, devel*.html, tests/**, template.html"/>
-					<zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>
-					<!-- Put a copy of log4j configuration file where it can be used  -->
-					<zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>
-					<!-- This is runtime dependency must be supplied by the container -->
-					<!-- zipfileset dir="${web.lib.path}" includes="servlet-api.jar" prefix="WEB-INF/lib" / -->
-				</zip>
-	</target> 
+		<echo>Preparing war file without JAXWS and binaries</echo>
+		<delete file="${jaba}">
+		</delete>
+		<delete file="${jaba-no-jaxws-no-binaries}">
+		</delete>
+		<zip destfile="${jaba-no-jaxws-no-binaries}" whenempty="create">
+			<zipfileset dir="${basedir}/WEB-INF" prefix="WEB-INF">
+				<include name="web.xml"/>
+				<include name="sun-jaxws.xml"/>
+				<exclude name="classes"/>
+				<exclude name="lib"/>
+			</zipfileset>
+			<zipfileset dir="${basedir}/ExecutionStatistic" prefix="ExecutionStatistic" />
+			<zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>
+			<zipfileset dir="${basedir}/conf" prefix="conf" excludes="**/log4j.properties*"/>
+			<!-- Add JSW2 web site apart from the binary archive -->
+			<zipfileset dir="${basedir}/website" excludes="archive/**, full_javadoc/**, devel*.html, tests/**, template.html"/>
+			<zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>
+			<!-- Put a copy of log4j configuration file where it can be used  -->
+			<zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>
+			<!-- This is runtime dependency must be supplied by the container -->
+			<!-- zipfileset dir="${web.lib.path}" includes="servlet-api.jar" prefix="WEB-INF/lib" / -->
+		</zip>
+	</target>
 
 	<target name="build-devel-website" description="Pack developement related pages, tests, javadoc" >
-				<echo>Packing data for internal web site</echo>
-				<delete file="${jaba-devel-web}"></delete>	
-				<zip destfile="${jaba-devel-web}" whenempty="create">
-					<!-- Add JSW2 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/**"/>
-				</zip>
-	</target> 
-	
+		<echo>Packing data for internal web site</echo>
+		<delete file="${jaba-devel-web}">
+		</delete>
+		<zip destfile="${jaba-devel-web}" whenempty="create">
+			<!-- Add JSW2 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/**"/>
+		</zip>
+	</target>
+
 	<target name="jaba-without-jaxws" description="Prepare JWS2 war file without runtime dependency - JAXWS jars" depends="jaba-no-jaxws-no-binaries, pack-binaries">
-				<echo>Preparing war file without JAXWS</echo>
-		<delete file="${jaba-no-jaxws}"></delete>	
+		<echo>Preparing war file without JAXWS</echo>
+		<delete file="${jaba-no-jaxws}">
+		</delete>
 		<copy tofile="${jaba-no-jaxws}" file="${jaba-no-jaxws-no-binaries}"/>
 		<zip destfile="${jaba-no-jaxws}" update="true" >
-				<zipgroupfileset file="${binaries}" />
+			<zipgroupfileset file="${binaries}" />
 		</zip>
-	</target> 
+	</target>
 
 	<target name="jaba-without-jaxws-windows" description="Prepare JWS2 war file without runtime dependency - JAXWS jars" 
 		depends="full-jaba-jar, pack-windows-binaries">
-				<echo>Preparing war file without JAXWS</echo>
-		<delete file="${jaba-windows}"></delete>	
+		<echo>Preparing war file without JAXWS</echo>
+		<delete file="${jaba-windows}">
+		</delete>
 		<delete dir="${basedir}/jobsout/*"/>
-		<delete file="${jaba-no-jaxws-windows}"></delete>
-				<zip destfile="${jaba-no-jaxws-windows}" >
-					<zipfileset dir="${basedir}/WEB-INF" prefix="WEB-INF">
-						<include name="web.xml"/>
-						<include name="sun-jaxws.xml"/>
-						<exclude name="classes"/>
-						<exclude name="lib"/>
-					</zipfileset>
-					<zipgroupfileset file="${win-binaries}" />
-					<zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>
-					<zipfileset dir="${basedir}/conf" prefix="conf" excludes="**/log4j.properties*"/>
-					<zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>
-					<zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>
-					<!-- Add JSW2 web site apart from the binary archive -->
-					<zipfileset dir="${basedir}/website" excludes="archive/**, full_javadoc/**, devel*.html, tests/**, template.html"/>
-				</zip>
-	</target> 
+		<delete file="${jaba-no-jaxws-windows}">
+		</delete>
+		<zip destfile="${jaba-no-jaxws-windows}" >
+			<zipfileset dir="${basedir}/WEB-INF" prefix="WEB-INF">
+				<include name="web.xml"/>
+				<include name="sun-jaxws.xml"/>
+				<exclude name="classes"/>
+				<exclude name="lib"/>
+			</zipfileset>
+			<zipgroupfileset file="${win-binaries}" />
+			<zipfileset dir="${basedir}/jobsout" prefix="jobsout" excludes="**/*"/>
+			<zipfileset dir="${basedir}/conf" prefix="conf" excludes="**/log4j.properties*"/>
+			<zipfileset dir="." includes="${full-jaba-client}" fullpath="WEB-INF/lib/jaba-client.jar"/>
+			<zipfileset dir="conf" includes="log4j.properties" prefix="WEB-INF/classes"/>
+			<!-- Add JSW2 web site apart from the binary archive -->
+			<zipfileset dir="${basedir}/website" excludes="archive/**, full_javadoc/**, devel*.html, tests/**, template.html"/>
+		</zip>
+	</target>
+
+
 
-	
-	
 	<target name="jaba-complete" description="Prepare JWS2 war file" depends="jaba-without-jaxws, pack-jaxws">
-			<echo>Preparing a complete war file</echo>
-			<copy tofile="${jaba}" file="${jaba-no-jaxws}"/>
-			<zip destfile="${jaba}" update="true" >
-				<zipgroupfileset file="${jaxws-lib}"/>
-			</zip>
-	</target> 
+		<echo>Preparing a complete war file</echo>
+		<copy tofile="${jaba}" file="${jaba-no-jaxws}"/>
+		<zip destfile="${jaba}" update="true" >
+			<zipgroupfileset file="${jaxws-lib}"/>
+		</zip>
+	</target>
 
 	<target name="jaba-no-binaries" description="Prepare JWS2 war file without native binaries" depends="jaba-no-jaxws-no-binaries, pack-jaxws">
-			<echo>Preparing a complete war file</echo>
-			<copy tofile="${jaba-no-binaries}" file="${jaba-no-jaxws-no-binaries}"/>
-			<zip destfile="${jaba-no-binaries}" update="true" >
-					<zipgroupfileset file="${jaxws-lib}"/>
-			</zip>	
-	</target> 
+		<echo>Preparing a complete war file</echo>
+		<copy tofile="${jaba-no-binaries}" file="${jaba-no-jaxws-no-binaries}"/>
+		<zip destfile="${jaba-no-binaries}" update="true" >
+			<zipgroupfileset file="${jaxws-lib}"/>
+		</zip>
+	</target>
 
 	<target name="jaba-complete-windows" description="Prepare JWS2 war file for windows" depends="jaba-without-jaxws-windows, pack-jaxws">
-				<echo>Preparing a complete war file</echo>
-				<copy tofile="${jaba-windows}" file="${jaba-no-jaxws-windows}"/>
-				<zip destfile="${jaba-windows}" update="true" >
-					<zipgroupfileset file="${jaxws-lib}"/>
-				</zip>
-	</target> 
-	
+		<echo>Preparing a complete war file</echo>
+		<copy tofile="${jaba-windows}" file="${jaba-no-jaxws-windows}"/>
+		<zip destfile="${jaba-windows}" update="true" >
+			<zipgroupfileset file="${jaxws-lib}"/>
+		</zip>
+	</target>
+
 	<target name="build-all" description="Build-all the distributives"
 		depends="full-jaba-client, minimal-jaba-client-jar, jaba-no-jaxws-no-binaries, jaba-no-binaries, jaba-complete, jaba-complete-windows"/>
 
 	<!-- This task does not really depends on compile, but it is better to make sure that the code is sound -->
 	<target name="archive-project" description="Pack everything in the project for those who do not have access to SVN" depends="compile">
-		<delete file="${jaba-project}"></delete>	
+		<delete file="${jaba-project}">
+		</delete>
 		<zip destfile="${jaba-project}" whenempty="create" >
 			<fileset dir="." excludes="${distdir}/**, jobsout/**, test-output/**, **.svn, dundee-conf/**, TODO.txt, IDEAS.txt, ${activity.log}, **/*.zip, **/*.war"/>
 			<!-- Add jobsout directory but no content -->
@@ -455,142 +491,143 @@
 		    </junit>
 		</target>
 	-->
-	
+
 	<taskdef name="testNG" classname="org.testng.TestNGAntTask">
-		<classpath refid="test.classpath"></classpath>
+		<classpath refid="test.classpath">
+		</classpath>
 	</taskdef>
-		
+
 	<target name="CustomTest" depends="compile_with_debug">
-			<delete file="${activity.log}"/> 
-			<testNG haltonfailure="true" enableassert="true" >
-				        <jvmarg value="-server" />
-				        <jvmarg value="-enableassertions" />
-				        <jvmarg value="-Xms1024m" />
-				        <jvmarg value="-Xmx1024m" />
-						<env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>
-				        <classpath refid="test.classpath" />
-				    	<classpath refid="project.classpath" />
-						<xmlfileset dir="." includes="temp-testng-customsuite.xml"/>
-				        <sysproperty key="TestingDataPath" value="${data.src}"/>
-		    </testNG>
+		<delete file="${activity.log}"/>
+		<testNG haltonfailure="true" enableassert="true" >
+			<jvmarg value="-server" />
+			<jvmarg value="-enableassertions" />
+			<jvmarg value="-Xms1024m" />
+			<jvmarg value="-Xmx1024m" />
+			<env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>
+			<classpath refid="test.classpath" />
+			<classpath refid="project.classpath" />
+			<xmlfileset dir="." includes="temp-testng-customsuite.xml"/>
+			<sysproperty key="TestingDataPath" value="${data.src}"/>
+		</testNG>
 	</target>
 
 	<target name="Run_cluster_dependent_test" depends="compile_with_debug">
-				<delete file="${activity.log}"/> 
-				<testNG groups="cluster" haltonfailure="true" enableassert="true" parallel="false" 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>
-	
+		<delete file="${activity.log}"/>
+		<testNG groups="cluster" haltonfailure="true" enableassert="true" parallel="false" 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>
+
 	<target name="Test" depends="compile_with_debug">
-				<delete file="${activity.log}"/> 
-				<testNG haltonfailure="true" enableassert="true" verbose="3" excludedgroups="performance" >
-					        <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>
+		<delete file="${activity.log}"/>
+		<testNG haltonfailure="true" enableassert="true" verbose="3" excludedgroups="performance" >
+			<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="Performance_tests" depends="compile_with_debug">
-					<delete file="${activity.log}"/> 
-					<testNG haltonfailure="true" enableassert="true" verbose="3" groups="performance" >
-						        <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>
+		<delete file="${activity.log}"/>
+		<testNG haltonfailure="true" enableassert="true" verbose="3" groups="performance" >
+			<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="Test_runners" depends="compile_with_debug">
-			<delete file="${activity.log}"/> 
-			<testNG groups="runner" 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>
+		<delete file="${activity.log}"/>
+		<testNG groups="runner" 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="Test_engines" depends="compile_with_debug">
-			<delete file="${activity.log}"/> 
-			<testNG groups="engine" 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>
+		<delete file="${activity.log}"/>
+		<testNG groups="engine" 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"  >
-				        <jvmarg value="-server" />
-				        <jvmarg value="-enableassertions" />
-				        <jvmarg value="-Xms1024m" />
-				        <jvmarg value="-Xmx1024m" />
-						<classfileset dir="${classes}" includes="**/*.class" />
-						<classpath refid="test.classpath" />
-				    	<classpath refid="project.classpath" />
-				        <sysproperty key="TestingDataPath" value="${data.src}"/>
-		    </testNG>
+		<delete file="${activity.log}" failonerror="false"/>
+		<testNG excludedgroups="cluster, non_windows" haltonfailure="true" verbose="3" enableassert="true"  >
+			<jvmarg value="-server" />
+			<jvmarg value="-enableassertions" />
+			<jvmarg value="-Xms1024m" />
+			<jvmarg value="-Xmx1024m" />
+			<classfileset dir="${classes}" includes="**/*.class" />
+			<classpath refid="test.classpath" />
+			<classpath refid="project.classpath" />
+			<sysproperty key="TestingDataPath" value="${data.src}"/>
+		</testNG>
 	</target>
 
 	<target name="All_cluster_independent_tests" depends="compile_with_debug">
-			<delete file="${activity.log}" failonerror="false"/> 
-			<testNG excludedgroups="cluster, performance" haltonfailure="true" verbose="3" enableassert="true"  >
-				        <jvmarg value="-server" />
-				        <jvmarg value="-enableassertions" />
-				        <jvmarg value="-Xms1024m" />
-				        <jvmarg value="-Xmx1024m" />
-						<classfileset dir="${classes}" includes="**/*.class" />
-						<classpath refid="test.classpath" />
-				    	<classpath refid="project.classpath" />
-				        <sysproperty key="TestingDataPath" value="${data.src}"/>
-		    </testNG>
+		<delete file="${activity.log}" failonerror="false"/>
+		<testNG excludedgroups="cluster, performance" haltonfailure="true" verbose="3" enableassert="true"  >
+			<jvmarg value="-server" />
+			<jvmarg value="-enableassertions" />
+			<jvmarg value="-Xms1024m" />
+			<jvmarg value="-Xmx1024m" />
+			<classfileset dir="${classes}" includes="**/*.class" />
+			<classpath refid="test.classpath" />
+			<classpath refid="project.classpath" />
+			<sysproperty key="TestingDataPath" value="${data.src}"/>
+		</testNG>
 	</target>
 
 	<target name="Rerun_failed_tests" depends="compile_with_debug">
-			<delete file="${activity.log}" failonerror="false"/> 
-			<testNG haltonfailure="true" enableassert="true" verbose="9" >
-				        <jvmarg value="-server" />
-				        <jvmarg value="-enableassertions" />
-				        <jvmarg value="-Xms1024m" />
-				        <jvmarg value="-Xmx1024m" />
-						<env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>
-				        <classpath refid="test.classpath" />
-				    	<classpath refid="project.classpath" />
-						<xmlfileset dir="." includes="test-output/testng-failed.xml"/>
-				        <sysproperty key="TestingDataPath" value="${data.src}"/>
-		    </testNG>
+		<delete file="${activity.log}" failonerror="false"/>
+		<testNG haltonfailure="true" enableassert="true" verbose="9" >
+			<jvmarg value="-server" />
+			<jvmarg value="-enableassertions" />
+			<jvmarg value="-Xms1024m" />
+			<jvmarg value="-Xmx1024m" />
+			<env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}"/>
+			<classpath refid="test.classpath" />
+			<classpath refid="project.classpath" />
+			<xmlfileset dir="." includes="test-output/testng-failed.xml"/>
+			<sysproperty key="TestingDataPath" value="${data.src}"/>
+		</testNG>
 	</target>
 
 	<!-- <zipfileset excludes="META-INF/*.SF" src="jarfilename.jar"/> 
@@ -631,7 +668,7 @@
 		</target>
 		
 		-->
-	
+
 	<!--
 		<target name="run-client-jar" description="EXAMPLE TASK ONLY">
 			<java jar="${basedir}/resources/wsclient.jar" fork="true"
@@ -648,5 +685,5 @@
 			</java>
 		</target>
 	-->
-	
+
 </project>
\ No newline at end of file