remm 2004/08/10 15:42:37
Modified: . build.xml build.properties.default
catalina build.xml
webapps/admin build.xml
catalina/src/share/org/apache/naming/factory Constants.java
Log:
- Repackage DBCP as a single JAR and, more importantly, rename the packages.
- Using the regular DBCP is still possible, of course.
Revision Changes Path
1.194 +61 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- build.xml 31 Jul 2004 17:13:53 -0000 1.193
+++ build.xml 10 Aug 2004 22:42:37 -0000 1.194
@@ -498,6 +498,65 @@
<!-- <antcall target="build-commons-modeler" /> -->
<!-- <antcall target="build-commons-daemon" /> -->
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-collections-src.loc}"/>
+ <param name="destfile"
value="${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-pool-src.loc}"/>
+ <param name="destfile"
value="${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
+ <param name="destfile"
value="${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar"/>
+ </antcall>
+ <mkdir dir="${base.path}/tomcat-deps"/>
+ <copy todir="${base.path}/tomcat-deps">
+ <fileset dir="${commons-collections.home}" >
+ <include name="**/collections/CursorableLinkedList.java" />
+ <include name="**/collections/KeyValue.java" />
+ <include name="**/collections/LRUMap.java" />
+ <include name="**/collections/SequencedHashMap.java" />
+ </fileset>
+ <fileset dir="${commons-pool.home}">
+ <include name="**/*.java" />
+ <exclude name="**/Stack*.java" />
+ <exclude name="**/SoftReferenceObjectPool.java" />
+ <exclude name="**/test/**" />
+ </fileset>
+ <fileset dir="${commons-dbcp.home}">
+ <include name="**/*.java" />
+ <exclude name="**/test/**" />
+ </fileset>
+ </copy>
+ <replace dir="${base.path}/tomcat-deps/src/java/org/apache/commons">
+ <replacefilter token="return UnmodifiableList.decorate(l);"
+ value="return l;" />
+ <replacefilter token="import
org.apache.commons.collections.list.UnmodifiableList;"
+ value=" " />
+ </replace>
+ <replace dir="${base.path}/tomcat-deps/src/java/org/apache/commons" >
+ <replacefilter token="org.apache.commons"
+ value="org.apache.tomcat.dbcp" />
+ </replace>
+ <mkdir dir="${base.path}/tomcat-deps/src/java/org/apache/tomcat/dbcp" />
+ <move todir="${base.path}/tomcat-deps/src/java/org/apache/tomcat/dbcp">
+ <fileset dir="${base.path}/tomcat-deps/src/java/org/apache/commons" />
+ </move>
+ <mkdir dir="${base.path}/tomcat-deps/classes"/>
+ <javac destdir="${base.path}/tomcat-deps/classes"
+ optimize="off" debug="on"
+ srcdir="${base.path}/tomcat-deps/src/java" >
+ <include name="**" />
+ </javac>
+ <jar
jarfile="${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar"
+ index="true">
+ <fileset dir="${base.path}/tomcat-deps/classes">
+ <include name="**/*.class" />
+ <include name="**/*.properties" />
+ </fileset>
+ </jar>
+
</target>
<target name="build-webapps" depends="init"
@@ -1616,6 +1675,7 @@
<param name="destfile" value="${commons-launcher.jar}"/>
</antcall>
+ <!--
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool.loc}"/>
<param name="destfile" value="${commons-pool.jar}"/>
@@ -1626,6 +1686,7 @@
<param name="destfile" value="${commons-dbcp.jar}"/>
<param name="destdir" value="${base.path}"/>
</antcall>
+ -->
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-httpclient.loc}"/>
1.133 +12 -14 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build.properties.default 5 Aug 2004 20:20:15 -0000 1.132
+++ build.properties.default 10 Aug 2004 22:42:37 -0000 1.133
@@ -60,13 +60,6 @@
commons-beanutils.loc=${base-jakarta.loc}/commons/beanutils/binaries/commons-beanutils-1.7.0.tar.gz
-# ----- Commons Collections, version 2.0 or later -----
-commons-collections.home=${base.path}/commons-collections-3.1
-commons-collections.lib=${commons-collections.home}
-commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.1.tar.gz
-
-
# ----- Commons Launcher, version 0.9 or later -----
commons-launcher.home=${base.path}/commons-launcher-0.9
commons-launcher.lib=${commons-launcher.home}
@@ -151,10 +144,9 @@
# ----- Commons DBCP, version 1.1 or later -----
+commons-dbcp.version=1.2.1
commons-dbcp.home=${base.path}/commons-dbcp-1.2.1
-commons-dbcp.lib=${commons-dbcp.home}
-commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.2.1.jar
-commons-dbcp.loc=${base-jakarta.loc}/commons/dbcp/binaries/commons-dbcp-1.2.1.tar.gz
+commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz
# ----- Commons HttpClient, version 2.0 or later -----
@@ -166,9 +158,15 @@
# ----- Commons Pool, version 1.1 or later -----
commons-pool.home=${base.path}/commons-pool-1.2
-commons-pool.lib=${commons-pool.home}
-commons-pool.jar=${commons-pool.lib}/commons-pool-1.2.jar
-commons-pool.loc=${base-jakarta.loc}/commons/pool/binaries/commons-pool-1.2.tar.gz
+commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.2-src.tar.gz
+
+
+# ----- Commons Collections, version 2.0 or later -----
+commons-collections.home=${base.path}/commons-collections-3.1
+commons-collections.lib=${commons-collections.home}
+commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar
+commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.1.tar.gz
+commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.1-src.tar.gz
# ----- Commons FileUpload, version 1.0-20030531 or later -----
1.64 +2 -2 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- build.xml 31 Jul 2004 17:13:53 -0000 1.63
+++ build.xml 10 Aug 2004 22:42:37 -0000 1.64
@@ -528,7 +528,7 @@
<!-- =================== BUILD: Copy Static Files ======================= -->
- <target name="build-static"
depends="flags,flags.display,build-prepare,copy-dbcp.jar,copy-fileupload.jar,copy-jmx.jar,copy-launcher.jars,copy-modeler.jar,copy-pool.jar,copy-xerces2.jars">
+ <target name="build-static"
depends="flags,flags.display,build-prepare,copy-fileupload.jar,copy-jmx.jar,copy-launcher.jars,copy-modeler.jar,copy-xerces2.jars">
<!-- Executable Commands -->
<copy todir="${catalina.build}/bin">
@@ -545,7 +545,7 @@
<copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
-->
<copy todir="${catalina.build}/common/lib"
- file="${commons-collections.jar}"/>
+
file="${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar"/>
<!-- Configuration Files -->
<copy todir="${catalina.build}/conf">
1.12 +1 -0 jakarta-tomcat-catalina/webapps/admin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 5 Aug 2004 20:17:23 -0000 1.11
+++ build.xml 10 Aug 2004 22:42:37 -0000 1.12
@@ -186,6 +186,7 @@
<!-- ================ BUILD: Copy Static Files ========================== -->
<target name="build-static"
depends="flags,flags.display,build-prepare,copy-struts.jar">
<copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib"
file="${commons-beanutils.jar}"/>
+ <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib"
file="${commons-collections.jar}"/>
<copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib"
file="${commons-digester.jar}"/>
<copy todir="${webapps.build}/${webapp.name}">
<fileset dir=".">
1.5 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/Constants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Constants.java 27 Feb 2004 14:58:54 -0000 1.4
+++ Constants.java 10 Aug 2004 22:42:37 -0000 1.5
@@ -42,7 +42,7 @@
Package + ".EjbFactory";
public static final String DBCP_DATASOURCE_FACTORY =
- "org.apache.commons.dbcp.BasicDataSourceFactory";
+ "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
public static final String OPENEJB_EJB_FACTORY =
Package + ".OpenEjbFactory";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
