svn commit: r1617818 - in /ofbiz/trunk/framework/catalina: ofbiz-component.xml src/org/ofbiz/catalina/container/CatalinaContainer.java

[do...@apache.org]

Author: doogie
Date: Wed Aug 13 19:39:00 2014
New Revision: 1617818

URL: http://svn.apache.org/r1617818
Log:
Remove creation of any delegator instance when a catalina container
starts; nothing was ever using the saved delegator instance anyways.

Modified:
    ofbiz/trunk/framework/catalina/ofbiz-component.xml
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Modified: ofbiz/trunk/framework/catalina/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/ofbiz-component.xml?rev=1617818&r1=1617817&r2=1617818&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/catalina/ofbiz-component.xml Wed Aug 13 19:39:00 2014
@@ -28,7 +28,6 @@ under the License.
 
     <container name="catalina-container" loaders="main" class="org.ofbiz.catalina.container.CatalinaContainer">
         <!-- static configuration for tomcat -->
-        <property name="delegator-name" value="default"/>
         <property name="use-naming" value="false"/>
         <property name="debug" value="0"/>
         <property name="catalina-runtime-home" value="runtime/catalina"/>
@@ -186,7 +185,6 @@ under the License.
     </container>
     <container name="catalina-container-test" loaders="test" class="org.ofbiz.catalina.container.CatalinaContainer">
         <!-- static configuration for tomcat -->
-        <property name="delegator-name" value="default"/>
         <property name="use-naming" value="false"/>
         <property name="debug" value="0"/>
         <property name="catalina-runtime-home" value="runtime/catalina"/>

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1617818&r1=1617817&r2=1617818&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Wed Aug 13 19:39:00 2014
@@ -81,8 +81,6 @@ import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.SSLUtil;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
-import org.ofbiz.entity.Delegator;
-import org.ofbiz.entity.DelegatorFactory;
 import org.w3c.dom.Document;
 
 /*
@@ -151,7 +149,6 @@ public class CatalinaContainer implement
         SSLUtil.loadJsseProperties();
     }
 
-    protected Delegator delegator = null;
     protected Tomcat tomcat = null;
     protected Map<String, ContainerConfig.Container.Property> clusterConfig = new HashMap<String, ContainerConfig.Container.Property>();
     protected Map<String, Engine> engines = new HashMap<String, Engine>();
@@ -179,7 +176,6 @@ public class CatalinaContainer implement
         //int debug = ContainerConfig.getPropertyValue(cc, "debug", 0);
 
         // grab some global context settings
-        this.delegator = DelegatorFactory.getDelegator(ContainerConfig.getPropertyValue(cc, "delegator-name", "default"));
         this.contextReloadable = ContainerConfig.getPropertyValue(cc, "apps-context-reloadable", false);
         this.crossContext = ContainerConfig.getPropertyValue(cc, "apps-cross-context", true);
         this.distribute = ContainerConfig.getPropertyValue(cc, "apps-distributable", true);