craigmcc 01/07/14 19:44:30
Modified: . build-webapp.xml build.properties.sample build.xml
Log:
Modify build processes to include the new commons packages dependencies.
No sources have been changed to depend on them yet.
Revision Changes Path
1.5 +15 -0 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-webapp.xml 2001/04/23 20:35:33 1.4
+++ build-webapp.xml 2001/07/15 02:44:30 1.5
@@ -45,6 +45,17 @@
build.home Base directory into which we are building
the Struts components.
+ commons-beanutils.jar (required). The path to the JAR file
+ of the Jakarta Commons Beanutils
+ package (version 1.0 or later).
+
+ commons-collections.jar (required). The path to the JAR file
+ of the Jakarta Commons Collections
+ package (version 1.0 or later).
+
+ commons-digester.jar (required). The path to the JAR file
+ of the Jakarta Commons Digester
+ package (version 1.0 or later).
servlet.jar MUST be set to the pathname of the
servlet API classes you wish to
@@ -140,6 +151,9 @@
<!-- The class path used for compiling this library -->
<path id="classpath">
+ <pathelement location="${commons-beanutils.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-digester.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
@@ -229,6 +243,7 @@
</copy>
<mkdir dir="${webapp.target}/WEB-INF/lib"/>
<copy todir="${webapp.target}/WEB-INF/lib">
+ <fileset dir="${struts.libs}" includes="commons-*.jar"/>
<fileset dir="${struts.libs}" includes="struts.jar"/>
</copy>
</target>
1.5 +13 -1 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties.sample 2001/05/06 12:07:31 1.4
+++ build.properties.sample 2001/07/15 02:44:30 1.5
@@ -6,7 +6,7 @@
# to "build.properties" in the same directory that contains the Struts
# "build.xml" file.
#
-# $Id: build.properties.sample,v 1.4 2001/05/06 12:07:31 vmassol Exp $
+# $Id: build.properties.sample,v 1.5 2001/07/15 02:44:30 craigmcc Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below assume that the build.xml file is in the
@@ -19,6 +19,18 @@
# "jakarta-tomcat-4.0" at jakarta.apache.org). This is only required
# if you are going to execute the "deploy.catalina" target.
catalina.home=../jakarta-tomcat-4.0/build
+
+# The JAR file containing version 1.0 (or later) of the Beanutils package
+# from the Jakarta Commons project.
+commons-beanutils.jar=/usr/local/commons-beanutils-1.0/commons-beanutils.jar
+
+# The JAR file containing version 1.0 (or later) of the Collections package
+# from the Jakarta Commons project.
+commons-collections.jar=/usr/local/commons-collections-1.0/commons-collections.jar
+
+# 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 the JDBC 2.0 Optional Package extensions API
# (javax.sql). This file will automatically be added to your class path
1.55 +27 -0 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 2001/06/01 19:19:27 1.54
+++ build.xml 2001/07/15 02:44:30 1.55
@@ -24,6 +24,18 @@
installation. This is required only when
executing the "deploy.catalina" target.
+ commons-beanutils.jar (required). The path to the JAR file
+ of the Jakarta Commons Beanutils
+ package (version 1.0 or later).
+
+ commons-collections.jar (required). The path to the JAR file
+ of the Jakarta Commons Collections
+ package (version 1.0 or later).
+
+ commons-digester.jar (required). The path to the JAR file
+ of the Jakarta Commons Digester
+ package (version 1.0 or later).
+
jdbc20ext.jar (required). The path to the JAR file
for the JDBC 2.0 Optional Package APIs.
@@ -47,6 +59,12 @@
<!-- Default values for unspecified properties -->
<property name="catalina.home" value="../jakarta-tomcat-4.0/build"/>
+ <property name="commons-beanutils.jar"
+ value="/usr/local/commons-beanutils-1.0/commons-beanutils.jar"/>
+ <property name="commons-collections.jar"
+ 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="jdbc20ext.jar" value="../jdbc2_0-stdext.jar"/>
<property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
<property name="tomcat.home" value="../build/tomcat"/>
@@ -116,6 +134,9 @@
<!-- Compilation Classpath -->
<path id="compile.classpath">
+ <pathelement location="${commons-beanutils.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-digester.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
</path>
@@ -149,6 +170,12 @@
<copy todir="${build.home}/library/classes/org/apache/struts/resources">
<fileset dir="${conf.share.dir}" includes="**/*.dtd"/>
</copy>
+ <copy file="${commons-beanutils.jar}"
+ tofile="${build.home}/library/commons-beanutils.jar"/>
+ <copy file="${commons-collections.jar}"
+ tofile="${build.home}/library/commons-collections.jar"/>
+ <copy file="${commons-digester.jar}"
+ tofile="${build.home}/library/commons-digester.jar"/>
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
</target>
