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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/core   Init.java
                        ManagedJbpmContext.java
  Log:
  remove dependency to TM
  
  Revision  Changes    Path
  1.28      +6 -6      jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- Init.java	2 Nov 2006 17:06:11 -0000	1.27
  +++ Init.java	8 Nov 2006 15:48:52 -0000	1.28
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.27 2006/11/02 17:06:11 gavin Exp $
  +//$Id: Init.java,v 1.28 2006/11/08 15:48:52 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -38,7 +38,7 @@
      private boolean debug;
      private boolean myFacesLifecycleBug;
      private String userTransactionName;
  -   private String transactionManagerName;
  +   //private String transactionManagerName;
      
      private Map<String, List<ObserverMethod>> observers = new HashMap<String, List<ObserverMethod>>();
      private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
  @@ -48,10 +48,10 @@
      @Create
      public void create()
      {
  -      if (transactionManagerName!=null)
  +      /*if (transactionManagerName!=null)
         {
            Transactions.setTransactionManagerName(transactionManagerName);
  -      }
  +      }*/
         if (userTransactionName!=null)
         {
            Transactions.setUserTransactionName(userTransactionName);
  @@ -232,7 +232,7 @@
      /**
       * The JNDI name of the JTA TransactionManager
       */
  -   protected String getTransactionManagerName()
  +   /*protected String getTransactionManagerName()
      {
         return transactionManagerName;
      }
  @@ -240,7 +240,7 @@
      protected void setTransactionManagerName(String transactionManagerName)
      {
         this.transactionManagerName = transactionManagerName;
  -   }
  +   }*/
   
      /**
       * The JNDI name of the JTA UserTransaction
  
  
  
  1.15      +3 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ManagedJbpmContext.java	22 Oct 2006 01:47:11 -0000	1.14
  +++ ManagedJbpmContext.java	8 Nov 2006 15:48:52 -0000	1.15
  @@ -34,7 +34,7 @@
    * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve at hibernate.org">Steve Ebersole </a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   @Scope(ScopeType.EVENT)
   @Name("jbpmContext")
  @@ -73,7 +73,8 @@
         }
         if ( !synchronizationRegistered && !Lifecycle.isDestroying() && Transactions.isTransactionActive() )
         {
  -         Transactions.registerSynchronization(this);
  +         jbpmContext.getSession().getTransaction().registerSynchronization(this);
  +         //Transactions.registerSynchronization(this);
            synchronizationRegistered = true;
         }
         return jbpmContext;