brj 2005/04/13 12:48:28
Modified: src/java/org/apache/ojb/broker/accesslayer
RelationshipPrefetcherFactory.java
ReportQueryRsIterator.java
CollectionPrefetcher.java ReferencePrefetcher.java
SqlBasedReportQueryRsIterator.java
ReportRsIteratorFactoryImpl.java
RsIteratorFactory.java
RelationshipPrefetcherImpl.java
MtoNCollectionPrefetcher.java PlainPrefetcher.java
BasePrefetcher.java SqlBasedRsIterator.java
RsIterator.java RsIteratorFactoryImpl.java
src/java/org/apache/ojb/broker/core
DelegatingPersistenceBroker.java
src/java/org/apache/ojb/broker
PersistenceBrokerInternal.java
Log:
use PBInternal instead of PBImpl
Revision Changes Path
1.7 +4 -4
db-ojb/src/java/org/apache/ojb/broker/accesslayer/RelationshipPrefetcherFactory.java
Index: RelationshipPrefetcherFactory.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RelationshipPrefetcherFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RelationshipPrefetcherFactory.java 12 May 2004 19:25:54 -0000
1.6
+++ RelationshipPrefetcherFactory.java 13 Apr 2005 19:48:28 -0000
1.7
@@ -16,7 +16,7 @@
*/
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.CollectionDescriptor;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
@@ -32,7 +32,7 @@
/**
* create either a CollectionPrefetcher or a ReferencePrefetcher
*/
- public static RelationshipPrefetcher
createRelationshipPrefetcher(PersistenceBrokerImpl aBroker,
ObjectReferenceDescriptor ord)
+ public static RelationshipPrefetcher
createRelationshipPrefetcher(PersistenceBrokerInternal aBroker,
ObjectReferenceDescriptor ord)
{
if (ord instanceof CollectionDescriptor)
{
@@ -55,7 +55,7 @@
/**
* create either a CollectionPrefetcher or a ReferencePrefetcher
*/
- public static RelationshipPrefetcher
createRelationshipPrefetcher(PersistenceBrokerImpl aBroker, ClassDescriptor
anOwnerCld, String aRelationshipName)
+ public static RelationshipPrefetcher
createRelationshipPrefetcher(PersistenceBrokerInternal aBroker, ClassDescriptor
anOwnerCld, String aRelationshipName)
{
ObjectReferenceDescriptor ord;
1.15 +3 -3
db-ojb/src/java/org/apache/ojb/broker/accesslayer/ReportQueryRsIterator.java
Index: ReportQueryRsIterator.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/ReportQueryRsIterator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ReportQueryRsIterator.java 16 Mar 2005 20:31:01 -0000 1.14
+++ ReportQueryRsIterator.java 13 Apr 2005 19:48:28 -0000 1.15
@@ -20,7 +20,7 @@
import java.sql.SQLException;
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.FieldDescriptor;
import org.apache.ojb.broker.query.ReportQuery;
@@ -42,7 +42,7 @@
/**
* Constructor for ReportQueryRsIterator.
*/
- public ReportQueryRsIterator(RsQueryObject queryObject,
PersistenceBrokerImpl broker)
+ public ReportQueryRsIterator(RsQueryObject queryObject,
PersistenceBrokerInternal broker)
{
super(queryObject, broker);
try
1.37 +3 -3
db-ojb/src/java/org/apache/ojb/broker/accesslayer/CollectionPrefetcher.java
Index: CollectionPrefetcher.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/CollectionPrefetcher.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- CollectionPrefetcher.java 12 Apr 2005 20:53:20 -0000 1.36
+++ CollectionPrefetcher.java 13 Apr 2005 19:48:28 -0000 1.37
@@ -29,7 +29,7 @@
import org.apache.ojb.broker.ManageableCollection;
import org.apache.ojb.broker.OJBRuntimeException;
import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.core.proxy.CollectionProxy;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.CollectionDescriptor;
@@ -59,7 +59,7 @@
* @param aBroker
* @param anOrd
*/
- public CollectionPrefetcher(PersistenceBrokerImpl aBroker,
ObjectReferenceDescriptor anOrd)
+ public CollectionPrefetcher(PersistenceBrokerInternal aBroker,
ObjectReferenceDescriptor anOrd)
{
super(aBroker, anOrd);
}
1.24 +4 -4
db-ojb/src/java/org/apache/ojb/broker/accesslayer/ReferencePrefetcher.java
Index: ReferencePrefetcher.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/ReferencePrefetcher.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ReferencePrefetcher.java 6 Jan 2005 21:00:00 -0000 1.23
+++ ReferencePrefetcher.java 13 Apr 2005 19:48:28 -0000 1.24
@@ -24,8 +24,8 @@
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.IdentityFactory;
import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.cache.LocalCache;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.FieldDescriptor;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
@@ -47,7 +47,7 @@
* @param aBroker
* @param anOrd
*/
- public ReferencePrefetcher(PersistenceBrokerImpl aBroker,
ObjectReferenceDescriptor anOrd)
+ public ReferencePrefetcher(PersistenceBrokerInternal aBroker,
ObjectReferenceDescriptor anOrd)
{
super(aBroker, anOrd);
}
@@ -116,7 +116,7 @@
Object[] fkValues;
Object owner;
Identity id;
- PersistenceBrokerImpl pb = getBroker();
+ PersistenceBrokerInternal pb = getBroker();
LocalCache cache = pb.ojbLocalCache();
IdentityFactory idFactory = pb.serviceIdentity();
1.12 +4 -4
db-ojb/src/java/org/apache/ojb/broker/accesslayer/SqlBasedReportQueryRsIterator.java
Index: SqlBasedReportQueryRsIterator.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/SqlBasedReportQueryRsIterator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SqlBasedReportQueryRsIterator.java 4 Apr 2004 23:53:31 -0000
1.11
+++ SqlBasedReportQueryRsIterator.java 13 Apr 2005 19:48:28 -0000
1.12
@@ -19,13 +19,13 @@
import java.sql.SQLException;
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.util.JdbcTypesHelper;
/**
* ReporQueryRsIterator based on SQL-Statement
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Jakob Braeuchi</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jakob Braeuchi</a>
* @version $Id$
*/
public class SqlBasedReportQueryRsIterator extends SqlBasedRsIterator
@@ -36,7 +36,7 @@
/**
* SqlBasedRsIterator constructor.
*/
- public SqlBasedReportQueryRsIterator(RsQueryObject queryObject,
PersistenceBrokerImpl broker)
+ public SqlBasedReportQueryRsIterator(RsQueryObject queryObject,
PersistenceBrokerInternal broker)
throws PersistenceBrokerException
{
1.2 +7 -12
db-ojb/src/java/org/apache/ojb/broker/accesslayer/ReportRsIteratorFactoryImpl.java
Index: ReportRsIteratorFactoryImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/ReportRsIteratorFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReportRsIteratorFactoryImpl.java 11 Aug 2004 00:42:53 -0000 1.1
+++ ReportRsIteratorFactoryImpl.java 13 Apr 2005 19:48:28 -0000 1.2
@@ -15,37 +15,32 @@
* limitations under the License.
*/
-import org.apache.ojb.broker.accesslayer.ReportQueryRsIterator;
-import org.apache.ojb.broker.accesslayer.RsIterator;
-import org.apache.ojb.broker.accesslayer.RsQueryObject;
-import org.apache.ojb.broker.accesslayer.SqlBasedReportQueryRsIterator;
-import org.apache.ojb.broker.accesslayer.RsIteratorFactory;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryBySQL;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
/**
* Factory for creation of [EMAIL PROTECTED] RsIterator} instances based on
report queries.
*
* @see RsIteratorFactoryFactory
- * @author <a href="mailto:[EMAIL PROTECTED]">Jakob Braeuchi</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jakob Braeuchi</a>
* @version $Id$
*/
class ReportRsIteratorFactoryImpl implements RsIteratorFactory
{
/**
- * @see
org.apache.ojb.broker.accesslayer.RsIteratorFactory#createRsIterator(Query,
ClassDescriptor, org.apache.ojb.broker.core.PersistenceBrokerImpl)
+ * @see
org.apache.ojb.broker.accesslayer.RsIteratorFactory#createRsIterator(Query,
ClassDescriptor, org.apache.ojb.broker.core.PersistenceBrokerInternal)
*/
- public RsIterator createRsIterator(Query query, ClassDescriptor cld,
PersistenceBrokerImpl broker)
+ public RsIterator createRsIterator(Query query, ClassDescriptor cld,
PersistenceBrokerInternal broker)
{
return new ReportQueryRsIterator(RsQueryObject.get(cld, query),
broker);
}
/**
- * @see
org.apache.ojb.broker.accesslayer.RsIteratorFactory#createRsIterator(org.apache.ojb.broker.query.QueryBySQL,
ClassDescriptor, PersistenceBrokerImpl)
+ * @see
org.apache.ojb.broker.accesslayer.RsIteratorFactory#createRsIterator(org.apache.ojb.broker.query.QueryBySQL,
ClassDescriptor, org.apache.ojb.broker.core.PersistenceBrokerInternal)
*/
- public RsIterator createRsIterator(QueryBySQL query, ClassDescriptor
cld, PersistenceBrokerImpl broker)
+ public RsIterator createRsIterator(QueryBySQL query, ClassDescriptor
cld, PersistenceBrokerInternal broker)
{
return new SqlBasedReportQueryRsIterator(RsQueryObject.get(cld,
query), broker);
}
1.2 +5 -6
db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIteratorFactory.java
Index: RsIteratorFactory.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIteratorFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RsIteratorFactory.java 11 Aug 2004 00:42:53 -0000 1.1
+++ RsIteratorFactory.java 13 Apr 2005 19:48:28 -0000 1.2
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-import org.apache.ojb.broker.accesslayer.RsIterator;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryBySQL;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
/**
* Interface for RsIteratorFactory
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Jakob Braeuchi</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jakob Braeuchi</a>
* @version $Id$
*/
public interface RsIteratorFactory
@@ -32,10 +31,10 @@
/**
* Create a RsIterator based on a Query
*/
- RsIterator createRsIterator(Query query, ClassDescriptor cld,
PersistenceBrokerImpl broker);
+ RsIterator createRsIterator(Query query, ClassDescriptor cld,
PersistenceBrokerInternal broker);
/**
* Create a RsIterator based on a SQL-Statement
*/
- RsIterator createRsIterator(QueryBySQL query, ClassDescriptor cld,
PersistenceBrokerImpl broker);
+ RsIterator createRsIterator(QueryBySQL query, ClassDescriptor cld,
PersistenceBrokerInternal broker);
}
1.16 +3 -3
db-ojb/src/java/org/apache/ojb/broker/accesslayer/RelationshipPrefetcherImpl.java
Index: RelationshipPrefetcherImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RelationshipPrefetcherImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RelationshipPrefetcherImpl.java 6 Jan 2005 21:00:00 -0000 1.15
+++ RelationshipPrefetcherImpl.java 13 Apr 2005 19:48:28 -0000 1.16
@@ -17,7 +17,7 @@
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.core.ValueContainer;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
@@ -38,7 +38,7 @@
/**
* Constructor for RelationshipPrefetcherImpl.
*/
- public RelationshipPrefetcherImpl(PersistenceBrokerImpl aBroker,
ObjectReferenceDescriptor anOrd)
+ public RelationshipPrefetcherImpl(PersistenceBrokerInternal aBroker,
ObjectReferenceDescriptor anOrd)
{
super(aBroker, anOrd.getItemClassDescriptor());
objectReferenceDescriptor = anOrd;
1.21 +3 -3
db-ojb/src/java/org/apache/ojb/broker/accesslayer/MtoNCollectionPrefetcher.java
Index: MtoNCollectionPrefetcher.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/MtoNCollectionPrefetcher.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MtoNCollectionPrefetcher.java 13 Apr 2005 19:19:38 -0000 1.20
+++ MtoNCollectionPrefetcher.java 13 Apr 2005 19:48:28 -0000 1.21
@@ -27,8 +27,8 @@
import org.apache.ojb.broker.IdentityFactory;
import org.apache.ojb.broker.ManageableCollection;
import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
import org.apache.ojb.broker.core.proxy.CollectionProxy;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.CollectionDescriptor;
@@ -53,7 +53,7 @@
* @param aBroker the PersistenceBroker
* @param anOrd the CollectionDescriptor
*/
- public MtoNCollectionPrefetcher(PersistenceBrokerImpl aBroker,
ObjectReferenceDescriptor anOrd)
+ public MtoNCollectionPrefetcher(PersistenceBrokerInternal aBroker,
ObjectReferenceDescriptor anOrd)
{
super(aBroker, anOrd);
}
1.12 +4 -4
db-ojb/src/java/org/apache/ojb/broker/accesslayer/PlainPrefetcher.java
Index: PlainPrefetcher.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/PlainPrefetcher.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PlainPrefetcher.java 2 Apr 2005 09:44:39 -0000 1.11
+++ PlainPrefetcher.java 13 Apr 2005 19:48:28 -0000 1.12
@@ -24,8 +24,8 @@
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.cache.LocalCache;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
import org.apache.ojb.broker.core.proxy.IndirectionHandler;
import org.apache.ojb.broker.query.Query;
@@ -38,7 +38,7 @@
public class PlainPrefetcher extends BasePrefetcher
{
- public PlainPrefetcher(PersistenceBrokerImpl aBroker, Class anItemClass)
+ public PlainPrefetcher(PersistenceBrokerInternal aBroker, Class
anItemClass)
{
super(aBroker, anItemClass);
}
@@ -103,7 +103,7 @@
Class realClass;
HashMap classToIds = new HashMap();
Class topLevelClass = getItemClassDescriptor().getClassOfObject();
- PersistenceBrokerImpl pb = getBroker();
+ PersistenceBrokerInternal pb = getBroker();
LocalCache cache = pb.ojbLocalCache();
for (Iterator it = proxies.iterator(); it.hasNext(); )
1.15 +7 -7
db-ojb/src/java/org/apache/ojb/broker/accesslayer/BasePrefetcher.java
Index: BasePrefetcher.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/BasePrefetcher.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BasePrefetcher.java 13 Apr 2005 19:19:38 -0000 1.14
+++ BasePrefetcher.java 13 Apr 2005 19:48:28 -0000 1.15
@@ -20,7 +20,7 @@
import java.util.Iterator;
import org.apache.ojb.broker.Identity;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+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;
@@ -39,14 +39,14 @@
public abstract class BasePrefetcher implements RelationshipPrefetcher
{
private Logger logger;
- private PersistenceBrokerImpl broker;
+ private PersistenceBrokerInternal broker;
protected ClassDescriptor itemClassDesc;
protected final int pkLimit; // max number of pk's in one query
/**
* Constructor for BasePrefetcher.
*/
- public BasePrefetcher(PersistenceBrokerImpl aBroker, Class anItemClass)
+ public BasePrefetcher(PersistenceBrokerInternal aBroker, Class
anItemClass)
{
this(aBroker,
aBroker.getDescriptorRepository().getDescriptorFor(anItemClass));
}
@@ -54,7 +54,7 @@
/**
* Constructor for BasePrefetcher.
*/
- public BasePrefetcher(PersistenceBrokerImpl aBroker, ClassDescriptor
anItemCld)
+ public BasePrefetcher(PersistenceBrokerInternal aBroker, ClassDescriptor
anItemCld)
{
super();
broker = aBroker;
@@ -231,9 +231,9 @@
/**
* Returns the broker.
- * @return PersistenceBrokerImpl
+ * @return PersistenceBrokerInternal
*/
- protected PersistenceBrokerImpl getBroker()
+ protected PersistenceBrokerInternal getBroker()
{
return broker;
}
1.24 +3 -3
db-ojb/src/java/org/apache/ojb/broker/accesslayer/SqlBasedRsIterator.java
Index: SqlBasedRsIterator.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/SqlBasedRsIterator.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SqlBasedRsIterator.java 4 Apr 2004 23:53:31 -0000 1.23
+++ SqlBasedRsIterator.java 13 Apr 2005 19:48:28 -0000 1.24
@@ -17,7 +17,7 @@
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
/**
* RsIterator based on SQL-Statement
@@ -30,7 +30,7 @@
/**
* SqlBasedRsIterator constructor.
*/
- public SqlBasedRsIterator(RsQueryObject queryObject,
PersistenceBrokerImpl broker)
+ public SqlBasedRsIterator(RsQueryObject queryObject,
PersistenceBrokerInternal broker)
throws PersistenceBrokerException
{
super(queryObject, broker);
1.73 +6 -5
db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIterator.java
Index: RsIterator.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIterator.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- RsIterator.java 1 Apr 2005 20:28:09 -0000 1.72
+++ RsIterator.java 13 Apr 2005 19:48:28 -0000 1.73
@@ -31,6 +31,7 @@
import org.apache.ojb.broker.PBStateEvent;
import org.apache.ojb.broker.PBStateListener;
import org.apache.ojb.broker.PersistenceBrokerException;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.PersistenceBrokerSQLException;
import org.apache.ojb.broker.cache.LocalCache;
import org.apache.ojb.broker.core.PersistenceBrokerImpl;
@@ -91,7 +92,7 @@
/**
* reference to the PersistenceBroker
*/
- private PersistenceBrokerImpl m_broker;
+ private PersistenceBrokerInternal m_broker;
/**
* the underlying resultset
@@ -155,7 +156,7 @@
* @param queryObject query object
* @param broker the broker we should use.
*/
- public RsIterator(RsQueryObject queryObject, final PersistenceBrokerImpl
broker)
+ public RsIterator(RsQueryObject queryObject, final
PersistenceBrokerInternal broker)
{
setCache(broker.ojbLocalCache());
setRow(new HashMap());
@@ -860,12 +861,12 @@
return getQueryObject().getClassDescriptor();
}
- protected void setBroker(PersistenceBrokerImpl broker)
+ protected void setBroker(PersistenceBrokerInternal broker)
{
m_broker = broker;
}
- protected PersistenceBrokerImpl getBroker()
+ protected PersistenceBrokerInternal getBroker()
{
return m_broker;
}
1.2 +4 -8
db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIteratorFactoryImpl.java
Index: RsIteratorFactoryImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIteratorFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RsIteratorFactoryImpl.java 11 Aug 2004 00:42:53 -0000 1.1
+++ RsIteratorFactoryImpl.java 13 Apr 2005 19:48:28 -0000 1.2
@@ -15,14 +15,10 @@
* limitations under the License.
*/
-import org.apache.ojb.broker.accesslayer.RsIterator;
-import org.apache.ojb.broker.accesslayer.SqlBasedRsIterator;
-import org.apache.ojb.broker.accesslayer.RsQueryObject;
-import org.apache.ojb.broker.accesslayer.RsIteratorFactory;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryBySQL;
-import org.apache.ojb.broker.core.PersistenceBrokerImpl;
/**
* Factory for creation of RsIterator instances.
@@ -37,7 +33,7 @@
/**
* @see
org.apache.ojb.broker.accesslayer.RsIteratorFactory#createRsIterator(Query,
ClassDescriptor, org.apache.ojb.broker.core.PersistenceBrokerImpl)
*/
- public RsIterator createRsIterator(Query query, ClassDescriptor cld,
PersistenceBrokerImpl broker)
+ public RsIterator createRsIterator(Query query, ClassDescriptor cld,
PersistenceBrokerInternal broker)
{
return new RsIterator(RsQueryObject.get(cld, query), broker);
}
@@ -46,7 +42,7 @@
* @see
org.apache.ojb.broker.accesslayer.RsIteratorFactory#createRsIterator
* (org.apache.ojb.broker.query.QueryBySQL,
org.apache.ojb.broker.metadata.ClassDescriptor,
org.apache.ojb.broker.core.PersistenceBrokerImpl))
*/
- public RsIterator createRsIterator(QueryBySQL query, ClassDescriptor
cld, PersistenceBrokerImpl broker)
+ public RsIterator createRsIterator(QueryBySQL query, ClassDescriptor
cld, PersistenceBrokerInternal broker)
{
return new SqlBasedRsIterator(RsQueryObject.get(cld, query),
broker);
}
1.20 +25 -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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DelegatingPersistenceBroker.java 13 Apr 2005 19:19:38 -0000 1.19
+++ DelegatingPersistenceBroker.java 13 Apr 2005 19:48:28 -0000 1.20
@@ -28,6 +28,7 @@
import org.apache.ojb.broker.accesslayer.StatementManagerIF;
import org.apache.ojb.broker.accesslayer.batch.BatchManager;
import org.apache.ojb.broker.accesslayer.sql.SqlGenerator;
+import org.apache.ojb.broker.cache.LocalCache;
import org.apache.ojb.broker.cache.ObjectCache;
import org.apache.ojb.broker.core.proxy.ProxyFactory;
import org.apache.ojb.broker.metadata.ClassDescriptor;
@@ -434,4 +435,28 @@
{
getBroker().destroy();
}
+
+ /**
+ * @see
org.apache.ojb.broker.PersistenceBrokerInternal#getReferenceBroker()
+ */
+ public QueryReferenceBroker getReferenceBroker()
+ {
+ return getBroker().getReferenceBroker();
+ }
+
+ /**
+ * @see org.apache.ojb.broker.PersistenceBrokerInternal#ojbLocalCache()
+ */
+ public LocalCache ojbLocalCache()
+ {
+ return getBroker().ojbLocalCache();
+ }
+
+ /**
+ * @see
org.apache.ojb.broker.PersistenceBrokerInternal#refreshRelationships(java.lang.Object,
org.apache.ojb.broker.metadata.ClassDescriptor)
+ */
+ public void refreshRelationships(Object obj, ClassDescriptor cld)
+ {
+ getBroker().refreshRelationships(obj, cld);
+ }
}
1.7 +23 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PersistenceBrokerInternal.java 13 Apr 2005 19:19:38 -0000 1.6
+++ PersistenceBrokerInternal.java 13 Apr 2005 19:48:28 -0000 1.7
@@ -2,6 +2,8 @@
import org.apache.ojb.broker.accesslayer.RowReader;
import org.apache.ojb.broker.accesslayer.batch.BatchManager;
+import org.apache.ojb.broker.cache.LocalCache;
+import org.apache.ojb.broker.core.QueryReferenceBroker;
import org.apache.ojb.broker.core.proxy.ProxyFactory;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.query.QueryFactoryNew;
@@ -97,4 +99,24 @@
*/
public QueryFactoryNew getQueryFactory();
+ /**
+ * Answer the ReferenceBroker.
+ * @return QueryReferenceBroker
+ */
+ public QueryReferenceBroker getReferenceBroker();
+
+ /**
+ * Answer the Local Cache.
+ * @return LocalCache
+ */
+ public LocalCache ojbLocalCache();
+
+ /**
+ * Refresh Relationships
+ * @throws PersistenceBrokerException if there is a error refreshing
collections or references
+ * @param obj the owner of the Relationships
+ * @param cld tha ClassDescriptor of obj
+ */
+ public void refreshRelationships(Object obj, ClassDescriptor cld);
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
