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 TransactionNotInProgressException.java OJBTxManager.java
Date Wed, 21 Dec 2005 22:27:13 GMT
tomdz       2005/12/21 14:27:13

  Modified:    src/java/org/apache/ojb/broker/query Tag: OJB_1_0_RELEASE
                        ReportQueryByCriteria.java MtoNQuery.java
                        UserAlias.java DBException.java SearchFilter.java
                        AbstractQueryImpl.java QueryBySQL.java
                        QueryFactory.java SelectionCriteria.java
                        QueryByCriteria.java SqlCriteria.java
                        OJBSearchFilter.java LikeCriteria.java
                        NullCriteria.java InCriteria.java
                        BetweenCriteria.java QueryByMtoNCriteria.java
                        FieldCriteria.java ExistsCriteria.java
                        Criteria.java ReportQuery.java QueryByIdentity.java
                        Query.java ValueCriteria.java CriteriaUtils.java
                        ReportQueryByMtoNCriteria.java
               src/java/org/apache/ojb/broker/transaction Tag:
                        OJB_1_0_RELEASE
                        TransactionNotInProgressException.java
                        OJBTxManager.java
  Log:
  Updated license
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.10.2.2  +4 -5      db-ojb/src/java/org/apache/ojb/broker/query/ReportQueryByCriteria.java
  
  Index: ReportQueryByCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/ReportQueryByCriteria.java,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- ReportQueryByCriteria.java	8 Jun 2005 19:45:29 -0000	1.10.2.1
  +++ ReportQueryByCriteria.java	21 Dec 2005 22:27:09 -0000	1.10.2.2
  @@ -1,9 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -import java.util.Map;
  -
  -
  -/* 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,8 @@
    * limitations under the License.
    */
    
  +import java.util.Map;
  +
   /**
    * Query for Reports. 
    * Supports selection of a subset of attributes.
  
  
  
  1.3.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/MtoNQuery.java
  
  Index: MtoNQuery.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/MtoNQuery.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- MtoNQuery.java	4 Apr 2004 23:53:36 -0000	1.3
  +++ MtoNQuery.java	21 Dec 2005 22:27:09 -0000	1.3.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.2.2.2   +1 -1      db-ojb/src/java/org/apache/ojb/broker/query/UserAlias.java
  
  Index: UserAlias.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/UserAlias.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- UserAlias.java	23 Dec 2004 22:03:24 -0000	1.2.2.1
  +++ UserAlias.java	21 Dec 2005 22:27:09 -0000	1.2.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.1   +4 -3      db-ojb/src/java/org/apache/ojb/broker/query/DBException.java
  
  Index: DBException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/DBException.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- DBException.java	4 Apr 2004 23:53:36 -0000	1.5
  +++ DBException.java	21 Dec 2005 22:27:09 -0000	1.5.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -import org.apache.ojb.broker.OJBException;
  -
  -/* 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.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.broker.OJBException;
  +
   public class DBException extends OJBException
   {
   
  
  
  
  1.8.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/broker/query/SearchFilter.java
  
  Index: SearchFilter.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/SearchFilter.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- SearchFilter.java	19 Jun 2004 09:21:37 -0000	1.8
  +++ SearchFilter.java	21 Dec 2005 22:27:09 -0000	1.8.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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  +5 -5      db-ojb/src/java/org/apache/ojb/broker/query/AbstractQueryImpl.java
  
  Index: AbstractQueryImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/AbstractQueryImpl.java,v
  retrieving revision 1.14.2.2
  retrieving revision 1.14.2.3
  diff -u -r1.14.2.2 -r1.14.2.3
  --- AbstractQueryImpl.java	26 Apr 2005 03:41:36 -0000	1.14.2.2
  +++ AbstractQueryImpl.java	21 Dec 2005 22:27:09 -0000	1.14.2.3
  @@ -1,9 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -import java.io.Serializable;
  -import java.util.List;
  -
  -/* 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 java.io.Serializable;
  +import java.util.List;
  +
   /**
    * Abstract implemenation of Query interface
    *
  
  
  
  1.7.2.1   +2 -3      db-ojb/src/java/org/apache/ojb/broker/query/QueryBySQL.java
  
  Index: QueryBySQL.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/QueryBySQL.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- QueryBySQL.java	4 Apr 2004 23:53:36 -0000	1.7
  +++ QueryBySQL.java	21 Dec 2005 22:27:09 -0000	1.7.2.1
  @@ -1,7 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -
  -/* 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.17.2.1  +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/QueryFactory.java
  
  Index: QueryFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/QueryFactory.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- QueryFactory.java	19 Jun 2004 09:21:37 -0000	1.17
  +++ QueryFactory.java	21 Dec 2005 22:27:09 -0000	1.17.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.17.2.2  +5 -5      db-ojb/src/java/org/apache/ojb/broker/query/SelectionCriteria.java
  
  Index: SelectionCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/SelectionCriteria.java,v
  retrieving revision 1.17.2.1
  retrieving revision 1.17.2.2
  diff -u -r1.17.2.1 -r1.17.2.2
  --- SelectionCriteria.java	13 Jan 2005 19:20:03 -0000	1.17.2.1
  +++ SelectionCriteria.java	21 Dec 2005 22:27:09 -0000	1.17.2.2
  @@ -1,9 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -import java.util.List;
  -import java.util.Map;
  -
  -/* 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 java.util.List;
  +import java.util.Map;
  +
   /**
    * abstract baseclass of all criteria classes, can't be instantiated.
    * 
  
  
  
  1.26.2.4  +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/QueryByCriteria.java
  
  Index: QueryByCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/QueryByCriteria.java,v
  retrieving revision 1.26.2.3
  retrieving revision 1.26.2.4
  diff -u -r1.26.2.3 -r1.26.2.4
  --- QueryByCriteria.java	6 Dec 2005 15:17:40 -0000	1.26.2.3
  +++ QueryByCriteria.java	21 Dec 2005 22:27:09 -0000	1.26.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/SqlCriteria.java
  
  Index: SqlCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/SqlCriteria.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- SqlCriteria.java	22 May 2004 08:37:23 -0000	1.8
  +++ SqlCriteria.java	21 Dec 2005 22:27:09 -0000	1.8.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.1   +3 -3      db-ojb/src/java/org/apache/ojb/broker/query/OJBSearchFilter.java
  
  Index: OJBSearchFilter.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/OJBSearchFilter.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- OJBSearchFilter.java	19 Jun 2004 09:21:37 -0000	1.5
  +++ OJBSearchFilter.java	21 Dec 2005 22:27:09 -0000	1.5.2.1
  @@ -1,7 +1,6 @@
  -// David Forslund agreed to put this stuff under APache licence !
   package org.apache.ojb.broker.query;
   
  -/* 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.
  @@ -28,6 +27,7 @@
    * This extends SearchFilter and implements the Convert method
    * that produces the search filter string for the SQL database
    *
  + * @author David Forslund
    * @author koenig
    * @version $Revision$ $Date$
    */
  
  
  
  1.11.2.2  +4 -4      db-ojb/src/java/org/apache/ojb/broker/query/LikeCriteria.java
  
  Index: LikeCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/LikeCriteria.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- LikeCriteria.java	26 Jul 2004 15:49:52 -0000	1.11.2.1
  +++ LikeCriteria.java	21 Dec 2005 22:27:09 -0000	1.11.2.2
  @@ -1,4 +1,6 @@
  -/* Copyright 2002-2004 The Apache Software Foundation
  +package org.apache.ojb.broker.query;
  +
  +/* 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.
  @@ -13,8 +15,6 @@
    * limitations under the License.
    */
   
  -package org.apache.ojb.broker.query;
  -
   /**
    * Model a Like Criteria</br> 
    * Escape Processing by Paul R. Nase 
  
  
  
  1.9.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/NullCriteria.java
  
  Index: NullCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/NullCriteria.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- NullCriteria.java	22 May 2004 08:37:23 -0000	1.9
  +++ NullCriteria.java	21 Dec 2005 22:27:09 -0000	1.9.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.11.2.1  +4 -4      db-ojb/src/java/org/apache/ojb/broker/query/InCriteria.java
  
  Index: InCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/InCriteria.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- InCriteria.java	22 May 2004 08:37:23 -0000	1.11
  +++ InCriteria.java	21 Dec 2005 22:27:09 -0000	1.11.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -import java.util.Collection;
  -
  -/* 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.
  @@ -17,6 +15,8 @@
    * limitations under the License.
    */
   
  +import java.util.Collection;
  +
   /**
    * SelectionCriteria for 'in (a,b,c..)'
    * 
  
  
  
  1.10.2.1  +2 -3      db-ojb/src/java/org/apache/ojb/broker/query/BetweenCriteria.java
  
  Index: BetweenCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/BetweenCriteria.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- BetweenCriteria.java	22 May 2004 08:37:23 -0000	1.10
  +++ BetweenCriteria.java	21 Dec 2005 22:27:09 -0000	1.10.2.1
  @@ -1,7 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -
  -/* 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.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/QueryByMtoNCriteria.java
  
  Index: QueryByMtoNCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/QueryByMtoNCriteria.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- QueryByMtoNCriteria.java	4 Apr 2004 23:53:36 -0000	1.7
  +++ QueryByMtoNCriteria.java	21 Dec 2005 22:27:09 -0000	1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.9.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/FieldCriteria.java
  
  Index: FieldCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/FieldCriteria.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- FieldCriteria.java	22 May 2004 08:37:23 -0000	1.9
  +++ FieldCriteria.java	21 Dec 2005 22:27:09 -0000	1.9.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/ExistsCriteria.java
  
  Index: ExistsCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/ExistsCriteria.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ExistsCriteria.java	22 May 2004 08:37:23 -0000	1.7
  +++ ExistsCriteria.java	21 Dec 2005 22:27:09 -0000	1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.45.2.5  +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/Criteria.java
  
  Index: Criteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Criteria.java,v
  retrieving revision 1.45.2.4
  retrieving revision 1.45.2.5
  diff -u -r1.45.2.4 -r1.45.2.5
  --- Criteria.java	6 Dec 2005 15:15:04 -0000	1.45.2.4
  +++ Criteria.java	21 Dec 2005 22:27:09 -0000	1.45.2.5
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.2   +4 -5      db-ojb/src/java/org/apache/ojb/broker/query/ReportQuery.java
  
  Index: ReportQuery.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/ReportQuery.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- ReportQuery.java	8 Jun 2005 19:45:29 -0000	1.6.2.1
  +++ ReportQuery.java	21 Dec 2005 22:27:09 -0000	1.6.2.2
  @@ -1,9 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -import java.util.Map;
  -
  -
  -/* 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,8 @@
    * limitations under the License.
    */
   
  +import java.util.Map;
  +
   /**
    * Interface for ReportQueries
    * 
  
  
  
  1.9.2.3   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/QueryByIdentity.java
  
  Index: QueryByIdentity.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/QueryByIdentity.java,v
  retrieving revision 1.9.2.2
  retrieving revision 1.9.2.3
  diff -u -r1.9.2.2 -r1.9.2.3
  --- QueryByIdentity.java	13 Jan 2005 16:14:35 -0000	1.9.2.2
  +++ QueryByIdentity.java	21 Dec 2005 22:27:09 -0000	1.9.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.17.2.3  +4 -4      db-ojb/src/java/org/apache/ojb/broker/query/Query.java
  
  Index: Query.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Query.java,v
  retrieving revision 1.17.2.2
  retrieving revision 1.17.2.3
  diff -u -r1.17.2.2 -r1.17.2.3
  --- Query.java	26 Apr 2005 03:41:36 -0000	1.17.2.2
  +++ Query.java	21 Dec 2005 22:27:09 -0000	1.17.2.3
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -import java.util.List;
  -
  -/* 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.
  @@ -17,6 +15,8 @@
    * limitations under the License.
    */
   
  +import java.util.List;
  +
   /**
    * represents Queries that can be used by the OJB PersistenceBroker
    * to retrieve Objects from the underlying DB.
  
  
  
  1.8.2.3   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/ValueCriteria.java
  
  Index: ValueCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/ValueCriteria.java,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -r1.8.2.2 -r1.8.2.3
  --- ValueCriteria.java	13 Jan 2005 19:20:03 -0000	1.8.2.2
  +++ ValueCriteria.java	21 Dec 2005 22:27:09 -0000	1.8.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/CriteriaUtils.java
  
  Index: CriteriaUtils.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/CriteriaUtils.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- CriteriaUtils.java	4 Apr 2004 23:53:36 -0000	1.5
  +++ CriteriaUtils.java	21 Dec 2005 22:27:09 -0000	1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.3.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/query/Attic/ReportQueryByMtoNCriteria.java
  
  Index: ReportQueryByMtoNCriteria.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Attic/ReportQueryByMtoNCriteria.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- ReportQueryByMtoNCriteria.java	4 Apr 2004 23:53:36 -0000	1.3
  +++ ReportQueryByMtoNCriteria.java	21 Dec 2005 22:27:09 -0000	1.3.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.query;
   
  -/* 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.1   +16 -1     db-ojb/src/java/org/apache/ojb/broker/transaction/TransactionNotInProgressException.java
  
  Index: TransactionNotInProgressException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/TransactionNotInProgressException.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TransactionNotInProgressException.java	3 May 2004 23:05:56 -0000	1.1
  +++ TransactionNotInProgressException.java	21 Dec 2005 22:27:12 -0000	1.1.2.1
  @@ -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 org.apache.ojb.broker.OJBRuntimeException;
   
   /**
  
  
  
  1.1.2.1   +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.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- OJBTxManager.java	3 May 2004 23:05:56 -0000	1.1
  +++ OJBTxManager.java	21 Dec 2005 22:27:12 -0000	1.1.2.1
  @@ -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