Author: arminw
Date: Thu Mar 16 10:39:21 2006
New Revision: 386410
URL: http://svn.apache.org/viewcvs?rev=386410&view=rev
Log:
merge with 1.x branch
Modified:
db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java
Modified:
db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java
URL:
http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java?rev=386410&r1=386409&r2=386410&view=diff
==============================================================================
---
db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java
(original)
+++
db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java
Thu Mar 16 10:39:21 2006
@@ -20,7 +20,10 @@
*/
public class OC4JTransactionManagerFactory extends
AbstractTransactionManagerFactory
{
- private static final String[][] config = {{"OC4J",
"java:comp/pm/TransactionManager", null}};
+ private static final String[][] config = {
+ {"OC4J", "java:comp/pm/TransactionManager", null},
+ {"OC4J_old", "java:comp/UserTransaction", null}
+ };
/**
* @see AbstractTransactionManagerFactory#getLookupInfo
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
