db-ojb-dev mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=428996&view=rev
Log:
rollback wrong checkin

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=428996&r1=428995&r2=428996&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:35:33 2006
@@ -30,6 +30,7 @@
 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;
@@ -90,7 +91,7 @@
     /**
      * Creates a new OJB runtime that uses the given container, or more
      * precisely a child container of it.
-     * 
+     *
      * @param container The container
      * @param loadConf  Whether to load the configuration properties from
      *                  the OJB.properties file
@@ -103,8 +104,8 @@
 
     /**
      * Initializes the static part of the runtime system, e.g. sets default mappings
-     * and loads the properties from an external file (if requested). 
-     * 
+     * and loads the properties from an external file (if requested).
+     *
      * @param loadConf Whether to load the configuration from an external file
      */
     private void initStaticSystem(boolean loadConf)
@@ -165,7 +166,7 @@
      * Returns the value of a configuration property. Note that using this method does not
result in the
      * initialization of the runtime. This means that the properties may not have been loaded
yet from
      * the OJB.properties file.
-     * 
+     *
      * @param name The property name
      * @return The property value
      */
@@ -177,7 +178,7 @@
     /**
      * Sets a configuration property. Note that this is only possible prior to using
      * any OJB functionality, e.g. accessing the persistence configuration or broker.
-     * 
+     *
      * @param name  The property name
      * @param value The property value
      * @param force Whether to override an existing value
@@ -193,7 +194,7 @@
 
     /**
      * Returns the component container.
-     * 
+     *
      * @return The container
      */
     public ComponentContainer getComponentContainer()
@@ -209,7 +210,7 @@
 
     /**
      * Returns the proxy factory.
-     * 
+     *
      * @return The proxy factory
      */
     public ProxyFactory getProxyFactory()
@@ -346,7 +347,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.getJdbcConnectionDescriptor().getObjectCacheDescriptor());
+        CachingManager cm = new CachingManager(conf);
         conf.setCachingManager(cm);
         return conf;
     }
@@ -427,7 +428,7 @@
      * @return A {@link PersistenceBroker} instance obtained from the
      * {@link org.apache.ojb.broker.core.PersistenceBrokerFactoryIF}.
      */
-    public PersistenceBrokerInternal lookupBroker()
+    public PersistenceBroker lookupBroker()
     {
         initDynamicSystem();
         return lookupBroker(metadataManager.getDefaultPBKey());
@@ -439,7 +440,7 @@
      * @param key The {@link PBKey} to determine the {@link org.apache.ojb.broker.PersistenceConfiguration}
      * @return The broker instance for the specified configuration.
      */
-    public PersistenceBrokerInternal lookupBroker(PBKey key)
+    public PersistenceBroker 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