cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory Constants.java
remm2004/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 ChangesPath
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 - 1.193
+++ build.xml 10 Aug 2004 22:42:37 - 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 -14jakarta-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 - 1.132
+++ build.properties.default 10 Aug 2004 22:42:37 - 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 -
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory Constants.java ResourceFactory.java TransactionFactory.java TyrexFactory.java TyrexResourceFactory.java TyrexTransactionFactory.java
remm2003/06/16 14:32:43
Modified:catalina/src/share/org/apache/naming/factory Constants.java
ResourceFactory.java TransactionFactory.java
Removed: catalina/src/share/org/apache/naming/factory
TyrexFactory.java TyrexResourceFactory.java
TyrexTransactionFactory.java
Log:
- Remove bundled Tyrex support, as agreed on earlier (Tyrex is no longer
supported, apparently; there are alternatives, readu to use with TC, such
as JOTM).
- As Tomcat provides a completely standard and quite powerful extension
mechanism for its JNDI features, I don't see a need for providing anything
but the most common resource factories.
Revision ChangesPath
1.3 +3 -13
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Constants.java14 Dec 2002 14:05:12 - 1.2
+++ Constants.java16 Jun 2003 21:32:42 - 1.3
@@ -94,18 +94,8 @@
public static final String OPENEJB_EJB_FACTORY =
Package + .OpenEjbFactory;
-public static final String TYREX_RESOURCE_FACTORY =
-Package + .TyrexResourceFactory;
-
-public static final String TYREX_TRANSACTION_FACTORY =
-Package + .TyrexTransactionFactory;
-
public static final String OBJECT_FACTORIES = ;
public static final String FACTORY = factory;
-
-public static final String TYREX_DOMAIN_CONFIG = tyrexDomainConfig;
-
-public static final String TYREX_DOMAIN_NAME = tyrexDomainName;
}
1.2 +4 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/ResourceFactory.java
Index: ResourceFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceFactory.java 18 Jul 2002 16:47:36 - 1.1
+++ ResourceFactory.java 16 Jun 2003 21:32:42 - 1.2
@@ -170,16 +170,6 @@
.newInstance();
} catch(Throwable t) {
}
-} else if (ref.getClassName().equals(tyrex.resource.Resource)) {
-String tyrexResourceFactoryClassName =
-System.getProperty(tyrex.resource.Resource.Factory,
- Constants.TYREX_RESOURCE_FACTORY);
-try {
-factory = (ObjectFactory)
-Class.forName(tyrexResourceFactoryClassName)
-.newInstance();
-} catch(Throwable t) {
-}
}
}
if (factory != null) {
1.2 +4 -16
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/TransactionFactory.java
Index: TransactionFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/TransactionFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionFactory.java 18 Jul 2002 16:47:36 - 1.1
+++ TransactionFactory.java 16 Jun 2003 21:32:42 - 1.2
@@ -137,18 +137,6 @@
} catch(Throwable t) {
}
}
-} else {
-// Defaults to Tyrex
-String javaxTransactionUserTransactionFactoryClassName =
-System.getProperty
-(javax.transaction.UserTransaction.Factory,
- Constants.TYREX_TRANSACTION_FACTORY);
-try {
-factory = (ObjectFactory) Class.forName
-(javaxTransactionUserTransactionFactoryClassName)
-.newInstance();
-} catch(Throwable t) {
-}
}
if (factory != null) {
return factory.getObjectInstance
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
