husted 2003/06/07 14:53:29
Modified: . build-all-clean.bat.sample build-tests.xml
build-webapp.xml build.properties.sample build.xml
conf/share MANIFEST.MF
contrib/struts-el build-tests.xml build-webapp.xml
build.properties.sample build.xml
Log:
Replace DBCP/Pool dependency with Struts Legacy.
Revision Changes Path
1.8 +5 -8 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-all-clean.bat.sample 28 Feb 2003 06:42:20 -0000 1.7
+++ build-all-clean.bat.sample 7 Jun 2003 21:53:28 -0000 1.8
@@ -54,12 +54,6 @@
cd ..\lang
call ant %CLEAN% dist
-cd ..\pool
-call ant %CLEAN% dist
-
-cd ..\dbcp
-call ant %CLEAN% dist
-
cd ..\digester
call ant %CLEAN% dist
@@ -72,7 +66,10 @@
cd ..\fileupload
call maven
-cd ..\..\jakarta-struts-current
+cd ..\..\jakarta-struts-current\contrib\struts-legacy
+call ant %CLEAN% dist
+
+cd ..\..\
call ant %CLEAN% dist
pause
1.20 +3 -7 jakarta-struts/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build-tests.xml 13 May 2003 18:22:32 -0000 1.19
+++ build-tests.xml 7 Jun 2003 21:53:28 -0000 1.20
@@ -90,12 +90,10 @@
<pathelement location="${build.home}/test/classes"/>
<pathelement location="${commons-beanutils.jar}"/>
<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-validator.jar}"/>
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${httpunit.jar}"/>
@@ -103,6 +101,7 @@
<pathelement location="${cactus.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${struts.jar}"/>
</path>
@@ -190,17 +189,14 @@
todir="${out.test.dir}/lib"/>
<copy file="${commons-collections.jar}"
todir="${out.test.dir}/lib"/>
- <copy file="${commons-dbcp.jar}"
- todir="${out.test.dir}/lib"/>
<copy file="${commons-digester.jar}"
todir="${out.test.dir}/lib"/>
<copy file="${commons-logging.jar}"
todir="${out.test.dir}/lib"/>
- <copy file="${commons-pool.jar}"
- todir="${out.test.dir}/lib"/>
<copy file="${commons-validator.jar}"
todir="${out.test.dir}/lib"/>
-
+ <copy file="${struts-legacy.jar}"
+ todir="${out.test.dir}/lib"/>
<war warfile="${out.test.dir}/test.war"
webxml="${conf.test.dir}/web.xml">
1.14 +5 -10 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build-webapp.xml 28 Feb 2003 06:42:20 -0000 1.13
+++ build-webapp.xml 7 Jun 2003 21:53:28 -0000 1.14
@@ -53,10 +53,6 @@
of the Jakarta Commons Collections
package (version 1.0 or later).
- commons-dbcp.jar (required). The path to the JAR file
- of the Jakarta Commons DBCP
- 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).
@@ -73,10 +69,6 @@
of the Jakarta Commons Logging
package (version 1.0 or later).
- commons-pool.jar (required). The path to the JAR file
- of the Jakarta Commons POOL
- 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).
@@ -85,6 +77,10 @@
servlet API classes you wish to
compile against.
+ struts-legacy.jar (required). The path to the JAR file
+ of the Jakarta Struts Legacy
+ package (version 1.0 or later).
+
struts.libs If specified, must be the pathname of a
directory from which "struts.jar" will be
copied to your WEB-INF/lib directory, and
@@ -177,13 +173,12 @@
<path id="classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-pool.jar}"/>
<pathelement location="${commons-validator.jar}"/>
+ <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
1.40 +5 -9 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.properties.sample 6 Jun 2003 22:02:08 -0000 1.39
+++ build.properties.sample 7 Jun 2003 21:53:28 -0000 1.40
@@ -40,10 +40,6 @@
# from the Jakarta Commons project.
commons-collections.jar=${commons-lib.home}/collections/dist/commons-collections.jar
-# The JAR file containing the DBCP package (Version 1.0 or later)
-# from the Jakarta Commons project.
-commons-dbcp.jar=${commons-lib.home}/dbcp/dist/commons-dbcp.jar
-
# The JAR file containing the Digester package (Version 1.3 or later)
# from the Jakarta Commons project.
commons-digester.jar=${commons-lib.home}/digester/dist/commons-digester.jar
@@ -60,10 +56,6 @@
# from the Jakarta Commons project.
commons-logging.jar=${commons-lib.home}/logging/dist/commons-logging.jar
-# The JAR file containing the POOL package (Version 1.0.1 or later)
-# from the Jakarta Commons project.
-commons-pool.jar=${commons-lib.home}/pool/dist/commons-pool.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
@@ -87,6 +79,10 @@
# The JAR file containing the Servlet API classes to compile against (either
# version 2.2 or 2.3)
servlet.jar=${apache.home}/jakarta-servletapi/lib/servlet.jar
+
+# The JAR file containing the Struts Legacy package (Version 1.0 or later)
+# from the Struts contrib area.
+struts-legacy.jar=../contrib/struts-legacy/dist/struts-legacy.jar
# The directory containing your binary distribution of Tomcat 3.3, from CVS
# module "jakarta-tomcat" (and branch "TOMCAT_32") at jakarta.apache.org.
1.105 +5 -12 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- build.xml 6 Jun 2003 20:55:35 -0000 1.104
+++ build.xml 7 Jun 2003 21:53:28 -0000 1.105
@@ -40,8 +40,8 @@
of the Jakarta Commons Collections
package (version 1.0 or later).
- commons-dbcp.jar (required). The path to the JAR file
- of the Jakarta Commons DBCP
+ struts-legacy.jar (required). The path to the JAR file
+ of the Jakarta Struts Legacy
package (version 1.0 or later).
commons-digester.jar (required). The path to the JAR file
@@ -60,10 +60,6 @@
of the Jakarta Commons Logging
package (version 1.0 or later).
- commons-pool.jar (required). The path to the JAR file
- of the Jakarta Commons POOL
- 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).
@@ -198,12 +194,11 @@
<path id="compile.classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-dbcp.jar}"/>
+ <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-pool.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jakarta-oro.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
@@ -252,8 +247,8 @@
tofile="${build.home}/library/commons-beanutils.jar"/>
<copy file="${commons-collections.jar}"
tofile="${build.home}/library/commons-collections.jar"/>
- <copy file="${commons-dbcp.jar}"
- tofile="${build.home}/library/commons-dbcp.jar"/>
+ <copy file="${struts-legacy.jar}"
+ tofile="${build.home}/library/struts-legacy.jar"/>
<copy file="${commons-digester.jar}"
tofile="${build.home}/library/commons-digester.jar"/>
<copy file="${commons-fileupload.jar}"
@@ -262,8 +257,6 @@
tofile="${build.home}/library/commons-lang.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-validator.jar}"
tofile="${build.home}/library/commons-validator.jar"/>
<copy file="${jakarta-oro.jar}"
1.6 +1 -1 jakarta-struts/conf/share/MANIFEST.MF
Index: MANIFEST.MF
===================================================================
RCS file: /home/cvs/jakarta-struts/conf/share/MANIFEST.MF,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MANIFEST.MF 10 Apr 2003 02:27:39 -0000 1.5
+++ MANIFEST.MF 7 Jun 2003 21:53:28 -0000 1.6
@@ -10,9 +10,9 @@
Class-Path:
commons-beanutils.jar
commons-collections.jar
- commons-dbcp.jar
commons-digester.jar
commons-logging.jar
commons-pool.jar
commons-validator.jar
jakarta-oro.jar
+ struts-legacy.jar
\ No newline at end of file
1.6 +5 -8 jakarta-struts/contrib/struts-el/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build-tests.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-tests.xml 10 Mar 2003 02:43:31 -0000 1.5
+++ build-tests.xml 7 Jun 2003 21:53:28 -0000 1.6
@@ -100,11 +100,9 @@
<pathelement location="${build.home}/test/classes"/>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-httpclient.jar}"/>
<pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-pool.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${aspectjrt.jar}"/>
<pathelement location="${cactus.jar}"/>
@@ -113,9 +111,10 @@
<pathelement location="${xalanj.jar}"/>
<pathelement location="${jtidy.jar}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${struts.jar}"/>
- <pathelement location="${jstl.jar}"/>
- <pathelement location="${jstl-standard.jar}"/>
+ <pathelement location="${jstl.jar}"/>
+ <pathelement location="${jstl-standard.jar}"/>
</path>
<!-- ========== Executable Targets ======================================== -->
@@ -198,15 +197,13 @@
todir="${out.test.dir}/lib"/>
<copy file="${commons-collections.jar}"
todir="${out.test.dir}/lib"/>
- <copy file="${commons-dbcp.jar}"
- todir="${out.test.dir}/lib"/>
<copy file="${commons-digester.jar}"
todir="${out.test.dir}/lib"/>
<copy file="${commons-logging.jar}"
todir="${out.test.dir}/lib"/>
- <copy file="${commons-pool.jar}"
- todir="${out.test.dir}/lib"/>
<copy file="${commons-validator.jar}"
+ todir="${out.test.dir}/lib"/>
+ <copy file="${struts-legacy.jar}"
todir="${out.test.dir}/lib"/>
<war warfile="${out.test.dir}/test.war"
1.5 +5 -9 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-webapp.xml 28 Feb 2003 06:42:21 -0000 1.4
+++ build-webapp.xml 7 Jun 2003 21:53:28 -0000 1.5
@@ -53,10 +53,6 @@
of the Jakarta Commons Collections
package (version 1.0 or later).
- commons-dbcp.jar (required). The path to the JAR file
- of the Jakarta Commons DBCP
- 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).
@@ -73,10 +69,6 @@
of the Jakarta Commons Logging
package (version 1.0 or later).
- commons-pool.jar (required). The path to the JAR file
- of the Jakarta Commons POOL
- 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).
@@ -85,6 +77,10 @@
servlet API classes you wish to
compile against.
+ struts-legacy.jar (required). The path to the JAR file
+ of the Jakarta Struts Legacy
+ package (version 1.0 or later).
+
struts.libs If specified, must be the pathname of a
directory from which "struts.jar" will be
copied to your WEB-INF/lib directory, and
@@ -177,7 +173,6 @@
<path id="classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-lang.jar}"/>
@@ -186,6 +181,7 @@
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
<pathelement location="${struts.libs}/struts-el.jar"/>
<pathelement location="${webapp.libs}"/>
1.5 +6 -6 jakarta-struts/contrib/struts-el/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.properties.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties.sample 7 Feb 2003 22:35:30 -0000 1.4
+++ build.properties.sample 7 Jun 2003 21:53:28 -0000 1.5
@@ -28,10 +28,6 @@
# from the Jakarta Commons project.
commons-collections.jar = <path to commons-collections.jar>
-# The JAR file containing version 1.0 (or later) of the DBCP package
-# from the Jakarta Commons project.
-commons-dbcp.jar = <path to commons-dbcp.jar>
-
# The JAR file containing version 1.0 (or later) of the Digester package
# from the Jakarta Commons project.
commons-digester.jar = <path to commons.digester.jar>
@@ -48,9 +44,13 @@
# from the Jakarta Commons project.
commons-validator.jar = <path to commons-validator.jar>
-# The JAR file containing version 2.06 (or later) of
+# The JAR file containing version 2.06 (or later) of
# the the Jakarta ORO project.
jakarta-oro.jar = <path to jakarta-oro.jar>
+
+# The JAR file containing version 1.0 (or later) of the Struts Legacy package
+# from the Jakarta Struts contrib area.
+struts-legacy.jar = <path to struts-legacy.jar>
# Properties related to Struts unit testing
# -----------------------------------------
1.15 +3 -6 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 3 May 2003 17:05:20 -0000 1.14
+++ build.xml 7 Jun 2003 21:53:28 -0000 1.15
@@ -153,13 +153,12 @@
<path id="compile.classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-pool.jar}"/>
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${struts-legacy.jar}"/>
<pathelement location="${struts.jar}"/>
<pathelement location="${struts-el.jar}"/>
<pathelement location="${jstl.jar}"/>
@@ -203,8 +202,6 @@
tofile="${build.home}/library/commons-beanutils.jar"/>
<copy file="${commons-collections.jar}"
tofile="${build.home}/library/commons-collections.jar"/>
- <copy file="${commons-dbcp.jar}"
- tofile="${build.home}/library/commons-dbcp.jar"/>
<copy file="${commons-digester.jar}"
tofile="${build.home}/library/commons-digester.jar"/>
<copy file="${commons-fileupload.jar}"
@@ -213,12 +210,12 @@
tofile="${build.home}/library/commons-lang.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-validator.jar}"
tofile="${build.home}/library/commons-validator.jar"/>
<copy file="${jakarta-oro.jar}"
tofile="${build.home}/library/jakarta-oro.jar"/>
+ <copy file="${struts-legacy.jar}"
+ tofile="${build.home}/library/struts-legacy.jar"/>
<!-- Compile-time dependency only
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
