<?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
+<project default="jabaws" name="Build Java Bioinformatics Analysis Web Services" basedir=".">\r
\r
<property name="basedir" location="${basedir}/log" />\r
<property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx24-amd64"/>\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="jaba_version" value="2.1"/>\r
<property name="datamodel" value="${distdir}/datamodel-${jaba_version}.jar"/>\r
<property name="datamodel-src" value="${distdir}/datamodel-src-${jaba_version}.jar"/>\r
<property name="min-jaba-client" value="${distdir}/min-jaba-client-${jaba_version}.jar"/>\r
+ <property name="jaba-client-src" value="${distdir}/jaba-client-src-${jaba_version}.jar"/>\r
+ \r
<property name="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
</fileset>\r
</path>\r
\r
-\r
<!-- add test classes -->\r
<path id="test.classpath">\r
<fileset dir="${test.lib.path}">\r
<pathelement location="${classes}" />\r
</path>\r
\r
-\r
- <!-- The compilation order is \r
+ <!--\r
+ The compilation order is \r
1. datamodel \r
2. engine\r
3. runner\r
<!-- Clean temp directories -->\r
<target name="clean">\r
<delete dir="${classes}" />\r
+ <delete file="${distdir}/binaries.zip" />\r
+ <delete file="${basedir}/activity.log" />\r
+ <delete file="${basedir}/derby.log" />\r
<mkdir dir="${classes}" />\r
+ <copy file="${basedir}/conf/log4j.properties" tofile="${classes}/log4j.properties" />\r
</target>\r
\r
<!--\r
</jar>\r
</target>\r
\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="${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 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}">\r
<include name="compbio/data/msa/**"/>\r
<include name="compbio/ws/client/**"/>\r
</fileset>\r
+ <zipgroupfileset excludes="META-INF/*" dir="" includes="WEB-INF/lib/log4j-1.2.15.jar" />\r
<manifest>\r
<attribute name="Built-By" value="${author}" />\r
<attribute name="Main-Class" value="compbio.ws.client.Jws2Client" />\r
<include name="compbio/engine/**"/>\r
<!-- Runners -->\r
<include name="compbio/runner/**"/>\r
+ <!-- Logging configuration -->\r
</fileset>\r
\r
<target name="full-jaba-client-jar" description="Pack datamodel, engine and runners" depends="compile">\r
</target>\r
\r
<target name="clearStatDB" description="Remove all records from statistics database">\r
- <java classname="compbio.stat.collector.StatDB" fork="true" failonerror="true" classpath="${classes}">\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
</target>\r
-->\r
\r
- <target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar">\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>\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
+<!--\r
+DEPRICATED - STANDARD JABA WAR WILL WORK FOR WINDOWS JUST FINE, DOWNLOAD SPACE SAVING IS NOT WORTH THE 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
-->\r
\r
<target name="build-all" description="Build-all the distributives"\r
- depends="full-jaba-client, minimal-jaba-client-jar, jaba-no-binaries,\r
- jaba-complete, datamodel-jar, datamodel-source-jar, source-jar"/>\r
+ depends="full-jaba-client, minimal-jaba-client-jar, jaba-no-binaries, 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
</target>\r
\r
\r
-</project>
\ No newline at end of file
+</project>\r
git://source.jalview.org / jabaws.git / blobdiff