craigmcc 02/01/15 19:05:22
Modified: . build-webapp.xml build.properties.sample build.xml
Log:
Include commons-dbcp.jar and commons-pool.jar with Struts, in preparation
for migration to the DBCP version of a connection pool as the preferred
standard implementation.
Revision Changes Path
1.7 +10 -0 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-webapp.xml 14 Jan 2002 18:49:17 -0000 1.6
+++ build-webapp.xml 16 Jan 2002 03:05:22 -0000 1.7
@@ -53,6 +53,10 @@
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).
@@ -61,6 +65,10 @@
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).
+
servlet.jar MUST be set to the pathname of the
servlet API classes you wish to
compile against.
@@ -157,8 +165,10 @@
<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-logging.jar}"/>
+ <pathelement location="${commons-pool.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.libs}/struts.jar"/>
1.7 +9 -1 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.properties.sample 14 Jan 2002 18:49:17 -0000 1.6
+++ build.properties.sample 16 Jan 2002 03:05:22 -0000 1.7
@@ -6,7 +6,7 @@
# to "build.properties" in the same directory that contains the Struts
# "build.xml" file.
#
-# $Id: build.properties.sample,v 1.6 2002/01/14 18:49:17 craigmcc Exp $
+# $Id: build.properties.sample,v 1.7 2002/01/16 03:05:22 craigmcc Exp $
# -----------------------------------------------------------------------------
# WARNING: The relative paths below assume that the build.xml file is in the
@@ -28,6 +28,10 @@
# 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 DBCP package
+# from the Jakarta Commons project.
+commons-dbcp.jar=/usr/local/commons-dbcp-1.0/commons-dbcp.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
@@ -35,6 +39,10 @@
# 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
+
+# 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 the JDBC 2.0 Optional Package extensions API
# (javax.sql). This file will automatically be added to your class path
1.59 +20 -20 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- build.xml 14 Jan 2002 18:49:17 -0000 1.58
+++ build.xml 16 Jan 2002 03:05:22 -0000 1.59
@@ -32,6 +32,10 @@
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).
@@ -40,6 +44,10 @@
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).
+
jdbc20ext.jar (required). The path to the JAR file
for the JDBC 2.0 Optional Package APIs.
@@ -69,10 +77,14 @@
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"/>
@@ -147,8 +159,10 @@
<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="${jdbc20ext.jar}"/>
<pathelement location="${servlet.jar}"/>
</path>
@@ -164,8 +178,10 @@
<pathelement location="${cactus.jar}"/>
<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="${servlet.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
@@ -212,10 +228,14 @@
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-logging.jar}"
tofile="${build.home}/library/commons-logging.jar"/>
+ <copy file="${commons-pool.jar}"
+ tofile="${build.home}/library/commons-pool.jar"/>
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
</target>
@@ -339,10 +359,6 @@
<copy todir="${catalina.home}/webapps/struts-blank">
<fileset dir="${build.home}/blank"/>
</copy>
-<!--
- <copy todir="${catalina.home}/webapps/struts-blank/WEB-INF/lib"
- file="${xerces.jar}"/>
--->
<mkdir dir="${catalina.home}/webapps/struts-documentation"/>
<copy todir="${catalina.home}/webapps/struts-documentation">
@@ -353,37 +369,21 @@
<copy todir="${catalina.home}/webapps/struts-example">
<fileset dir="${build.home}/example"/>
</copy>
-<!--
- <copy todir="${catalina.home}/webapps/struts-example/WEB-INF/lib"
- file="${xerces.jar}"/>
--->
<mkdir dir="${catalina.home}/webapps/struts-template"/>
<copy todir="${catalina.home}/webapps/struts-template">
<fileset dir="${build.home}/template-example"/>
</copy>
-<!--
- <copy todir="${catalina.home}/webapps/struts-template/WEB-INF/lib"
- file="${xerces.jar}"/>
--->
<mkdir dir="${catalina.home}/webapps/struts-exercise-taglib"/>
<copy todir="${catalina.home}/webapps/struts-exercise-taglib">
<fileset dir="${build.home}/exercise-taglib"/>
</copy>
-<!--
- <copy todir="${catalina.home}/webapps/struts-exercise-taglib/WEB-INF/lib"
- file="${xerces.jar}"/>
--->
<mkdir dir="${catalina.home}/webapps/struts-upload"/>
<copy todir="${catalina.home}/webapps/struts-upload">
<fileset dir="${build.home}/upload"/>
</copy>
-<!--
- <copy todir="${catalina.home}/webapps/struts-upload/WEB-INF/lib"
- file="${xerces.jar}"/>
--->
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
