cvs commit: incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager UserTransactionImpl.java

[dain]

dain        2004/01/23 11:14:12

  Modified:    modules/transaction project.xml
               
modules/transaction/src/java/org/apache/geronimo/transaction/manager
                        UserTransactionImpl.java
  Log:
  Rollback accidental commit
  
  Revision  Changes    Path
  1.3       +1 -10     incubator-geronimo/modules/transaction/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/transaction/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml       23 Jan 2004 19:06:56 -0000      1.2
  +++ project.xml       23 Jan 2004 19:14:12 -0000      1.3
  @@ -30,15 +30,6 @@
   
           <dependency>
               <groupId>geronimo</groupId>
  -            <artifactId>geronimo-connector</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>geronimo</groupId>
               <artifactId>geronimo-kernel</artifactId>
               <version>DEV</version>
               <properties>
  
  
  
  1.3       +13 -13    
incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager/UserTransactionImpl.java
  
  Index: UserTransactionImpl.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager/UserTransactionImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserTransactionImpl.java  23 Jan 2004 19:06:56 -0000      1.2
  +++ UserTransactionImpl.java  23 Jan 2004 19:14:12 -0000      1.3
  @@ -64,7 +64,7 @@
   import javax.transaction.TransactionManager;
   import javax.transaction.UserTransaction;
   
  -import 
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
  +//import 
org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
   
   /**
    * TODO this needs to migrate to using TransactionContext.
  @@ -75,7 +75,7 @@
    */
   public class UserTransactionImpl implements UserTransaction, Serializable {
       private transient TransactionManager transactionManager;
  -    private transient TrackedConnectionAssociator 
trackedConnectionAssociator;
  +//    private transient TrackedConnectionAssociator 
trackedConnectionAssociator;
   
       public UserTransactionImpl() {
       }
  @@ -88,13 +88,13 @@
           this.transactionManager = transactionManager;
       }
   
  -    public TrackedConnectionAssociator getTrackedConnectionAssociator() {
  -        return trackedConnectionAssociator;
  -    }
  -
  -    public void setTrackedConnectionAssociator(TrackedConnectionAssociator 
trackedConnectionAssociator) {
  -        this.trackedConnectionAssociator = trackedConnectionAssociator;
  -    }
  +//    public TrackedConnectionAssociator getTrackedConnectionAssociator() {
  +//        return trackedConnectionAssociator;
  +//    }
  +//
  +//    public void setTrackedConnectionAssociator(TrackedConnectionAssociator 
trackedConnectionAssociator) {
  +//        this.trackedConnectionAssociator = trackedConnectionAssociator;
  +//    }
   
       public void begin() throws NotSupportedException, SystemException {
           checkState();
  @@ -127,8 +127,8 @@
       }
   
       private void checkState() {
  -        if (transactionManager == null || trackedConnectionAssociator == 
null) {
  -            throw new IllegalStateException("UserTransaction is disabled");
  -        }
  +//        if (transactionManager == null || trackedConnectionAssociator == 
null) {
  +//            throw new IllegalStateException("UserTransaction is disabled");
  +//        }
       }
   }