craigmcc 2002/07/26 10:01:31
Modified: . build-tests.xml build-webapp.xml
build.properties.sample build.xml
Log:
Add dependencies on commons-fileupload and commons-resources from the
Jakarta Commons Sandbox. The former was added because Martin's got some
code ready to go that uses it. The latter was added because we've always
talked about doing so, and wanted to encourage us to finish that migration.
Revision Changes Path
1.9 +2 -0 jakarta-struts/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build-tests.xml 2 Jul 2002 01:55:27 -0000 1.8
+++ build-tests.xml 26 Jul 2002 17:01:31 -0000 1.9
@@ -89,9 +89,11 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-httpclient.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
+ <pathelement location="${commons-resources.jar}"/>
<pathelement location="${commons-services.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${aspectjrt.jar}"/>
1.10 +10 -0 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build-webapp.xml 2 Apr 2002 03:59:54 -0000 1.9
+++ build-webapp.xml 26 Jul 2002 17:01:31 -0000 1.10
@@ -61,6 +61,10 @@
of the Jakarta Commons Digester
package (version 1.0 or later).
+ commons-fileupload.jar (required). The path to the JAR file
+ of the Jakarta Commons FileUpload
+ 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).
@@ -69,6 +73,10 @@
of the Jakarta Commons POOL
package (version 1.0 or later).
+ commons-resources.jar (required). The path to the JAR file
+ of the Jakarta Commons Resources
+ package (version 1.0 or later).
+
commons-services.jar (required). The path to the JAR file
of the Jakarta Commons SERVICES
package (version 1.0 or later).
@@ -175,8 +183,10 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
+ <pathelement location="${commons-resources.jar}"/>
<pathelement location="${commons-services.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
1.11 +9 -1 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties.sample 2 Apr 2002 03:59:54 -0000 1.10
+++ build.properties.sample 26 Jul 2002 17:01:31 -0000 1.11
@@ -36,6 +36,10 @@
# 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 FileUpload package
+# from the Jakarta Commons project.
+commons-fileupload.jar=/usr/local/commons-fileupload-1.0/commons-fileupload.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
@@ -43,6 +47,10 @@
# The JAR file containing version 1.0 (or later) of the POOL package
# from the Jakarta Commons project.
commons-pool.jar=/usr/local/commons-pool-1.0/commons-pool.jar
+
+# The JAR file containing version 1.0 (or later) of the Resources package
+# from the Jakarta Commons project.
+commons-resources.jar=/usr/local/commons-resources-1.0/commons-resources.jar
# The JAR file containing a recent version of the SERVICES package
# from the Jakarta Commons project.
1.74 +14 -16 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- build.xml 26 Jun 2002 18:25:51 -0000 1.73
+++ build.xml 26 Jul 2002 17:01:31 -0000 1.74
@@ -49,6 +49,10 @@
of the Jakarta Commons Digester
package (version 1.0 or later).
+ commons-fileupload.jar (required). The path to the JAR file
+ of the Jakarta Commons FileUpload
+ 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).
@@ -57,6 +61,10 @@
of the Jakarta Commons POOL
package (version 1.0 or later).
+ commons-resources.jar (required). The path to the JAR file
+ of the Jakarta Commons Resources
+ package (version 1.0 or later).
+
commons-services.jar (required). The path to the JAR file
of the Jakarta Commons SERVICES
package (version 1.0 or later).
@@ -92,22 +100,6 @@
<!-- 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-dbcp.jar"
- value="/usr/local/commons-dbcp-1.0/commons-dbcp.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="commons-pool.jar"
- value="/usr/local/commons-pool-1.0/commons-pool.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"/>
- <property name="xerces.jar" value="../xml-xerces/xerces.jar"/>
<!-- ========== Initialization Properties ================================= -->
@@ -198,8 +190,10 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
+ <pathelement location="${commons-resources.jar}"/>
<pathelement location="${commons-services.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jakarta-oro.jar}"/>
@@ -248,10 +242,14 @@
tofile="${build.home}/library/commons-dbcp.jar"/>
<copy file="${commons-digester.jar}"
tofile="${build.home}/library/commons-digester.jar"/>
+ <copy file="${commons-fileupload.jar}"
+ tofile="${build.home}/library/commons-fileupload.jar"/>
<copy file="${commons-logging.jar}"
tofile="${build.home}/library/commons-logging.jar"/>
<copy file="${commons-pool.jar}"
tofile="${build.home}/library/commons-pool.jar"/>
+ <copy file="${commons-resources.jar}"
+ tofile="${build.home}/library/commons-resources.jar"/>
<copy file="${commons-services.jar}"
tofile="${build.home}/library/commons-services.jar"/>
<copy file="${commons-validator.jar}"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
