[jboss-cvs] jboss-ejb3/src/main/org/jboss/ejb3/tx ...

[Bill DeCoste]

  User: bdecoste
  Date: 06/07/24 17:28:28

  Modified:    src/main/org/jboss/ejb3/tx  TxUtil.java
  Log:
  MDB cleanup, standalone test for standard testcases, fixed class level @Resources jndi env bindings
  
  Revision  Changes    Path
  1.14      +15 -3     jboss-ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TxUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/tx/TxUtil.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- TxUtil.java	30 Oct 2005 00:06:44 -0000	1.13
  +++ TxUtil.java	24 Jul 2006 21:28:28 -0000	1.14
  @@ -23,6 +23,8 @@
   
   import javax.ejb.TransactionManagement;
   import javax.ejb.TransactionManagementType;
  +import javax.naming.InitialContext;
  +import javax.naming.NamingException;
   import javax.transaction.TransactionManager;
   import org.jboss.aop.Advisor;
   import org.jboss.tm.TxManager;
  @@ -31,13 +33,23 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.14 $
    */
   public class TxUtil
   {
  -   public static TransactionManager getTransactionManager()
  +   public static TransactionManager getTransactionManager() throws RuntimeException
      {
  -      return TxManager.getInstance();
  +      try
  +      {
  +         //return TxManager.getInstance();
  +         InitialContext jndiContext = new InitialContext();
  +         TransactionManager tm = (TransactionManager)jndiContext.lookup("java:TransactionManager");
  +         return tm;
  +      } 
  +      catch (NamingException e)
  +      {
  +         throw new RuntimeException("Unable to lookup TransactionManager", e);
  +      }
      }
   
      public static TransactionManagementType getTransactionManagementType(Advisor c)