svn commit: r615806 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ openjpa-persistence/src/main/java/org/apache/openjpa/persistence/

[fancy]

Author: fancy
Date: Mon Jan 28 01:36:42 2008
New Revision: 615806

URL: http://svn.apache.org/viewvc?rev=615806&view=rev
Log:
OPENJPA-477 no need to make changes to BootStrap, StateManagerImpl and 
PersistenceProviderImpl.
These files are restored to their previous version.

Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
    
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java?rev=615806&r1=615805&r2=615806&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java
 Mon Jan 28 01:36:42 2008
@@ -39,7 +39,7 @@
  */
 public class Bootstrap {
 
-    protected static final Class[] FACTORY_ARGS =
+    private static final Class[] FACTORY_ARGS =
         new Class[]{ ConfigurationProvider.class };
 
     private static Localizer s_loc = Localizer.forPackage(Bootstrap.class);
@@ -124,7 +124,7 @@
         return (BrokerFactory) meth.invoke(null, new Object[]{ conf });
     }
 
-    protected static String getFactoryClassName(ConfigurationProvider conf,
+    private static String getFactoryClassName(ConfigurationProvider conf,
         ClassLoader loader) {
         try {
             return getFactoryClass(conf, loader).getName();

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=615806&r1=615805&r2=615806&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
 Mon Jan 28 01:36:42 2008
@@ -3001,7 +3001,7 @@
     /**
      * Mark the field as loaded or unloaded.
      */
-    public void setLoaded(int field, boolean isLoaded) {
+    private void setLoaded(int field, boolean isLoaded) {
         // don't continue if loaded state is already correct; otherwise we
         // can end up clearing _fieldImpl when we shouldn't
         if (_loaded.get(field) == isLoaded)

Modified: 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java?rev=615806&r1=615805&r2=615806&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
 Mon Jan 28 01:36:42 2008
@@ -71,7 +71,7 @@
      */
     public OpenJPAEntityManagerFactory createEntityManagerFactory(String name,
         String resource, Map m) {
-        PersistenceProductDerivation pd = newPersistenceProductDerivation();
+        PersistenceProductDerivation pd = new PersistenceProductDerivation();
         try {
             Object poolValue = Configurations.removeProperty(EMF_POOL, m);
             ConfigurationProvider cp = pd.load(resource, name, m);
@@ -99,7 +99,7 @@
         }
         
         if (poolValue == null || !((Boolean) poolValue).booleanValue())
-            return newBrokerFactory(cp, loader);
+            return Bootstrap.newBrokerFactory(cp, loader);
         else
             return Bootstrap.getBrokerFactory(cp, loader);
     }
@@ -199,19 +199,4 @@
             return _trans.transform(cl, name, previousVersion, pd, bytes);
         }
        }
-
-    /**
-     * Return a persistence product deviration with default setting.
-     */
-    public PersistenceProductDerivation newPersistenceProductDerivation() {
-        return new PersistenceProductDerivation();
-    }
-
-    /**
-     * Return a broker factory for the given configuration and class loader.
-     */
-    public BrokerFactory newBrokerFactory(ConfigurationProvider cp,
-        ClassLoader loader) {
-        return Bootstrap.newBrokerFactory(cp, loader);
-    }
 }