svn commit: r812692 [3/3] - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/shoppingcart/ applications/product/src/org/ofbiz/shipment/packing/ applications/product/src/org/ofbiz/shipment/verify/ applications/product/src/org/ofbiz/shipment/weigh...

[adrianc]

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java Tue Sep  8 20:56:14 2009
@@ -285,7 +285,7 @@
     public GenericDelegator getDelegator() {
         if (internalDelegator == null) {
             if (delegatorName == null) delegatorName = "default";
-            if (delegatorName != null) internalDelegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            if (delegatorName != null) internalDelegator = GenericDelegator.getGenericDelegator(delegatorName);
             if (internalDelegator == null) {
                 throw new IllegalStateException("[GenericEntity.getDelegator] could not find delegator with name " + delegatorName);
             }
@@ -300,7 +300,7 @@
         this.internalDelegator = internalDelegator;
     }
 
-    protected Object getFieldValue(String name) {
+    public Object get(String name) {
         if (getModelEntity().getField(name) == null) {
             throw new IllegalArgumentException("[GenericEntity.get] \"" + name + "\" is not a field of " + entityName);
         }
@@ -696,7 +696,7 @@
     public Object get(String name, String resource, Locale locale) {
         Object fieldValue = null;
         try {
-            fieldValue = getFieldValue(name);
+            fieldValue = get(name);
         } catch (IllegalArgumentException e) {
             if (Debug.verboseOn()) {
                 Debug.logVerbose(e, "The field name (or key) [" + name + "] is not valid for entity [" + this.getEntityName() + "], printing IllegalArgumentException instead of throwing it because Map interface specification does not allow throwing that exception.", module);
@@ -754,7 +754,7 @@
         while (iter != null && iter.hasNext()) {
             ModelField curField = iter.next();
             keyBuffer.append('.');
-            keyBuffer.append(this.getFieldValue(curField.getName()));
+            keyBuffer.append(this.get(curField.getName()));
         }
 
         String bundleKey = keyBuffer.toString();
@@ -1337,7 +1337,7 @@
 
     public Object get(Object key) {
         try {
-            return this.get((String)key, this.getDelegator().getLocale());
+            return this.get((String) key);
         } catch (IllegalArgumentException e) {
             if (Debug.verboseOn()) {
                 Debug.logVerbose(e, "The field name (or key) [" + key + "] is not valid for entity [" + this.getEntityName() + "], printing IllegalArgumentException instead of throwing it because Map interface specification does not allow throwing that exception.", module);

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractCache.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractCache.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractCache.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractCache.java Tue Sep  8 20:56:14 2009
@@ -19,7 +19,6 @@
 package org.ofbiz.entity.cache;
 
 import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 
 public abstract class AbstractCache<K, V> {
@@ -32,7 +31,7 @@
     }
 
     public GenericDelegator getDelegator() {
-        return DelegatorFactory.getGenericDelegator(delegatorName);
+        return GenericDelegator.getGenericDelegator(delegatorName);
     }
 
     public void remove(String entityName) {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java Tue Sep  8 20:56:14 2009
@@ -27,7 +27,6 @@
 import org.ofbiz.base.util.ObjectType;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.EntityCryptoException;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.entity.GenericEntityException;
@@ -254,7 +253,7 @@
         if (delegator == null) {
             // this will be the common case for now as the delegator isn't available where we want to do this
             // we'll cheat a little here and assume the default delegator
-            delegator = DelegatorFactory.getGenericDelegator("default");
+            delegator = GenericDelegator.getGenericDelegator("default");
         }
 
         String fieldName = null;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java Tue Sep  8 20:56:14 2009
@@ -32,7 +32,6 @@
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.FlexibleMapAccessor;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -137,7 +136,7 @@
             resultSetType = ResultSet.TYPE_FORWARD_ONLY;
 
         if (delegatorName != null && delegatorName.length() > 0) {
-            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
 
         EntityCondition whereEntityCondition = getWhereEntityCondition(context, modelEntity, delegator.getModelFieldTypeReader(modelEntity));

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Tue Sep  8 20:56:14 2009
@@ -35,7 +35,6 @@
 import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.jdbc.DatabaseUtil;
@@ -225,7 +224,7 @@
 
         String delegatorNameToUse = overrideDelegator != null ? overrideDelegator : delegatorName;
         String groupNameToUse = overrideGroup != null ? overrideGroup : entityGroupName;
-        GenericDelegator delegator = DelegatorFactory.getGenericDelegator(delegatorNameToUse);
+        GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorNameToUse);
         if (delegator == null) {
             throw new ContainerException("Invalid delegator name!");
         }

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java Tue Sep  8 20:56:14 2009
@@ -35,7 +35,6 @@
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.entity.GenericEntityException;
@@ -149,7 +148,7 @@
         // what to do with the delegatorName? this is the delegatorName to use in this service...
         String delegatorName = (String) context.get("delegatorName");
         if (UtilValidate.isNotEmpty(delegatorName)) {
-            this.delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
 
 

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java Tue Sep  8 20:56:14 2009
@@ -41,7 +41,6 @@
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.UtilURL;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.entity.GenericEntityException;
@@ -134,7 +133,7 @@
         GenericDelegator delegator = dctx.getDelegator();
         String overrideDelegatorName = (String) context.get("delegatorName");
         if (UtilValidate.isNotEmpty(overrideDelegatorName)) {
-            delegator = DelegatorFactory.getGenericDelegator(overrideDelegatorName);
+            delegator = GenericDelegator.getGenericDelegator(overrideDelegatorName);
             if (delegator == null) {
                 return ServiceUtil.returnError("Could not find delegator with specified name " + overrideDelegatorName);
             }

Modified: ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java (original)
+++ ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java Tue Sep  8 20:56:14 2009
@@ -29,7 +29,6 @@
 import org.ofbiz.base.container.ContainerConfig;
 import org.ofbiz.base.container.ContainerException;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.service.GenericDispatcher;
 import org.ofbiz.service.LocalDispatcher;
@@ -61,7 +60,7 @@
 
         // get the delegator
         String delegatorName = ContainerConfig.getPropertyValue(cc, "delegator-name", "default");
-        GenericDelegator delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+        GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorName);
 
         // get the dispatcher
         String dispatcherName = ContainerConfig.getPropertyValue(cc, "dispatcher-name", "xui-dispatcher");

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java Tue Sep  8 20:56:14 2009
@@ -26,7 +26,6 @@
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.FlexibleMapAccessor;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.finder.EntityFinderUtil.Condition;
@@ -102,7 +101,7 @@
             String delegatorName = this.delegatorNameExdr.expandString(context);
 
             if (delegatorName != null && delegatorName.length() > 0) {
-                delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+                delegator = GenericDelegator.getGenericDelegator(delegatorName);
             }
 
             ModelEntity modelEntity = delegator.getModelEntity(entityName);

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java Tue Sep  8 20:56:14 2009
@@ -28,7 +28,6 @@
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.util.EntityDataAssert;
 import org.ofbiz.entity.util.EntitySaxReader;
@@ -87,7 +86,7 @@
 
         GenericDelegator delegator = methodContext.getDelegator();
         if (delegatorName != null && delegatorName.length() > 0) {
-            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
 
         URL dataUrl = null;

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java Tue Sep  8 20:56:14 2009
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -88,7 +87,7 @@
 
         GenericDelegator delegator = methodContext.getDelegator();
         if (delegatorName != null && delegatorName.length() > 0) {
-            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
 
         try {

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java Tue Sep  8 20:56:14 2009
@@ -25,7 +25,6 @@
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.entity.GenericValue;
@@ -79,7 +78,7 @@
 
         GenericDelegator delegator = methodContext.getDelegator();
         if (delegatorName != null && delegatorName.length() > 0) {
-            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
 
         Map<String, ? extends Object> inMap = mapAcsr.get(methodContext);

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Tue Sep  8 20:56:14 2009
@@ -34,7 +34,6 @@
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.LRUMap;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -105,7 +104,7 @@
         try {
             GenericDelegator origDelegator = this.delegator;
             if (!this.delegator.getOriginalDelegatorName().equals(this.delegator.getDelegatorName())) {
-                origDelegator = DelegatorFactory.getGenericDelegator(this.delegator.getOriginalDelegatorName());
+                origDelegator = GenericDelegator.getGenericDelegator(this.delegator.getOriginalDelegatorName());
             }
             this.jm = JobManager.getInstance(origDelegator, enableJM);
         } catch (GeneralRuntimeException e) {
@@ -277,12 +276,11 @@
         // get eventMap once for all calls for speed, don't do event calls if it is null
         Map<String, List<ServiceEcaRule>> eventMap = ServiceEcaUtil.getServiceEventMap(modelService.name);
 
-        // setup the engine and context
-        DispatchContext ctx = localContext.get(localName);
-        GenericDelegator delegator = ctx.getDelegator();
+        // check the locale
         Locale locale = this.checkLocale(context);
-        delegator.setLocale(locale);
 
+        // setup the engine and context
+        DispatchContext ctx = localContext.get(localName);
         GenericEngine engine = this.getGenericEngine(modelService.engineName);
 
         // set IN attributes with default-value as applicable
@@ -358,7 +356,7 @@
 
                     // now that we have authed, if there is a userLogin, set the EE userIdentifier
                     if (userLogin != null && userLogin.getString("userLoginId") != null) {
-                        delegator.setUserIdentifier(userLogin.getString("userLoginId"));
+                        GenericDelegator.pushUserIdentifier(userLogin.getString("userLoginId"));
                     }
 
                     // pre-validate ECA
@@ -553,6 +551,9 @@
 
                 // call notifications -- event is determined from the result (success, error, fail)
                 modelService.evalNotifications(this.getLocalContext(localName), context, result);
+
+                // clear out the EE userIdentifier
+                GenericDelegator.popUserIdentifier();
             }
         } catch (GenericTransactionException te) {
             Debug.logError(te, "Problems with the transaction", module);

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java Tue Sep  8 20:56:14 2009
@@ -35,7 +35,6 @@
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.GenericEntityException;
@@ -86,7 +85,7 @@
         String delegatorName = ContainerConfig.getPropertyValue(cfg, "delegator-name", "default");
         this.deleteMail = "true".equals(ContainerConfig.getPropertyValue(cfg, "delete-mail", "false"));
 
-        this.delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+        this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
         this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
         this.timerDelay = (long) ContainerConfig.getPropertyValue(cfg, "poll-delay", 300000);
         this.maxSize = (long) ContainerConfig.getPropertyValue(cfg, "maxSize", 1000000); // maximum size in bytes

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java Tue Sep  8 20:56:14 2009
@@ -29,7 +29,6 @@
 import org.ofbiz.base.container.Container;
 import org.ofbiz.base.container.ContainerConfig;
 import org.ofbiz.base.container.ContainerException;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.service.GenericDispatcher;
 import org.ofbiz.service.LocalDispatcher;
@@ -121,7 +120,7 @@
         }
 
         // get the delegator for this container
-        GenericDelegator delegator = DelegatorFactory.getGenericDelegator(delegatorProp.value);
+        GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorProp.value);
 
         // create the LocalDispatcher
         LocalDispatcher dispatcher = GenericDispatcher.getLocalDispatcher(name, delegator);

Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java Tue Sep  8 20:56:14 2009
@@ -33,7 +33,6 @@
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.testtools.EntityTestCase;
 import org.ofbiz.service.GenericDispatcher;
@@ -69,7 +68,7 @@
         
         String uniqueSuffix = "-" + RandomStringUtils.randomAlphanumeric(10);
 
-        this.delegator = DelegatorFactory.getGenericDelegator(this.originalDelegatorName).makeTestDelegator(this.originalDelegatorName + uniqueSuffix);
+        this.delegator = GenericDelegator.getGenericDelegator(this.originalDelegatorName).makeTestDelegator(this.originalDelegatorName + uniqueSuffix);
         this.dispatcher = GenericDispatcher.getLocalDispatcher(originalDispatcherName + uniqueSuffix, delegator);
 
         for (Element testCaseElement : UtilXml.childElementList(mainElement, UtilMisc.toSet("test-case", "test-group"))) {

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Tue Sep  8 20:56:14 2009
@@ -50,7 +50,6 @@
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilObject;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.security.Security;
 import org.ofbiz.security.SecurityConfigurationException;
@@ -330,7 +329,7 @@
                 delegatorName = "default";
             }
             if (Debug.verboseOn()) Debug.logVerbose("Setup Entity Engine Delegator with name " + delegatorName, module);
-            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            delegator = GenericDelegator.getGenericDelegator(delegatorName);
             config.getServletContext().setAttribute("delegator", delegator);
             if (delegator == null) {
                 Debug.logError("[ContextFilter.init] ERROR: delegator factory returned null for delegatorName \"" + delegatorName + "\"", module);

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Tue Sep  8 20:56:14 2009
@@ -36,7 +36,6 @@
 import org.ofbiz.base.util.UtilJ2eeCompat;
 import org.ofbiz.base.util.UtilTimer;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.transaction.GenericTransactionException;
@@ -112,6 +111,11 @@
         GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
         //Debug.log("Cert Chain: " + request.getAttribute("javax.servlet.request.X509Certificate"), module);
 
+        // set the Entity Engine user info if we have a userLogin
+        if (userLogin != null) {
+            GenericDelegator.pushUserIdentifier(userLogin.getString("userLoginId"));
+        }
+
         // workaraound if we are in the root webapp
         String webappName = UtilHttp.getApplicationName(request);
 
@@ -144,7 +148,7 @@
         GenericDelegator delegator = null;
         String delegatorName = (String) session.getAttribute("delegatorName");
         if (UtilValidate.isNotEmpty(delegatorName)) {
-            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
         if (delegator == null) {
             delegator = (GenericDelegator) getServletContext().getAttribute("delegator");
@@ -190,15 +194,10 @@
         UtilHttp.setInitialRequestInfo(request);
         VisitHandler.getVisitor(request, response);
 
-        if (delegator != null) {
-            // set the GenericDelegator properties
-            String visitId = VisitHandler.getVisitId(session);
-            if (UtilValidate.isNotEmpty(visitId)) {
-                delegator.setSessionIdentifier(visitId);
-            }
-            if (userLogin != null) {
-                delegator.setUserIdentifier(userLogin.getString("userLoginId"));
-            }
+        // set the Entity Engine user info if we have a userLogin
+        String visitId = VisitHandler.getVisitId(session);
+        if (UtilValidate.isNotEmpty(visitId)) {
+            GenericDelegator.pushSessionIdentifier(visitId);
         }
 
         // display details on the servlet objects
@@ -311,6 +310,10 @@
             }
         }
         if (Debug.timingOn()) timer.timerString("[" + rname + "] Request Done", module);
+
+        // sanity check 2: make sure there are no user or session infos in the delegator, ie clear the thread
+        GenericDelegator.clearUserIdentifierStack();
+        GenericDelegator.clearSessionIdentifierStack();
     }
 
     /**

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Tue Sep  8 20:56:14 2009
@@ -107,8 +107,6 @@
             GenericValue userLogin, GenericDelegator delegator) throws RequestHandlerException {
 
         HttpSession session = request.getSession();
-        Locale locale = UtilHttp.getLocale(request);
-        delegator.setLocale(locale);
 
         // get the controllerConfig once for this method so we don't have to get it over and over inside the method
         ConfigXMLReader.ControllerConfig controllerConfig = this.getControllerConfig();
@@ -182,6 +180,7 @@
                 // If the request method was POST then return an error to avoid problems with XSRF where the request may have come from another machine/program and had the same session ID but was not encrypted as it should have been (we used to let it pass to not lose data since it was too late to protect that data anyway)
                 if (request.getMethod().equalsIgnoreCase("POST")) {
                     // we can't redirect with the body parameters, and for better security from XSRF, just return an error message
+                    Locale locale = UtilHttp.getLocale(request);
                     String errMsg = UtilProperties.getMessage("WebappUiLabels", "requestHandler.InsecureFormPostToSecureRequest", locale);
                     Debug.logError("Got a insecure (non-https) form POST to a secure (http) request [" + requestMap.uri + "], returning error", module);
 
@@ -388,6 +387,7 @@
                     // check to see if there is an "error" response, if so go there and make an request error message
                     if (requestMap.requestResponseMap.containsKey("error")) {
                         eventReturn = "error";
+                        Locale locale = UtilHttp.getLocale(request);
                         String errMsg = UtilProperties.getMessage("WebappUiLabels", "requestHandler.error_call_event", locale);
                         request.setAttribute("_ERROR_MESSAGE_", errMsg + ": " + e.toString());
                     } else {

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java Tue Sep  8 20:56:14 2009
@@ -43,7 +43,6 @@
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.entity.GenericValue;
@@ -118,7 +117,7 @@
             return "error";
         }
 
-        GenericDelegator delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+        GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorName);
 
         if (delegator == null) {
             String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.no_delegator_name_defined", locale);

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java Tue Sep  8 20:56:14 2009
@@ -32,7 +32,6 @@
 import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.service.GenericDispatcher;
 import org.ofbiz.service.GenericServiceException;
@@ -53,7 +52,7 @@
 
     public void init(ServletContext context) throws EventHandlerException {
         String delegatorName = context.getInitParameter("entityDelegatorName");
-        this.delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+        this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
         this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
     }
 

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java Tue Sep  8 20:56:14 2009
@@ -49,7 +49,6 @@
 import org.apache.xmlrpc.util.HttpUtil;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.GenericDispatcher;
@@ -75,7 +74,7 @@
 
     public void init(ServletContext context) throws EventHandlerException {
         String delegatorName = context.getInitParameter("entityDelegatorName");
-        this.delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+        this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
         this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
         this.setHandlerMapping(new ServiceRpcHandler());
 

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Tue Sep  8 20:56:14 2009
@@ -33,7 +33,6 @@
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -354,7 +353,7 @@
 
     public GenericDelegator getDelegator() {
         if (this.delegator == null) {
-            this.delegator = DelegatorFactory.getGenericDelegator(this.delegatorName);
+            this.delegator = GenericDelegator.getGenericDelegator(this.delegatorName);
         }
         // if still null, then we have a problem
         if (this.delegator == null) {

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java Tue Sep  8 20:56:14 2009
@@ -32,7 +32,6 @@
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -108,7 +107,7 @@
                         // first try the session attribute delegatorName
                         String delegatorName = (String) session.getAttribute("delegatorName");
                         if (UtilValidate.isNotEmpty(delegatorName)) {
-                            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+                            delegator = GenericDelegator.getGenericDelegator(delegatorName);
                         }
 
                         // then try the ServletContext attribute delegator, should always be there...
@@ -200,7 +199,7 @@
 
                         String delegatorName = (String) session.getAttribute("delegatorName");
                         if (delegator == null && UtilValidate.isNotEmpty(delegatorName)) {
-                            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+                            delegator = GenericDelegator.getGenericDelegator(delegatorName);
                         }
 
                         if (delegator == null) {

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java Tue Sep  8 20:56:14 2009
@@ -32,7 +32,6 @@
 
 import org.ofbiz.base.util.CachedClassLoader;
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.security.Security;
 import org.ofbiz.security.SecurityFactory;
@@ -68,7 +67,7 @@
             Thread.currentThread().setContextClassLoader(loader);
             ServletContext context = this.getServletContext();
             String delegatorName = context.getInitParameter("entityDelegatorName");
-            this.delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
             String dispatcherName = context.getInitParameter("localDispatcherName");
             this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.delegator);
             this.security = SecurityFactory.getInstance(this.delegator);

Modified: ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java (original)
+++ ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java Tue Sep  8 20:56:14 2009
@@ -33,7 +33,6 @@
 
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -60,7 +59,7 @@
         System.err.println(org.webslinger.commons.vfs.flat.FlatFileProvider.class);
         servletContext = config.getServletContext();
         String delegatorName = servletContext.getInitParameter("entityDelegatorName");
-        delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+        delegator = GenericDelegator.getGenericDelegator(delegatorName);
         String readerFiles = servletContext.getInitParameter("serviceReaderUrls");
         if (readerFiles != null) {
             for (String reader: CollectionUtil.split(readerFiles, ";")) {
@@ -104,7 +103,7 @@
     @Override
     protected void initializeContext(WebslingerServletContext context, Layout layout) throws Exception {
         OfbizLayout ofbizLayout = (OfbizLayout) layout;
-        GenericDelegator delegator = DelegatorFactory.getGenericDelegator(ofbizLayout.delegatorName);
+        GenericDelegator delegator = GenericDelegator.getGenericDelegator(ofbizLayout.delegatorName);
         context.setAttribute("delegator", delegator);
         context.setAttribute("dispatcher", new WebslingerGenericDispatcher(context, layout.getTarget(), delegator, globalReaderURLs));
         context.setAttribute("authz", AuthorizationFactory.getInstance(delegator));

Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Tue Sep  8 20:56:14 2009
@@ -62,7 +62,6 @@
 import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilProperties.UtilResourceBundle;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -350,7 +349,7 @@
         }
 
         String groupNameToUse = overrideGroup != null ? overrideGroup : "org.ofbiz";
-        GenericDelegator delegator = UtilValidate.isNotEmpty(overrideDelegator) ? DelegatorFactory.getGenericDelegator(overrideDelegator) : dctx.getDelegator();
+        GenericDelegator delegator = UtilValidate.isNotEmpty(overrideDelegator) ? GenericDelegator.getGenericDelegator(overrideDelegator) : dctx.getDelegator();
 
         String helperName = delegator.getGroupHelperName(groupNameToUse);
         if (helperName == null) {

Propchange: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
            ('svn:mergeinfo' removed)

Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AuditEntityObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AuditEntityObject.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AuditEntityObject.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AuditEntityObject.java Tue Sep  8 20:56:14 2009
@@ -18,7 +18,6 @@
  *******************************************************************************/
 package org.ofbiz.shark.audit;
 
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 
@@ -41,7 +40,7 @@
 
     public GenericDelegator getGenericDelegator() {
         if (this.delegator == null && delegatorName != null) {
-            this.delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
         return this.delegator;
     }

Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java Tue Sep  8 20:56:14 2009
@@ -40,7 +40,6 @@
 import org.ofbiz.base.util.GeneralRuntimeException;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -108,7 +107,7 @@
         }
 
         // get the delegator and dispatcher objects
-        SharkContainer.delegator = DelegatorFactory.getGenericDelegator(delegatorProp.value);
+        SharkContainer.delegator = GenericDelegator.getGenericDelegator(delegatorProp.value);
         try {
             SharkContainer.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherProp.value, SharkContainer.delegator);
         } catch (GenericServiceException e) {

Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/InstanceEntityObject.java Tue Sep  8 20:56:14 2009
@@ -18,7 +18,6 @@
  *******************************************************************************/
 package org.ofbiz.shark.instance;
 
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericDelegator;
 
@@ -40,7 +39,7 @@
 
     public GenericDelegator getGenericDelegator() {
         if (this.delegator == null && delegatorName != null) {
-            this.delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
         return this.delegator;
     }

Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java Tue Sep  8 20:56:14 2009
@@ -25,7 +25,6 @@
 import java.util.HashMap;
 import java.io.Serializable;
 
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
@@ -147,7 +146,7 @@
 
     protected synchronized GenericDelegator getDelegator() {
         if (this.delegator == null && this.delegatorName != null) {
-            this.delegator = DelegatorFactory.getGenericDelegator(this.delegatorName);
+            this.delegator = GenericDelegator.getGenericDelegator(this.delegatorName);
         }
         return this.delegator;
     }

Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java Tue Sep  8 20:56:14 2009
@@ -28,7 +28,6 @@
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -146,7 +145,7 @@
 
     public GenericDelegator getDelegator() {
         if (UtilValidate.isEmpty(delegator)) {
-            delegator = DelegatorFactory.getGenericDelegator(delegatorName);
+            delegator = GenericDelegator.getGenericDelegator(delegatorName);
         }
         return delegator;
     }

Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java?rev=812692&r1=812691&r2=812692&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java Tue Sep  8 20:56:14 2009
@@ -35,7 +35,6 @@
 import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -1313,7 +1312,7 @@
 
         if (args.length > 0)
             sampleFileName = args[0];
-        List values = readXpdl(UtilURL.fromFilename(sampleFileName), DelegatorFactory.getGenericDelegator("default"));
+        List values = readXpdl(UtilURL.fromFilename(sampleFileName), GenericDelegator.getGenericDelegator("default"));
         Iterator viter = values.iterator();
 
         while (viter.hasNext())