Author: niallp
Date: Wed Nov 3 12:00:43 2004
New Revision: 56520
Modified:
struts/trunk/build-tests.xml
struts/trunk/build-webapp.xml
struts/trunk/build.properties.sample
struts/trunk/build.properties.sample.lib
struts/trunk/build.xml
struts/trunk/doc/userGuide/installation.xml
struts/trunk/project.xml
Log:
Remove Commons Collections from Struts build
Modified: struts/trunk/build-tests.xml
==============================================================================
--- struts/trunk/build-tests.xml (original)
+++ struts/trunk/build-tests.xml Wed Nov 3 12:00:43 2004
@@ -101,7 +101,6 @@
<pathelement location="${build.home}/library/${app.name}.jar"/>
<pathelement location="${build.home}/test/classes"/>
<pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-httpclient.jar}"/>
@@ -200,8 +199,6 @@
<copy file="${log4j.jar}" todir="${out.test.dir}/lib"/>
<copy file="${cactus.jar}" todir="${out.test.dir}/lib"/>
<copy file="${commons-beanutils.jar}"
- todir="${out.test.dir}/lib"/>
- <copy file="${commons-collections.jar}"
todir="${out.test.dir}/lib"/>
<copy file="${commons-digester.jar}"
todir="${out.test.dir}/lib"/>
Modified: struts/trunk/build-webapp.xml
==============================================================================
--- struts/trunk/build-webapp.xml (original)
+++ struts/trunk/build-webapp.xml Wed Nov 3 12:00:43 2004
@@ -49,10 +49,6 @@
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).
@@ -164,7 +160,6 @@
<!-- 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="${commons-fileupload.jar}"/>
<pathelement location="${commons-logging.jar}"/>
Modified: struts/trunk/build.properties.sample
==============================================================================
--- struts/trunk/build.properties.sample (original)
+++ struts/trunk/build.properties.sample Wed Nov 3 12:00:43 2004
@@ -36,10 +36,6 @@
# from the Jakarta Commons project.
commons-beanutils.jar=${commons-lib.home}/beanutils/dist/commons-beanutils.jar
-# The JAR file containing the Collections package (see Installation page)
-# from the Jakarta Commons project.
-commons-collections.jar=${commons-lib.home}/collections/dist/commons-collections.jar
-
# The JAR file containing the Digester package (see Installation page)
# from the Jakarta Commons project.
commons-digester.jar=${commons-lib.home}/digester/dist/commons-digester.jar
Modified: struts/trunk/build.properties.sample.lib
==============================================================================
--- struts/trunk/build.properties.sample.lib (original)
+++ struts/trunk/build.properties.sample.lib Wed Nov 3 12:00:43 2004
@@ -93,7 +93,6 @@
# For more about these dependencies, see the installation page in the UserGuide
antlr.jar=${struts-lib.home}/antlr.jar
commons-beanutils.jar=${struts-lib.home}/commons-beanutils.jar
-commons-collections.jar=${struts-lib.home}/commons-collections.jar
commons-digester.jar=${struts-lib.home}/commons-digester.jar
commons-fileupload.jar=${struts-lib.home}/commons-fileupload.jar
commons-logging.jar=${struts-lib.home}/commons-logging.jar
Modified: struts/trunk/build.xml
==============================================================================
--- struts/trunk/build.xml (original)
+++ struts/trunk/build.xml Wed Nov 3 12:00:43 2004
@@ -30,10 +30,6 @@
Commons Beanutils package.
[Version 1.6.1 or later]
- commons-collections.jar The path to the JAR file of the Jakarta
- Commons Collections package.
- [Version 2.1 or later]
-
commons-digester.jar The path to the JAR file of the Jakarta
Commons Digester package.
[Version 1.5 or later]
@@ -200,7 +196,6 @@
<!-- Compilation Classpath -->
<path id="compile.classpath">
<pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-logging.jar}"/>
@@ -261,8 +256,6 @@
</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="${commons-fileupload.jar}"
Modified: struts/trunk/doc/userGuide/installation.xml
==============================================================================
--- struts/trunk/doc/userGuide/installation.xml (original)
+++ struts/trunk/doc/userGuide/installation.xml Wed Nov 3 12:00:43 2004
@@ -103,7 +103,7 @@
<ul>
<li><a href="http://www.antlr.org/";>ANTLR</a> (Version 2.7.2)</li>
<li><a href="http://jakarta.apache.org/commons/beanutils/";>Jakarta Commons
Beanutils</a> (Version 1.7.0)</li>
- <li><a href="http://jakarta.apache.org/commons/digester/";>Jakarta Commons
Digester</a> (Version 1.5)</li>
+ <li><a href="http://jakarta.apache.org/commons/digester/";>Jakarta Commons
Digester</a> (Version 1.6)</li>
<li><a href="http://jakarta.apache.org/commons/fileupload/";>Jakarta Commons
FileUpload</a> (Version 1.0)</li>
<li><a href="http://jakarta.apache.org/commons/logging/";>Jakarta Commons
Logging</a> (Version 2.0)</li>
<li><a href="http://jakarta.apache.org/commons/logging/";>Jakarta Commons
Logging</a> (Version 1.0.4)</li>
Modified: struts/trunk/project.xml
==============================================================================
--- struts/trunk/project.xml (original)
+++ struts/trunk/project.xml Wed Nov 3 12:00:43 2004
@@ -196,7 +196,7 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
<url>http://jakarta.apache.org/commons/digester.html</url>
<properties>
<war.bundle>true</war.bundle>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
