From: Sasha <asherstnev@main-laptop2>
Date: Fri, 26 Apr 2013 17:21:49 +0000 (+0100)
Subject: copy log4j.properties to WEB-INF/classes
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0b0d53861bb6cec5139bf8a69cf6ba7abe9e52f6;p=jabaws.git

copy log4j.properties to WEB-INF/classes
---

diff --git a/build.xml b/build.xml
index 09d031c..8eb2e88 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project default="minimal-jaba-client-jar" name="Build minimal client for Java Bioinformatics Analysis Web Services" basedir=".">
+<project default="jabaws" name="Build Java Bioinformatics Analysis Web Services" basedir=".">
 
 	<property name="basedir" location="${basedir}/log" />
 	<property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx24-amd64"/>
@@ -20,7 +20,7 @@
 	<property name="compbio-ga" value="compbio-ga-1.0.jar"/>
 	
 	<!-- products -->
-	<property name="jaba_version" value="2.0"/>
+	<property name="jaba_version" value="2.1"/>
 	<property name="datamodel" value="${distdir}/datamodel-${jaba_version}.jar"/>
 	<property name="datamodel-src" value="${distdir}/datamodel-src-${jaba_version}.jar"/>
 	<property name="min-jaba-client" value="${distdir}/min-jaba-client-${jaba_version}.jar"/>
@@ -60,7 +60,6 @@
 		</fileset>
 	</path>
 
-
 	<!-- add test classes -->
 	<path id="test.classpath">
 		<fileset dir="${test.lib.path}">
@@ -69,8 +68,8 @@
 		<pathelement location="${classes}" />
 	</path>
 
-
-	<!-- The compilation order is 
+	<!--
+	The compilation order is 
 	1. datamodel 
 	2. engine
 	3. runner
@@ -123,6 +122,7 @@
 		<delete file="${basedir}/activity.log" />
 		<delete file="${basedir}/derby.log" />
 		<mkdir dir="${classes}" />
+		<copy file="${basedir}/conf/log4j.properties" tofile="${classes}/log4j.properties" />
 	</target>
 
 	<!--
@@ -305,6 +305,7 @@
 		<include name="compbio/engine/**"/>
 		<!-- Runners -->
 		<include name="compbio/runner/**"/>
+		<!-- Logging configuration -->
 	</fileset>
 
 	<target name="full-jaba-client-jar" description="Pack datamodel, engine and runners" depends="compile">
@@ -399,7 +400,7 @@
 	</target>
 -->
 
-	<target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar,  clearStatDB">
+	<target name="jaba-no-binaries" description="Prepare JABAWS war file without native binaries" depends="full-jaba-jar, clearStatDB">
 		<echo>Preparing a war file without binaries</echo>
 		<delete file="${jaba-no-binaries}">
 		</delete>
@@ -451,8 +452,8 @@
 		</zip>
 	</target>
 
-<!-- DEPRICATED - STANDARD JABA WAR WILL WORK FOR WINDOWS JUST FINE, DOWNLOAD SPACE SAVING IS NOT WORTH THE 
-  ADDITIONAL COMPLEXITY 
+<!--
+DEPRICATED - STANDARD JABA WAR WILL WORK FOR WINDOWS JUST FINE, DOWNLOAD SPACE SAVING IS NOT WORTH THE ADDITIONAL COMPLEXITY 
 	<target name="jaba-complete-windows" description="Prepare JABAWS war file for windows" depends="jaba-no-binaries">
 		<echo>Preparing a complete war file</echo>
 		<copy tofile="${jaba-windows}" file="${jaba-no-binaries}"/>
@@ -463,8 +464,7 @@
 -->
  
 	<target name="build-all" description="Build-all the distributives"
-		depends="full-jaba-client, minimal-jaba-client-jar, jaba-no-binaries,
-		 jaba-complete, datamodel-jar, datamodel-source-jar, source-jar, jaba-client-src-jar"/>
+		depends="full-jaba-client, minimal-jaba-client-jar, jaba-no-binaries, jaba-complete, datamodel-jar, datamodel-source-jar, source-jar, jaba-client-src-jar"/>
 
 	<!-- 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">