db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject svn commit: r428995 - /db/ojb/trunk/src/java/org/apache/ojb/broker/OJB.java
Date Sat, 05 Aug 2006 12:31:13 GMT
Author: arminw
Date: Sat Aug  5 05:31:12 2006
New Revision: 428995

URL: http://svn.apache.org/viewvc?rev=428995&view=rev
Log:
remove jdori based JDO 1.0 prototype

Modified:
    db/ojb/trunk/src/java/org/apache/ojb/broker/OJB.java

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/OJB.java
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/java/org/apache/ojb/broker/OJB.java?rev=428995&r1=428994&r2=428995&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/OJB.java (original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/OJB.java Sat Aug  5 05:31:12 2006
@@ -30,7 +30,6 @@
 import org.apache.ojb.broker.core.proxy.SetProxy;
 import org.apache.ojb.broker.locking.LockManager;
 import org.apache.ojb.broker.metadata.MetadataManager;
-import org.apache.ojb.broker.metadata.ObjectCacheDescriptor;
 import org.apache.ojb.broker.metadata.PersistenceConfigurationDescriptor;
 import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
 import org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldFactory;
@@ -347,7 +346,7 @@
         3. many models for the same JCD --> Different CachingManager for each model, but
invalidation
            of cached objects one another CachingManager#registerForObjectInvalidation)
         */
-        CachingManager cm = new CachingManager(conf);
+        CachingManager cm = new CachingManager(conf.getJdbcConnectionDescriptor().getObjectCacheDescriptor());
         conf.setCachingManager(cm);
         return conf;
     }
@@ -428,7 +427,7 @@
      * @return A {@link PersistenceBroker} instance obtained from the
      * {@link org.apache.ojb.broker.core.PersistenceBrokerFactoryIF}.
      */
-    public PersistenceBroker lookupBroker()
+    public PersistenceBrokerInternal lookupBroker()
     {
         initDynamicSystem();
         return lookupBroker(metadataManager.getDefaultPBKey());
@@ -440,7 +439,7 @@
      * @param key The {@link PBKey} to determine the {@link org.apache.ojb.broker.PersistenceConfiguration}
      * @return The broker instance for the specified configuration.
      */
-    public PersistenceBroker lookupBroker(PBKey key)
+    public PersistenceBrokerInternal lookupBroker(PBKey key)
     {
         initDynamicSystem();
         try



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