You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by to...@apache.org on 2005/12/21 23:29:53 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/odmg/oql OQLQueryImpl.java EnhancedOQLQuery.java

tomdz       2005/12/21 14:29:53

  Modified:    src/java/org/apache/ojb/odmg/collections Tag:
                        OJB_1_0_RELEASE DListEntry.java DSetImpl.java
                        DListImpl.java DMapEntry.java DListIterator.java
                        DSetEntry.java DMapImpl.java DBagImpl.java
                        DSetIterator.java
               src/java/org/apache/ojb/odmg/link Tag: OJB_1_0_RELEASE
                        LinkEntryOneToOne.java LinkEntryOneToN.java
                        LinkEntry.java LinkEntryMtoN.java
               src/java/org/apache/ojb/odmg/locking Tag: OJB_1_0_RELEASE
                        SerializableStrategy.java LockManager.java
                        ObjectLocks.java LockMapFactory.java
                        LockManagerFactory.java RepeatableReadStrategy.java
                        ReadUncommittedStrategy.java
                        LockStrategyFactory.java AbstractLockStrategy.java
                        RemoteLockMapImpl.java LockManagerDefaultImpl.java
                        ReadCommittedStrategy.java LockStrategy.java
                        LockManagerOdmgImpl.java LockEntry.java
                        LockMap.java InMemoryLockMapImpl.java
               src/java/org/apache/ojb/odmg/states Tag: OJB_1_0_RELEASE
                        StateOldDirty.java StateTransient.java
                        StateNewClean.java ModificationState.java
                        StateNewDirty.java StateNewDelete.java
                        StateOldClean.java StateOldDelete.java
               src/java/org/apache/ojb/odmg/oql Tag: OJB_1_0_RELEASE
                        OQLQueryImpl.java EnhancedOQLQuery.java
  Log:
  Updated license
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.25.2.4  +2 -2      db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java
  
  Index: DListEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java,v
  retrieving revision 1.25.2.3
  retrieving revision 1.25.2.4
  diff -u -r1.25.2.3 -r1.25.2.4
  --- DListEntry.java	4 Jun 2005 14:38:13 -0000	1.25.2.3
  +++ DListEntry.java	21 Dec 2005 22:29:50 -0000	1.25.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.21.2.5  +1 -1      db-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java
  
  Index: DSetImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DSetImpl.java,v
  retrieving revision 1.21.2.4
  retrieving revision 1.21.2.5
  diff -u -r1.21.2.4 -r1.21.2.5
  --- DSetImpl.java	4 Jun 2005 14:38:13 -0000	1.21.2.4
  +++ DSetImpl.java	21 Dec 2005 22:29:50 -0000	1.21.2.5
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.27.2.5  +2 -2      db-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java
  
  Index: DListImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java,v
  retrieving revision 1.27.2.4
  retrieving revision 1.27.2.5
  diff -u -r1.27.2.4 -r1.27.2.5
  --- DListImpl.java	4 Jun 2005 14:38:13 -0000	1.27.2.4
  +++ DListImpl.java	21 Dec 2005 22:29:50 -0000	1.27.2.5
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.18.2.2  +2 -3      db-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java
  
  Index: DMapEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java,v
  retrieving revision 1.18.2.1
  retrieving revision 1.18.2.2
  diff -u -r1.18.2.1 -r1.18.2.2
  --- DMapEntry.java	3 Apr 2005 02:38:45 -0000	1.18.2.1
  +++ DMapEntry.java	21 Dec 2005 22:29:50 -0000	1.18.2.2
  @@ -1,7 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.8.2.4   +2 -2      db-ojb/src/java/org/apache/ojb/odmg/collections/DListIterator.java
  
  Index: DListIterator.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListIterator.java,v
  retrieving revision 1.8.2.3
  retrieving revision 1.8.2.4
  diff -u -r1.8.2.3 -r1.8.2.4
  --- DListIterator.java	4 Jun 2005 14:38:13 -0000	1.8.2.3
  +++ DListIterator.java	21 Dec 2005 22:29:50 -0000	1.8.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.10.2.3  +2 -2      db-ojb/src/java/org/apache/ojb/odmg/collections/DSetEntry.java
  
  Index: DSetEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DSetEntry.java,v
  retrieving revision 1.10.2.2
  retrieving revision 1.10.2.3
  diff -u -r1.10.2.2 -r1.10.2.3
  --- DSetEntry.java	16 Aug 2005 15:04:39 -0000	1.10.2.2
  +++ DSetEntry.java	21 Dec 2005 22:29:50 -0000	1.10.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.21.2.5  +2 -2      db-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java
  
  Index: DMapImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java,v
  retrieving revision 1.21.2.4
  retrieving revision 1.21.2.5
  diff -u -r1.21.2.4 -r1.21.2.5
  --- DMapImpl.java	12 Aug 2005 12:13:37 -0000	1.21.2.4
  +++ DMapImpl.java	21 Dec 2005 22:29:50 -0000	1.21.2.5
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.2   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/collections/DBagImpl.java
  
  Index: DBagImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DBagImpl.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- DBagImpl.java	3 Apr 2005 02:38:45 -0000	1.7.2.1
  +++ DBagImpl.java	21 Dec 2005 22:29:50 -0000	1.7.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.8.2.2   +2 -2      db-ojb/src/java/org/apache/ojb/odmg/collections/DSetIterator.java
  
  Index: DSetIterator.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DSetIterator.java,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- DSetIterator.java	3 Apr 2005 02:38:45 -0000	1.8.2.1
  +++ DSetIterator.java	21 Dec 2005 22:29:50 -0000	1.8.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.collections;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.1.2.2   +5 -5      db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryOneToOne.java
  
  Index: LinkEntryOneToOne.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryOneToOne.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LinkEntryOneToOne.java	23 Mar 2005 00:50:58 -0000	1.1.2.1
  +++ LinkEntryOneToOne.java	21 Dec 2005 22:29:50 -0000	1.1.2.2
  @@ -1,9 +1,6 @@
   package org.apache.ojb.odmg.link;
   
  -import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -18,6 +15,9 @@
    * limitations under the License.
    */
   
  +import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
  +
   /**
    * @author <a href="mailto:arminw@apache.org">Armin Waibel</a>
    * @version $Id$
  
  
  
  1.1.2.2   +5 -5      db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryOneToN.java
  
  Index: LinkEntryOneToN.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryOneToN.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LinkEntryOneToN.java	23 Mar 2005 00:50:58 -0000	1.1.2.1
  +++ LinkEntryOneToN.java	21 Dec 2005 22:29:50 -0000	1.1.2.2
  @@ -1,9 +1,6 @@
   package org.apache.ojb.odmg.link;
   
  -import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.metadata.CollectionDescriptor;
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -18,6 +15,9 @@
    * limitations under the License.
    */
   
  +import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.metadata.CollectionDescriptor;
  +
   /**
    * @author <a href="mailto:arminw@apache.org">Armin Waibel</a>
    * @version $Id$
  
  
  
  1.1.2.2   +6 -6      db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntry.java
  
  Index: LinkEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntry.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LinkEntry.java	23 Mar 2005 00:50:58 -0000	1.1.2.1
  +++ LinkEntry.java	21 Dec 2005 22:29:50 -0000	1.1.2.2
  @@ -1,10 +1,6 @@
   package org.apache.ojb.odmg.link;
   
  -import org.apache.commons.lang.builder.ToStringBuilder;
  -import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -19,6 +15,10 @@
    * limitations under the License.
    */
   
  +import org.apache.commons.lang.builder.ToStringBuilder;
  +import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
  +
   /**
    * @author <a href="mailto:arminw@apache.org">Armin Waibel</a>
    * @version $Id$
  
  
  
  1.1.2.2   +5 -5      db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryMtoN.java
  
  Index: LinkEntryMtoN.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/link/LinkEntryMtoN.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LinkEntryMtoN.java	23 Mar 2005 00:50:58 -0000	1.1.2.1
  +++ LinkEntryMtoN.java	21 Dec 2005 22:29:50 -0000	1.1.2.2
  @@ -1,9 +1,6 @@
   package org.apache.ojb.odmg.link;
   
  -import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.metadata.CollectionDescriptor;
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -18,6 +15,9 @@
    * limitations under the License.
    */
   
  +import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.metadata.CollectionDescriptor;
  +
   /**
    * @author <a href="mailto:arminw@apache.org">Armin Waibel</a>
    * @version $Id$
  
  
  
  No                   revision
  No                   revision
  1.4.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/SerializableStrategy.java
  
  Index: SerializableStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/SerializableStrategy.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- SerializableStrategy.java	19 Feb 2005 21:49:54 -0000	1.4.2.2
  +++ SerializableStrategy.java	21 Dec 2005 22:29:51 -0000	1.4.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.2   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/LockManager.java
  
  Index: LockManager.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/LockManager.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- LockManager.java	18 Sep 2004 13:04:02 -0000	1.5.2.1
  +++ LockManager.java	21 Dec 2005 22:29:51 -0000	1.5.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.6.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/ObjectLocks.java
  
  Index: ObjectLocks.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/ObjectLocks.java,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- ObjectLocks.java	19 Feb 2005 21:49:54 -0000	1.6.2.2
  +++ ObjectLocks.java	21 Dec 2005 22:29:51 -0000	1.6.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.4   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockMapFactory.java
  
  Index: LockMapFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockMapFactory.java,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- LockMapFactory.java	16 Aug 2005 15:04:38 -0000	1.7.2.3
  +++ LockMapFactory.java	21 Dec 2005 22:29:51 -0000	1.7.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.5   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockManagerFactory.java
  
  Index: LockManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockManagerFactory.java,v
  retrieving revision 1.5.2.4
  retrieving revision 1.5.2.5
  diff -u -r1.5.2.4 -r1.5.2.5
  --- LockManagerFactory.java	22 Nov 2005 00:35:03 -0000	1.5.2.4
  +++ LockManagerFactory.java	21 Dec 2005 22:29:51 -0000	1.5.2.5
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.4.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/RepeatableReadStrategy.java
  
  Index: RepeatableReadStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/RepeatableReadStrategy.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- RepeatableReadStrategy.java	19 Feb 2005 21:49:54 -0000	1.4.2.2
  +++ RepeatableReadStrategy.java	21 Dec 2005 22:29:51 -0000	1.4.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/ReadUncommittedStrategy.java
  
  Index: ReadUncommittedStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/ReadUncommittedStrategy.java,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- ReadUncommittedStrategy.java	19 Feb 2005 21:49:54 -0000	1.5.2.2
  +++ ReadUncommittedStrategy.java	21 Dec 2005 22:29:51 -0000	1.5.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.13.2.4  +2 -2      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockStrategyFactory.java
  
  Index: LockStrategyFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockStrategyFactory.java,v
  retrieving revision 1.13.2.3
  retrieving revision 1.13.2.4
  diff -u -r1.13.2.3 -r1.13.2.4
  --- LockStrategyFactory.java	16 Aug 2005 15:04:38 -0000	1.13.2.3
  +++ LockStrategyFactory.java	21 Dec 2005 22:29:51 -0000	1.13.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.4.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/AbstractLockStrategy.java
  
  Index: AbstractLockStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/AbstractLockStrategy.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- AbstractLockStrategy.java	19 Feb 2005 21:49:54 -0000	1.4.2.2
  +++ AbstractLockStrategy.java	21 Dec 2005 22:29:51 -0000	1.4.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.4.2.3   +2 -2      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/RemoteLockMapImpl.java
  
  Index: RemoteLockMapImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/RemoteLockMapImpl.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- RemoteLockMapImpl.java	19 Feb 2005 21:49:54 -0000	1.4.2.2
  +++ RemoteLockMapImpl.java	21 Dec 2005 22:29:51 -0000	1.4.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.4   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockManagerDefaultImpl.java
  
  Index: LockManagerDefaultImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockManagerDefaultImpl.java,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- LockManagerDefaultImpl.java	16 Aug 2005 15:04:38 -0000	1.7.2.3
  +++ LockManagerDefaultImpl.java	21 Dec 2005 22:29:51 -0000	1.7.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.4.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/ReadCommittedStrategy.java
  
  Index: ReadCommittedStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/ReadCommittedStrategy.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- ReadCommittedStrategy.java	19 Feb 2005 21:49:54 -0000	1.4.2.2
  +++ ReadCommittedStrategy.java	21 Dec 2005 22:29:51 -0000	1.4.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockStrategy.java
  
  Index: LockStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockStrategy.java,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- LockStrategy.java	19 Feb 2005 21:49:54 -0000	1.5.2.2
  +++ LockStrategy.java	21 Dec 2005 22:29:51 -0000	1.5.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.1.2.4   +8 -8      db-ojb/src/java/org/apache/ojb/odmg/locking/LockManagerOdmgImpl.java
  
  Index: LockManagerOdmgImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/LockManagerOdmgImpl.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- LockManagerOdmgImpl.java	19 Feb 2005 21:49:54 -0000	1.1.2.3
  +++ LockManagerOdmgImpl.java	21 Dec 2005 22:29:51 -0000	1.1.2.4
  @@ -1,12 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.locking.IsolationLevels;
  -import org.apache.ojb.broker.core.proxy.ProxyHelper;
  -import org.apache.ojb.broker.metadata.ClassDescriptor;
  -import org.apache.ojb.odmg.TransactionImpl;
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -21,6 +15,12 @@
    * limitations under the License.
    */
   
  +import org.apache.ojb.broker.Identity;
  +import org.apache.ojb.broker.locking.IsolationLevels;
  +import org.apache.ojb.broker.core.proxy.ProxyHelper;
  +import org.apache.ojb.broker.metadata.ClassDescriptor;
  +import org.apache.ojb.odmg.TransactionImpl;
  +
   /**
    * The odmg lock manager implementation of the {@link LockManager} interface. This class
    * using the OJB kernel locking api {@link org.apache.ojb.broker.locking.LockManager}
  
  
  
  1.6.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockEntry.java
  
  Index: LockEntry.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockEntry.java,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- LockEntry.java	19 Feb 2005 21:49:54 -0000	1.6.2.2
  +++ LockEntry.java	21 Dec 2005 22:29:51 -0000	1.6.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.6.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockMap.java
  
  Index: LockMap.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/LockMap.java,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- LockMap.java	19 Feb 2005 21:49:54 -0000	1.6.2.2
  +++ LockMap.java	21 Dec 2005 22:29:51 -0000	1.6.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright  2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.14.2.3  +2 -2      db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/InMemoryLockMapImpl.java
  
  Index: InMemoryLockMapImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/Attic/InMemoryLockMapImpl.java,v
  retrieving revision 1.14.2.2
  retrieving revision 1.14.2.3
  diff -u -r1.14.2.2 -r1.14.2.3
  --- InMemoryLockMapImpl.java	19 Feb 2005 21:49:54 -0000	1.14.2.2
  +++ InMemoryLockMapImpl.java	21 Dec 2005 22:29:51 -0000	1.14.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.locking;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.7.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/states/StateOldDirty.java
  
  Index: StateOldDirty.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateOldDirty.java,v
  retrieving revision 1.7.2.2
  retrieving revision 1.7.2.3
  diff -u -r1.7.2.2 -r1.7.2.3
  --- StateOldDirty.java	13 Mar 2005 03:53:30 -0000	1.7.2.2
  +++ StateOldDirty.java	21 Dec 2005 22:29:51 -0000	1.7.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.states;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.1.2.3   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/states/StateTransient.java
  
  Index: StateTransient.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateTransient.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- StateTransient.java	4 Dec 2005 02:36:48 -0000	1.1.2.2
  +++ StateTransient.java	21 Dec 2005 22:29:51 -0000	1.1.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.states;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.4   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/states/StateNewClean.java
  
  Index: StateNewClean.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateNewClean.java,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- StateNewClean.java	13 Mar 2005 03:53:30 -0000	1.7.2.3
  +++ StateNewClean.java	21 Dec 2005 22:29:51 -0000	1.7.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.states;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.12.2.3  +1 -1      db-ojb/src/java/org/apache/ojb/odmg/states/ModificationState.java
  
  Index: ModificationState.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/ModificationState.java,v
  retrieving revision 1.12.2.2
  retrieving revision 1.12.2.3
  diff -u -r1.12.2.2 -r1.12.2.3
  --- ModificationState.java	4 Dec 2005 02:36:48 -0000	1.12.2.2
  +++ ModificationState.java	21 Dec 2005 22:29:51 -0000	1.12.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.states;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.6.2.5   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/states/StateNewDirty.java
  
  Index: StateNewDirty.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateNewDirty.java,v
  retrieving revision 1.6.2.4
  retrieving revision 1.6.2.5
  diff -u -r1.6.2.4 -r1.6.2.5
  --- StateNewDirty.java	13 Dec 2005 18:21:24 -0000	1.6.2.4
  +++ StateNewDirty.java	21 Dec 2005 22:29:51 -0000	1.6.2.5
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.states;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.5   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/states/StateNewDelete.java
  
  Index: StateNewDelete.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateNewDelete.java,v
  retrieving revision 1.5.2.4
  retrieving revision 1.5.2.5
  diff -u -r1.5.2.4 -r1.5.2.5
  --- StateNewDelete.java	4 Jun 2005 14:38:13 -0000	1.5.2.4
  +++ StateNewDelete.java	21 Dec 2005 22:29:51 -0000	1.5.2.5
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.states;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.2   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/states/StateOldClean.java
  
  Index: StateOldClean.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateOldClean.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- StateOldClean.java	16 Nov 2004 17:45:35 -0000	1.5.2.1
  +++ StateOldClean.java	21 Dec 2005 22:29:51 -0000	1.5.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.states;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.4   +1 -1      db-ojb/src/java/org/apache/ojb/odmg/states/StateOldDelete.java
  
  Index: StateOldDelete.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/states/StateOldDelete.java,v
  retrieving revision 1.5.2.3
  retrieving revision 1.5.2.4
  diff -u -r1.5.2.3 -r1.5.2.4
  --- StateOldDelete.java	4 Jun 2005 14:38:13 -0000	1.5.2.3
  +++ StateOldDelete.java	21 Dec 2005 22:29:52 -0000	1.5.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.states;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.18.2.5  +2 -2      db-ojb/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java
  
  Index: OQLQueryImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLQueryImpl.java,v
  retrieving revision 1.18.2.4
  retrieving revision 1.18.2.5
  diff -u -r1.18.2.4 -r1.18.2.5
  --- OQLQueryImpl.java	17 May 2005 23:12:29 -0000	1.18.2.4
  +++ OQLQueryImpl.java	21 Dec 2005 22:29:53 -0000	1.18.2.5
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.oql;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.2   +2 -2      db-ojb/src/java/org/apache/ojb/odmg/oql/EnhancedOQLQuery.java
  
  Index: EnhancedOQLQuery.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/EnhancedOQLQuery.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- EnhancedOQLQuery.java	23 Mar 2005 16:56:29 -0000	1.5.2.1
  +++ EnhancedOQLQuery.java	21 Dec 2005 22:29:53 -0000	1.5.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.odmg.oql;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  

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