Some minor simplifications to ComponentContainer: removed some unnecessary overloaded methods.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561757 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/base/src/org/ofbiz/base/container/ComponentContainer.java b/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
index 2516f27..93b4c3b 100644
--- a/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
+++ b/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
@@ -102,10 +102,6 @@
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 @@
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;
- }
}
diff --git a/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java b/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
index 38ea86f..c9bc2c9 100644
--- a/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
+++ b/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
@@ -35,7 +35,8 @@
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) {
