You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2014/01/27 18:19:52 UTC

svn commit: r1561757 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base/container: ComponentContainer.java JustLoadComponentsContainer.java

Author: jacopoc
Date: Mon Jan 27 17:19:52 2014
New Revision: 1561757

URL: http://svn.apache.org/r1561757
Log:
Some minor simplifications to ComponentContainer: removed some unnecessary overloaded methods. 

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=1561757&r1=1561756&r2=1561757&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Mon Jan 27 17:19:52 2014
@@ -102,10 +102,6 @@ public class ComponentContainer implemen
         return true;
     }
 
-    public synchronized void loadComponents(String loaderConfig, boolean updateClasspath) throws AlreadyLoadedException, ComponentException {
-        loadComponents(loaderConfig, updateClasspath, null, null);
-    }
-
     public synchronized void loadComponents(String loaderConfig, boolean updateClasspath, String instrumenterClassName, String instrumenterFile) throws AlreadyLoadedException, ComponentException {
         // set the loaded list; and fail if already loaded
         //if (loadedComponents == null) {
@@ -303,16 +299,4 @@ public class ComponentContainer implemen
         return name;
     }
 
-    /**
-     * Static method for easy loading of components for use when the container system is not.
-     *
-     * @param updateClasspath Tells the component loader to update the classpath, and thread classloader
-     * @throws AlreadyLoadedException
-     * @throws ComponentException
-     */
-    public static synchronized void loadComponents(boolean updateClasspath) throws AlreadyLoadedException, ComponentException {
-        ComponentContainer cc = new ComponentContainer();
-        cc.loadComponents(null, updateClasspath);
-        cc = null;
-    }
 }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java?rev=1561757&r1=1561756&r2=1561757&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java Mon Jan 27 17:19:52 2014
@@ -35,7 +35,8 @@ public class JustLoadComponentsContainer
     public void init(String[] args, String name, String configFile) {
         this.name = name;
         try {
-            ComponentContainer.loadComponents(true);
+            ComponentContainer cc = new ComponentContainer();
+            cc.loadComponents(null, true, null, null);
         } catch (AlreadyLoadedException e) {
             Debug.logError(e, module);
         } catch (ComponentException e) {