[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/odmg/states StateTransient.java StateNewClean.java StateN
From:       arminw () apache ! org
Date:       2005-08-27 12:28:14
Message-ID: 20050827122814.91090.qmail () minotaur ! apache ! org
[Download RAW message or body]

arminw      2005/08/27 05:28:14

  Modified:    src/java/org/apache/ojb/odmg/collections DBagImpl.java
                        DListEntry.java DListImpl.java DListIterator.java
                        DMapEntry.java DMapImpl.java DSetEntry.java
                        DSetImpl.java DSetIterator.java
               src/java/org/apache/ojb/odmg/locking LockManager.java
                        LockManagerOdmgImpl.java
               src/java/org/apache/ojb/odmg/oql EnhancedOQLQuery.java
                        OQLLexer.java OQLLexerTokenTypes.java
                        OQLParser.java OQLQueryImpl.java
               src/java/org/apache/ojb/odmg/states StateNewClean.java
                        StateNewDelete.java StateNewDirty.java
                        StateOldDelete.java StateOldDirty.java
  Added:       src/java/org/apache/ojb/odmg/collections DArrayExt.java
                        DBagExt.java DListExt.java DMapExt.java
                        DSetExt.java
               src/java/org/apache/ojb/odmg/link LinkEntry.java
                        LinkEntryMtoN.java LinkEntryOneToN.java
                        LinkEntryOneToOne.java
               src/java/org/apache/ojb/odmg/states StateTransient.java
  Log:
  merge 1.0.x branch with 1.x trunk
  
  Revision  Changes    Path
  1.10      +19 -34    db-ojb/src/java/org/apache/ojb/odmg/collections/DBagImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DBagImpl.java.diff?r1=1.9&r2=1.10
  
  
  1.28      +76 -68    \
db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java.diff?r1=1.27&r2=1.28
  
  
  1.34      +134 -253  db-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java.diff?r1=1.33&r2=1.34
  
  
  1.11      +29 -116   \
db-ojb/src/java/org/apache/ojb/odmg/collections/DListIterator.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListIterator.java.diff?r1=1.10&r2=1.11
  
  
  1.21      +112 -45   db-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java.diff?r1=1.20&r2=1.21
  
  
  1.24      +102 -146  db-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java.diff?r1=1.23&r2=1.24
  
  
  1.12      +23 -10    db-ojb/src/java/org/apache/ojb/odmg/collections/DSetEntry.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DSetEntry.java.diff?r1=1.11&r2=1.12
  
  
  1.26      +145 -199  db-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java.diff?r1=1.25&r2=1.26
  
  
  1.11      +14 -38    \
db-ojb/src/java/org/apache/ojb/odmg/collections/DSetIterator.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DSetIterator.java.diff?r1=1.10&r2=1.11
  
  
  1.1                  db-ojb/src/java/org/apache/ojb/odmg/collections/DArrayExt.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DArrayExt.java?rev=1.1
  
  
  1.1                  db-ojb/src/java/org/apache/ojb/odmg/collections/DBagExt.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DBagExt.java?rev=1.1
  
  
  1.1                  db-ojb/src/java/org/apache/ojb/odmg/collections/DListExt.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListExt.java?rev=1.1
  
  
  1.1                  db-ojb/src/java/org/apache/ojb/odmg/collections/DMapExt.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapExt.java?rev=1.1
  
  
  1.1                  db-ojb/src/java/org/apache/ojb/odmg/collections/DSetExt.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DSetExt.java?rev=1.1
  
  
  1.2       +52 -0     db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntry.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntry.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +43 -0     db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryMtoN.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryMtoN.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +43 -0     db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryOneToN.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryOneToN.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +43 -0     \
db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryOneToOne.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryOneToOne.java.diff?r1=1.1&r2=1.2
  
  
  1.7       +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/LockManager.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/locking/LockManager.java.diff?r1=1.6&r2=1.7
  
  
  1.5       +27 -21    \
db-ojb/src/java/org/apache/ojb/odmg/locking/LockManagerOdmgImpl.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/locking/LockManagerOdmgImpl.java.diff?r1=1.4&r2=1.5
  
  
  1.6       +23 -3     db-ojb/src/java/org/apache/ojb/odmg/oql/EnhancedOQLQuery.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/oql/EnhancedOQLQuery.java.diff?r1=1.5&r2=1.6
  
  
  1.21      +11 -21    db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java.diff?r1=1.20&r2=1.21
  
  
  1.16      +62 -68    \
db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.java  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.java.diff?r1=1.15&r2=1.16
  
  
  1.28      +17 -15    db-ojb/src/java/org/apache/ojb/odmg/oql/OQLParser.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLParser.java.diff?r1=1.27&r2=1.28
  
  
  1.27      +39 -52    db-ojb/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java.diff?r1=1.26&r2=1.27
  
  
  1.10      +0 -2      db-ojb/src/java/org/apache/ojb/odmg/states/StateNewClean.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateNewClean.java.diff?r1=1.9&r2=1.10
  
  
  1.7       +4 -2      db-ojb/src/java/org/apache/ojb/odmg/states/StateNewDelete.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateNewDelete.java.diff?r1=1.6&r2=1.7
  
  
  1.9       +0 -2      db-ojb/src/java/org/apache/ojb/odmg/states/StateNewDirty.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateNewDirty.java.diff?r1=1.8&r2=1.9
  
  
  1.7       +3 -1      db-ojb/src/java/org/apache/ojb/odmg/states/StateOldDelete.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateOldDelete.java.diff?r1=1.6&r2=1.7
  
  
  1.9       +1 -0      db-ojb/src/java/org/apache/ojb/odmg/states/StateOldDirty.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateOldDirty.java.diff?r1=1.8&r2=1.9
  
  
  1.2       +112 -0    db-ojb/src/java/org/apache/ojb/odmg/states/StateTransient.java
  
  http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateTransient.java.diff?r1=1.1&r2=1.2
  
  

---------------------------------------------------------------------
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]