You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ps...@apache.org on 2004/02/01 07:20:04 UTC
svn commit: rev 6401 - incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory
Author: psteitz
Date: Sat Jan 31 22:20:03 2004
New Revision: 6401
Removed:
incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/TyrexFactory.java
incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/TyrexResourceFactory.java
incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/TyrexTransactionFactory.java
Modified:
incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java
incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceFactory.java
incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/TransactionFactory.java
Log:
Removed Tyrex factories.
Modified: incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java
==============================================================================
--- incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java (original)
+++ incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/Constants.java Sat Jan 31 22:20:03 2004
@@ -91,18 +91,8 @@
public static final String DBCP_DATASOURCE_FACTORY =
"org.apache.commons.dbcp.BasicDataSourceFactory";
- 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";
}
Modified: incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceFactory.java
==============================================================================
--- incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceFactory.java (original)
+++ incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/ResourceFactory.java Sat Jan 31 22:20:03 2004
@@ -170,17 +170,7 @@
.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) {
return factory.getObjectInstance
Modified: incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/TransactionFactory.java
==============================================================================
--- incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/TransactionFactory.java (original)
+++ incubator/directory/naming/trunk/factory/src/java/org/apache/naming/factory/TransactionFactory.java Sat Jan 31 22:20:03 2004
@@ -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