svn commit: r1360681 - in /ofbiz/trunk/framework/base: dtd/ofbiz-containers.xsd src/org/ofbiz/base/container/ContainerConfig.java src/org/ofbiz/base/container/ContainerLoader.java

[jacopoc]

Author: jacopoc
Date: Thu Jul 12 13:50:25 2012
New Revision: 1360681

URL: http://svn.apache.org/viewvc?rev=1360681&view=rev
Log:
Removed "loader" element and all supporting code that I had recently introduced and that it is no more needed now that I have completed (in rev. 1360637) the support to set loader profiles in the startup properties.

Modified:
    ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd
    ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java

Modified: ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd?rev=1360681&r1=1360680&r2=1360681&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd (original)
+++ ofbiz/trunk/framework/base/dtd/ofbiz-containers.xsd Thu Jul 12 13:50:25 2012
@@ -21,19 +21,10 @@ under the License.
     <xs:element name="ofbiz-containers">
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="loader"/>
                 <xs:element maxOccurs="unbounded" ref="container"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:element name="loader">
-        <xs:complexType>
-            <xs:attributeGroup ref="attlist.loader"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.loader">
-        <xs:attribute type="xs:string" name="name" use="required"/>
-    </xs:attributeGroup>
     <xs:element name="container">
         <xs:complexType>
             <xs:sequence>

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java?rev=1360681&r1=1360680&r2=1360681&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerConfig.java Thu Jul 12 13:50:25 2012
@@ -49,29 +49,6 @@ public class ContainerConfig {
     @LockedBy("ContainerConfig.class")
     private static Map<String, Container> containers = new LinkedHashMap<String, Container>();
 
-    public static List<String> getLoaders(String configFile) throws ContainerException {
-        URL xmlUrl = UtilURL.fromResource(configFile);
-        if (xmlUrl == null) {
-            throw new ContainerException("Could not find container config file " + configFile);
-        }
-        Document containerDocument = null;
-        try {
-            containerDocument = UtilXml.readXmlDocument(xmlUrl, true);
-        } catch (SAXException e) {
-            throw new ContainerException("Error reading the container config file: " + xmlUrl, e);
-        } catch (ParserConfigurationException e) {
-            throw new ContainerException("Error reading the container config file: " + xmlUrl, e);
-        } catch (IOException e) {
-            throw new ContainerException("Error reading the container config file: " + xmlUrl, e);
-        }
-        Element root = containerDocument.getDocumentElement();
-        List<String> result = new ArrayList<String>();
-        for (Element curElement: UtilXml.childElementList(root, "loader")) {
-            result.add(curElement.getAttribute("name"));
-        }
-        return result;
-    }
-
     public static Container getContainer(String containerName, String configFile) throws ContainerException {
         Container container = containers.get(containerName);
         if (container == null) {

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=1360681&r1=1360680&r2=1360681&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Thu Jul 12 13:50:25 2012
@@ -81,21 +81,12 @@ public class ContainerLoader implements
         // get this loader's configuration file
         this.configFile = config.containerConfig;
 
-        List<String> loaderProfiles = null;
+        List<String> loaders = null;
         for (Map loaderMap: config.loaders) {
             if (module.equals((String)loaderMap.get("class"))) {
-                loaderProfiles = StringUtil.split((String)loaderMap.get("profiles"), ",");
+                loaders = StringUtil.split((String)loaderMap.get("profiles"), ",");
             }
         }
-        List<String> loaders = null;
-        try {
-            loaders = ContainerConfig.getLoaders(configFile);
-        } catch (ContainerException e) {
-            throw new StartupException(e);
-        }
-        if (loaderProfiles != null) {
-            loaders.addAll(loaderProfiles);
-        }
 
         Debug.logInfo("[Startup] Loading containers from " + configFile + " for loaders " + loaders, module);
         Collection<ContainerConfig.Container> containers = null;