[jBoss-Dev] CVS update: jboss/src/main/org/jboss/tmTxCapsule.java TxManager.java

[jBoss CVS Development]

  User: fleury  
  Date: 00/08/17 20:21:12

  Modified:    src/main/org/jboss/tm TxCapsule.java TxManager.java
  Log:
  Logger messages and clean up for binary
  
  Revision  Changes    Path
  1.2       +6 -5      jboss/src/main/org/jboss/tm/TxCapsule.java
  
  Index: TxCapsule.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TxCapsule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TxCapsule.java    2000/08/11 17:45:15     1.1
  +++ TxCapsule.java    2000/08/18 03:21:12     1.2
  @@ -23,6 +23,7 @@
   import javax.transaction.xa.Xid;
   import javax.transaction.xa.XAResource;
   import javax.transaction.xa.XAException;
  +import org.jboss.logging.Logger;
   
   /**
    *  TxCapsule
  @@ -31,7 +32,7 @@
    *
    *   @see <related>
    *   @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *  @version $Revision: 1.1 $
  + *  @version $Revision: 1.2 $
    */
   public class TxCapsule
   {
  @@ -125,7 +126,7 @@
               {
                  if(e.errorCode != XAException.XA_HEURCOM)
                  {
  -                   e.printStackTrace();
  +                   Logger.exception(e);
                     // Rollback
                     setRollbackOnly();
                     break;
  @@ -151,7 +152,7 @@
                     try {
                        ((XAResource)resources.elementAt(i)).forget(xid);
                     } catch(XAException another) {}
  -                  e.printStackTrace();
  +                  Logger.exception(e);
                     // TODO: what to do here?
                  }
               }
  @@ -196,7 +197,7 @@
   //            resources.removeElement(xaRes);
               return true;
           } catch(XAException e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
               return false;
           }
      }
  @@ -216,7 +217,7 @@
               resources.addElement(xaRes);
               return true;
           } catch(XAException e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
               return false;
           }
      }
  
  
  
  1.10      +8 -8      jboss/src/main/org/jboss/tm/TxManager.java
  
  Index: TxManager.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TxManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TxManager.java    2000/08/16 12:22:37     1.9
  +++ TxManager.java    2000/08/18 03:21:12     1.10
  @@ -31,7 +31,7 @@
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.9 $
  + *   @version $Revision: 1.10 $
    */
   public class TxManager
      implements TransactionManager
  @@ -54,7 +54,7 @@
      public void begin()
         throws NotSupportedException,SystemException
      {
  -//      System.out.println("begin tx");
  +//      Logger.log("begin tx");
   
                // create tx capsule
                TxCapsule txCap = new TxCapsule(this, timeOut);
  @@ -74,7 +74,7 @@
                      java.lang.IllegalStateException,
                      SystemException
      {
  -//      System.out.println("commit tx");
  +//      Logger.log("commit tx");
   
                try {
   
  @@ -125,7 +125,7 @@
      public Transaction suspend()
                       throws SystemException
      {
  -//      System.out.println("suspend tx");
  +//      Logger.log("suspend tx");
   
           // Useless
   
  @@ -139,7 +139,7 @@
                        java.lang.SecurityException,
                        SystemException
      {
  -//      System.out.println("rollback tx");
  +//      Logger.log("rollback tx");
         getTransaction().rollback();
      }
   
  @@ -147,7 +147,7 @@
                        throws java.lang.IllegalStateException,
                               SystemException
      {
  -//      System.out.println("set rollback only tx");
  +//      Logger.log("set rollback only tx");
         getTransaction().setRollbackOnly();
      }
   
  @@ -189,9 +189,9 @@
                        javax.naming.InitialContext context = new 
javax.naming.InitialContext();
   
                        //One tx in naming
  -                     System.out.println("Calling get manager from JNDI");
  +                     Logger.log("Calling get manager from JNDI");
                        TxManager manager = (TxManager) 
context.lookup("TransactionManager");
  -                     System.out.println("Returning TM "+manager.hashCode());
  +                     Logger.log("Returning TM "+manager.hashCode());
   
                        return manager;