[Jboss-cvs] JBossAS SVN: r56987 - in trunk/ejb3/src: main/org/jboss/ejb3/entity main/org/jboss/ejb3/tx test/org/jboss/ejb3/test/stateful test/org/jboss/ejb3/test/stateful/unit

[jboss-cvs-commits at lists.jboss.org]

Author: bdecoste
Date: 2006-09-19 23:16:34 -0400 (Tue, 19 Sep 2006)
New Revision: 56987

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/entity/ManagedEntityManagerFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
Log:
removed remaining TxManager.getInstance() calls for plugable TransactionManagers

Modified: trunk/ejb3/src/main/org/jboss/ejb3/entity/ManagedEntityManagerFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/entity/ManagedEntityManagerFactory.java	2006-09-20 02:29:35 UTC (rev 56986)
+++ trunk/ejb3/src/main/org/jboss/ejb3/entity/ManagedEntityManagerFactory.java	2006-09-20 03:16:34 UTC (rev 56987)
@@ -34,6 +34,7 @@
 import org.jboss.tm.TxManager;
 import org.jboss.tm.TxUtils;
 import org.jboss.ejb3.ThreadLocalStack;
+import org.jboss.ejb3.tx.TxUtil;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
@@ -47,7 +48,7 @@
    private static final Logger log = Logger.getLogger(ManagedEntityManagerFactory.class);
 
    protected EntityManagerFactory entityManagerFactory;
-   protected TransactionLocal session = new TransactionLocal(TxManager.getInstance());
+   protected TransactionLocal session = new TransactionLocal(TxUtil.getTransactionManager());
    protected String kernelName;
 
    public static ThreadLocalStack<Map> nonTxStack = new ThreadLocalStack<Map>();

Modified: trunk/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java	2006-09-20 02:29:35 UTC (rev 56986)
+++ trunk/ejb3/src/main/org/jboss/ejb3/tx/TxInterceptorFactory.java	2006-09-20 03:16:34 UTC (rev 56987)
@@ -102,7 +102,7 @@
       // We have to do this until AOP supports matching based on annotation attributes
       TransactionManagementType type = TxUtil.getTransactionManagementType(advisor);
       if (type == TransactionManagementType.BEAN)
-         return new BMTInterceptor(TxManager.getInstance(), !(advisor instanceof StatefulContainer));
+         return new BMTInterceptor(TxUtil.getTransactionManager(), !(advisor instanceof StatefulContainer));
 
       Method method = ((MethodJoinpoint) jp).getMethod();
       int timeout = resolveTransactionTimeout(advisor, method);
@@ -113,11 +113,11 @@
       String txType = resolveTxType(advisor, jp).toUpperCase();
       if (txType.equals("REQUIRED"))
       {
-         return new TxInterceptor.Required(TxManager.getInstance(), policy, timeout);
+         return new TxInterceptor.Required(TxUtil.getTransactionManager(), policy, timeout);
       }
       else if (txType.equals("REQUIRESNEW"))
       {
-         return new TxInterceptor.RequiresNew(TxManager.getInstance(), policy, timeout);
+         return new TxInterceptor.RequiresNew(TxUtil.getTransactionManager(), policy, timeout);
       }
       else
       {

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java	2006-09-20 02:29:35 UTC (rev 56986)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTx.java	2006-09-20 03:16:34 UTC (rev 56987)
@@ -35,5 +35,7 @@
    
    boolean isLocalTransacted() throws javax.transaction.SystemException;
    
+   boolean testNewTx() throws javax.transaction.SystemException;
+   
    void testTxRollback();
 }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java	2006-09-20 02:29:35 UTC (rev 56986)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTxBean.java	2006-09-20 03:16:34 UTC (rev 56987)
@@ -53,7 +53,7 @@
    private static final Logger log = Logger.getLogger(StatefulTxBean.class);
    
    @JndiInject(jndiName="java:/TransactionManager") private TransactionManager tm;
-   
+    
    @RolesAllowed("allowed")
    public boolean isGlobalTransacted() throws javax.transaction.SystemException
    {
@@ -67,6 +67,13 @@
       return (tm.getTransaction() != null);
    }
    
+   @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+   @RolesAllowed("allowed")
+   public boolean testNewTx() throws javax.transaction.SystemException
+   {
+      return (tm.getTransaction() != null);
+   }
+   
    @TransactionAttribute(TransactionAttributeType.REQUIRED)
    @RolesAllowed("allowed")
    public void testTxRollback()

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java	2006-09-20 02:29:35 UTC (rev 56986)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java	2006-09-20 03:16:34 UTC (rev 56987)
@@ -156,6 +156,8 @@
       assertTrue(transacted);
       transacted = stateful.isGlobalTransacted();
       assertFalse(transacted);
+      transacted = stateful.testNewTx();
+      assertTrue(transacted);
       
       try
       {