martinc 2003/02/27 22:42:21
Modified: . build-all-clean.bat.sample build-tests.xml
build-webapp.xml build.properties.sample build.xml
contrib/struts-el build-webapp.xml build.xml
doc/userGuide installation.xml
Log:
Remove dependency on Commons Resources for Struts 1.1 release.
Revision Changes Path
1.7 +1 -6 jakarta-struts/build-all-clean.bat.sample
Index: build-all-clean.bat.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build-all-clean.bat.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-all-clean.bat.sample 8 Feb 2003 19:31:52 -0000 1.6
+++ build-all-clean.bat.sample 28 Feb 2003 06:42:20 -0000 1.7
@@ -72,11 +72,6 @@
cd ..\fileupload
call maven
-cd ..\..\jakarta-commons-sandbox
-
-cd resources
-call maven
-
cd ..\..\jakarta-struts-current
call ant %CLEAN% dist
1.18 +0 -1 jakarta-struts/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build-tests.xml 27 Feb 2003 00:03:21 -0000 1.17
+++ build-tests.xml 28 Feb 2003 06:42:20 -0000 1.18
@@ -96,7 +96,6 @@
<pathelement location="${commons-httpclient.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
- <pathelement location="${commons-resources.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${httpunit.jar}"/>
<pathelement location="${aspectjrt.jar}"/>
1.13 +0 -5 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build-webapp.xml 22 Dec 2002 01:25:32 -0000 1.12
+++ build-webapp.xml 28 Feb 2003 06:42:20 -0000 1.13
@@ -77,10 +77,6 @@
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-validator.jar (required). The path to the JAR file
of the Jakarta Commons VALIDATOR
package (version 1.0 or later).
@@ -187,7 +183,6 @@
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
- <pathelement location="${commons-resources.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
1.31 +1 -5 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.properties.sample 27 Feb 2003 19:21:56 -0000 1.30
+++ build.properties.sample 28 Feb 2003 06:42:20 -0000 1.31
@@ -63,10 +63,6 @@
# from the Jakarta Commons project.
commons-pool.jar=${commons-lib.home}/pool/dist/commons-pool.jar
-# The JAR file containing the Resources package (recent Nightly Build)
-# from the Jakarta Commons project.
-commons-resources.jar=${commons-sandbox-lib.home}/resources/target/commons-resources.jar
-
# The JAR file containing the Validator package (Version 1.0.1 or later)
# from the Jakarta Commons project.
commons-validator.jar=${commons-lib.home}/validator/dist/commons-validator.jar
1.101 +0 -7 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- build.xml 27 Feb 2003 00:26:42 -0000 1.100
+++ build.xml 28 Feb 2003 06:42:20 -0000 1.101
@@ -64,10 +64,6 @@
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-validator.jar (required). The path to the JAR file
of the Jakarta Commons VALIDATOR
package (version 1.0 or later).
@@ -196,7 +192,6 @@
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
- <pathelement location="${commons-resources.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jakarta-oro.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
@@ -256,8 +251,6 @@
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-validator.jar}"
tofile="${build.home}/library/commons-validator.jar"/>
<copy file="${jakarta-oro.jar}"
1.4 +0 -5 jakarta-struts/contrib/struts-el/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build-webapp.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-webapp.xml 8 Jan 2003 19:04:23 -0000 1.3
+++ build-webapp.xml 28 Feb 2003 06:42:21 -0000 1.4
@@ -77,10 +77,6 @@
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-validator.jar (required). The path to the JAR file
of the Jakarta Commons VALIDATOR
package (version 1.0 or later).
@@ -187,7 +183,6 @@
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-pool.jar}"/>
- <pathelement location="${commons-resources.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
1.12 +0 -2 jakarta-struts/contrib/struts-el/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 11 Feb 2003 05:37:59 -0000 1.11
+++ build.xml 28 Feb 2003 06:42:21 -0000 1.12
@@ -210,8 +210,6 @@
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-validator.jar}"
tofile="${build.home}/library/commons-validator.jar"/>
<copy file="${jakarta-oro.jar}"
1.26 +0 -16 jakarta-struts/doc/userGuide/installation.xml
Index: installation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- installation.xml 19 Jan 2003 00:40:41 -0000 1.25
+++ installation.xml 28 Feb 2003 06:42:21 -0000 1.26
@@ -109,20 +109,6 @@
Nightly Build.
</li>
- <li><strong>Jakarta Commons SandBox Packages</strong> - The current version of
Struts utilizes several
- packages from the <a href="http://jakarta.apache.org/commons/index.html#The
Sandbox">Jakarta
- Commons Sandbox Project</a>. Before the final release of Struts 1.1 these
packages
- will be migrated to the Jakarta Commons sections, and officially released. If
you are utilizing a binary distribution of
- Struts, the corresponding JAR files are included in the <code>lib</code>
- directory. However, if you wish to build Struts from source, you will
- need to download and install the following packages:
- <ul>
- <li><em>Resources</em> (Recent
- <a
href="http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-resources";>
- Nightly Build</a>)</li>
- </ul>
- </li>
-
<li><strong>Jakarta ORO</strong> -
<a href="http://jakarta.apache.org/oro/index.html";>Apache Jakarta ORO</a>
version 2.06 (or later) is required to build Struts from source.</li>
@@ -377,8 +363,6 @@
Logging package JAR file from the Jakarta Commons project.</li>
<li><strong>commons-pool.jar</strong> - Pathname of the
Pool package JAR file from the Jakarta Commons project.</li>
- <li><strong>commons-resources.jar</strong> - Pathname of the
- Resources package JAR file from the Jakarta Commons project.</li>
<li><strong>commons-validator.jar</strong> - Pathname of the
Validator package JAR file from the Jakarta Commons project.</li>
<li><strong>servletapi.home</strong> - Pathname to the directory of
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
