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

[Gavin King]

  User: gavin   
  Date: 06/11/02 12:06:11

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  better impl of settable TM and UT locations
  
  Revision  Changes    Path
  1.104     +3 -15     jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -b -r1.103 -r1.104
  --- Initialization.java	2 Nov 2006 17:00:48 -0000	1.103
  +++ Initialization.java	2 Nov 2006 17:06:11 -0000	1.104
  @@ -48,6 +48,7 @@
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.core.FacesContext;
   import org.jboss.seam.core.FacesMessages;
  +import org.jboss.seam.core.FacesPage;
   import org.jboss.seam.core.HttpError;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Interpolator;
  @@ -59,7 +60,6 @@
   import org.jboss.seam.core.ManagedPersistenceContext;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Messages;
  -import org.jboss.seam.core.FacesPage;
   import org.jboss.seam.core.PageContext;
   import org.jboss.seam.core.Pageflow;
   import org.jboss.seam.core.Pages;
  @@ -102,12 +102,11 @@
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Reflections;
   import org.jboss.seam.util.Resources;
  -import org.jboss.seam.util.Transactions;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.103 $
  + * @version $Revision: 1.104 $
    */
   public class Initialization
   {
  @@ -353,16 +352,6 @@
         Naming.setInitialContextProperties(jndiProperties);
      }
   
  -   private static void initUserTransactionName(Properties properties)
  -   {
  -      String userTransactionName = properties.getProperty("jta.UserTransaction");
  -      if (userTransactionName!=null) Transactions.setUserTransactionName(userTransactionName);
  -      userTransactionName = properties.getProperty("org.jboss.seam.userTransactionName");
  -      if (userTransactionName!=null) Transactions.setUserTransactionName(userTransactionName);
  -      String transactionManagerName = properties.getProperty("org.jboss.seam.transactionManagerName");
  -      if (userTransactionName!=null) Transactions.setTransactionManagerName(transactionManagerName);
  -   }
  -
      private Properties loadFromResource(String resource)
      {
         Properties props = new Properties();
  @@ -378,7 +367,6 @@
            {
               log.error("could not read " + resource, ioe);
            }
  -         initUserTransactionName(props); //TODO: this is very fragile!!!
         }
         else
         {