openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r920553 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
Date Mon, 08 Mar 2010 22:48:24 GMT
Author: dwoods
Date: Mon Mar  8 22:48:24 2010
New Revision: 920553

URL: http://svn.apache.org/viewvc?rev=920553&view=rev
Log:
OPENJPA-1524 Update JNDI lookup to find TransactionManager when running in Apache Aries. 
Still need to implement a better solution for non-Aries based OSGi environments.

Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java?rev=920553&r1=920552&r2=920553&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
(original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
Mon Mar  8 22:48:24 2010
@@ -57,12 +57,13 @@
 
     private static final String [] JNDI_LOCS = new String []{
         "javax.transaction.TransactionManager", // weblogic
-        "java:/TransactionManager", // jboss & jrun
+        "java:/TransactionManager", // jboss, jrun, Geronimo
         "java:/DefaultDomain/TransactionManager", // jrun too
         "java:comp/pm/TransactionManager", // orion & oracle
         "java:comp/TransactionManager", // generic
         "java:appserver/TransactionManager", // GlassFish
         "java:pm/TransactionManager", // borland
+        "aries:services/javax.transaction.TransactionManager", // Apache Aries
     };
     private static final String [] METHODS = new String[]{
         "com.arjuna.jta.JTA_TransactionManager.transactionManager", // hp



Mime
View raw message