From 12fd33c87c9b4e1ec2eee04d178babf2fc6d43f6 Mon Sep 17 00:00:00 2001
From: travismccauley <travismccauley>
Date: Wed, 7 Jan 2004 20:54:45 +0000
Subject: [PATCH] Updated context config to use the new Databases. And added a
 javac task to the build file to compile ThdlUser sources all in one go.

---
 build.xml                     | 15 ++++++++++-----
 config/lex-context-config.xml |  2 +-
 src/java/log4j.properties     |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 26680ca..b085958 100644
--- a/build.xml
+++ b/build.xml
@@ -30,9 +30,9 @@ jmeterhome=../jmeter
   <!-- Configure the context path for this application -->
 	<property name="path" value="/lex"/>
 
-    <property file="${user.home}/.${ant.project.name}-build.properties"/>
+<!--    <property file="${user.home}/.${ant.project.name}-build.properties"/>
 	<property file="${user.home}/.build.properties"/>
-	<property file="build.properties"/> 
+-->	<property file="build.properties"/> 
 
   <!-- Configure the custom Ant tasks for the Manager application 
   			These tasks require catalina-ant.jar in $ANT_HOME/lib-->
@@ -136,6 +136,11 @@ jmeterhome=../jmeter
 
 	<target name="compile" description="Compile web application" depends="copy">
 		<mkdir dir="${build}/WEB-INF/classes"/>
+		<javac srcdir="${thdluser.home}/src/java"
+				 destdir="${build}/WEB-INF/classes"
+				 deprecation="on"
+				 classpathref="classpath"
+				 debug="on"/>
 		<javac  destdir="${build}/WEB-INF/classes" classpathref="classpath" debug="on" listfiles="no">
 		<src path="${source}/java"/>
 		<include name="org/thdl/lex/**"/>
@@ -161,11 +166,11 @@ jmeterhome=../jmeter
 		</javadoc>
 	</target>
 	
-	<target name="install" description="Install web application" depends="compile, move-log">
+	<target name="install" description="Install web application" depends="compile">
 		<install url="${url}" username="${username}" password="${password}" path="${path}" config="file://${basedir}/${lex.context.config}" war="file://${build}"/>
 	</target>
 	
-	<target name="move-log" description="move old log file">
+	<!-- <target name="move-log" description="move old log file">
 		<mkdir dir="logs"/>
 		<mkdir dir="logs/old"/>
 		<tstamp prefix="now"/>
@@ -173,7 +178,7 @@ jmeterhome=../jmeter
 		<move file="${basedir}/logs/hibernate.log" tofile="${basedir}/logs/old/${now.DSTAMP}_${now.TSTAMP}_hibernate.log" overwrite="true"/>
 		<touch file="${basedir}/logs/lex.log"/>
 		<move file="${basedir}/logs/lex.log" tofile="${basedir}/logs/old/${now.DSTAMP}_${now.TSTAMP}_lex.log" overwrite="true"/>
-	</target>
+	</target> -->
 	
 	<target name="reinstall" description="Remove and Re-install web application" depends="remove">
 		<antcall target="install"/>
diff --git a/config/lex-context-config.xml b/config/lex-context-config.xml
index cc9f25a..4511363 100644
--- a/config/lex-context-config.xml
+++ b/config/lex-context-config.xml
@@ -55,7 +55,7 @@
         <!-- DBCP database connection settings -->
 		<parameter>
 			<name>url</name>
-			<value>jdbc:mysql://localhost/ThdlUsers</value>
+			<value>jdbc:mysql://localhost/ThdlUser</value>
 		</parameter>
 		<parameter>
 			<name>driverClassName</name>
diff --git a/src/java/log4j.properties b/src/java/log4j.properties
index 0b76bc3..90dfb36 100644
--- a/src/java/log4j.properties
+++ b/src/java/log4j.properties
@@ -6,13 +6,13 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
 ### direct messages to file hibernate.log ###
 log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=/Users/travis/webapps/development/Dictionary/logs/hibernate.log
+log4j.appender.file.File=/usr/local/Dictionary/dictionary-hibernate.log
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n 
 
 ### direct messages to file lex.log ###
 log4j.appender.lex-out=org.apache.log4j.FileAppender
-log4j.appender.lex-out.File=/Users/travis/webapps/development/Dictionary/logs/lex.log
+log4j.appender.lex-out.File=/usr/local/Dictionary/dictionary.log
 log4j.appender.lex-out.layout=org.apache.log4j.PatternLayout
 log4j.appender.lex-out.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n