copy log4j.properties to WEB-INF/classes

diff --git a/build.xml b/build.xml
index 09d031c..8eb2e88 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?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
@@ -20,7 +20,7 @@
        <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
@@ -60,7 +60,6 @@
                </fileset>\r
        </path>\r
 \r
-\r
        <!-- add test classes -->\r
        <path id="test.classpath">\r
                <fileset dir="${test.lib.path}">\r
@@ -69,8 +68,8 @@
                <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
@@ -123,6 +122,7 @@
                <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
@@ -305,6 +305,7 @@
                <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
@@ -399,7 +400,7 @@
        </target>\r
 -->\r
 \r
-       <target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar,  clearStatDB">\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
@@ -451,8 +452,8 @@
                </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
@@ -463,8 +464,7 @@
 -->\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, jaba-client-src-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