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=802567&r1=802566&r2=802567&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java Sun Aug 9 18:04:26 2009 @@ -285,7 +285,7 @@ public GenericDelegator getDelegator() { if (internalDelegator == null) { if (delegatorName == null) delegatorName = "default"; - if (delegatorName != null) internalDelegator = GenericDelegator.getGenericDelegator(delegatorName); + if (delegatorName != null) internalDelegator = DelegatorFactory.getGenericDelegator(delegatorName); if (internalDelegator == null) { throw new IllegalStateException("[GenericEntity.getDelegator] could not find delegator with name " + delegatorName); } @@ -300,7 +300,7 @@ this.internalDelegator = internalDelegator; } - public Object get(String name) { + protected Object getFieldValue(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 = get(name); + fieldValue = getFieldValue(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.get(curField.getName())); + keyBuffer.append(this.getFieldValue(curField.getName())); } String bundleKey = keyBuffer.toString(); @@ -1337,7 +1337,7 @@ public Object get(Object key) { try { - return this.get((String) key); + return this.get((String)key, this.getDelegator().getLocale()); } 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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -19,6 +19,7 @@ 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> { @@ -31,7 +32,7 @@ } public GenericDelegator getDelegator() { - return GenericDelegator.getGenericDelegator(delegatorName); + return DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -27,6 +27,7 @@ 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; @@ -251,7 +252,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 = GenericDelegator.getGenericDelegator("default"); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -32,6 +32,7 @@ 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; @@ -136,7 +137,7 @@ resultSetType = ResultSet.TYPE_FORWARD_ONLY; if (delegatorName != null && delegatorName.length() > 0) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -35,6 +35,7 @@ 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; @@ -224,7 +225,7 @@ String delegatorNameToUse = overrideDelegator != null ? overrideDelegator : delegatorName; String groupNameToUse = overrideGroup != null ? overrideGroup : entityGroupName; - GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorNameToUse); + GenericDelegator delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -35,6 +35,7 @@ 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; @@ -148,7 +149,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 = GenericDelegator.getGenericDelegator(delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -41,6 +41,7 @@ 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; @@ -133,7 +134,7 @@ GenericDelegator delegator = dctx.getDelegator(); String overrideDelegatorName = (String) context.get("delegatorName"); if (UtilValidate.isNotEmpty(overrideDelegatorName)) { - delegator = GenericDelegator.getGenericDelegator(overrideDelegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -29,6 +29,7 @@ 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; @@ -60,7 +61,7 @@ // get the delegator String delegatorName = ContainerConfig.getPropertyValue(cc, "delegator-name", "default"); - GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorName); + GenericDelegator delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -26,6 +26,7 @@ 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; @@ -101,7 +102,7 @@ String delegatorName = this.delegatorNameExdr.expandString(context); if (delegatorName != null && delegatorName.length() > 0) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -28,6 +28,7 @@ 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; @@ -86,7 +87,7 @@ GenericDelegator delegator = methodContext.getDelegator(); if (delegatorName != null && delegatorName.length() > 0) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -22,6 +22,7 @@ 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; @@ -87,7 +88,7 @@ GenericDelegator delegator = methodContext.getDelegator(); if (delegatorName != null && delegatorName.length() > 0) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -25,6 +25,7 @@ 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; @@ -78,7 +79,7 @@ GenericDelegator delegator = methodContext.getDelegator(); if (delegatorName != null && delegatorName.length() > 0) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Sun Aug 9 18:04:26 2009 @@ -34,6 +34,7 @@ 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; @@ -104,7 +105,7 @@ try { GenericDelegator origDelegator = this.delegator; if (!this.delegator.getOriginalDelegatorName().equals(this.delegator.getDelegatorName())) { - origDelegator = GenericDelegator.getGenericDelegator(this.delegator.getOriginalDelegatorName()); + origDelegator = DelegatorFactory.getGenericDelegator(this.delegator.getOriginalDelegatorName()); } this.jm = JobManager.getInstance(origDelegator, enableJM); } catch (GeneralRuntimeException e) { @@ -276,11 +277,12 @@ // 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); - // check the locale - Locale locale = this.checkLocale(context); - // setup the engine and context DispatchContext ctx = localContext.get(localName); + GenericDelegator delegator = ctx.getDelegator(); + Locale locale = this.checkLocale(context); + delegator.setLocale(locale); + GenericEngine engine = this.getGenericEngine(modelService.engineName); // set IN attributes with default-value as applicable @@ -356,7 +358,7 @@ // now that we have authed, if there is a userLogin, set the EE userIdentifier if (userLogin != null && userLogin.getString("userLoginId") != null) { - GenericDelegator.pushUserIdentifier(userLogin.getString("userLoginId")); + delegator.setUserIdentifier(userLogin.getString("userLoginId")); } // pre-validate ECA @@ -551,9 +553,6 @@ // 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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -35,6 +35,7 @@ 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; @@ -85,7 +86,7 @@ String delegatorName = ContainerConfig.getPropertyValue(cfg, "delegator-name", "default"); this.deleteMail = "true".equals(ContainerConfig.getPropertyValue(cfg, "delete-mail", "false")); - this.delegator = GenericDelegator.getGenericDelegator(delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -29,6 +29,7 @@ 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; @@ -120,7 +121,7 @@ } // get the delegator for this container - GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorProp.value); + GenericDelegator delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java Sun Aug 9 18:04:26 2009 @@ -33,6 +33,7 @@ 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; @@ -68,7 +69,7 @@ String uniqueSuffix = "-" + RandomStringUtils.randomAlphanumeric(10); - this.delegator = GenericDelegator.getGenericDelegator(this.originalDelegatorName).makeTestDelegator(this.originalDelegatorName + uniqueSuffix); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -50,6 +50,7 @@ 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; @@ -329,7 +330,7 @@ delegatorName = "default"; } if (Debug.verboseOn()) Debug.logVerbose("Setup Entity Engine Delegator with name " + delegatorName, module); - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -36,6 +36,7 @@ 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; @@ -111,11 +112,6 @@ 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); @@ -148,7 +144,7 @@ GenericDelegator delegator = null; String delegatorName = (String) session.getAttribute("delegatorName"); if (UtilValidate.isNotEmpty(delegatorName)) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.getGenericDelegator(delegatorName); } if (delegator == null) { delegator = (GenericDelegator) getServletContext().getAttribute("delegator"); @@ -194,10 +190,15 @@ UtilHttp.setInitialRequestInfo(request); VisitHandler.getVisitor(request, response); - // set the Entity Engine user info if we have a userLogin - String visitId = VisitHandler.getVisitId(session); - if (UtilValidate.isNotEmpty(visitId)) { - GenericDelegator.pushSessionIdentifier(visitId); + 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")); + } } // display details on the servlet objects @@ -310,10 +311,6 @@ } } 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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -107,6 +107,8 @@ 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(); @@ -180,7 +182,6 @@ // 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); @@ -387,7 +388,6 @@ // 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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -43,6 +43,7 @@ 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; @@ -117,7 +118,7 @@ return "error"; } - GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorName); + GenericDelegator delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -32,6 +32,7 @@ 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; @@ -52,7 +53,7 @@ public void init(ServletContext context) throws EventHandlerException { String delegatorName = context.getInitParameter("entityDelegatorName"); - this.delegator = GenericDelegator.getGenericDelegator(delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -49,6 +49,7 @@ 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; @@ -74,7 +75,7 @@ public void init(ServletContext context) throws EventHandlerException { String delegatorName = context.getInitParameter("entityDelegatorName"); - this.delegator = GenericDelegator.getGenericDelegator(delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -33,6 +33,7 @@ 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; @@ -353,7 +354,7 @@ public GenericDelegator getDelegator() { if (this.delegator == null) { - this.delegator = GenericDelegator.getGenericDelegator(this.delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -32,6 +32,7 @@ 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; @@ -107,7 +108,7 @@ // first try the session attribute delegatorName String delegatorName = (String) session.getAttribute("delegatorName"); if (UtilValidate.isNotEmpty(delegatorName)) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.getGenericDelegator(delegatorName); } // then try the ServletContext attribute delegator, should always be there... @@ -199,7 +200,7 @@ String delegatorName = (String) session.getAttribute("delegatorName"); if (delegator == null && UtilValidate.isNotEmpty(delegatorName)) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -32,6 +32,7 @@ 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; @@ -67,7 +68,7 @@ Thread.currentThread().setContextClassLoader(loader); ServletContext context = this.getServletContext(); String delegatorName = context.getInitParameter("entityDelegatorName"); - this.delegator = GenericDelegator.getGenericDelegator(delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&view=diff ============================================================================== --- ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java (original) +++ ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java Sun Aug 9 18:04:26 2009 @@ -33,6 +33,7 @@ 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; @@ -59,7 +60,7 @@ System.err.println(org.webslinger.commons.vfs.flat.FlatFileProvider.class); servletContext = config.getServletContext(); String delegatorName = servletContext.getInitParameter("entityDelegatorName"); - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.getGenericDelegator(delegatorName); String readerFiles = servletContext.getInitParameter("serviceReaderUrls"); if (readerFiles != null) { for (String reader: CollectionUtil.split(readerFiles, ";")) { @@ -103,7 +104,7 @@ @Override protected void initializeContext(WebslingerServletContext context, Layout layout) throws Exception { OfbizLayout ofbizLayout = (OfbizLayout) layout; - GenericDelegator delegator = GenericDelegator.getGenericDelegator(ofbizLayout.delegatorName); + GenericDelegator delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Sun Aug 9 18:04:26 2009 @@ -62,6 +62,7 @@ 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; @@ -349,7 +350,7 @@ } String groupNameToUse = overrideGroup != null ? overrideGroup : "org.ofbiz"; - GenericDelegator delegator = UtilValidate.isNotEmpty(overrideDelegator) ? GenericDelegator.getGenericDelegator(overrideDelegator) : dctx.getDelegator(); + GenericDelegator delegator = UtilValidate.isNotEmpty(overrideDelegator) ? DelegatorFactory.getGenericDelegator(overrideDelegator) : dctx.getDelegator(); String helperName = delegator.getGroupHelperName(groupNameToUse); if (helperName == null) { 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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.shark.audit; +import org.ofbiz.entity.DelegatorFactory; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; @@ -40,7 +41,7 @@ public GenericDelegator getGenericDelegator() { if (this.delegator == null && delegatorName != null) { - this.delegator = GenericDelegator.getGenericDelegator(delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -40,6 +40,7 @@ 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; @@ -107,7 +108,7 @@ } // get the delegator and dispatcher objects - SharkContainer.delegator = GenericDelegator.getGenericDelegator(delegatorProp.value); + SharkContainer.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.shark.instance; +import org.ofbiz.entity.DelegatorFactory; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericDelegator; @@ -39,7 +40,7 @@ public GenericDelegator getGenericDelegator() { if (this.delegator == null && delegatorName != null) { - this.delegator = GenericDelegator.getGenericDelegator(delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -25,6 +25,7 @@ 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; @@ -146,7 +147,7 @@ protected synchronized GenericDelegator getDelegator() { if (this.delegator == null && this.delegatorName != null) { - this.delegator = GenericDelegator.getGenericDelegator(this.delegatorName); + this.delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -28,6 +28,7 @@ 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; @@ -145,7 +146,7 @@ public GenericDelegator getDelegator() { if (UtilValidate.isEmpty(delegator)) { - delegator = GenericDelegator.getGenericDelegator(delegatorName); + delegator = DelegatorFactory.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=802567&r1=802566&r2=802567&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 Sun Aug 9 18:04:26 2009 @@ -35,6 +35,7 @@ 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; @@ -1312,7 +1313,7 @@ if (args.length > 0) sampleFileName = args[0]; - List values = readXpdl(UtilURL.fromFilename(sampleFileName), GenericDelegator.getGenericDelegator("default")); + List values = readXpdl(UtilURL.fromFilename(sampleFileName), DelegatorFactory.getGenericDelegator("default")); Iterator viter = values.iterator(); while (viter.hasNext())
