[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ojb-dev
Subject:    cvs commit: db-ojb/src/java/org/apache/ojb/otm/core BaseConnection.java ConcreteEditingContext.java
From:       arminw () apache ! org
Date:       2005-08-27 12:29:03
Message-ID: 20050827122903.91334.qmail () minotaur ! apache ! org
[Download RAW message or body]

arminw      2005/08/27 05:29:03

  Modified:    src/java/org/apache/ojb/odmg DatabaseImpl.java
                        ImplementationImpl.java ImplementationJTAImpl.java
                        J2EETransactionImpl.java JTATxManager.java
                        LocalTxManager.java NamedRootsMap.java
                        NarrowTransaction.java ObjectEnvelope.java
                        ObjectEnvelopeTable.java PBCapsule.java
                        TransactionAbortedExceptionOJB.java
                        TransactionAware.java TransactionExt.java
                        TransactionImpl.java
               src/java/org/apache/ojb/otm/core BaseConnection.java
                        ConcreteEditingContext.java
  Added:       src/java/org/apache/ojb/odmg ImplementationExt.java
                        ObjectEnvelopeOrdering.java OJBAssociate.java
                        RuntimeObject.java
  Removed:     src/java/org/apache/ojb/odmg ImplementationInternal.java
                        NamedRootsEntry.java ObjectEnvelopeReordering.java
  Log:
  merge 1.0.x branch with 1.x trunk
  
  Revision  Changes    Path
  1.31      +21 -110   db-ojb/src/java/org/apache/ojb/odmg/DatabaseImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/DatabaseImpl.java.diff?r1=1.30&r2=1.31
  
  
  1.6       +190 -125  db-ojb/src/java/org/apache/ojb/odmg/ImplementationImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/ImplementationImpl.java.diff?r1=1.5&r2=1.6
  
  
  1.5       +7 -14     db-ojb/src/java/org/apache/ojb/odmg/ImplementationJTAImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/ImplementationJTAImpl.java.diff?r1=1.4&r2=1.5
  
  
  1.29      +17 -24    db-ojb/src/java/org/apache/ojb/odmg/J2EETransactionImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/J2EETransactionImpl.java.diff?r1=1.28&r2=1.29
  
  
  1.11      +34 -26    db-ojb/src/java/org/apache/ojb/odmg/JTATxManager.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/JTATxManager.java.diff?r1=1.10&r2=1.11
  
  
  1.8       +2 -3      db-ojb/src/java/org/apache/ojb/odmg/LocalTxManager.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/LocalTxManager.java.diff?r1=1.7&r2=1.8
  
  
  1.15      +266 -58   db-ojb/src/java/org/apache/ojb/odmg/NamedRootsMap.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/NamedRootsMap.java.diff?r1=1.14&r2=1.15
  
  
  1.13      +51 -11    db-ojb/src/java/org/apache/ojb/odmg/NarrowTransaction.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/NarrowTransaction.java.diff?r1=1.12&r2=1.13
  
  
  1.38      +714 -118  db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelope.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelope.java.diff?r1=1.37&r2=1.38
  
  
  1.44      +482 -218  db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java.diff?r1=1.43&r2=1.44
  
  
  1.8       +5 -0      db-ojb/src/java/org/apache/ojb/odmg/PBCapsule.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/PBCapsule.java.diff?r1=1.7&r2=1.8
  
  
  1.6       +0 -2      \
db-ojb/src/java/org/apache/ojb/odmg/TransactionAbortedExceptionOJB.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/TransactionAbortedExceptionOJB.java.diff?r1=1.5&r2=1.6
  
  
  1.8       +91 -1     db-ojb/src/java/org/apache/ojb/odmg/TransactionAware.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/TransactionAware.java.diff?r1=1.7&r2=1.8
  
  
  1.6       +120 -22   db-ojb/src/java/org/apache/ojb/odmg/TransactionExt.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/TransactionExt.java.diff?r1=1.5&r2=1.6
  
  
  1.71      +654 -386  db-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java.diff?r1=1.70&r2=1.71
  
  
  1.2       +212 -0    db-ojb/src/java/org/apache/ojb/odmg/ImplementationExt.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/ImplementationExt.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +827 -0    \
db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeOrdering.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeOrdering.java.diff?r1=1.1&r2=1.2
  
  
  1.1                  db-ojb/src/java/org/apache/ojb/odmg/OJBAssociate.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/OJBAssociate.java?rev=1.1
  
  
  1.2       +205 -0    db-ojb/src/java/org/apache/ojb/odmg/RuntimeObject.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/RuntimeObject.java.diff?r1=1.1&r2=1.2
  
  
  1.45      +16 -9     db-ojb/src/java/org/apache/ojb/otm/core/BaseConnection.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/otm/core/BaseConnection.java.diff?r1=1.44&r2=1.45
  
  
  1.58      +22 -4     \
db-ojb/src/java/org/apache/ojb/otm/core/ConcreteEditingContext.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/otm/core/ConcreteEditingContext.java.diff?r1=1.57&r2=1.58
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]