db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/transaction OJBTxManager.java
Date Thu, 22 Dec 2005 08:28:41 GMT
tomdz       2005/12/22 00:28:41

  Modified:    src/java/org/apache/ojb/jdo/jdoql jdoql-ojb-lexer.g
                        jdoql-ojb-treeparser.g jdoql-ojb-parser.g
               src/java/org/apache/ojb/otm/lock/wait
                        ConcurrentModificationException.java
               src/java/org/apache/ojb/broker/transaction OJBTxManager.java
  Log:
  Updated license
  
  Revision  Changes    Path
  1.6       +1 -1      db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-lexer.g
  
  Index: jdoql-ojb-lexer.g
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-lexer.g,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jdoql-ojb-lexer.g	16 May 2004 22:15:46 -0000	1.5
  +++ jdoql-ojb-lexer.g	22 Dec 2005 08:28:40 -0000	1.6
  @@ -2,7 +2,7 @@
   {
       package org.apache.ojb.jdo.jdoql;
   
  -/* 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       +1 -1      db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-treeparser.g
  
  Index: jdoql-ojb-treeparser.g
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-treeparser.g,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jdoql-ojb-treeparser.g	23 May 2004 12:02:29 -0000	1.4
  +++ jdoql-ojb-treeparser.g	22 Dec 2005 08:28:40 -0000	1.5
  @@ -2,7 +2,7 @@
   {
       package org.apache.ojb.jdo.jdoql;
   
  -/* 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       +1 -1      db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-parser.g
  
  Index: jdoql-ojb-parser.g
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-parser.g,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jdoql-ojb-parser.g	16 May 2004 22:15:46 -0000	1.5
  +++ jdoql-ojb-parser.g	22 Dec 2005 08:28:40 -0000	1.6
  @@ -2,7 +2,7 @@
   {
       package org.apache.ojb.jdo.jdoql;
   
  -/* 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       +4 -3      db-ojb/src/java/org/apache/ojb/otm/lock/wait/ConcurrentModificationException.java
  
  Index: ConcurrentModificationException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/wait/ConcurrentModificationException.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConcurrentModificationException.java	4 Apr 2004 23:53:41 -0000	1.4
  +++ ConcurrentModificationException.java	22 Dec 2005 08:28:41 -0000	1.5
  @@ -1,8 +1,6 @@
   package org.apache.ojb.otm.lock.wait;
   
  -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.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.otm.lock.LockingException;
  +
   public class ConcurrentModificationException extends LockingException
   {
   
  
  
  
  1.2       +16 -1     db-ojb/src/java/org/apache/ojb/broker/transaction/OJBTxManager.java
  
  Index: OJBTxManager.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/OJBTxManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OJBTxManager.java	3 May 2004 23:05:56 -0000	1.1
  +++ OJBTxManager.java	22 Dec 2005 08:28:41 -0000	1.2
  @@ -1,5 +1,20 @@
   package org.apache.ojb.broker.transaction;
   
  +/* 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.
  + * You may obtain a copy of the License at
  + *
  + *     http://www.apache.org/licenses/LICENSE-2.0
  + *
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an "AS IS" BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
  +
   import javax.transaction.Transaction;
   
   /**
  
  
  

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


Mime
View raw message