[jboss-cvs] jboss-seam/src/main/org/jboss/seam/microcontainer ...

[Gavin King]

  User: gavin   
  Date: 07/05/30 14:53:47

  Modified:    src/main/org/jboss/seam/microcontainer 
                        TransactionManagerFactory.java
  Log:
  apply JBSEAM-1144
  make Transaction management be a component that implements UserTransaction
  no longer need to roll back txns at end of request, due to JBAS-3242 being fixed
  
  Revision  Changes    Path
  1.14      +3 -3      jboss-seam/src/main/org/jboss/seam/microcontainer/TransactionManagerFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionManagerFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/microcontainer/TransactionManagerFactory.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- TransactionManagerFactory.java	16 Dec 2006 02:58:11 -0000	1.13
  +++ TransactionManagerFactory.java	30 May 2007 18:53:47 -0000	1.14
  @@ -1,14 +1,14 @@
  -//$Id: TransactionManagerFactory.java,v 1.13 2006/12/16 02:58:11 nrichards Exp $
  +//$Id: TransactionManagerFactory.java,v 1.14 2007/05/30 18:53:47 gavin Exp $
   package org.jboss.seam.microcontainer;
   
   import javax.naming.InitialContext;
   import javax.transaction.TransactionManager;
   
  +import org.jboss.seam.core.Transaction;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.resource.connectionmanager.TransactionSynchronizer;
   import org.jboss.seam.util.Naming;
  -import org.jboss.seam.util.Transactions;
   import org.jboss.tm.TransactionManagerLocator;
   import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
   import org.jboss.util.naming.NonSerializableFactory;
  @@ -37,7 +37,7 @@
         //create a UserTransaction and bind to JNDI
         ServerVMClientUserTransaction ut = new ServerVMClientUserTransaction(transactionManager);
         //TODO: parse the UserTransaction name and create subcontexts
  -      NonSerializableFactory.rebind( initialContext, Transactions.getUserTransactionName(), ut );
  +      NonSerializableFactory.rebind( initialContext, Transaction.getUserTransactionName(), ut );
         
         return transactionManager;