jvanzyl 01/11/23 06:37:35
Modified: . build-om.xml build-turbine-sql.xml build.xml
default.properties
Log:
- removing the requirement for logkit, with log4j in the classpath
velocity will use log4j instead.
Revision Changes Path
1.11 +1 -1 jakarta-turbine-fulcrum/build-om.xml
Index: build-om.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build-om.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-om.xml 2001/11/14 23:02:29 1.10
+++ build-om.xml 2001/11/23 14:37:34 1.11
@@ -24,7 +24,7 @@
classname="org.apache.torque.task.TorqueObjectModelTask">
<classpath>
<pathelement location="${velocity.jar}"/>
- <pathelement location="${logkit.jar}"/>
+ <pathelement location="${log4j.jar}"/>
<pathelement location="${torque.jar}"/>
<pathelement location="${xerces.jar}"/>
<pathelement location="${commons-collections.jar}"/>
1.7 +1 -1 jakarta-turbine-fulcrum/build-turbine-sql.xml
Index: build-turbine-sql.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build-turbine-sql.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-turbine-sql.xml 2001/11/14 23:02:29 1.6
+++ build-turbine-sql.xml 2001/11/23 14:37:34 1.7
@@ -9,7 +9,7 @@
<path id="classpath">
<pathelement location="${velocity.jar}"/>
- <pathelement location="${logkit.jar}"/>
+ <pathelement location="${log4j.jar}"/>
<pathelement location="${torque.jar}"/>
<pathelement location="${xerces.jar}"/>
<pathelement location="${commons-util.jar}"/>
1.34 +1 -16 jakarta-turbine-fulcrum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 2001/11/20 20:44:12 1.33
+++ build.xml 2001/11/23 14:37:34 1.34
@@ -20,7 +20,6 @@
<pathelement location="${jdbc.jar}"/>
<pathelement location="${jndi.jar}"/>
<pathelement location="${log4j.jar}"/>
- <pathelement location="${logkit.jar}"/>
<pathelement location="${regexp.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${torque.jar}"/>
@@ -48,7 +47,6 @@
<echo message="jdbc.jar = ${jdbc.jar}"/>
<echo message="jndi.jar = ${jndi.jar}"/>
<echo message="log4j.jar = ${log4j.jar}"/>
- <echo message="logkit.jar = ${logkit.jar}"/>
<echo message="regexp.jar = ${regexp.jar}"/>
<echo message="servlet.jar = ${servlet.jar}"/>
<echo message="torque.jar = ${torque.jar}"/>
@@ -132,12 +130,6 @@
classpathref="classpath"
/>
- <available
- classname="org.apache.log.LogKit"
- property="logkit.present"
- classpathref="classpath"
- />
-
<available
classname="org.apache.velocity.runtime.Runtime"
property="velocity.present"
@@ -246,13 +238,6 @@
</antcall>
</target>
- <target name="check.logkit" unless="logkit.present">
- <antcall target="property-warning">
- <param name="name" value="logkit.jar"/>
- <param name="value" value="${logkit.jar}"/>
- </antcall>
- </target>
-
<target name="check.log4j" unless="log4j.present">
<antcall target="property-warning">
<param name="name" value="log4j.jar"/>
@@ -392,7 +377,7 @@
<target name="prepare"
depends="init,env,create-dirs,
- check.velocity,check.logkit,check.log4j,check.torque,check.bsf,
+ check.velocity,check.log4j,check.torque,check.bsf,
check.servlet,check.javamail,check.jaf,check.xerces,check.xalan,
check.xmlrpc,check.commons-collections,check.commons-util,
check.regexp,
1.9 +1 -2 jakarta-turbine-fulcrum/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/default.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.properties 2001/11/14 23:02:29 1.8
+++ default.properties 2001/11/23 14:37:34 1.9
@@ -40,8 +40,7 @@
jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
jndi.jar = ${lib.repo}/jndi-1.2.1.jar
junit.jar = ${lib.repo}/junit.jar
-log4j.jar = ${lib.repo}/log4j-1.1.jar
-logkit.jar = ${lib.repo}/logkit-1.0.jar
+log4j.jar = ${lib.repo}/log4j-1.1.3.jar
servlet.jar = ${lib.repo}/servlet.jar
torque.jar = ${lib.repo}/torque-1.0.jar
velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
