db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker PersistenceBrokerInternal.java
Date Wed, 01 Dec 2004 20:08:27 GMT
brj         2004/12/01 12:08:27

  Modified:    src/java/org/apache/ojb/broker/query AbstractCriterion.java
                        QueryByCriteria.java Query.java Criteria.java
                        QueryByExample.java AbstractQueryImpl.java
                        IdentityCriterion.java Criterion.java
               src/java/org/apache/ojb/broker/core
                        DelegatingPersistenceBroker.java
               src/java/org/apache/ojb/broker
                        PersistenceBrokerInternal.java
  Log:
  -new method getSqlInLimit in PBInternal
  -changed signature of preprocess to use PBInternal
  
  Revision  Changes    Path
  1.4       +4 -4      db-ojb/src/java/org/apache/ojb/broker/query/AbstractCriterion.java
  
  Index: AbstractCriterion.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/AbstractCriterion.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractCriterion.java	24 Sep 2004 19:36:13 -0000	1.3
  +++ AbstractCriterion.java	1 Dec 2004 20:08:27 -0000	1.4
  @@ -14,7 +14,7 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  -import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   
   /**
    * Abstract Implementation of Criterion.
  @@ -27,9 +27,9 @@
   	private Criterion m_parentCriterion = null;
   
       /**
  -     * @see org.apache.ojb.broker.query.Criterion#preprocess(org.apache.ojb.broker.PersistenceBroker)
  +     * @see org.apache.ojb.broker.query.Criterion#preprocess(org.apache.ojb.broker.PersistenceBrokerInternal)
        */
  -    public void preprocess(PersistenceBroker aPb)
  +    public void preprocess(PersistenceBrokerInternal aPb)
       {
           // do nothing
       }
  
  
  
  1.33      +4 -4      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- QueryByCriteria.java	28 Oct 2004 19:03:45 -0000	1.32
  +++ QueryByCriteria.java	1 Dec 2004 20:08:27 -0000	1.33
  @@ -21,7 +21,7 @@
   import java.util.List;
   import java.util.Map;
   
  -import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.FieldHelper;
   import org.apache.ojb.broker.metadata.MetadataManager;
  @@ -567,9 +567,9 @@
   	}
       
       /**
  -     * @see org.apache.ojb.broker.query.Query#preprocess(org.apache.ojb.broker.PersistenceBroker)
  +     * @see org.apache.ojb.broker.query.Query#preprocess(org.apache.ojb.broker.PersistenceBrokerInternal)
        */
  -    public void preprocess(PersistenceBroker aPb)
  +    public void preprocess(PersistenceBrokerInternal aPb)
       {
           if (getCriteria() != null)
           {
  
  
  
  1.19      +3 -3      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Query.java	15 Sep 2004 17:18:44 -0000	1.18
  +++ Query.java	1 Dec 2004 20:08:27 -0000	1.19
  @@ -2,7 +2,7 @@
   
   import java.util.List;
   
  -import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   
   /* Copyright 2002-2004 The Apache Software Foundation
    *
  @@ -134,7 +134,7 @@
        * 
        * @param aPb the PersistenceBroker
        */
  -    public void preprocess(PersistenceBroker aPb);
  +    public void preprocess(PersistenceBrokerInternal aPb);
       
       /**
        * @deprecated 
  
  
  
  1.55      +3 -3      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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Criteria.java	14 Nov 2004 09:36:44 -0000	1.54
  +++ Criteria.java	1 Dec 2004 20:08:27 -0000	1.55
  @@ -26,8 +26,8 @@
   import java.util.StringTokenizer;
   import java.util.Vector;
   
  -import org.apache.ojb.broker.PersistenceBroker;
   import org.apache.ojb.broker.PersistenceBrokerFactory;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   import org.apache.ojb.broker.core.PersistenceBrokerImpl;
   import org.apache.ojb.broker.metadata.FieldHelper;
   
  @@ -1293,7 +1293,7 @@
        * 
        * @param aPb the PersistenceBroker
        */
  -    public void preprocess(PersistenceBroker aPb)
  +    public void preprocess(PersistenceBrokerInternal aPb)
       {
           Iterator iter = getIterator();
           
  
  
  
  1.7       +4 -3      db-ojb/src/java/org/apache/ojb/broker/query/QueryByExample.java
  
  Index: QueryByExample.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/QueryByExample.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- QueryByExample.java	25 Sep 2004 14:54:56 -0000	1.6
  +++ QueryByExample.java	1 Dec 2004 20:08:27 -0000	1.7
  @@ -17,6 +17,7 @@
   */
   
   import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.DescriptorRepository;
   import org.apache.ojb.broker.metadata.FieldDescriptor;
  @@ -143,9 +144,9 @@
       }
       
       /**
  -     * @see org.apache.ojb.broker.query.Query#preprocess(org.apache.ojb.broker.PersistenceBroker)
  +     * @see org.apache.ojb.broker.query.Query#preprocess(org.apache.ojb.broker.PersistenceBrokerInternal)
        */
  -    public void preprocess(PersistenceBroker aPb)
  +    public void preprocess(PersistenceBrokerInternal aPb)
       {
           buildCriteria(aPb);
       }
  
  
  
  1.18      +4 -4      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- AbstractQueryImpl.java	28 Oct 2004 19:03:45 -0000	1.17
  +++ AbstractQueryImpl.java	1 Dec 2004 20:08:27 -0000	1.18
  @@ -3,7 +3,7 @@
   import java.io.Serializable;
   import java.util.List;
   
  -import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   
   /* Copyright 2002-2004 The Apache Software Foundation
    *
  @@ -182,9 +182,9 @@
       }
       
       /**
  -     * @see org.apache.ojb.broker.query.Query#preprocess(org.apache.ojb.broker.PersistenceBroker)
  +     * @see org.apache.ojb.broker.query.Query#preprocess(org.apache.ojb.broker.PersistenceBrokerInternal)
        */
  -    public void preprocess(PersistenceBroker aPb)
  +    public void preprocess(PersistenceBrokerInternal aPb)
       {
           // do nothing
       }
  
  
  
  1.6       +4 -3      db-ojb/src/java/org/apache/ojb/broker/query/IdentityCriterion.java
  
  Index: IdentityCriterion.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/IdentityCriterion.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- IdentityCriterion.java	13 Nov 2004 10:01:21 -0000	1.5
  +++ IdentityCriterion.java	1 Dec 2004 20:08:27 -0000	1.6
  @@ -6,6 +6,7 @@
   
   import org.apache.ojb.broker.Identity;
   import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.DescriptorRepository;
   import org.apache.ojb.broker.metadata.FieldDescriptor;
  @@ -82,7 +83,7 @@
        * 
        * @param aPb the Broker used to access the repository
        */
  -    protected void buildCriteria(PersistenceBroker aPb)
  +    protected void buildCriteria(PersistenceBrokerInternal aPb)
       {
           Identity id = (Identity)getValue();
           DescriptorRepository repository = aPb.getConfiguration().getModel();
  @@ -115,7 +116,7 @@
        * 
        * @param aPb the PersistenceBroker
        */
  -    public void preprocess(PersistenceBroker aPb)
  +    public void preprocess(PersistenceBrokerInternal aPb)
       {
           buildCriteria(aPb);
       }
  
  
  
  1.4       +3 -3      db-ojb/src/java/org/apache/ojb/broker/query/Criterion.java
  
  Index: Criterion.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Criterion.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Criterion.java	24 Sep 2004 19:36:13 -0000	1.3
  +++ Criterion.java	1 Dec 2004 20:08:27 -0000	1.4
  @@ -19,7 +19,7 @@
   import java.util.List;
   import java.util.Map;
   
  -import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   
   /**
    * Interface for Criterion
  @@ -34,7 +34,7 @@
        * 
        * @param aPb the PersistenceBroker
        */
  -    public void preprocess(PersistenceBroker aPb);
  +    public void preprocess(PersistenceBrokerInternal aPb);
       
       /**
        * Return the parent Criterion.
  
  
  
  1.16      +8 -0      db-ojb/src/java/org/apache/ojb/broker/core/DelegatingPersistenceBroker.java
  
  Index: DelegatingPersistenceBroker.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/DelegatingPersistenceBroker.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DelegatingPersistenceBroker.java	14 Nov 2004 09:34:27 -0000	1.15
  +++ DelegatingPersistenceBroker.java	1 Dec 2004 20:08:27 -0000	1.16
  @@ -406,4 +406,12 @@
       {
           getBroker().addMtoNImplementor(m2nImpl);
       }
  +    
  +    /**
  +     * @see org.apache.ojb.broker.PersistenceBrokerInternal#getSqlInLimit()
  +     */
  +    public int getSqlInLimit()
  +    {
  +        return getBroker().getSqlInLimit();
  +    }
   }
  
  
  
  1.3       +7 -1      db-ojb/src/java/org/apache/ojb/broker/PersistenceBrokerInternal.java
  
  Index: PersistenceBrokerInternal.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/PersistenceBrokerInternal.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PersistenceBrokerInternal.java	14 Nov 2004 09:33:37 -0000	1.2
  +++ PersistenceBrokerInternal.java	1 Dec 2004 20:08:27 -0000	1.3
  @@ -68,4 +68,10 @@
        * @return The proxy
        */
       public Object createProxy(Class proxyClass, Identity realSubjectsIdentity);
  +    
  +    /**
  +     * @return the maximum number of values in the SQL IN-clause.
  +     */
  +    public int getSqlInLimit();
  +    
   }
  
  
  

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