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

[Gavin King]

  User: gavin   
  Date: 07/07/06 15:42:56

  Modified:    src/main/org/jboss/seam/transaction     
                        AbstractUserTransaction.java EntityTransaction.java
                        HibernateTransaction.java NoTransaction.java
                        UserTransaction.java
  Log:
  JBSEAM-1614
  
  Revision  Changes    Path
  1.2       +10 -0     jboss-seam/src/main/org/jboss/seam/transaction/AbstractUserTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractUserTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/AbstractUserTransaction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AbstractUserTransaction.java	24 Jun 2007 06:34:34 -0000	1.1
  +++ AbstractUserTransaction.java	6 Jul 2007 19:42:56 -0000	1.2
  @@ -6,6 +6,7 @@
   import static javax.transaction.Status.STATUS_COMMITTED;
   import static javax.transaction.Status.STATUS_NO_TRANSACTION;
   
  +import javax.persistence.EntityManager;
   import javax.transaction.Synchronization;
   import javax.transaction.SystemException;
   
  @@ -61,4 +62,13 @@
      }
      
      public abstract void registerSynchronization(Synchronization sync);
  +   
  +   public void enlist(EntityManager entityManager) throws SystemException
  +   {
  +      if ( isActiveOrMarkedRollback() )
  +      {
  +         entityManager.joinTransaction();
  +      }
  +   }
  +   
   }
  
  
  
  1.7       +6 -0      jboss-seam/src/main/org/jboss/seam/transaction/EntityTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/EntityTransaction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- EntityTransaction.java	24 Jun 2007 19:40:33 -0000	1.6
  +++ EntityTransaction.java	6 Jul 2007 19:42:56 -0000	1.7
  @@ -220,4 +220,10 @@
         this.entityManager = entityManager;
      }
   
  +   @Override
  +   public void enlist(EntityManager entityManager)
  +   {
  +      //no-op
  +   }
  +
   }
  
  
  
  1.6       +7 -0      jboss-seam/src/main/org/jboss/seam/transaction/HibernateTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/HibernateTransaction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- HibernateTransaction.java	24 Jun 2007 19:40:33 -0000	1.5
  +++ HibernateTransaction.java	6 Jul 2007 19:42:56 -0000	1.6
  @@ -2,6 +2,7 @@
   
   import static org.jboss.seam.annotations.Install.FRAMEWORK;
   
  +import javax.persistence.EntityManager;
   import javax.transaction.HeuristicMixedException;
   import javax.transaction.HeuristicRollbackException;
   import javax.transaction.NotSupportedException;
  @@ -184,6 +185,12 @@
      }
      
      @Override
  +   public void enlist(EntityManager entityManager) throws SystemException
  +   {
  +      throw new UnsupportedOperationException("JPA EntityManager should not be used with Hibernate Transaction API");
  +   }
  +   
  +   @Override
      public boolean isConversationContextRequired()
      {
         return true;
  
  
  
  1.3       +7 -0      jboss-seam/src/main/org/jboss/seam/transaction/NoTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NoTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/NoTransaction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- NoTransaction.java	24 Jun 2007 06:34:34 -0000	1.2
  +++ NoTransaction.java	6 Jul 2007 19:42:56 -0000	1.3
  @@ -1,5 +1,6 @@
   package org.jboss.seam.transaction;
   
  +import javax.persistence.EntityManager;
   import javax.transaction.HeuristicMixedException;
   import javax.transaction.HeuristicRollbackException;
   import javax.transaction.NotSupportedException;
  @@ -55,4 +56,10 @@
         throw new UnsupportedOperationException("no transaction");
      }
   
  +   @Override
  +   public void enlist(EntityManager entityManager) throws SystemException
  +   {
  +      //no-op
  +   }
  +
   }
  
  
  
  1.6       +2 -0      jboss-seam/src/main/org/jboss/seam/transaction/UserTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UserTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/UserTransaction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- UserTransaction.java	24 Jun 2007 06:34:34 -0000	1.5
  +++ UserTransaction.java	6 Jul 2007 19:42:56 -0000	1.6
  @@ -1,5 +1,6 @@
   package org.jboss.seam.transaction;
   
  +import javax.persistence.EntityManager;
   import javax.transaction.Synchronization;
   import javax.transaction.SystemException;
   
  @@ -24,4 +25,5 @@
      public boolean isConversationContextRequired();
      public abstract void registerSynchronization(Synchronization sync);
   
  +   public void enlist(EntityManager entityManager) throws SystemException;
   }