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

[Gavin King]

  User: gavin   
  Date: 06/11/08 10:48:52

  Modified:    src/main/org/jboss/seam/util  Transactions.java
  Log:
  remove dependency to TM
  
  Revision  Changes    Path
  1.18      +15 -18    jboss-seam/src/main/org/jboss/seam/util/Transactions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Transactions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/util/Transactions.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- Transactions.java	2 Nov 2006 17:00:48 -0000	1.17
  +++ Transactions.java	8 Nov 2006 15:48:52 -0000	1.18
  @@ -1,13 +1,10 @@
  -//$Id: Transactions.java,v 1.17 2006/11/02 17:00:48 gavin Exp $
  +//$Id: Transactions.java,v 1.18 2006/11/08 15:48:52 gavin Exp $
   package org.jboss.seam.util;
   
   import javax.naming.NameNotFoundException;
   import javax.naming.NamingException;
  -import javax.transaction.RollbackException;
   import javax.transaction.Status;
  -import javax.transaction.Synchronization;
   import javax.transaction.SystemException;
  -import javax.transaction.TransactionManager;
   import javax.transaction.UserTransaction;
   
   public class Transactions
  @@ -15,8 +12,6 @@
      private static String userTransactionName = "UserTransaction";
      private static final String STANDARD_USER_TRANSACTION_NAME = "java:comp/UserTransaction";
      
  -   private static String transactionManagerName = "java:/TransactionManager";
  -   
      public static boolean isTransactionActive() throws SystemException, NamingException
      {
         return getUserTransaction().getStatus()==Status.STATUS_ACTIVE;
  @@ -33,11 +28,6 @@
         return getUserTransaction().getStatus() == Status.STATUS_MARKED_ROLLBACK;
      }
      
  -   public static TransactionManager getTransactionManager() throws NamingException
  -   {
  -      return (TransactionManager) Naming.getInitialContext().lookup(transactionManagerName);
  -   }
  -
      public static UserTransaction getUserTransaction() throws NamingException
      {
         try
  @@ -58,12 +48,6 @@
         }
      }
      
  -   public static void registerSynchronization(Synchronization sync) 
  -         throws SystemException, RollbackException, NamingException
  -   {
  -      getTransactionManager().getTransaction().registerSynchronization(sync);
  -   }
  -
      private Transactions() {}
   
      public static void setUserTransactionName(String userTransactionName)
  @@ -88,6 +72,19 @@
         }
      }
   
  +   /*private static String transactionManagerName = "java:/TransactionManager";
  +   
  +   public static TransactionManager getTransactionManager() throws NamingException
  +   {
  +      return (TransactionManager) Naming.getInitialContext().lookup(transactionManagerName);
  +   }
  +
  +   public static void registerSynchronization(Synchronization sync) 
  +         throws SystemException, RollbackException, NamingException
  +   {
  +      getTransactionManager().getTransaction().registerSynchronization(sync);
  +   }
  +
      public static String getTransactionManagerName()
      {
         return transactionManagerName;
  @@ -96,6 +93,6 @@
      public static void setTransactionManagerName(String transactionManagerName)
      {
         Transactions.transactionManagerName = transactionManagerName;
  -   }
  +   }*/
      
   }