craigmcc 02/01/14 10:49:17
Modified: . build-webapp.xml build.properties.sample build.xml
Log:
Update the build scripts for the HEAD branch to include commons-logging.jar
since the HEAD branch of Digester now depends on it. At the moment, nothing
in Struts itself uses this library, but that could change in the future.
Developers should update their build environment by grabbing a nightly build
of commons-logging and updating their build.properties file appropriately.
Revision Changes Path
1.6 +5 -0 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-webapp.xml 15 Jul 2001 02:44:30 -0000 1.5
+++ build-webapp.xml 14 Jan 2002 18:49:17 -0000 1.6
@@ -57,6 +57,10 @@
of the Jakarta Commons Digester
package (version 1.0 or later).
+ commons-logging.jar (required). The path to the JAR file
+ of the Jakarta Commons Logging
+ package (version 1.0 or later).
+
servlet.jar MUST be set to the pathname of the
servlet API classes you wish to
compile against.
@@ -154,6 +158,7 @@
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
1.6 +5 -1 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties.sample 15 Jul 2001 02:44:30 -0000 1.5
+++ build.properties.sample 14 Jan 2002 18:49:17 -0000 1.6
@@ -6,7 +6,7 @@
# to "build.properties" in the same directory that contains the Struts
# "build.xml" file.
#
-# $Id: build.properties.sample,v 1.5 2001/07/15 02:44:30 craigmcc Exp $
+# $Id: build.properties.sample,v 1.6 2002/01/14 18:49:17 craigmcc Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below assume that the build.xml file is in the
@@ -31,6 +31,10 @@
# The JAR file containing version 1.0 (or later) of the Digester package
# from the Jakarta Commons project.
commons-digester.jar=/usr/local/commons-digester-1.0/commons-digester.jar
+
+# The JAR file containing version 1.0 (or later) of the Logging package
+# from the Jakarta Commons project.
+commons-logging.jar=/usr/local/commons-logging-1.0/commons-logging.jar
# The JAR file containing the JDBC 2.0 Optional Package extensions API
# (javax.sql). This file will automatically be added to your class path
1.58 +10 -0 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- build.xml 26 Dec 2001 21:55:54 -0000 1.57
+++ build.xml 14 Jan 2002 18:49:17 -0000 1.58
@@ -36,6 +36,10 @@
of the Jakarta Commons Digester
package (version 1.0 or later).
+ commons-logging.jar (required). The path to the JAR file
+ of the Jakarta Commons Logging
+ package (version 1.0 or later).
+
jdbc20ext.jar (required). The path to the JAR file
for the JDBC 2.0 Optional Package APIs.
@@ -67,6 +71,8 @@
value="/usr/local/commons-collections-1.0/commons-collections.jar"/>
<property name="commons-digester.jar"
value="/usr/local/commons-digester-1.0/commons-digester.jar"/>
+ <property name="commons-logging.jar"
+ value="/usr/local/commons-logging-1.0/commons-logging.jar"/>
<property name="jdbc20ext.jar" value="../jdbc2_0-stdext.jar"/>
<property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
<property name="tomcat.home" value="../build/tomcat"/>
@@ -142,6 +148,7 @@
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
</path>
@@ -158,6 +165,7 @@
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
@@ -206,6 +214,8 @@
tofile="${build.home}/library/commons-collections.jar"/>
<copy file="${commons-digester.jar}"
tofile="${build.home}/library/commons-digester.jar"/>
+ <copy file="${commons-logging.jar}"
+ tofile="${build.home}/library/commons-logging.jar"/>
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
