thdltools/Dictionary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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.

Browse source
This commit is contained in:
travismccauley 2004-01-07 20:54:45 +00:00
parent d398e86fa0
commit 12fd33c87c
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build.xml
View file

@ -30,9 +30,9 @@ jmeterhome=../jmeter
<!-- Configure the context path for this application --> <!-- Configure the context path for this application -->
<property name="path" value="/lex"/> <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="${user.home}/.build.properties"/>
<property file="build.properties"/> --> <property file="build.properties"/>
<!-- Configure the custom Ant tasks for the Manager application <!-- Configure the custom Ant tasks for the Manager application
These tasks require catalina-ant.jar in $ANT_HOME/lib--> 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"> <target name="compile" description="Compile web application" depends="copy">
<mkdir dir="${build}/WEB-INF/classes"/> <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"> <javac destdir="${build}/WEB-INF/classes" classpathref="classpath" debug="on" listfiles="no">
<src path="${source}/java"/> <src path="${source}/java"/>
<include name="org/thdl/lex/**"/> <include name="org/thdl/lex/**"/>
@ -161,11 +166,11 @@ jmeterhome=../jmeter
</javadoc> </javadoc>
</target> </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}"/> <install url="${url}" username="${username}" password="${password}" path="${path}" config="file://${basedir}/${lex.context.config}" war="file://${build}"/>
</target> </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"/>
<mkdir dir="logs/old"/> <mkdir dir="logs/old"/>
<tstamp prefix="now"/> <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"/> <move file="${basedir}/logs/hibernate.log" tofile="${basedir}/logs/old/${now.DSTAMP}_${now.TSTAMP}_hibernate.log" overwrite="true"/>
<touch file="${basedir}/logs/lex.log"/> <touch file="${basedir}/logs/lex.log"/>
<move file="${basedir}/logs/lex.log" tofile="${basedir}/logs/old/${now.DSTAMP}_${now.TSTAMP}_lex.log" overwrite="true"/> <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"> <target name="reinstall" description="Remove and Re-install web application" depends="remove">
<antcall target="install"/> <antcall target="install"/>

2
config/lex-context-config.xml
View file

@ -55,7 +55,7 @@
<!-- DBCP database connection settings --> <!-- DBCP database connection settings -->
<parameter> <parameter>
<name>url</name> <name>url</name>
<value>jdbc:mysql://localhost/ThdlUsers</value> <value>jdbc:mysql://localhost/ThdlUser</value>
</parameter> </parameter>
<parameter> <parameter>
<name>driverClassName</name> <name>driverClassName</name>

4
src/java/log4j.properties
View file

@ -6,13 +6,13 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
### direct messages to file hibernate.log ### ### direct messages to file hibernate.log ###
log4j.appender.file=org.apache.log4j.FileAppender 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=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
### direct messages to file lex.log ### ### direct messages to file lex.log ###
log4j.appender.lex-out=org.apache.log4j.FileAppender 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=org.apache.log4j.PatternLayout
log4j.appender.lex-out.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n log4j.appender.lex-out.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n