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:30:21 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/otm/lock/map LockMap.java InMemoryLockMap.java

tomdz       2005/12/21 14:30:21

  Modified:    src/java/org/apache/ojb/otm/lock Tag: OJB_1_0_RELEASE
                        LockListener.java ObjectLock.java LockType.java
                        LockManager.java UnknownIsolationException.java
                        IsolationFactory.java LockingException.java
               src/java/org/apache/ojb/otm/core Tag: OJB_1_0_RELEASE
                        ConcreteEditingContext.java BaseConnection.java
                        TransactionInProgressException.java
                        TransactionAbortedException.java
                        ConnectionException.java TransactionListener.java
                        OTMGenericException.java
                        TransactionNotInProgressException.java
                        LockingPassthruException.java
                        QueryPreparationRuntimeException.java
                        TransactionException.java Transaction.java
               src/java/org/apache/ojb/otm/copy Tag: OJB_1_0_RELEASE
                        CloneableObjectCopyStrategy.java
                        SerializeObjectCopyStrategy.java
                        ObjectCopyStrategy.java NoOpObjectCopyStrategy.java
                        ObjectCopyException.java
                        MetadataObjectCopyStrategy.java
                        ReflectiveObjectCopyStrategy.java OjbCloneable.java
               src/java/org/apache/ojb/otm/lock/isolation Tag:
                        OJB_1_0_RELEASE ReadCommittedIsolation.java
                        RepeatableReadIsolation.java
                        TransactionIsolation.java
                        ReadUncommittedIsolation.java
                        SerializableIsolation.java AbstractIsolation.java
               src/java/org/apache/ojb/otm Tag: OJB_1_0_RELEASE Kit.java
                        EditingContext.java OTMKit.java OTMConnection.java
               src/java/org/apache/ojb/otm/kit Tag: OJB_1_0_RELEASE
                        SimpleKit.java
               src/java/org/apache/ojb/otm/lock/map Tag: OJB_1_0_RELEASE
                        LockMap.java InMemoryLockMap.java
  Log:
  Updated license
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/LockListener.java
  
  Index: LockListener.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/LockListener.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- LockListener.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ LockListener.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock;
   
  -/* 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.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/ObjectLock.java
  
  Index: ObjectLock.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/ObjectLock.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- ObjectLock.java	4 Apr 2004 23:53:41 -0000	1.10
  +++ ObjectLock.java	21 Dec 2005 22:30:18 -0000	1.10.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock;
   
  -/* 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.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/LockType.java
  
  Index: LockType.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/LockType.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- LockType.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ LockType.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock;
   
  -/* 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.9.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/LockManager.java
  
  Index: LockManager.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/LockManager.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- LockManager.java	4 Apr 2004 23:53:41 -0000	1.9
  +++ LockManager.java	21 Dec 2005 22:30:18 -0000	1.9.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock;
   
  -/* 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.4.2.1   +4 -3      db-ojb/src/java/org/apache/ojb/otm/lock/UnknownIsolationException.java
  
  Index: UnknownIsolationException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/UnknownIsolationException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- UnknownIsolationException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ UnknownIsolationException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.otm.lock;
   
  -import org.apache.ojb.otm.core.OTMGenericException;
  -
  -/* 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.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.otm.core.OTMGenericException;
  +
   public class UnknownIsolationException extends OTMGenericException
   {
   
  
  
  
  1.12.2.2  +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/IsolationFactory.java
  
  Index: IsolationFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/IsolationFactory.java,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- IsolationFactory.java	19 Feb 2005 21:49:55 -0000	1.12.2.1
  +++ IsolationFactory.java	21 Dec 2005 22:30:18 -0000	1.12.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock;
   
  -/* 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.4.2.1   +4 -3      db-ojb/src/java/org/apache/ojb/otm/lock/LockingException.java
  
  Index: LockingException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/LockingException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- LockingException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ LockingException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.otm.lock;
   
  -import org.apache.commons.lang.exception.NestableException;
  -
  -/* 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.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.commons.lang.exception.NestableException;
  +
   public class LockingException extends NestableException
   {
   
  
  
  
  No                   revision
  No                   revision
  1.47.2.4  +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/ConcreteEditingContext.java
  
  Index: ConcreteEditingContext.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/ConcreteEditingContext.java,v
  retrieving revision 1.47.2.3
  retrieving revision 1.47.2.4
  diff -u -r1.47.2.3 -r1.47.2.4
  --- ConcreteEditingContext.java	23 Jan 2005 03:07:32 -0000	1.47.2.3
  +++ ConcreteEditingContext.java	21 Dec 2005 22:30:18 -0000	1.47.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.37.2.2  +2 -2      db-ojb/src/java/org/apache/ojb/otm/core/BaseConnection.java
  
  Index: BaseConnection.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/BaseConnection.java,v
  retrieving revision 1.37.2.1
  retrieving revision 1.37.2.2
  diff -u -r1.37.2.1 -r1.37.2.2
  --- BaseConnection.java	26 Aug 2005 19:26:39 -0000	1.37.2.1
  +++ BaseConnection.java	21 Dec 2005 22:30:18 -0000	1.37.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/TransactionInProgressException.java
  
  Index: TransactionInProgressException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/TransactionInProgressException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- TransactionInProgressException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ TransactionInProgressException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.5.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/TransactionAbortedException.java
  
  Index: TransactionAbortedException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/TransactionAbortedException.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- TransactionAbortedException.java	4 Apr 2004 23:53:41 -0000	1.5
  +++ TransactionAbortedException.java	21 Dec 2005 22:30:18 -0000	1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/ConnectionException.java
  
  Index: ConnectionException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/ConnectionException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- ConnectionException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ ConnectionException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.5.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/TransactionListener.java
  
  Index: TransactionListener.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/TransactionListener.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- TransactionListener.java	4 Apr 2004 23:53:41 -0000	1.5
  +++ TransactionListener.java	21 Dec 2005 22:30:18 -0000	1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/OTMGenericException.java
  
  Index: OTMGenericException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/OTMGenericException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- OTMGenericException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ OTMGenericException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/TransactionNotInProgressException.java
  
  Index: TransactionNotInProgressException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/TransactionNotInProgressException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- TransactionNotInProgressException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ TransactionNotInProgressException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.4.2.1   +5 -4      db-ojb/src/java/org/apache/ojb/otm/core/LockingPassthruException.java
  
  Index: LockingPassthruException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/LockingPassthruException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- LockingPassthruException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ LockingPassthruException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,9 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -import org.apache.commons.lang.exception.NestableRuntimeException;
  -import org.apache.ojb.otm.lock.LockingException;
  -
  -/* 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.
  @@ -17,6 +14,10 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.commons.lang.exception.NestableRuntimeException;
  +import org.apache.ojb.otm.lock.LockingException;
  +
   public class LockingPassthruException extends NestableRuntimeException
   {
       /**
  
  
  
  1.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/QueryPreparationRuntimeException.java
  
  Index: QueryPreparationRuntimeException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/QueryPreparationRuntimeException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- QueryPreparationRuntimeException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ QueryPreparationRuntimeException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/TransactionException.java
  
  Index: TransactionException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/TransactionException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- TransactionException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ TransactionException.java	21 Dec 2005 22:30:18 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.13.2.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/core/Transaction.java
  
  Index: Transaction.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/Transaction.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- Transaction.java	4 Apr 2004 23:53:41 -0000	1.13
  +++ Transaction.java	21 Dec 2005 22:30:18 -0000	1.13.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.core;
   
  -/* 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.
  
  
  
  No                   revision
  No                   revision
  1.11.2.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/copy/CloneableObjectCopyStrategy.java
  
  Index: CloneableObjectCopyStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/copy/CloneableObjectCopyStrategy.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- CloneableObjectCopyStrategy.java	12 Apr 2004 16:32:40 -0000	1.11
  +++ CloneableObjectCopyStrategy.java	21 Dec 2005 22:30:19 -0000	1.11.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.copy;
   
  -/* 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.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/copy/SerializeObjectCopyStrategy.java
  
  Index: SerializeObjectCopyStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/copy/SerializeObjectCopyStrategy.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- SerializeObjectCopyStrategy.java	12 Apr 2004 16:32:41 -0000	1.10
  +++ SerializeObjectCopyStrategy.java	21 Dec 2005 22:30:19 -0000	1.10.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.copy;
   
  -/* 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.1  +1 -2      db-ojb/src/java/org/apache/ojb/otm/copy/ObjectCopyStrategy.java
  
  Index: ObjectCopyStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/copy/ObjectCopyStrategy.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- ObjectCopyStrategy.java	12 Apr 2004 16:32:41 -0000	1.10
  +++ ObjectCopyStrategy.java	21 Dec 2005 22:30:19 -0000	1.10.2.1
  @@ -1,7 +1,6 @@
   package org.apache.ojb.otm.copy;
   
  -
  -/* 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.1  +1 -2      db-ojb/src/java/org/apache/ojb/otm/copy/NoOpObjectCopyStrategy.java
  
  Index: NoOpObjectCopyStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/copy/NoOpObjectCopyStrategy.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- NoOpObjectCopyStrategy.java	12 Apr 2004 16:32:41 -0000	1.10
  +++ NoOpObjectCopyStrategy.java	21 Dec 2005 22:30:19 -0000	1.10.2.1
  @@ -1,7 +1,6 @@
   package org.apache.ojb.otm.copy;
   
  -
  -/* 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.5.2.1   +4 -3      db-ojb/src/java/org/apache/ojb/otm/copy/ObjectCopyException.java
  
  Index: ObjectCopyException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/copy/ObjectCopyException.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ObjectCopyException.java	4 Apr 2004 23:53:40 -0000	1.5
  +++ ObjectCopyException.java	21 Dec 2005 22:30:19 -0000	1.5.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.otm.copy;
   
  -import org.apache.ojb.otm.core.OTMGenericException;
  -
  -/* 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.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.otm.core.OTMGenericException;
  +
   public class ObjectCopyException extends OTMGenericException
   {
   
  
  
  
  1.22.2.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/copy/MetadataObjectCopyStrategy.java
  
  Index: MetadataObjectCopyStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/copy/MetadataObjectCopyStrategy.java,v
  retrieving revision 1.22
  retrieving revision 1.22.2.1
  diff -u -r1.22 -r1.22.2.1
  --- MetadataObjectCopyStrategy.java	22 May 2004 11:39:18 -0000	1.22
  +++ MetadataObjectCopyStrategy.java	21 Dec 2005 22:30:19 -0000	1.22.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.copy;
   
  -/* 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.17.2.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/copy/ReflectiveObjectCopyStrategy.java
  
  Index: ReflectiveObjectCopyStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/copy/ReflectiveObjectCopyStrategy.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- ReflectiveObjectCopyStrategy.java	12 Apr 2004 16:32:41 -0000	1.17
  +++ ReflectiveObjectCopyStrategy.java	21 Dec 2005 22:30:19 -0000	1.17.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.copy;
   
  -/* 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.5.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/copy/OjbCloneable.java
  
  Index: OjbCloneable.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/copy/OjbCloneable.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- OjbCloneable.java	4 Apr 2004 23:53:40 -0000	1.5
  +++ OjbCloneable.java	21 Dec 2005 22:30:19 -0000	1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.copy;
   
  -/* 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.
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/isolation/ReadCommittedIsolation.java
  
  Index: ReadCommittedIsolation.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/isolation/ReadCommittedIsolation.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ReadCommittedIsolation.java	4 Apr 2004 23:53:41 -0000	1.5
  +++ ReadCommittedIsolation.java	21 Dec 2005 22:30:20 -0000	1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock.isolation;
   
  -/* 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.5.2.1   +9 -8      db-ojb/src/java/org/apache/ojb/otm/lock/isolation/RepeatableReadIsolation.java
  
  Index: RepeatableReadIsolation.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/isolation/RepeatableReadIsolation.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- RepeatableReadIsolation.java	4 Apr 2004 23:53:41 -0000	1.5
  +++ RepeatableReadIsolation.java	21 Dec 2005 22:30:20 -0000	1.5.2.1
  @@ -1,13 +1,6 @@
   package org.apache.ojb.otm.lock.isolation;
   
  -import java.util.Collection;
  -import java.util.Iterator;
  -
  -import org.apache.ojb.otm.core.Transaction;
  -import org.apache.ojb.otm.lock.LockingException;
  -import org.apache.ojb.otm.lock.ObjectLock;
  -
  -/* 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.
  @@ -21,6 +14,14 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import java.util.Collection;
  +import java.util.Iterator;
  +
  +import org.apache.ojb.otm.core.Transaction;
  +import org.apache.ojb.otm.lock.LockingException;
  +import org.apache.ojb.otm.lock.ObjectLock;
  +
   public class RepeatableReadIsolation extends AbstractIsolation
   {
   
  
  
  
  1.5.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/isolation/TransactionIsolation.java
  
  Index: TransactionIsolation.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/isolation/TransactionIsolation.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- TransactionIsolation.java	4 Apr 2004 23:53:41 -0000	1.5
  +++ TransactionIsolation.java	21 Dec 2005 22:30:20 -0000	1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock.isolation;
   
  -/* 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.7.2.1   +6 -5      db-ojb/src/java/org/apache/ojb/otm/lock/isolation/ReadUncommittedIsolation.java
  
  Index: ReadUncommittedIsolation.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/isolation/ReadUncommittedIsolation.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ReadUncommittedIsolation.java	12 Apr 2004 16:32:42 -0000	1.7
  +++ ReadUncommittedIsolation.java	21 Dec 2005 22:30:20 -0000	1.7.2.1
  @@ -1,10 +1,6 @@
   package org.apache.ojb.otm.lock.isolation;
   
  -import org.apache.ojb.otm.core.Transaction;
  -import org.apache.ojb.otm.lock.LockingException;
  -import org.apache.ojb.otm.lock.ObjectLock;
  -
  -/* 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.
  @@ -18,6 +14,11 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.otm.core.Transaction;
  +import org.apache.ojb.otm.lock.LockingException;
  +import org.apache.ojb.otm.lock.ObjectLock;
  +
   public class ReadUncommittedIsolation extends AbstractIsolation
   {
   
  
  
  
  1.5.2.1   +8 -7      db-ojb/src/java/org/apache/ojb/otm/lock/isolation/SerializableIsolation.java
  
  Index: SerializableIsolation.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/isolation/SerializableIsolation.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- SerializableIsolation.java	4 Apr 2004 23:53:41 -0000	1.5
  +++ SerializableIsolation.java	21 Dec 2005 22:30:20 -0000	1.5.2.1
  @@ -1,12 +1,6 @@
   package org.apache.ojb.otm.lock.isolation;
   
  -import java.util.Collection;
  -
  -import org.apache.ojb.otm.core.Transaction;
  -import org.apache.ojb.otm.lock.LockingException;
  -import org.apache.ojb.otm.lock.ObjectLock;
  -
  -/* 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.
  @@ -20,6 +14,13 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import java.util.Collection;
  +
  +import org.apache.ojb.otm.core.Transaction;
  +import org.apache.ojb.otm.lock.LockingException;
  +import org.apache.ojb.otm.lock.ObjectLock;
  +
   public class SerializableIsolation extends AbstractIsolation
   {
   
  
  
  
  1.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/isolation/AbstractIsolation.java
  
  Index: AbstractIsolation.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/isolation/AbstractIsolation.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- AbstractIsolation.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ AbstractIsolation.java	21 Dec 2005 22:30:20 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock.isolation;
   
  -/* 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.
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/Kit.java
  
  Index: Kit.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/Kit.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- Kit.java	4 Apr 2004 23:53:40 -0000	1.5
  +++ Kit.java	21 Dec 2005 22:30:20 -0000	1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm;
   
  -/* 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.12.2.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/EditingContext.java
  
  Index: EditingContext.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/EditingContext.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- EditingContext.java	12 Apr 2004 16:32:40 -0000	1.12
  +++ EditingContext.java	21 Dec 2005 22:30:20 -0000	1.12.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm;
   
  -/* 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.12.2.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/OTMKit.java
  
  Index: OTMKit.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/OTMKit.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- OTMKit.java	4 Apr 2004 23:53:40 -0000	1.12
  +++ OTMKit.java	21 Dec 2005 22:30:20 -0000	1.12.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm;
   
  -/* 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.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/OTMConnection.java
  
  Index: OTMConnection.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/OTMConnection.java,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- OTMConnection.java	12 Apr 2004 16:32:40 -0000	1.21
  +++ OTMConnection.java	21 Dec 2005 22:30:20 -0000	1.21.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm;
   
  -/* 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.
  
  
  
  No                   revision
  No                   revision
  1.19.2.1  +1 -1      db-ojb/src/java/org/apache/ojb/otm/kit/SimpleKit.java
  
  Index: SimpleKit.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/kit/SimpleKit.java,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -r1.19 -r1.19.2.1
  --- SimpleKit.java	4 Apr 2004 23:53:41 -0000	1.19
  +++ SimpleKit.java	21 Dec 2005 22:30:20 -0000	1.19.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.kit;
   
  -/* 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.
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/map/LockMap.java
  
  Index: LockMap.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/map/LockMap.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- LockMap.java	4 Apr 2004 23:53:41 -0000	1.5
  +++ LockMap.java	21 Dec 2005 22:30:21 -0000	1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock.map;
   
  -/* 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.6.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/otm/lock/map/InMemoryLockMap.java
  
  Index: InMemoryLockMap.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/map/InMemoryLockMap.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- InMemoryLockMap.java	4 Apr 2004 23:53:41 -0000	1.6
  +++ InMemoryLockMap.java	21 Dec 2005 22:30:21 -0000	1.6.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.otm.lock.map;
   
  -/* 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.
  
  
  

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