You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/10/05 02:08:39 UTC
svn commit: r821643 [11/15] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/test/
applications/accounting/src/org/ofbiz/accounting/
applications/accounting/src/org/ofbiz/accounting/agreement/
applications/accounting/src/org/ofbiz...
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java Mon Oct 5 00:08:27 2009
@@ -29,7 +29,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralRuntimeException;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericResultSetClosedException;
import org.ofbiz.entity.GenericValue;
@@ -57,7 +57,7 @@
protected ModelFieldTypeReader modelFieldTypeReader;
protected boolean closed = false;
protected boolean haveMadeValue = false;
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected GenericDAO genericDAO = null;
protected EntityCondition whereCondition = null;
protected EntityCondition havingCondition = null;
@@ -90,7 +90,7 @@
this.modelFieldTypeReader = modelFieldTypeReader;
}
- public void setDelegator(GenericDelegator delegator) {
+ public void setDelegator(Delegator delegator) {
this.delegator = delegator;
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java Mon Oct 5 00:08:27 2009
@@ -41,7 +41,7 @@
import org.ofbiz.base.util.Base64;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilXml;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.eca.EntityEcaHandler;
@@ -71,7 +71,7 @@
public static final int DEFAULT_TX_TIMEOUT = 7200;
protected org.xml.sax.Locator locator;
- protected GenericDelegator delegator;
+ protected Delegator delegator;
protected EntityEcaHandler ecaHandler = null;
protected GenericValue currentValue = null;
protected CharSequence currentFieldName = null;
@@ -99,13 +99,13 @@
protected EntitySaxReader() {}
- public EntitySaxReader(GenericDelegator delegator, int transactionTimeout) {
+ public EntitySaxReader(Delegator delegator, int transactionTimeout) {
// clone the delegator right off so there is no chance of making change to the initial object
this.delegator = delegator.cloneDelegator();
this.transactionTimeout = transactionTimeout;
}
- public EntitySaxReader(GenericDelegator delegator) {
+ public EntitySaxReader(Delegator delegator) {
this(delegator, DEFAULT_TX_TIMEOUT);
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java Mon Oct 5 00:08:27 2009
@@ -37,7 +37,7 @@
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -393,21 +393,21 @@
return result;
}
- public static List<GenericValue> findDatedInclusionEntity(GenericDelegator delegator, String entityName, Map<String, ? extends Object> search) throws GenericEntityException {
+ public static List<GenericValue> findDatedInclusionEntity(Delegator delegator, String entityName, Map<String, ? extends Object> search) throws GenericEntityException {
return findDatedInclusionEntity(delegator, entityName, search, UtilDateTime.nowTimestamp());
}
- public static List<GenericValue> findDatedInclusionEntity(GenericDelegator delegator, String entityName, Map<String, ? extends Object> search, Timestamp now) throws GenericEntityException {
+ public static List<GenericValue> findDatedInclusionEntity(Delegator delegator, String entityName, Map<String, ? extends Object> search, Timestamp now) throws GenericEntityException {
EntityCondition searchCondition = EntityCondition.makeCondition(UtilMisc.toList(
EntityCondition.makeCondition(search), EntityUtil.getFilterByDateExpr(now)));
return delegator.findList(entityName, searchCondition, null, UtilMisc.toList("-fromDate"), null, false);
}
- public static GenericValue newDatedInclusionEntity(GenericDelegator delegator, String entityName, Map<String, ? extends Object> search) throws GenericEntityException {
+ public static GenericValue newDatedInclusionEntity(Delegator delegator, String entityName, Map<String, ? extends Object> search) throws GenericEntityException {
return newDatedInclusionEntity(delegator, entityName, search, UtilDateTime.nowTimestamp());
}
- public static GenericValue newDatedInclusionEntity(GenericDelegator delegator, String entityName, Map<String, ? extends Object> find, Timestamp now) throws GenericEntityException {
+ public static GenericValue newDatedInclusionEntity(Delegator delegator, String entityName, Map<String, ? extends Object> find, Timestamp now) throws GenericEntityException {
Map<String, Object> search;
List<GenericValue> entities = findDatedInclusionEntity(delegator, entityName, find, now);
if (UtilValidate.isNotEmpty(entities)) {
@@ -444,11 +444,11 @@
}
}
- public static void delDatedInclusionEntity(GenericDelegator delegator, String entityName, Map<String, ? extends Object> search) throws GenericEntityException {
+ public static void delDatedInclusionEntity(Delegator delegator, String entityName, Map<String, ? extends Object> search) throws GenericEntityException {
delDatedInclusionEntity(delegator, entityName, search, UtilDateTime.nowTimestamp());
}
- public static void delDatedInclusionEntity(GenericDelegator delegator, String entityName, Map<String, ? extends Object> search, Timestamp now) throws GenericEntityException {
+ public static void delDatedInclusionEntity(Delegator delegator, String entityName, Map<String, ? extends Object> search, Timestamp now) throws GenericEntityException {
List<GenericValue> entities = findDatedInclusionEntity(delegator, entityName, search, now);
for (GenericValue entity: entities) {
entity.set("thruDate",now);
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java Mon Oct 5 00:08:27 2009
@@ -26,7 +26,7 @@
import javolution.util.FastSet;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.model.ModelEntity;
@@ -39,7 +39,7 @@
public static final String module = EntityGroupUtil.class.getName();
- public static Set<String> getEntityNamesByGroup(String entityGroupId, GenericDelegator delegator, boolean requireStampFields) throws GenericEntityException {
+ public static Set<String> getEntityNamesByGroup(String entityGroupId, Delegator delegator, boolean requireStampFields) throws GenericEntityException {
Set<String> entityNames = FastSet.newInstance();
List<GenericValue> entitySyncGroupIncludes = delegator.findByAnd("EntityGroupEntry", UtilMisc.toMap("entityGroupId", entityGroupId));
@@ -52,7 +52,7 @@
return entityNames;
}
- public static List<ModelEntity> getModelEntitiesFromRecords(List<GenericValue> entityGroupEntryValues, GenericDelegator delegator, boolean requireStampFields) throws GenericEntityException {
+ public static List<ModelEntity> getModelEntitiesFromRecords(List<GenericValue> entityGroupEntryValues, Delegator delegator, boolean requireStampFields) throws GenericEntityException {
List<ModelEntity> entityModelToUseList = FastList.newInstance();
for (String entityName: delegator.getModelReader().getEntityNames()) {
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityServiceFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityServiceFactory.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityServiceFactory.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityServiceFactory.java Mon Oct 5 00:08:27 2009
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.ofbiz.entityext;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericDispatcher;
import org.ofbiz.service.LocalDispatcher;
@@ -30,12 +30,12 @@
public static final String module = EntityServiceFactory.class.getName();
- public static LocalDispatcher getLocalDispatcher(GenericDelegator delegator) {
+ public static LocalDispatcher getLocalDispatcher(Delegator delegator) {
LocalDispatcher dispatcher = GenericDispatcher.getLocalDispatcher("entity-" + delegator.getDelegatorName(), delegator);
return dispatcher;
}
- public static DispatchContext getDispatchContext(GenericDelegator delegator) {
+ public static DispatchContext getDispatchContext(Delegator delegator) {
LocalDispatcher dispatcher = getLocalDispatcher(delegator);
if (dispatcher == null) return null;
return dispatcher.getDispatchContext();
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java Mon Oct 5 00:08:27 2009
@@ -23,7 +23,7 @@
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.security.Security;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.jdbc.DatabaseUtil;
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java Mon Oct 5 00:08:27 2009
@@ -22,7 +22,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericPK;
@@ -42,13 +42,13 @@
public static final String module = EntityCacheServices.class.getName();
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected LocalDispatcher dispatcher = null;
protected String userLoginId = null;
public EntityCacheServices() {}
- public void setDelegator(GenericDelegator delegator, String userLoginId) {
+ public void setDelegator(Delegator delegator, String userLoginId) {
this.delegator = delegator;
this.dispatcher = EntityServiceFactory.getLocalDispatcher(delegator);
this.userLoginId = userLoginId;
@@ -170,7 +170,7 @@
*@return Map with the result of the service, the output parameters
*/
public static Map clearAllEntityCaches(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Boolean distributeBool = (Boolean) context.get("distribute");
boolean distribute = false;
if (distributeBool != null) distribute = distributeBool.booleanValue();
@@ -187,7 +187,7 @@
*@return Map with the result of the service, the output parameters
*/
public static Map clearCacheLine(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Boolean distributeBool = (Boolean) context.get("distribute");
boolean distribute = false;
if (distributeBool != null) distribute = distributeBool.booleanValue();
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 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.Delegator;
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);
+ Delegator delegator = GenericDelegator.getGenericDelegator(delegatorNameToUse);
if (delegator == null) {
throw new ContainerException("Invalid delegator name!");
}
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java Mon Oct 5 00:08:27 2009
@@ -23,7 +23,7 @@
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.security.Security;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.jdbc.DatabaseUtil;
@@ -110,7 +110,7 @@
}
public static Map<String, Object> importDelimitedFile(DispatchContext dctx, Map<String, Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
// check permission
@@ -226,7 +226,7 @@
return header;
}
- private static int readEntityFile(File file, String delimiter, GenericDelegator delegator) throws IOException, GeneralException {
+ private static int readEntityFile(File file, String delimiter, Delegator delegator) throws IOException, GeneralException {
String entityName = file.getName().substring(0, file.getName().lastIndexOf('.'));
if (entityName == null) {
throw new GeneralException("Entity name cannot be null : [" + file.getName() + "]");
@@ -270,7 +270,7 @@
return lineNumber;
}
- private static GenericValue makeGenericValue(GenericDelegator delegator, String entityName, String[] header, String[] line) {
+ private static GenericValue makeGenericValue(Delegator delegator, String entityName, String[] header, String[] line) {
GenericValue newValue = delegator.makeValue(entityName);
for (int i = 0; i < header.length; i++) {
String name = header[i].trim();
@@ -305,7 +305,7 @@
return newValue;
}
- private String[] getEntityFieldNames(GenericDelegator delegator, String entityName) {
+ private String[] getEntityFieldNames(Delegator delegator, String entityName) {
ModelEntity entity = delegator.getModelEntity(entityName);
if (entity == null) {
return null;
@@ -325,7 +325,7 @@
}
public static Map<String, Object> rebuildAllIndexesAndKeys(DispatchContext dctx, Map<String, Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
// check permission
@@ -422,7 +422,7 @@
}
public static Map<String, Object> unwrapByteWrappers(DispatchContext dctx, Map<String, Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String entityName = (String) context.get("entityName");
String fieldName = (String) context.get("fieldName");
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/DelegatorEcaHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/DelegatorEcaHandler.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/DelegatorEcaHandler.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/DelegatorEcaHandler.java Mon Oct 5 00:08:27 2009
@@ -25,7 +25,7 @@
import org.ofbiz.base.util.Debug;
import static org.ofbiz.base.util.UtilGenerics.checkList;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.eca.EntityEcaHandler;
@@ -39,14 +39,14 @@
public static final String module = DelegatorEcaHandler.class.getName();
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected String delegatorName = null;
protected String entityEcaReaderName = null;
protected DispatchContext dctx = null;
public DelegatorEcaHandler() { }
- public void setDelegator(GenericDelegator delegator) {
+ public void setDelegator(Delegator delegator) {
this.delegator = delegator;
this.delegatorName = delegator.getDelegatorName();
this.entityEcaReaderName = EntityEcaUtil.getEntityEcaReaderName(delegator.getOriginalDelegatorName());
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java Mon Oct 5 00:08:27 2009
@@ -38,7 +38,7 @@
import org.ofbiz.entity.config.DelegatorInfo;
import org.ofbiz.entity.config.EntityConfigUtil;
import org.ofbiz.entity.config.EntityEcaReaderInfo;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.w3c.dom.Element;
/**
@@ -132,7 +132,7 @@
}
}
- public static Collection<EntityEcaRule> getEntityEcaRules(GenericDelegator delegator, String entityName, String event) {
+ public static Collection<EntityEcaRule> getEntityEcaRules(Delegator delegator, String entityName, String event) {
Map<String, Map<String, List<EntityEcaRule>>> ecaCache = EntityEcaUtil.getEntityEcaCache(EntityEcaUtil.getEntityEcaReaderName(delegator.getDelegatorName()));
Map<String, List<EntityEcaRule>> eventMap = ecaCache.get(entityName);
if (eventMap != null) {
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Mon Oct 5 00:08:27 2009
@@ -41,7 +41,7 @@
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -119,14 +119,14 @@
HttpServletRequest request = (HttpServletRequest)context.get("request");
GenericValue userLogin = null;
String partyId = null;
- GenericDelegator delegator = null;
+ Delegator delegator = null;
if (request != null) {
HttpSession session = request.getSession();
userLogin = (GenericValue)session.getAttribute("userLogin");
if (userLogin != null) {
partyId = userLogin.getString("partyId");
}
- delegator = (GenericDelegator)request.getAttribute("delegator");
+ delegator = (Delegator)request.getAttribute("delegator");
}
if (auxiliaryValueGetter != null) auxiliaryValueGetter.clearList();
@@ -146,7 +146,7 @@
return passed;
}
- public static Map<String, Object> checkPermission(GenericValue content, String statusId, GenericValue userLogin, List<String> passedPurposes, List<String> targetOperations, List<String> passedRoles, GenericDelegator delegator , Security security, String entityAction) {
+ public static Map<String, Object> checkPermission(GenericValue content, String statusId, GenericValue userLogin, List<String> passedPurposes, List<String> targetOperations, List<String> passedRoles, Delegator delegator , Security security, String entityAction) {
String privilegeEnumId = null;
return checkPermission(content, statusId, userLogin, passedPurposes, targetOperations, passedRoles, delegator, security, entityAction, privilegeEnumId, null);
}
@@ -154,7 +154,7 @@
public static Map<String, Object> checkPermission(GenericValue content, String statusId,
GenericValue userLogin, List<String> passedPurposes,
List<String> targetOperations, List<String> passedRoles,
- GenericDelegator delegator ,
+ Delegator delegator ,
Security security, String entityAction,
String privilegeEnumId, String quickCheckContentId) {
List<String> statusList = null;
@@ -167,7 +167,7 @@
public static Map<String, Object> checkPermission(GenericValue content, List<String> statusList,
GenericValue userLogin, List<String> passedPurposes,
List<String> targetOperations, List<String> passedRoles,
- GenericDelegator delegator ,
+ Delegator delegator ,
Security security, String entityAction,
String privilegeEnumId) {
return checkPermission(content, statusList, userLogin, passedPurposes, targetOperations, passedRoles, delegator, security, entityAction, privilegeEnumId, null);
@@ -176,7 +176,7 @@
public static Map<String, Object> checkPermission(GenericValue content, List<String> statusList,
GenericValue userLogin, List<String> passedPurposes,
List<String> targetOperations, List<String> passedRoles,
- GenericDelegator delegator ,
+ Delegator delegator ,
Security security, String entityAction,
String privilegeEnumId, String quickCheckContentId) {
@@ -209,7 +209,7 @@
}
- public static boolean checkPermissionMethod(GenericDelegator delegator, GenericValue userLogin, List<String> targetOperationList, String entityName, List<? extends Object> entityIdList, List<String> purposeList, List<String> roleList, String privilegeEnumId) throws GenericEntityException {
+ public static boolean checkPermissionMethod(Delegator delegator, GenericValue userLogin, List<String> targetOperationList, String entityName, List<? extends Object> entityIdList, List<String> purposeList, List<String> roleList, String privilegeEnumId) throws GenericEntityException {
boolean passed = false;
String lcEntityName = entityName.toLowerCase();
@@ -496,7 +496,7 @@
return passed;
}
- public static boolean checkPermissionMethod(GenericDelegator delegator, String partyId, String entityName, List<? extends Object> entityIdList, AuxiliaryValueGetter auxiliaryValueGetter, RelatedRoleGetter relatedRoleGetter, PermissionConditionGetter permissionConditionGetter) throws GenericEntityException {
+ public static boolean checkPermissionMethod(Delegator delegator, String partyId, String entityName, List<? extends Object> entityIdList, AuxiliaryValueGetter auxiliaryValueGetter, RelatedRoleGetter relatedRoleGetter, PermissionConditionGetter permissionConditionGetter) throws GenericEntityException {
permissionConditionGetter.init(delegator);
if (Debug.verboseOn()) Debug.logVerbose(permissionConditionGetter.dumpAsText(), module);
@@ -605,7 +605,7 @@
}
- public static GenericValue getNextEntity(GenericDelegator delegator, String entityName, String pkFieldName, Object obj, Map<String, GenericValue> entities) throws GenericEntityException {
+ public static GenericValue getNextEntity(Delegator delegator, String entityName, String pkFieldName, Object obj, Map<String, GenericValue> entities) throws GenericEntityException {
GenericValue entity = null;
if (obj instanceof String) {
String entityId = (String)obj;
@@ -618,12 +618,12 @@
return entity;
}
- public static boolean checkHasRoleOperations(String partyId, PermissionConditionGetter permissionConditionGetter , GenericDelegator delegator) {
+ public static boolean checkHasRoleOperations(String partyId, PermissionConditionGetter permissionConditionGetter , Delegator delegator) {
List<String> targetOperations = permissionConditionGetter.getOperationList();
return checkHasRoleOperations(partyId, targetOperations, delegator);
}
- public static boolean checkHasRoleOperations(String partyId, List<String> targetOperations, GenericDelegator delegator) {
+ public static boolean checkHasRoleOperations(String partyId, List<String> targetOperations, Delegator delegator) {
//if (Debug.infoOn()) Debug.logInfo("targetOperations:" + targetOperations, module);
//if (Debug.infoOn()) Debug.logInfo("userLoginId:" + userLoginId, module);
if (targetOperations == null) return false;
@@ -710,7 +710,7 @@
public static boolean hasMatch(GenericValue entity, PermissionConditionGetter permissionConditionGetter, RelatedRoleGetter relatedRoleGetter, AuxiliaryValueGetter auxiliaryValueGetter, String partyId, boolean checkAncestors) throws GenericEntityException {
ModelEntity modelEntity = entity.getModelEntity();
- GenericDelegator delegator = entity.getDelegator();
+ Delegator delegator = entity.getDelegator();
String pkFieldName = modelEntity.getFirstPkFieldName();
String entityId = entity.getString(pkFieldName);
if (Debug.verboseOn()) Debug.logVerbose("\n\nIN hasMatch: entityId:" + entityId + " partyId:" + partyId + " checkAncestors:" + checkAncestors, module);
@@ -802,7 +802,7 @@
* and returns the ones that match the user.
* Follows group parties to see if the user is a member.
*/
- public static List<String> getUserRoles(GenericValue entity, GenericValue userLogin, GenericDelegator delegator) throws GenericEntityException {
+ public static List<String> getUserRoles(GenericValue entity, GenericValue userLogin, Delegator delegator) throws GenericEntityException {
String entityName = entity.getEntityName();
List<String> roles = FastList.newInstance();
@@ -864,7 +864,7 @@
/**
* Tests to see if the user belongs to a group
*/
- public static boolean isGroupMember(Map<String, ?> partyRelationshipValues, GenericDelegator delegator) {
+ public static boolean isGroupMember(Map<String, ?> partyRelationshipValues, Delegator delegator) {
boolean isMember = false;
String partyIdFrom = (String)partyRelationshipValues.get("partyIdFrom") ;
String partyIdTo = (String)partyRelationshipValues.get("partyIdTo") ;
@@ -924,7 +924,7 @@
public String getStatusValue();
public int getPrivilegeValue() throws GenericEntityException;
public String getAuxiliaryValue();
- public void init(GenericDelegator delegator) throws GenericEntityException;
+ public void init(Delegator delegator) throws GenericEntityException;
public void restart();
public void setOperationList(String operationIdString);
public void setOperationList(List<String> opList);
@@ -998,7 +998,7 @@
public int getPrivilegeValue() throws GenericEntityException {
int privilegeEnumSeq = -1;
String privilegeEnumId = null;
- GenericDelegator delegator = currentValue.getDelegator();
+ Delegator delegator = currentValue.getDelegator();
if (UtilValidate.isNotEmpty(privilegeFieldName)) {
privilegeEnumId = currentValue.getString(this.privilegeFieldName);
@@ -1042,7 +1042,7 @@
this.entityList = FastList.newInstance();
}
- public void init(GenericDelegator delegator) throws GenericEntityException {
+ public void init(Delegator delegator) throws GenericEntityException {
EntityCondition opCond = EntityCondition.makeCondition(operationFieldName, EntityOperator.IN, this.operationList);
this.entityList = delegator.findList(this.entityName, opCond, null, null, null, true);
}
@@ -1128,7 +1128,7 @@
}
public interface AuxiliaryValueGetter {
- public void init(GenericDelegator delegator, String entityId) throws GenericEntityException;
+ public void init(Delegator delegator, String entityId) throws GenericEntityException;
public List<String> getList();
public void clearList();
public String dumpAsText();
@@ -1174,7 +1174,7 @@
this.entityList = lst;
}
- public void init(GenericDelegator delegator, String entityId) throws GenericEntityException {
+ public void init(Delegator delegator, String entityId) throws GenericEntityException {
if (this.entityList == null) {
this.entityList = FastList.newInstance();
@@ -1202,8 +1202,8 @@
}
public interface RelatedRoleGetter {
- public void init(GenericDelegator delegator, String entityId, String partyId, GenericValue entity) throws GenericEntityException;
- public void initWithAncestors(GenericDelegator delegator, GenericValue entity, String partyId) throws GenericEntityException;
+ public void init(Delegator delegator, String entityId, String partyId, GenericValue entity) throws GenericEntityException;
+ public void initWithAncestors(Delegator delegator, GenericValue entity, String partyId) throws GenericEntityException;
public List<String> getList();
public void clearList();
public void setList(List<String> lst);
@@ -1263,7 +1263,7 @@
this.roleIdList = lst;
}
- public void init(GenericDelegator delegator, String entityId, String partyId, GenericValue entity) throws GenericEntityException {
+ public void init(Delegator delegator, String entityId, String partyId, GenericValue entity) throws GenericEntityException {
List<String> lst = getUserRolesFromList(delegator, UtilMisc.toList(entityId), partyId, this.roleEntityIdName,
this.partyFieldName, this.roleTypeFieldName, this.roleEntityName);
@@ -1273,7 +1273,7 @@
}
}
- public void initWithAncestors(GenericDelegator delegator, GenericValue entity, String partyId) throws GenericEntityException {
+ public void initWithAncestors(Delegator delegator, GenericValue entity, String partyId) throws GenericEntityException {
List<String> ownedContentIdList = FastList.newInstance();
getEntityOwners(delegator, entity, ownedContentIdList, this.entityName, this.ownerEntityFieldName);
@@ -1288,7 +1288,7 @@
if (entity == null || targetPartyId == null) {
return false;
}
- GenericDelegator delegator = entity.getDelegator();
+ Delegator delegator = entity.getDelegator();
ModelEntity modelEntity = delegator.getModelEntity(entityName);
if (modelEntity.getField("createdByUserLogin") == null) {
return false;
@@ -1326,7 +1326,7 @@
}
}
- public static List<String> getUserRolesFromList(GenericDelegator delegator, List<String> idList, String partyId, String entityIdFieldName, String partyIdFieldName, String roleTypeIdFieldName, String entityName) throws GenericEntityException {
+ public static List<String> getUserRolesFromList(Delegator delegator, List<String> idList, String partyId, String entityIdFieldName, String partyIdFieldName, String roleTypeIdFieldName, String entityName) throws GenericEntityException {
EntityExpr expr = EntityCondition.makeCondition(entityIdFieldName, EntityOperator.IN, idList);
EntityExpr expr2 = EntityCondition.makeCondition(partyIdFieldName, partyId);
@@ -1342,7 +1342,7 @@
return distinctList;
}
- public static void getEntityOwners(GenericDelegator delegator, GenericValue entity, List<String> contentOwnerList, String entityName, String ownerIdFieldName) throws GenericEntityException {
+ public static void getEntityOwners(Delegator delegator, GenericValue entity, List<String> contentOwnerList, String entityName, String ownerIdFieldName) throws GenericEntityException {
String ownerContentId = entity.getString(ownerIdFieldName);
if (UtilValidate.isNotEmpty(ownerContentId)) {
@@ -1357,7 +1357,7 @@
}
- public static int getPrivilegeEnumSeq(GenericDelegator delegator, String privilegeEnumId) throws GenericEntityException {
+ public static int getPrivilegeEnumSeq(Delegator delegator, String privilegeEnumId) throws GenericEntityException {
int privilegeEnumSeq = -1;
if (UtilValidate.isNotEmpty(privilegeEnumId)) {
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 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.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericEntityException;
@@ -79,7 +80,7 @@
// default to 2 hours, 120m, 7200s
public static final long defaultMaxRunningNoUpdateMillis = 7200000;
- public GenericDelegator delegator;
+ public Delegator delegator;
public LocalDispatcher dispatcher;
public Map<String, ? extends Object> context;
@@ -842,7 +843,7 @@
return entityModelToUseList;
}
- protected static Timestamp getCurrentRunStartTime(Timestamp lastSuccessfulSynchTime, List<ModelEntity> entityModelToUseList, GenericDelegator delegator) throws GenericEntityException {
+ protected static Timestamp getCurrentRunStartTime(Timestamp lastSuccessfulSynchTime, List<ModelEntity> entityModelToUseList, Delegator delegator) throws GenericEntityException {
// if currentRunStartTime is null, what to do? I guess iterate through all entities and find earliest tx stamp
if (lastSuccessfulSynchTime == null) {
Timestamp currentRunStartTime = null;
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 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.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericEntityException;
@@ -130,7 +131,7 @@
*@return Map with the result of the service, the output parameters
*/
public static Map storeEntitySyncData(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String overrideDelegatorName = (String) context.get("delegatorName");
if (UtilValidate.isNotEmpty(overrideDelegatorName)) {
delegator = GenericDelegator.getGenericDelegator(overrideDelegatorName);
@@ -527,7 +528,7 @@
public static Map<String, Object> loadOfflineSyncData(DispatchContext dctx, Map<String, ? extends Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String fileName = (String) context.get("xmlFileName");
@@ -598,7 +599,7 @@
*/
public static Map<String, Object> cleanSyncRemoveInfo(DispatchContext dctx, Map<String, ? extends Object> context) {
Debug.logInfo("Running cleanSyncRemoveInfo", module);
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
try {
// find the largest keepRemoveInfoHours value on an EntitySyncRemove and kill everything before that, if none found default to 10 days (240 hours)
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 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.Delegator;
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);
+ Delegator delegator = GenericDelegator.getGenericDelegator(delegatorName);
// get the dispatcher
String dispatcherName = ContainerConfig.getPropertyValue(cc, "dispatcher-name", "xui-dispatcher");
Modified: ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java (original)
+++ ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java Mon Oct 5 00:08:27 2009
@@ -29,7 +29,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.webapp.control.LoginWorker;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.GenericServiceException;
@@ -40,7 +40,7 @@
public static final String module = XuiSession.class.getName();
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected LocalDispatcher dispatcher = null;
protected GenericValue userLogin = null;
protected XuiContainer container = null;
@@ -49,7 +49,7 @@
protected final boolean IS_SAME_LOGIN = UtilProperties.propertyValueEqualsIgnoreCase("xui.properties", "isSameLogin", "true");
private Locale locale = (Locale) Locale.getDefault();
- public XuiSession(String id, GenericDelegator delegator, LocalDispatcher dispatcher, XuiContainer container) {
+ public XuiSession(String id, Delegator delegator, LocalDispatcher dispatcher, XuiContainer container) {
this.id = id;
this.delegator = delegator;
this.dispatcher = dispatcher;
@@ -61,7 +61,7 @@
return this.container;
}
- public GenericDelegator getDelegator() {
+ public Delegator getDelegator() {
return this.delegator;
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java Mon Oct 5 00:08:27 2009
@@ -32,7 +32,7 @@
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.security.Security;
@@ -56,7 +56,7 @@
protected TimeZone timeZone;
protected ClassLoader loader;
protected LocalDispatcher dispatcher;
- protected GenericDelegator delegator;
+ protected Delegator delegator;
protected Authorization authz;
protected Security security;
protected GenericValue userLogin;
@@ -76,7 +76,7 @@
this.locale = UtilHttp.getLocale(request);
this.timeZone = UtilHttp.getTimeZone(request);
this.dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
- this.delegator = (GenericDelegator) request.getAttribute("delegator");
+ this.delegator = (Delegator) request.getAttribute("delegator");
this.authz = (Authorization) request.getAttribute("authz");
this.security = (Security) request.getAttribute("security");
this.userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
@@ -124,7 +124,7 @@
this.locale = (Locale) context.get("locale");
this.timeZone = (TimeZone) context.get("timeZone");
this.dispatcher = (LocalDispatcher) context.get("dispatcher");
- this.delegator = (GenericDelegator) context.get("delegator");
+ this.delegator = (Delegator) context.get("delegator");
this.authz = (Authorization) context.get("authz");
this.security = (Security) context.get("security");
this.userLogin = (GenericValue) context.get("userLogin");
@@ -140,7 +140,7 @@
// or something similar
if (this.request != null) {
if (this.dispatcher == null) this.dispatcher = (LocalDispatcher) this.request.getAttribute("dispatcher");
- if (this.delegator == null) this.delegator = (GenericDelegator) this.request.getAttribute("delegator");
+ if (this.delegator == null) this.delegator = (Delegator) this.request.getAttribute("delegator");
if (this.authz == null) this.authz = (Authorization) this.request.getAttribute("authz");
if (this.security == null) this.security = (Security) this.request.getAttribute("security");
if (this.userLogin == null) this.userLogin = (GenericValue) this.request.getSession().getAttribute("userLogin");
@@ -273,7 +273,7 @@
return this.dispatcher;
}
- public GenericDelegator getDelegator() {
+ public Delegator getDelegator() {
return this.delegator;
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.finder.ByAndFinder;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.minilang.method.MethodContext;
@@ -53,7 +53,7 @@
@Override
public boolean exec(MethodContext methodContext) {
try {
- GenericDelegator delegator = methodContext.getDelegator();
+ Delegator delegator = methodContext.getDelegator();
this.finder.runFind(methodContext.getEnvMap(), delegator);
} catch (GeneralException e) {
Debug.logError(e, module);
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.finder.ByConditionFinder;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.minilang.method.MethodContext;
@@ -53,7 +53,7 @@
@Override
public boolean exec(MethodContext methodContext) {
try {
- GenericDelegator delegator = methodContext.getDelegator();
+ Delegator delegator = methodContext.getDelegator();
this.finder.runFind(methodContext.getEnvMap(), delegator);
} catch (GeneralException e) {
Debug.logError(e, module);
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 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.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.finder.EntityFinderUtil.Condition;
@@ -96,7 +97,7 @@
public boolean exec(MethodContext methodContext) {
try {
Map<String, Object> context = methodContext.getEnvMap();
- GenericDelegator delegator = methodContext.getDelegator();
+ Delegator delegator = methodContext.getDelegator();
String entityName = this.entityNameExdr.expandString(context);
String delegatorName = this.delegatorNameExdr.expandString(context);
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 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.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.util.EntityDataAssert;
import org.ofbiz.entity.util.EntitySaxReader;
@@ -84,7 +85,7 @@
String location = this.locationExdr.expandString(methodContext.getEnvMap());
String delegatorName = this.delegatorNameExdr.expandString(methodContext.getEnvMap());
- GenericDelegator delegator = methodContext.getDelegator();
+ Delegator delegator = methodContext.getDelegator();
if (delegatorName != null && delegatorName.length() > 0) {
delegator = GenericDelegator.getGenericDelegator(delegatorName);
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.finder.PrimaryKeyFinder;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.minilang.method.MethodContext;
@@ -53,7 +53,7 @@
@Override
public boolean exec(MethodContext methodContext) {
try {
- GenericDelegator delegator = methodContext.getDelegator();
+ Delegator delegator = methodContext.getDelegator();
this.finder.runFind(methodContext.getEnvMap(), delegator);
} catch (GeneralException e) {
Debug.logError(e, module);
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009
@@ -22,6 +22,7 @@
import java.util.Map;
import org.ofbiz.base.util.Debug;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -85,7 +86,7 @@
orderByNames = orderByListAcsr.get(methodContext);
}
- GenericDelegator delegator = methodContext.getDelegator();
+ Delegator delegator = methodContext.getDelegator();
if (delegatorName != null && delegatorName.length() > 0) {
delegator = GenericDelegator.getGenericDelegator(delegatorName);
}
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 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.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericValue;
@@ -76,7 +77,7 @@
boolean useCache = "true".equals(useCacheStr);
- GenericDelegator delegator = methodContext.getDelegator();
+ Delegator delegator = methodContext.getDelegator();
if (delegatorName != null && delegatorName.length() > 0) {
delegator = GenericDelegator.getGenericDelegator(delegatorName);
}
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java Mon Oct 5 00:08:27 2009
@@ -30,7 +30,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -47,7 +47,7 @@
public static final String module = OFBizSecurity.class.getName();
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected static final Map<String, Map<String, String>> simpleRoleEntity = UtilMisc.toMap(
"ORDERMGR", UtilMisc.toMap("name", "OrderRole", "pkey", "orderId"),
@@ -56,15 +56,15 @@
protected OFBizSecurity() {}
- protected OFBizSecurity(GenericDelegator delegator) {
+ protected OFBizSecurity(Delegator delegator) {
this.delegator = delegator;
}
- public GenericDelegator getDelegator() {
+ public Delegator getDelegator() {
return this.delegator;
}
- public void setDelegator(GenericDelegator delegator) {
+ public void setDelegator(Delegator delegator) {
this.delegator = delegator;
}
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java Mon Oct 5 00:08:27 2009
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpSession;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
/**
@@ -31,9 +31,9 @@
*/
public interface Security {
- public GenericDelegator getDelegator();
+ public Delegator getDelegator();
- public void setDelegator(GenericDelegator delegator);
+ public void setDelegator(Delegator delegator);
/**
* Uses userLoginSecurityGroupByUserLoginId cache to speed up the finding of the userLogin's security group list.
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java Mon Oct 5 00:08:27 2009
@@ -23,7 +23,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.w3c.dom.Element;
/**
@@ -50,7 +50,7 @@
* @param delegator the generic delegator
* @return instance of security implementation (default: OFBizSecurity)
*/
- public static Security getInstance(GenericDelegator delegator) throws SecurityConfigurationException {
+ public static Security getInstance(Delegator delegator) throws SecurityConfigurationException {
Security security = null;
// Make securityName a singleton
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/Authorization.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/Authorization.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/Authorization.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/Authorization.java Mon Oct 5 00:08:27 2009
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpSession;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
public interface Authorization {
@@ -64,7 +64,7 @@
/**
* Method for injecting the delegator object
*
- * @param delegator the GenericDelegator object to use for the Authorization implementation
+ * @param delegator the Delegator object to use for the Authorization implementation
*/
- public void setDelegator(GenericDelegator delegator);
+ public void setDelegator(Delegator delegator);
}
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java Mon Oct 5 00:08:27 2009
@@ -23,7 +23,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.security.SecurityConfigurationException;
import org.w3c.dom.Element;
@@ -52,7 +52,7 @@
* @return instance of security implementation (default: OFBizSecurity)
*/
@SuppressWarnings("unchecked")
- public static Authorization getInstance(GenericDelegator delegator) throws SecurityConfigurationException {
+ public static Authorization getInstance(Delegator delegator) throws SecurityConfigurationException {
Authorization security = null;
// Make securityName a singleton
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java Mon Oct 5 00:08:27 2009
@@ -30,7 +30,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.cache.Cache;
@@ -43,7 +43,7 @@
private static final String module = EntityAuthorization.class.getName();
- protected GenericDelegator delegator;
+ protected Delegator delegator;
@Override
public List<String> getAutoGrantPermissions(String userId, String permission, Map<String, ? extends Object> context) {
@@ -138,7 +138,7 @@
return false;
}
- public void setDelegator(GenericDelegator delegator) {
+ public void setDelegator(Delegator delegator) {
this.delegator = delegator;
}
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,7 @@
import java.util.Map;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
public interface DynamicAccess {
@@ -43,7 +43,7 @@
/**
* Method for injecting the delegator object
*
- * @param delegator the GenericDelegator object to use for the Authorization implementation
+ * @param delegator the Delegator object to use for the Authorization implementation
*/
- public void setDelegator(GenericDelegator delegator);
+ public void setDelegator(Delegator delegator);
}
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java Mon Oct 5 00:08:27 2009
@@ -27,7 +27,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.ObjectType;
import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
public class DynamicAccessFactory {
@@ -37,7 +37,7 @@
private static UtilCache<String,DynamicAccessHandler> dynamicAccessHandlerCache = new UtilCache<String,DynamicAccessHandler>("security.DynamicAccessHandlerCache");
private static final String module = DynamicAccessFactory.class.getName();
- public static DynamicAccessHandler getDynamicAccessHandler(GenericDelegator delegator, String accessString) {
+ public static DynamicAccessHandler getDynamicAccessHandler(Delegator delegator, String accessString) {
if (dynamicAccessHandlerCache.size() == 0) { // should always be at least 1
loadAccessHandlers(delegator);
}
@@ -58,7 +58,7 @@
return dynamicAccessHandlerCache.get("*");
}
- private static void loadAccessHandlers(GenericDelegator delegator) {
+ private static void loadAccessHandlers(Delegator delegator) {
Iterator<DynamicAccessHandler> it = ServiceRegistry.lookupProviders(DynamicAccessHandler.class, DynamicAccessFactory.class.getClassLoader());
while (it.hasNext()) {
DynamicAccessHandler handler = it.next();
@@ -68,7 +68,7 @@
}
@SuppressWarnings("unchecked")
- public static DynamicAccess loadDynamicAccessObject(GenericDelegator delegator, String accessString) {
+ public static DynamicAccess loadDynamicAccessObject(Delegator delegator, String accessString) {
DynamicAccess da = null;
Class<DynamicAccess> clazz;
try {
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessHandler.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessHandler.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessHandler.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,7 @@
import java.util.Map;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
public interface DynamicAccessHandler {
@@ -47,7 +47,7 @@
/**
* Method for injecting the delegator object
*
- * @param delegator the GenericDelegator object to use for the Authorization implementation
+ * @param delegator the Delegator object to use for the Authorization implementation
*/
- public void setDelegator(GenericDelegator delegator);
+ public void setDelegator(Delegator delegator);
}
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java Mon Oct 5 00:08:27 2009
@@ -25,12 +25,12 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.GroovyUtil;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
public class GroovyDaHandler implements DynamicAccessHandler {
private static final String module = GroovyDaHandler.class.getName();
- protected GenericDelegator delegator;
+ protected Delegator delegator;
public String getPattern() {
return "(^.*\\.groovy$)";
@@ -75,7 +75,7 @@
return false;
}
- public void setDelegator(GenericDelegator delegator) {
+ public void setDelegator(Delegator delegator) {
this.delegator = delegator;
}
}
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java Mon Oct 5 00:08:27 2009
@@ -21,15 +21,15 @@
import java.util.Map;
import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
public class ObjectDaHandler implements DynamicAccessHandler {
private static UtilCache<String,DynamicAccess> dynamicAccessCache = new UtilCache<String,DynamicAccess>("security.DynamicAccessCache");
- protected GenericDelegator delegator;
+ protected Delegator delegator;
- public void setDelegator(GenericDelegator delegator) {
+ public void setDelegator(Delegator delegator) {
this.delegator = delegator;
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java Mon Oct 5 00:08:27 2009
@@ -37,7 +37,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.security.Security;
import org.ofbiz.security.authz.Authorization;
import org.ofbiz.service.config.ServiceConfigUtil;
@@ -240,10 +240,10 @@
}
/**
- * Gets the GenericDelegator associated with this context/dispatcher
- * @return GenericDelegator associated with this context
+ * Gets the Delegator associated with this context/dispatcher
+ * @return Delegator associated with this context
*/
- public GenericDelegator getDelegator() {
+ public Delegator getDelegator() {
return dispatcher.getDelegator();
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java Mon Oct 5 00:08:27 2009
@@ -24,7 +24,7 @@
import javax.transaction.xa.XAException;
import org.ofbiz.service.calendar.RecurrenceRule;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.security.Security;
import org.ofbiz.security.authz.Authorization;
import org.ofbiz.service.jms.JmsListenerFactory;
@@ -180,7 +180,7 @@
/**
* @see org.ofbiz.service.LocalDispatcher#getDelegator()
*/
- public GenericDelegator getDelegator() {
+ public Delegator getDelegator() {
return dispatcher.getDelegator();
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcher.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcher.java Mon Oct 5 00:08:27 2009
@@ -26,7 +26,7 @@
import javolution.util.FastMap;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
/**
* Generic Services Local Dispatcher
@@ -38,15 +38,15 @@
protected static boolean ecasDisabled = false;
protected static Map<String, LocalDispatcher> dispatcherCache = FastMap.newInstance();
- public static LocalDispatcher getLocalDispatcher(String dispatcherName, GenericDelegator delegator) {
+ public static LocalDispatcher getLocalDispatcher(String dispatcherName, Delegator delegator) {
return getLocalDispatcher(dispatcherName, delegator, null, null, null);
}
- public static LocalDispatcher getLocalDispatcher(String dispatcherName, GenericDelegator delegator, Collection<URL> readerURLs, ClassLoader loader) {
+ public static LocalDispatcher getLocalDispatcher(String dispatcherName, Delegator delegator, Collection<URL> readerURLs, ClassLoader loader) {
return getLocalDispatcher(dispatcherName, delegator, readerURLs, loader, null);
}
- public static LocalDispatcher getLocalDispatcher(String dispatcherName, GenericDelegator delegator, Collection<URL> readerURLs, ClassLoader loader, ServiceDispatcher serviceDispatcher) {
+ public static LocalDispatcher getLocalDispatcher(String dispatcherName, Delegator delegator, Collection<URL> readerURLs, ClassLoader loader, ServiceDispatcher serviceDispatcher) {
if (dispatcherName == null) {
dispatcherName = "default";
Debug.logWarning("Got a getGenericDispatcher call with a null dispatcherName, assuming default for the name.", module);
@@ -90,11 +90,11 @@
}
/** special method to obtain a new 'unique' reference with a variation on parameters */
- public static LocalDispatcher newInstance(String name, GenericDelegator delegator, boolean enableJM, boolean enableJMS, boolean enableSvcs) throws GenericServiceException {
+ public static LocalDispatcher newInstance(String name, Delegator delegator, boolean enableJM, boolean enableJMS, boolean enableSvcs) throws GenericServiceException {
return newInstance(name, delegator, null, enableJM, enableJMS, enableSvcs);
}
- public static LocalDispatcher newInstance(String name, GenericDelegator delegator, Collection<URL> readerURLs, boolean enableJM, boolean enableJMS, boolean enableSvcs) throws GenericServiceException {
+ public static LocalDispatcher newInstance(String name, Delegator delegator, Collection<URL> readerURLs, boolean enableJM, boolean enableJMS, boolean enableSvcs) throws GenericServiceException {
ServiceDispatcher sd = new ServiceDispatcher(delegator, enableJM, enableJMS, enableSvcs);
ClassLoader loader = null;
try {
@@ -111,7 +111,7 @@
protected GenericDispatcher() {}
- protected GenericDispatcher(String name, GenericDelegator delegator, Collection<URL> readerURLs, ClassLoader loader, ServiceDispatcher serviceDispatcher) {
+ protected GenericDispatcher(String name, Delegator delegator, Collection<URL> readerURLs, ClassLoader loader, ServiceDispatcher serviceDispatcher) {
if (serviceDispatcher != null) {
this.dispatcher = serviceDispatcher;
}
@@ -126,7 +126,7 @@
init(name, delegator, dc);
}
- protected void init(String name, GenericDelegator delegator, DispatchContext ctx) {
+ protected void init(String name, Delegator delegator, DispatchContext ctx) {
if (name == null || name.length() == 0)
throw new IllegalArgumentException("The name of a LocalDispatcher cannot be a null or empty String");
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,7 @@
import java.util.Map;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.security.Security;
import org.ofbiz.security.authz.Authorization;
import org.ofbiz.service.jms.JmsListenerFactory;
@@ -317,7 +317,7 @@
* Gets the GenericEntityDelegator associated with this dispatcher
* @return GenericEntityDelegator associated with this dispatcher
*/
- public GenericDelegator getDelegator();
+ public Delegator getDelegator();
/**
* Gets the Authorization object associated with this dispatcher
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelPermission.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelPermission.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelPermission.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelPermission.java Mon Oct 5 00:08:27 2009
@@ -24,7 +24,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
@@ -93,7 +93,7 @@
Debug.logWarning("Null role type name passed for evaluation", module);
return false;
}
- GenericDelegator delegator = userLogin.getDelegator();
+ Delegator delegator = userLogin.getDelegator();
List<GenericValue> partyRoles = null;
/** (jaz) THIS IS NOT SECURE AT ALL
try {
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java Mon Oct 5 00:08:27 2009
@@ -41,7 +41,7 @@
import org.ofbiz.base.util.UtilTimer;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.model.ModelField;
@@ -492,7 +492,7 @@
boolean includeNonPk = "nonpk".equals(includeType) || "all".equals(includeType);
// need a delegator for this
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
if (delegator == null) {
Debug.logWarning("Cannot use auto-attribute fields with a null delegator", module);
}
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=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Mon Oct 5 00:08:27 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.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -72,7 +73,7 @@
protected static boolean enableJMS = true;
protected static boolean enableSvcs = true;
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected GenericEngineFactory factory = null;
protected Authorization authz = null;
protected Security security = null;
@@ -81,7 +82,7 @@
protected JobManager jm = null;
protected JmsListenerFactory jlf = null;
- protected ServiceDispatcher(GenericDelegator delegator, boolean enableJM, boolean enableJMS, boolean enableSvcs) {
+ protected ServiceDispatcher(Delegator delegator, boolean enableJM, boolean enableJMS, boolean enableSvcs) {
Debug.logInfo("[ServiceDispatcher] : Creating new instance.", module);
factory = new GenericEngineFactory(this);
ServiceGroupReader.readConfig();
@@ -102,7 +103,7 @@
// job manager needs to always be running, but the poller thread does not
try {
- GenericDelegator origDelegator = this.delegator;
+ Delegator origDelegator = this.delegator;
if (!this.delegator.getOriginalDelegatorName().equals(this.delegator.getDelegatorName())) {
origDelegator = GenericDelegator.getGenericDelegator(this.delegator.getOriginalDelegatorName());
}
@@ -121,7 +122,7 @@
}
}
- protected ServiceDispatcher(GenericDelegator delegator) {
+ protected ServiceDispatcher(Delegator delegator) {
this(delegator, enableJM, enableJMS, enableSvcs);
}
@@ -130,7 +131,7 @@
* @param delegator the local delegator
* @return A reference to this global ServiceDispatcher
*/
- public static ServiceDispatcher getInstance(String name, GenericDelegator delegator) {
+ public static ServiceDispatcher getInstance(String name, Delegator delegator) {
ServiceDispatcher sd = getInstance(null, null, delegator);
if (!sd.containsContext(name)) {
@@ -146,7 +147,7 @@
* @param delegator the local delegator
* @return A reference to this global ServiceDispatcher
*/
- public static ServiceDispatcher getInstance(String name, DispatchContext context, GenericDelegator delegator) {
+ public static ServiceDispatcher getInstance(String name, DispatchContext context, Delegator delegator) {
ServiceDispatcher sd;
String dispatcherKey = delegator != null ? delegator.getDelegatorName() : "null";
@@ -791,10 +792,10 @@
}
/**
- * Gets the GenericDelegator associated with this dispatcher
- * @return GenericDelegator associated with this dispatcher
+ * Gets the Delegator associated with this dispatcher
+ * @return Delegator associated with this dispatcher
*/
- public GenericDelegator getDelegator() {
+ public Delegator getDelegator() {
return this.delegator;
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java Mon Oct 5 00:08:27 2009
@@ -37,7 +37,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -367,7 +367,7 @@
public static Map<String, Object> purgeOldJobs(DispatchContext dctx, Map<String, ? extends Object> context) {
String sendPool = ServiceConfigUtil.getSendPool();
int daysToKeep = ServiceConfigUtil.getPurgeJobDays();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Timestamp now = UtilDateTime.nowTimestamp();
Calendar cal = Calendar.getInstance();
@@ -509,7 +509,7 @@
}
public static Map<String, Object> cancelJob(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = getLocale(context);
@@ -548,7 +548,7 @@
}
public static Map<String, Object> cancelJobRetries(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = getLocale(context);
@@ -598,7 +598,7 @@
public static GenericValue getUserLogin(DispatchContext dctx, Map<String, ? extends Object> context, String runAsUser) {
GenericValue userLogin = (GenericValue) context.get("userLogin");
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
if (UtilValidate.isNotEmpty(runAsUser)) {
try {
GenericValue runAs = delegator.findByPrimaryKeyCache("UserLogin", "userLoginId", runAsUser);
@@ -630,7 +630,7 @@
}
public static Map<String, Object> resetJob(DispatchContext dctx, Map<String, Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = getLocale(context);