hgomez 2002/06/11 05:13:22
Modified: . build.xml build.properties.sample
Log:
PR: Updated build.xml which will ensure that all required commons
jars needed for JDBCPooledRealm are present.
Updated build.properties.sample to reflect commons updates and
ant.lib (which is required for ant jscp task)
Revision Changes Path
1.184 +27 -18 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- build.xml 7 Jun 2002 07:16:51 -0000 1.183
+++ build.xml 11 Jun 2002 12:13:22 -0000 1.184
@@ -76,6 +76,18 @@
<property name="puretls.lib" location="${puretls.home}/build"/>
<property name="puretls.jar" location="${puretls.lib}/puretls.jar"/>
+ <property name="commons-dbcp.home" location="${jakarta-commons}/dbcp"/>
+ <property name="commons-dbcp.lib" location="${commons-dbcp.home}/dist"/>
+ <property name="commons-dbcp.jar"
location="${commons-dbcp.lib}/commons-dbcp.jar"/>
+
+ <property name="commons-pool.home" location="${jakarta-commons}/pool"/>
+ <property name="commons-pool.lib" location="${commons-pool.home}/dist"/>
+ <property name="commons-pool.jar"
location="${commons-pool.lib}/commons-pool.jar"/>
+
+ <property name="commons-collections.home"
location="${jakarta-commons}/collections"/>
+ <property name="commons-collections.lib"
location="${commons-collections.home}/dist"/>
+ <property name="commons-collections.jar"
location="${commons-collections.lib}/commons-collections.jar"/>
+
<property name="jtc.http11.home" location="${jakarta-tomcat-connectors}/http11"/>
<property name="jtc.http11.lib" location="${jtc.http11.home}/build/lib"/>
@@ -98,8 +110,6 @@
file="${jsse.jar}"/>
<available property="puretls.present"
file="${puretls.jar}"/>
- <available property="commons-dbcp.present"
- file="${jakarta-commons}/dbcp/dist/commons-dbcp.jar" />
<available property="jdk12.present"
classname="java.security.PrivilegedAction"/>
<available property="jaxp-present"
@@ -114,6 +124,13 @@
file="${jaxp.home}/xerces.jar" />
<available property="jtc-present"
file="${jakarta-tomcat-connectors}" />
+ <condition property="commons-dbcp.complete">
+ <and>
+ <available file="${commons-dbcp.jar}" />
+ <available file="${commons-pool.jar}" />
+ <available file="${commons-collections.jar}" />
+ </and>
+ </condition>
</target>
<target name="uptodate">
@@ -134,8 +151,8 @@
<echo message="Detected PureTLS"/>
</target>
- <target name="msg.commons-dbcp" if="commons-dbcp.present" >
- <echo message="Detected commons-DBCP"/>
+ <target name="msg.commons-dbcp" if="commons-dbcp.complete" >
+ <echo message="Detected commons-DBCP and required jars"/>
</target>
<target name="msg.jtc" unless="jtc-present" >
@@ -467,7 +484,7 @@
</target>
- <target name="commons-prepare" depends="prepare" if="commons-dbcp.present" >
+ <target name="commons-prepare" depends="prepare" if="commons-dbcp.complete" >
<!-- Because of way the build.xml files are set up, we can't call them from
inside this file. They need to be run before this script is executed
if you want the PooledJDBCRealm code to be built.
@@ -475,18 +492,10 @@
<ant antfile="../jakarta-commons/pool/build.xml" target="dist"/>
<ant antfile="../jakarta-commons/dbcp/build.xml" target="dist"/>
-->
- <echo message="copying commons jars"/>
- <copy todir="${tomcat.build}/lib/container" flatten="yes">
- <fileset dir="../jakarta-commons/dbcp">
- <include name="**/dist/*.jar"/>
- </fileset>
- <fileset dir="../jakarta-commons/pool">
- <include name="**/dist/*.jar"/>
- </fileset>
- <fileset dir="../jakarta-commons/collections">
- <include name="**/dist/*.jar"/>
- </fileset>
- </copy>
+ <echo message="copying commons jars for DBCP support"/>
+ <copy file="${commons-dbcp.jar}" todir="${tomcat.build}/lib/container"/>
+ <copy file="${commons-pool.jar}" todir="${tomcat.build}/lib/container"/>
+ <copy file="${commons-collections.jar}" todir="${tomcat.build}/lib/container"/>
</target>
<!-- ==================== "Standard" interceptors ========== -->
@@ -515,7 +524,7 @@
<exclude
name="org/apache/tomcat/modules/aaa/PooledJDBCRealm.java"
- unless="commons-dbcp.present"/>
+ unless="commons-dbcp.complete"/>
<exclude
name="org/apache/tomcat/modules/config/PolicyInterceptor.java"
unless="jdk12.present"/>
1.2 +22 -2 jakarta-tomcat/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 8 Apr 2002 01:56:51 -0000 1.1
+++ build.properties.sample 11 Jun 2002 12:13:22 -0000 1.2
@@ -42,4 +42,24 @@
# ----- (optional) Jakarta Commons Logging (required by Http11) -----
commons-logging.home=../commons-logging-1.0
commons-logging.lib=${commons-logging.home}
-commond-logging.jar=${commons-logging.lib}/commons-logging.jar
+commons-logging.jar=${commons-logging.lib}/commons-logging.jar
+
+# ----- (optional) Jakarta Commons DB Pool (required by future PooledJDBCRealm )
-----
+commons-dbcp.home=../commons-dbcp-1.0
+commons-dbcp.lib=${commons-dbcp.home}
+commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
+
+# ----- (optional) Jakarta Commons Pool (required by Commons DBCP) -----
+commons-pool.home=../commons-pool-1.0
+commons-pool.lib=${commons-pool.home}
+commons-pool.jar=${commons-pool.lib}/commons-pool.jar
+
+# ----- (optional) Jakarta Commons Collections (required by Commons Pool) -----
+commons-collections.home=../commons-collections-2.0
+commons-collections.lib=${commons-collections.home}
+commons-collections.jar=${commons-collections.lib}/commons-collections.jar
+
+# ----- ant lib for tomcat-ant (Jspc task) -----
+ant.home=${jakarta-ant}
+ant.bin=${ant.home}/bin
+ant.lib=${ant.home}/lib
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
