jon 01/11/14 15:02:29
Modified: . build-om.xml build-turbine-sql.xml build.xml
default.properties
Log:
latest velocity doesn't include logkit anymore in the .jar file, so it is
now a required dep in fulcrum for building things, however it isn't a
runtime dep. sigh. the solution is to change velocity to default to using
log4j.
Revision Changes Path
1.10 +1 -0 jakarta-turbine-fulcrum/build-om.xml
Index: build-om.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build-om.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build-om.xml 2001/11/13 05:35:43 1.9
+++ build-om.xml 2001/11/14 23:02:29 1.10
@@ -24,6 +24,7 @@
classname="org.apache.torque.task.TorqueObjectModelTask">
<classpath>
<pathelement location="${velocity.jar}"/>
+ <pathelement location="${logkit.jar}"/>
<pathelement location="${torque.jar}"/>
<pathelement location="${xerces.jar}"/>
<pathelement location="${commons-collections.jar}"/>
1.6 +1 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-turbine-sql.xml 2001/11/13 05:35:43 1.5
+++ build-turbine-sql.xml 2001/11/14 23:02:29 1.6
@@ -9,6 +9,7 @@
<path id="classpath">
<pathelement location="${velocity.jar}"/>
+ <pathelement location="${logkit.jar}"/>
<pathelement location="${torque.jar}"/>
<pathelement location="${xerces.jar}"/>
<pathelement location="${commons-util.jar}"/>
1.32 +19 -3 jakarta-turbine-fulcrum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 2001/11/10 00:51:55 1.31
+++ build.xml 2001/11/14 23:02:29 1.32
@@ -13,6 +13,7 @@
<path id="classpath">
<pathelement location="${velocity.jar}"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${logkit.jar}"/>
<pathelement location="${xerces.jar}"/>
<pathelement location="${bsf.jar}"/>
<pathelement location="${torque.jar}"/>
@@ -42,6 +43,7 @@
<echo message="lib.repo = ${lib.repo}"/>
<echo message="velocity.jar = ${velocity.jar}"/>
+ <echo message="logkit.jar = ${logkit.jar}"/>
<echo message="log4j.jar = ${log4j.jar}"/>
<echo message="xerces.jar = ${xerces.jar}"/>
<echo message="bsf.jar = ${bsf.jar}"/>
@@ -133,6 +135,12 @@
classpathref="classpath"
/>
+ <available
+ classname="org.apache.log.LogKit"
+ property="logkit.present"
+ classpathref="classpath"
+ />
+
<available
classname="org.apache.velocity.runtime.Runtime"
property="velocity.present"
@@ -241,6 +249,13 @@
</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"/>
@@ -380,9 +395,10 @@
<target name="prepare"
depends="init,env,create-dirs,
- 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,
+ check.velocity,check.logkit,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,
include-email,om">
<!-- We have some static files that should overwrite
1.8 +1 -0 jakarta-turbine-fulcrum/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/default.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.properties 2001/11/13 05:35:43 1.7
+++ default.properties 2001/11/14 23:02:29 1.8
@@ -41,6 +41,7 @@
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
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]>
