Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6564 support pre-AS7 transaction manager lookup and AS7-AS4 usertransaction lookup

This commit is contained in:
Scott Marlow 2011-08-11 11:04:22 -04:00
parent e1f86077c2
commit 2faeb783a4
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JBossAppServerJtaPlatform.java
View File

@ -23,6 +23,8 @@
*/ */
package org.hibernate.service.jta.platform.internal; package org.hibernate.service.jta.platform.internal;
import org.hibernate.service.jndi.JndiException;
import javax.transaction.TransactionManager; import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction; import javax.transaction.UserTransaction;
@ -32,12 +34,23 @@ import javax.transaction.UserTransaction;
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public class JBossAppServerJtaPlatform extends AbstractJtaPlatform { public class JBossAppServerJtaPlatform extends AbstractJtaPlatform {
public static final String TM_NAME = "java:jboss/TransactionManager"; public static final String AS7_TM_NAME = "java:jboss/TransactionManager";
public static final String UT_NAME = "UserTransaction"; public static final String AS4_TM_NAME = "java:/TransactionManager";
public static final String UT_NAME = "java:comp/UserTransaction"; // should work with AS7 and earlier
@Override @Override
protected TransactionManager locateTransactionManager() { protected TransactionManager locateTransactionManager() {
return (TransactionManager) jndiService().locate( TM_NAME ); try {
return (TransactionManager) jndiService().locate(AS7_TM_NAME);
}
catch(JndiException jndiException) {
try {
return (TransactionManager) jndiService().locate(AS4_TM_NAME);
}
catch(JndiException jndiExceptionInner) {
throw new JndiException("unable to find transaction manager", jndiException);
}
}
} }
@Override @Override