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 [14/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/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Mon Oct 5 00:08:27 2009
@@ -46,7 +46,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.collections.LifoSet;
-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;
@@ -403,7 +403,7 @@
public boolean isAggregatedItem(String productId) {
trace("is Aggregated Item", productId);
try {
- GenericDelegator delegator = cart.getDelegator();
+ Delegator delegator = cart.getDelegator();
GenericValue product = null;
product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
if ("AGGREGATED".equals(product.getString("productTypeId"))) {
@@ -424,7 +424,7 @@
trace("get Product Config Wrapper", productId);
ProductConfigWrapper pcw = null;
try {
- GenericDelegator delegator = cart.getDelegator();
+ Delegator delegator = cart.getDelegator();
pcw = new ProductConfigWrapper(delegator, session.getDispatcher(),
productId, null, null, null, null, null, null);
} catch (ItemNotFoundException e) {
@@ -450,7 +450,7 @@
try {
int index = Integer.parseInt(cartIndex);
ShoppingCartItem product = cart.findCartItem(index);
- GenericDelegator delegator = cart.getDelegator();
+ Delegator delegator = cart.getDelegator();
pcw = product.getConfigWrapper();
} catch (Exception e) {
trace("general exception", e);
@@ -462,7 +462,7 @@
public void addItem(String productId, BigDecimal quantity) throws CartItemModifyException, ItemNotFoundException {
trace("add item", productId + "/" + quantity);
try {
- GenericDelegator delegator = cart.getDelegator();
+ Delegator delegator = cart.getDelegator();
GenericValue product = null;
ProductConfigWrapper pcw = null;
product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
@@ -900,7 +900,7 @@
return null;
}
- GenericDelegator delegator = session.getDelegator();
+ Delegator delegator = session.getDelegator();
GenericValue facilityContactMech = ContactMechWorker.getFacilityContactMechByPurpose(delegator, facilityId, UtilMisc.toList("SHIP_ORIG_LOCATION", "PRIMARY_LOCATION"));
if (facilityContactMech != null) {
try {
@@ -1120,7 +1120,7 @@
}
public GenericValue getTerminalState() {
- GenericDelegator delegator = session.getDelegator();
+ Delegator delegator = session.getDelegator();
List states = null;
try {
states = delegator.findByAnd("PosTerminalState", UtilMisc.toMap("posTerminalId", this.getTerminalId()));
@@ -1237,7 +1237,7 @@
try {
int index = Integer.parseInt(cartIndex);
ShoppingCartItem product = cart.findCartItem(index);
- GenericDelegator delegator = cart.getDelegator();
+ Delegator delegator = cart.getDelegator();
ProductConfigWrapper pcw = null;
pcw = product.getConfigWrapper();
if (pcw != null) {
@@ -1255,7 +1255,7 @@
public List createShoppingLists() {
List shoppingLists = null;
- GenericDelegator delegator = this.session.getDelegator();
+ Delegator delegator = this.session.getDelegator();
try {
shoppingLists = delegator.findList("ShoppingList", null, null, null, null, false);
} catch (GenericEntityException e) {
@@ -1302,7 +1302,7 @@
}
public boolean addListToCart(String shoppingListId, PosScreen pos, boolean append) {
- GenericDelegator delegator = session.getDelegator();
+ Delegator delegator = session.getDelegator();
LocalDispatcher dispatcher = session.getDispatcher();
String includeChild = null; // Perhaps will be used later ...
String prodCatalogId = null;
@@ -1318,7 +1318,7 @@
}
public boolean restoreOrder(String orderId, PosScreen pos, boolean append) {
- GenericDelegator delegator = session.getDelegator();
+ Delegator delegator = session.getDelegator();
LocalDispatcher dispatcher = session.getDispatcher();
Map svcCtx = FastMap.newInstance();
@@ -1362,7 +1362,7 @@
}
public boolean clearList(String shoppingListId, PosScreen pos) {
- GenericDelegator delegator = session.getDelegator();
+ Delegator delegator = session.getDelegator();
try {
ShoppingListEvents.clearListInfo(delegator, shoppingListId);
} catch (GenericEntityException e) {
@@ -1384,7 +1384,7 @@
pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale));
return;
}
- GenericDelegator delegator = this.session.getDelegator();
+ Delegator delegator = this.session.getDelegator();
LocalDispatcher dispatcher = session.getDispatcher();
GenericValue userLogin = session.getUserLogin();
Locale locale = defaultLocale;
@@ -1413,7 +1413,7 @@
pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale));
return;
}
- GenericDelegator delegator = this.session.getDelegator();
+ Delegator delegator = this.session.getDelegator();
LocalDispatcher dispatcher = session.getDispatcher();
GenericValue userLogin = session.getUserLogin();
Locale locale = defaultLocale;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Mon Oct 5 00:08:27 2009
@@ -37,7 +37,7 @@
import org.ofbiz.base.util.UtilProperties;
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.condition.EntityCondition;
@@ -463,7 +463,7 @@
BigDecimal othTotal = ZERO;
BigDecimal total = ZERO;
- GenericDelegator delegator = pos.getSession().getDelegator();
+ Delegator delegator = pos.getSession().getDelegator();
List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("originFacilityId", EntityOperator.EQUALS, trans.getFacilityId()),
EntityCondition.makeCondition("terminalId", EntityOperator.EQUALS, trans.getTerminalId()));
EntityListIterator eli = null;
Modified: ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java Mon Oct 5 00:08:27 2009
@@ -28,7 +28,7 @@
import javolution.util.FastMap;
import org.ofbiz.base.util.*;
-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;
@@ -97,7 +97,7 @@
return startDate;
}
- public static double calculateActualHours(GenericDelegator delegator, String timesheetId) {
+ public static double calculateActualHours(Delegator delegator, String timesheetId) {
List actuals = FastList.newInstance();
double actualHours = 0.00;
if (timesheetId != null) {
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AssignmentEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AssignmentEventAudit.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AssignmentEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AssignmentEventAudit.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -36,7 +36,7 @@
protected GenericValue assignmentEventAudit = null;
private boolean newValue = false;
- public AssignmentEventAudit(EntityAuditMgr mgr, GenericDelegator delegator, String eventAuditId) {
+ public AssignmentEventAudit(EntityAuditMgr mgr, Delegator delegator, String eventAuditId) {
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
@@ -49,7 +49,7 @@
}
}
- public AssignmentEventAudit(EntityAuditMgr mgr, GenericDelegator delegator) {
+ public AssignmentEventAudit(EntityAuditMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.assignmentEventAudit = delegator.makeValue("WfAssignmentEventAudit", UtilMisc.toMap("eventAuditId", this.eventAuditId));
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009
@@ -18,17 +18,17 @@
*******************************************************************************/
package org.ofbiz.shark.audit;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
public abstract class AuditEntityObject {
- protected transient GenericDelegator delegator = null;
+ protected transient Delegator delegator = null;
protected EntityAuditMgr mgr = null;
protected String delegatorName = null;
- public AuditEntityObject(EntityAuditMgr mgr, GenericDelegator delegator) {
+ public AuditEntityObject(EntityAuditMgr mgr, Delegator delegator) {
this.delegatorName = delegator.getDelegatorName();
this.delegator = delegator;
this.mgr = mgr;
@@ -38,9 +38,9 @@
return this.mgr;
}
- public GenericDelegator getGenericDelegator() {
+ public Delegator getDelegator() {
if (this.delegator == null && delegatorName != null) {
- this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
+ this.delegator = Delegator.getDelegator(delegatorName);
}
return this.delegator;
}
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/CreateProcessEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/CreateProcessEventAudit.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/CreateProcessEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/CreateProcessEventAudit.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -35,7 +35,7 @@
protected GenericValue createProcessEventAudit = null;
private boolean newValue = false;
- public CreateProcessEventAudit(EntityAuditMgr mgr, GenericDelegator delegator, String eventAuditId) {
+ public CreateProcessEventAudit(EntityAuditMgr mgr, Delegator delegator, String eventAuditId) {
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
@@ -48,7 +48,7 @@
}
}
- public CreateProcessEventAudit(EntityAuditMgr mgr, GenericDelegator delegator) {
+ public CreateProcessEventAudit(EntityAuditMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/DataEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/DataEventAudit.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/DataEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/DataEventAudit.java Mon Oct 5 00:08:27 2009
@@ -27,7 +27,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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -42,7 +42,7 @@
protected GenericValue dataEventAudit = null;
private boolean newValue = false;
- public DataEventAudit(EntityAuditMgr mgr, GenericDelegator delegator, String eventAuditId) {
+ public DataEventAudit(EntityAuditMgr mgr, Delegator delegator, String eventAuditId) {
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
@@ -55,7 +55,7 @@
}
}
- public DataEventAudit(EntityAuditMgr mgr, GenericDelegator delegator) {
+ public DataEventAudit(EntityAuditMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.dataEventAudit = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfDataEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, this.eventAuditId));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java Mon Oct 5 00:08:27 2009
@@ -24,7 +24,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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.shark.container.SharkContainer;
@@ -167,7 +167,7 @@
// process history
private List getCreateProcessEvents(String processId) throws EventAuditException {
if (Debug.verboseOn()) Debug.log(":: getCreateProcessEvents ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createProcessEvents = new ArrayList();
List lookupList = null;
try {
@@ -190,7 +190,7 @@
private List getProcessStateEvents(String processId) throws EventAuditException {
if (Debug.verboseOn()) Debug.log(":: getProcessStateEvents ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List stateEvents = new ArrayList();
List lookupList = null;
try {
@@ -213,7 +213,7 @@
private List getProcessDataEvents(String processId) throws EventAuditException {
if (Debug.verboseOn()) Debug.log(":: getProcessDataEvents ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List dataEvents = new ArrayList();
List lookupList = null;
try {
@@ -237,7 +237,7 @@
// activity history
private List getAssignmentEvents(String processId, String activityId) throws EventAuditException {
if (Debug.verboseOn()) Debug.log(":: getAssignmentEvents ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List assignmentEvents = new ArrayList();
List lookupList = null;
try {
@@ -260,7 +260,7 @@
private List getActivityStateEvents(String processId, String activityId) throws EventAuditException {
if (Debug.verboseOn()) Debug.log(":: getActivityStateEvents ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List stateEvents = new ArrayList();
List lookupList = null;
try {
@@ -283,7 +283,7 @@
private List getActivityDataEvents(String processId, String activityId) throws EventAuditException {
if (Debug.verboseOn()) Debug.log(":: getActivityDataEvents ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List dataEvents = new ArrayList();
List lookupList = null;
try {
@@ -305,7 +305,7 @@
}
public synchronized String getNextId(String string) throws EventAuditException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
return delegator.getNextSeqId("SharkAuditSeq").toString();
}
}
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EventAudit.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EventAudit.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -37,7 +37,7 @@
private GenericValue eventAudit = null;
private boolean newValue = false;
- public EventAudit(EntityAuditMgr mgr, GenericDelegator delegator, String eventAuditId) {
+ public EventAudit(EntityAuditMgr mgr, Delegator delegator, String eventAuditId) {
super(mgr, delegator);
this.eventAuditId = eventAuditId;
if (this.delegator != null) {
@@ -51,7 +51,7 @@
}
}
- public EventAudit(EntityAuditMgr mgr, GenericDelegator delegator) {
+ public EventAudit(EntityAuditMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.eventAuditId = delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfEventAudit);
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/StateEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/StateEventAudit.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/StateEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/StateEventAudit.java Mon Oct 5 00:08:27 2009
@@ -20,7 +20,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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -35,7 +35,7 @@
protected GenericValue stateEventAudit = null;
private boolean newValue = false;
- public StateEventAudit(EntityAuditMgr mgr, GenericDelegator delegator, String eventAuditId) {
+ public StateEventAudit(EntityAuditMgr mgr, Delegator delegator, String eventAuditId) {
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
@@ -48,7 +48,7 @@
}
}
- public StateEventAudit(EntityAuditMgr mgr, GenericDelegator delegator) {
+ public StateEventAudit(EntityAuditMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.stateEventAudit = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfStateEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, this.eventAuditId));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java Mon Oct 5 00:08:27 2009
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.ofbiz.shark.auth;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.shark.container.SharkContainer;
@@ -42,7 +42,7 @@
}
public boolean validateUser(UserTransaction userTransaction, String userName, String password) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue sharkUser = null;
try {
sharkUser = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkUser, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, userName));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.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.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityCrypto;
@@ -49,7 +49,7 @@
}
public boolean validateUser(UserTransaction userTransaction, String userName, String password) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
String p = null;
GenericValue adminUser = null;
String pass_hash = LoginServices.getPasswordHash(password);
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009
@@ -40,7 +40,7 @@
import org.ofbiz.base.util.GeneralRuntimeException;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.GenericDispatcher;
@@ -55,7 +55,7 @@
{
public static final String module = SharkContainer.class.getName();
- private static GenericDelegator delegator = null;
+ private static Delegator delegator = null;
private static LocalDispatcher dispatcher = null;
private static GenericValue adminUser = null;
private static String adminPass = null;
@@ -107,7 +107,7 @@
}
// get the delegator and dispatcher objects
- SharkContainer.delegator = GenericDelegator.getGenericDelegator(delegatorProp.value);
+ SharkContainer.delegator = Delegator.getDelegator(delegatorProp.value);
try {
SharkContainer.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherProp.value, SharkContainer.delegator);
} catch (GenericServiceException e) {
@@ -223,7 +223,7 @@
}
// static helper methods
- public static GenericDelegator getDelegator() {
+ public static Delegator getDelegator() {
return SharkContainer.delegator;
}
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java Mon Oct 5 00:08:27 2009
@@ -30,7 +30,7 @@
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilObject;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.util.EntityListIterator;
import org.ofbiz.entity.condition.EntityCondition;
@@ -86,7 +86,7 @@
}
public List runQuery() throws GenericEntityException {
- GenericDelegator delegator = this.getDelegator();
+ Delegator delegator = this.getDelegator();
DynamicViewEntity view = this.makeView();
EntityListIterator eli = null;
List result = null;
@@ -145,7 +145,7 @@
this.viewLinks.add(new ViewLink(entityAlias, relEntityAlias, opt, keyMap));
}
- protected GenericDelegator getDelegator() {
+ protected Delegator getDelegator() {
return SharkContainer.getDelegator();
}
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java Mon Oct 5 00:08:27 2009
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.ofbiz.shark.instance;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.base.util.UtilMisc;
@@ -38,7 +38,7 @@
protected GenericValue activity = null;
protected boolean newValue = false;
- protected Activity(EntityPersistentMgr mgr, GenericDelegator delegator, String activityId) throws PersistenceException {
+ protected Activity(EntityPersistentMgr mgr, Delegator delegator, String activityId) throws PersistenceException {
super(mgr, delegator);
this.delegator = delegator;
if (this.delegator != null) {
@@ -57,7 +57,7 @@
this.activity = activity;
}
- public Activity(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public Activity(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.activity = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfActivity);
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java Mon Oct 5 00:08:27 2009
@@ -21,7 +21,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilObject;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.shark.container.SharkContainer;
@@ -40,7 +40,7 @@
protected GenericValue activityVariable = null;
protected boolean newValue = false;
- protected ActivityVariable(EntityPersistentMgr mgr, GenericDelegator delegator, String activityVariableId) throws PersistenceException {
+ protected ActivityVariable(EntityPersistentMgr mgr, Delegator delegator, String activityVariableId) throws PersistenceException {
super(mgr, delegator);
this.delegator = delegator;
if (this.delegator != null) {
@@ -59,7 +59,7 @@
this.activityVariable = activityVariable;
}
- public ActivityVariable(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public ActivityVariable(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.activityVariable = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfActivityVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityVariableId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfActivityVariable)));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java Mon Oct 5 00:08:27 2009
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.ofbiz.shark.instance;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.base.util.UtilMisc;
@@ -38,7 +38,7 @@
protected GenericValue andJoin = null;
protected boolean newValue = false;
- protected AndJoinEntry(EntityPersistentMgr mgr, GenericDelegator delegator, String andJoinId) {
+ protected AndJoinEntry(EntityPersistentMgr mgr, Delegator delegator, String andJoinId) {
super(mgr, delegator);
if (this.delegator != null) {
try {
@@ -56,7 +56,7 @@
this.andJoin = andJoin;
}
- public AndJoinEntry(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public AndJoinEntry(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.andJoin = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfAndJoin, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.andJoinId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfAndJoin)));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java Mon Oct 5 00:08:27 2009
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.ofbiz.shark.instance;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.base.util.UtilMisc;
@@ -38,7 +38,7 @@
protected GenericValue assignment = null;
protected boolean newValue = false;
- protected Assignment(EntityPersistentMgr mgr, GenericDelegator delegator, String activityId, String userName) throws PersistenceException {
+ protected Assignment(EntityPersistentMgr mgr, Delegator delegator, String activityId, String userName) throws PersistenceException {
super(mgr, delegator);
if (this.delegator != null) {
try {
@@ -56,7 +56,7 @@
this.assignment = assignment;
}
- public Assignment(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public Assignment(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.assignment = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfAssignment);
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Deadline.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Deadline.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Deadline.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Deadline.java Mon Oct 5 00:08:27 2009
@@ -25,7 +25,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
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;
@@ -40,7 +40,7 @@
protected GenericValue deadline = null;
protected boolean newValue = false;
- protected Deadline(EntityPersistentMgr mgr, GenericDelegator delegator, String deadlineId) throws PersistenceException {
+ protected Deadline(EntityPersistentMgr mgr, Delegator delegator, String deadlineId) throws PersistenceException {
super(mgr, delegator);
if (this.delegator != null) {
try {
@@ -58,7 +58,7 @@
this.deadline = deadline;
}
- public Deadline(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public Deadline(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.deadline = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfDeadline, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.deadlineId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfDeadline)));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Mon Oct 5 00:08:27 2009
@@ -45,7 +45,7 @@
import org.ofbiz.base.util.Debug;
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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityComparisonOperator;
@@ -214,7 +214,7 @@
}
public void deleteProcess(String processId, boolean admin, SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
if (admin) {
if (Debug.infoOn()) Debug.log(":: deleteProcess ::", module);
Process process = (Process) this.restoreProcess(processId, trans);
@@ -284,7 +284,7 @@
public void deleteAndJoinEntries(String procId, String asDefId, String aDefId, SharkTransaction trans) throws PersistenceException {
if (Debug.infoOn()) Debug.log(":: deleteAndJoinEntries ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
try {
delegator.removeByAnd(org.ofbiz.shark.SharkConstants.WfAndJoin, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, procId,
org.ofbiz.shark.SharkConstants.activitySetDefId, asDefId, org.ofbiz.shark.SharkConstants.activityDefId, aDefId));
@@ -294,7 +294,7 @@
}
public void deleteDeadlines(String procId, SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
try {
delegator.removeByAnd(org.ofbiz.shark.SharkConstants.WfDeadline, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, procId));
} catch (GenericEntityException e) {
@@ -303,7 +303,7 @@
}
public void deleteDeadlines(String procId, String actId, SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
try {
delegator.removeByAnd(org.ofbiz.shark.SharkConstants.WfDeadline, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, procId, org.ofbiz.shark.SharkConstants.activityId, actId));
} catch (GenericEntityException e) {
@@ -353,7 +353,7 @@
public List getAllProcessMgrs(SharkTransaction trans) throws PersistenceException {
if (Debug.verboseOn()) Debug.log(":: getAllProcessMgrs ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -383,7 +383,7 @@
public List getAllResources(SharkTransaction trans) throws PersistenceException {
if (Debug.verboseOn()) Debug.log(":: getAllResources ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -403,7 +403,7 @@
public List getAllAssignments(SharkTransaction trans) throws PersistenceException {
if (Debug.verboseOn()) Debug.log(":: getAllAssignments ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -422,7 +422,7 @@
}
public List getAllActivities(SharkTransaction trans) throws PersistenceException {
if (Debug.verboseOn()) Debug.log(":: getAllActivities ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -447,7 +447,7 @@
public List getProcessesForMgr(String mgrName, String state, SharkTransaction trans) throws PersistenceException {
if (Debug.verboseOn()) Debug.log(":: getProcessesForMgr ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
@@ -472,7 +472,7 @@
}
public List getAllRunningProcesses(SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List runningStates = UtilMisc.toList("open.running");
List order = UtilMisc.toList(org.ofbiz.shark.SharkConstants.startedTime);
List createdList = new ArrayList();
@@ -495,7 +495,7 @@
protected List findFinishedProcesses(SharkTransaction trans, String packageId, String processDefId, String packageVer, Date finishedBefore) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List finsihedStates = UtilMisc.toList("closed.completed", "closed.terminated", "closed.aborted");
List order = UtilMisc.toList(org.ofbiz.shark.SharkConstants.lastStateTime);
List createdList = new ArrayList();
@@ -555,7 +555,7 @@
return this.findProcessActivities(processId, finishedStates, EntityOperator.NOT_EQUAL, trans);
}
public List getAllAssignmentsForResource(String user, SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -619,7 +619,7 @@
* matter if activity is already in "closed" state or some of its sub-states.
*/
public List getAllAssignmentsForActivity(String activityId, SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -682,7 +682,7 @@
public List getAllVariablesForProcess(String processId, SharkTransaction trans) throws PersistenceException {
if (Debug.verboseOn()) Debug.log(":: getAllVariablesForProcess ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -708,7 +708,7 @@
public List getAllVariablesForActivity(String activityId, SharkTransaction trans) throws PersistenceException {
if (Debug.verboseOn()) Debug.log(":: getAllVariablesForActivity ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -729,7 +729,7 @@
public List getResourceRequestersProcessIds(String userName, SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List idList = new ArrayList();
List lookupList = null;
try {
@@ -782,7 +782,7 @@
public List getAllIdsForProcessesWithExpiriedDeadlines(long l, SharkTransaction trans) throws PersistenceException {
if (Debug.infoOn()) Debug.log(":: getAllIdsForProcessesWithExpiriedDeadlines ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List processIds = new ArrayList();
DynamicViewEntity view = new DynamicViewEntity();
@@ -843,7 +843,7 @@
public int getExecuteCount(String procId, String asDefId, String aDefId, SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
long count = 0;
try {
count = delegator.findCountByAnd(org.ofbiz.shark.SharkConstants.WfActivity, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, procId, org.ofbiz.shark.SharkConstants.setDefinitionId, asDefId, org.ofbiz.shark.SharkConstants.definitionId, aDefId));
@@ -855,7 +855,7 @@
}
private List getAndJoinValues(String processId, String activitySetDefId, String activityDefId) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List lookupList = null;
try {
lookupList = delegator.findByAnd(org.ofbiz.shark.SharkConstants.WfAndJoin, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, processId,
@@ -870,7 +870,7 @@
}
private List getDeadlineValues(List exprList) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List lookupList = null;
if (exprList == null) {
lookupList = new ArrayList();
@@ -940,7 +940,7 @@
}
public synchronized String getNextId(String string) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
return delegator.getNextSeqId("SharkWorkflowSeq").toString();
}
@@ -1004,7 +1004,7 @@
}
public List getAllProcesses(SharkTransaction trans) throws PersistenceException {
if (Debug.verboseOn()) Debug.log(":: getAllProcesses ::", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List lookupList = null;
try {
@@ -1132,7 +1132,7 @@
}
}
protected List findProcessActivities(String processId, List states, EntityComparisonOperator operator, SharkTransaction trans) throws PersistenceException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List createdList = new ArrayList();
List order = UtilMisc.toList(org.ofbiz.shark.SharkConstants.lastStateTime);
List lookupList = null;
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009
@@ -19,11 +19,12 @@
package org.ofbiz.shark.instance;
import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericDelegator;
public abstract class InstanceEntityObject {
- protected transient GenericDelegator delegator = null;
+ protected transient Delegator delegator = null;
protected EntityPersistentMgr mgr = null;
protected String delegatorName = null;
@@ -37,7 +38,7 @@
return this.mgr;
}
- public GenericDelegator getGenericDelegator() {
+ public Delegator getGenericDelegator() {
if (this.delegator == null && delegatorName != null) {
this.delegator = GenericDelegator.getGenericDelegator(delegatorName);
}
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java Mon Oct 5 00:08:27 2009
@@ -25,7 +25,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilObject;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.shark.container.SharkContainer;
@@ -43,7 +43,7 @@
protected GenericValue process = null;
protected boolean newValue = false;
- protected Process(EntityPersistentMgr mgr, GenericDelegator delegator, String processId) throws PersistenceException {
+ protected Process(EntityPersistentMgr mgr, Delegator delegator, String processId) throws PersistenceException {
super(mgr, delegator);
if (this.delegator != null) {
try {
@@ -63,7 +63,7 @@
this.process = process;
}
- public Process(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public Process(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.process = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfProcess);
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java Mon Oct 5 00:08:27 2009
@@ -19,7 +19,7 @@
package org.ofbiz.shark.instance;
import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.Debug;
@@ -37,7 +37,7 @@
protected GenericValue processMgr = null;
protected boolean newValue = false;
- protected ProcessMgr(EntityPersistentMgr mgr, GenericDelegator delegator, String name) throws PersistenceException {
+ protected ProcessMgr(EntityPersistentMgr mgr, Delegator delegator, String name) throws PersistenceException {
super(mgr, delegator);
if (this.delegator != null) {
try {
@@ -55,7 +55,7 @@
this.processMgr = processMgr;
}
- public ProcessMgr(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public ProcessMgr(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.processMgr = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfProcessMgr, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.currentState, new Long(0)));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java Mon Oct 5 00:08:27 2009
@@ -23,7 +23,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilObject;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.shark.container.SharkContainer;
@@ -39,7 +39,7 @@
protected GenericValue processVariable = null;
protected boolean newValue = false;
- protected ProcessVariable(EntityPersistentMgr mgr, GenericDelegator delegator, String processVariableId) throws PersistenceException {
+ protected ProcessVariable(EntityPersistentMgr mgr, Delegator delegator, String processVariableId) throws PersistenceException {
super(mgr, delegator);
if (this.delegator != null) {
try {
@@ -57,7 +57,7 @@
this.processVariable = processVariable;
}
- public ProcessVariable(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public ProcessVariable(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.processVariable = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfProcessVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processVariableId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfProcessVariable)));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java Mon Oct 5 00:08:27 2009
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.ofbiz.shark.instance;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.base.util.UtilMisc;
@@ -38,7 +38,7 @@
protected GenericValue resource = null;
protected boolean newValue = false;
- protected Resource(EntityPersistentMgr mgr, GenericDelegator delegator, String name) throws PersistenceException {
+ protected Resource(EntityPersistentMgr mgr, Delegator delegator, String name) throws PersistenceException {
super(mgr, delegator);
if (this.delegator != null) {
try {
@@ -56,7 +56,7 @@
this.resource = resource;
}
- public Resource(EntityPersistentMgr mgr, GenericDelegator delegator) {
+ public Resource(EntityPersistentMgr mgr, Delegator delegator) {
super(mgr, delegator);
this.newValue = true;
this.resource = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfResource);
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java Mon Oct 5 00:08:27 2009
@@ -19,7 +19,7 @@
package org.ofbiz.shark.mapping;
import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.shark.container.SharkContainer;
@@ -32,11 +32,11 @@
*/
public class EntityApplicationMap implements ApplicationMap {
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected GenericValue application = null;
protected boolean isNew = false;
- protected EntityApplicationMap(GenericDelegator delegator, String packageId, String processDefId, String applicationDefId) throws RootException {
+ protected EntityApplicationMap(Delegator delegator, String packageId, String processDefId, String applicationDefId) throws RootException {
this.delegator = delegator;
try {
this.application = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfApplicationMap, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.packageId, packageId, org.ofbiz.shark.SharkConstants.processDefId, processDefId, org.ofbiz.shark.SharkConstants.applicationDefId, applicationDefId));
@@ -50,7 +50,7 @@
this.delegator = application.getDelegator();
}
- public EntityApplicationMap(GenericDelegator delegator) {
+ public EntityApplicationMap(Delegator delegator) {
this.isNew = true;
this.delegator = delegator;
this.application = delegator.makeValue("SharkApplicationMap");
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java Mon Oct 5 00:08:27 2009
@@ -22,7 +22,7 @@
import java.util.Iterator;
import java.util.List;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.shark.container.SharkContainer;
@@ -63,7 +63,7 @@
}
public List getAllApplicationMappings(ApplicationMappingTransaction mappingTransaction) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List lookupList = null;
try {
lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfApplicationMap, null, null, null, null, false);
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java Mon Oct 5 00:08:27 2009
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.ofbiz.shark.mapping;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.base.util.UtilMisc;
@@ -36,11 +36,11 @@
public static final String module = EntityParticipantMap.class.getName();
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected GenericValue participant = null;
protected boolean newValue = false;
- protected EntityParticipantMap(GenericDelegator delegator, String packageId, String processDefId, String participantId) throws RootException {
+ protected EntityParticipantMap(Delegator delegator, String packageId, String processDefId, String participantId) throws RootException {
this.delegator = delegator;
try {
this.participant = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfParticipantMap, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.packageId, packageId, org.ofbiz.shark.SharkConstants.processDefId, processDefId, org.ofbiz.shark.SharkConstants.participantId, participantId));
@@ -54,7 +54,7 @@
this.delegator = application.getDelegator();
}
- public EntityParticipantMap(GenericDelegator delegator) {
+ public EntityParticipantMap(Delegator delegator) {
this.newValue = true;
this.delegator = delegator;
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java Mon Oct 5 00:08:27 2009
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.shark.container.SharkContainer;
@@ -61,7 +61,7 @@
}
public List getAllParticipantMappings(ParticipantMappingTransaction mappingTransaction) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List lookupList = null;
try {
lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfParticipantMap, null, null, null, null, false);
@@ -94,7 +94,7 @@
}
public List getParticipantMappings(ParticipantMappingTransaction mappingTransaction, String packageId, String processDefId, String participantId) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List lookupList = null;
try {
lookupList = delegator.findByAnd(org.ofbiz.shark.SharkConstants.WfParticipantMap, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.packageId, packageId, org.ofbiz.shark.SharkConstants.processDefId, processDefId, org.ofbiz.shark.SharkConstants.participantId, participantId));
@@ -115,7 +115,7 @@
}
public List getParticipantMappings(ParticipantMappingTransaction mappingTransaction, String userName) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List lookupList = null;
try {
lookupList = delegator.findByAnd(org.ofbiz.shark.SharkConstants.WfParticipantMap, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, userName));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Mon Oct 5 00:08:27 2009
@@ -33,7 +33,7 @@
import org.ofbiz.base.util.Debug;
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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -74,7 +74,7 @@
public void deleteXPDL(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException {
Debug.log("XPDL Delete : " + xpdlId + "/" + xpdlVersion, module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, false);
if (value != null) {
try {
@@ -88,7 +88,7 @@
public void moveToHistory(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException {
Debug.log("XPDL Move to History : " + xpdlId + "/" + xpdlVersion, module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, false);
value.set(org.ofbiz.shark.SharkConstants.isHistorical, "Y");
try {
@@ -113,7 +113,7 @@
public void clearRepository(RepositoryTransaction t) throws RepositoryException {
Debug.log("XPDL Clear Repository", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
try {
delegator.removeAll(org.ofbiz.shark.SharkConstants.WfRepository);
} catch (GenericEntityException e) {
@@ -207,7 +207,7 @@
public List getReferringXPDLIds(RepositoryTransaction t, String referredXPDLId) throws RepositoryException {
Debug.log("Get XPDL Reference IDs", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List referringIds = new ArrayList();
List refs = null;
try {
@@ -228,7 +228,7 @@
public List getReferringXPDLVersions(RepositoryTransaction t, String referredXPDLId, String referringXPDLId) throws RepositoryException {
Debug.log("Get Referring XPDL Versions", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List referringVers = new ArrayList();
List refs = null;
try {
@@ -248,7 +248,7 @@
public List getReferredXPDLIds(RepositoryTransaction t, String referringXPDLId, String referringXPDLVersion) throws RepositoryException {
Debug.log("Get Referring XPDL IDs", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List referringIds = new ArrayList();
List refs = null;
try {
@@ -278,7 +278,7 @@
}
private GenericValue getXpdlValue(String xpdlId, String xpdlVersion, boolean includeHistorical) throws RepositoryException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue xpdl = null;
try {
xpdl = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfRepository, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.xpdlId, xpdlId, org.ofbiz.shark.SharkConstants.xpdlVersion, xpdlVersion));
@@ -293,7 +293,7 @@
}
private List getXpdlValues(String xpdlId, String xpdlVersion, boolean includeHistory) throws RepositoryException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List exprList = new ArrayList();
if (xpdlId != null) {
exprList.add(EntityCondition.makeCondition(org.ofbiz.shark.SharkConstants.xpdlId, EntityOperator.EQUALS, xpdlId));
@@ -332,7 +332,7 @@
// TODO Auto-generated catch block
e1.printStackTrace();
}
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
try {
GenericValue v = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfRepository);
v.set(org.ofbiz.shark.SharkConstants.xpdlId, xpdlId);
@@ -379,7 +379,7 @@
int referredXPDLNumber) throws RepositoryException
{
Debug.log("Add XPDL Reference", module);
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue ref = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfRepositoryRef);
ref.set(org.ofbiz.shark.SharkConstants.xpdlId, referringXPDLId);
ref.set(org.ofbiz.shark.SharkConstants.xpdlVersion, referringXPDLVersion);
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009
@@ -26,6 +26,7 @@
import java.io.Serializable;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.base.util.UtilMisc;
@@ -52,7 +53,7 @@
public abstract class AbstractRequester implements WfRequester, Serializable {
public static final String module = LoggingRequester.class.getName();
- protected transient GenericDelegator delegator = null;
+ protected transient Delegator delegator = null;
protected transient GenericValue userLogin = null;
protected String delegatorName = null;
protected String userLoginId = null;
@@ -144,7 +145,7 @@
return wrdMap;
}
- protected synchronized GenericDelegator getDelegator() {
+ protected synchronized Delegator getDelegator() {
if (this.delegator == null && this.delegatorName != null) {
this.delegator = GenericDelegator.getGenericDelegator(this.delegatorName);
}
@@ -153,7 +154,7 @@
protected synchronized GenericValue getUserLogin() throws GenericEntityException {
if (userLogin == null && this.userLoginId != null) {
- GenericDelegator delegator = this.getDelegator();
+ Delegator delegator = this.getDelegator();
if (delegator != null) {
this.userLogin = delegator.findByPrimaryKey("UserLogin",
UtilMisc.toMap("userLoginId", this.userLoginId));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java Mon Oct 5 00:08:27 2009
@@ -23,7 +23,7 @@
import java.util.Iterator;
import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.shark.container.SharkContainer;
import org.ofbiz.base.util.UtilMisc;
@@ -48,7 +48,7 @@
}
public List getAllGroupnames(UserTransaction trans) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List groupNames = new ArrayList();
List groups = null;
try {
@@ -68,7 +68,7 @@
}
public List getAllUsers(UserTransaction trans) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List userNames = new ArrayList();
List users = null;
try {
@@ -88,7 +88,7 @@
}
public List getAllUsers(UserTransaction trans, String groupName) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List userNames = new ArrayList();
List members = null;
try {
@@ -124,7 +124,7 @@
}
public List getAllSubgroups(UserTransaction trans, String groupName) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
List subGroups = new ArrayList();
List rollups = null;
try {
@@ -160,7 +160,7 @@
}
public void createGroup(UserTransaction trans, String groupName, String description) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue group = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroup);
group.set(org.ofbiz.shark.SharkConstants.groupName, groupName);
group.set(org.ofbiz.shark.SharkConstants.description, description);
@@ -214,7 +214,7 @@
}
public void addGroupToGroup(UserTransaction trans, String parentGroupName, String groupName) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue rollup = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroupRollup);
rollup.set(org.ofbiz.shark.SharkConstants.parentGroupName, parentGroupName);
rollup.set(org.ofbiz.shark.SharkConstants.groupName, groupName);
@@ -260,7 +260,7 @@
}
public void addUserToGroup(UserTransaction trans, String groupName, String username) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue member = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroupMember);
member.set(org.ofbiz.shark.SharkConstants.groupName, groupName);
member.set(org.ofbiz.shark.SharkConstants.userName, username);
@@ -298,7 +298,7 @@
}
public void createUser(UserTransaction trans, String groupName, String username, String password, String firstName, String lastName, String email) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue user = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkUser);
user.set(org.ofbiz.shark.SharkConstants.userName, username);
user.set(org.ofbiz.shark.SharkConstants.firstName, firstName);
@@ -399,7 +399,7 @@
}
private GenericValue getUser(String username) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue value = null;
try {
value = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkUser, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, username));
@@ -411,7 +411,7 @@
}
private GenericValue getGroup(String groupName) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue value = null;
try {
value = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkGroup, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.groupName, groupName));
@@ -423,7 +423,7 @@
}
private GenericValue getGroupMember(String groupName, String username) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue member = null;
try {
member = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkGroupMember, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.groupName, groupName, org.ofbiz.shark.SharkConstants.userName, username));
@@ -435,7 +435,7 @@
}
private GenericValue getGroupRollup(String parentGroup, String group) throws RootException {
- GenericDelegator delegator = SharkContainer.getDelegator();
+ Delegator delegator = SharkContainer.getDelegator();
GenericValue rollup = null;
try {
rollup = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkGroupRollup, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.parentGroupName, parentGroup, org.ofbiz.shark.SharkConstants.groupName, group));
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java Mon Oct 5 00:08:27 2009
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.shark.container.SharkContainer;
@@ -37,7 +37,7 @@
public static final String module = PartyUserGroupMgr.class.getName();
protected CallbackUtilities callBack = null;
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
public void configure(CallbackUtilities cb) throws RootException {
this.delegator = SharkContainer.getDelegator();
Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java Mon Oct 5 00:08:27 2009
@@ -24,7 +24,7 @@
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.order.shoppingcart.ShoppingCart;
import org.ofbiz.product.store.ProductStoreWorker;
@@ -66,7 +66,7 @@
GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
WebPosSession webPosSession = (WebPosSession) session.getAttribute("webPosSession");
ShoppingCart cart = (ShoppingCart) session.getAttribute("shoppingCart");
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
if (UtilValidate.isEmpty(webPosSession)) {
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 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.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -49,14 +50,14 @@
private String productStoreId = null;
private String facilityId = null;
private String currencyUomId = null;
- private transient GenericDelegator delegator = null;
+ private transient Delegator delegator = null;
private String delegatorName = null;
private LocalDispatcher dispatcher = null;
private Boolean mgrLoggedIn = null;
private WebPosTransaction webPosTransaction = null;
private ShoppingCart cart = null;
- public WebPosSession(String id, Map<String, Object> attributes, GenericValue userLogin, Locale locale, String productStoreId, String facilityId, String currencyUomId, GenericDelegator delegator, LocalDispatcher dispatcher, ShoppingCart cart) {
+ public WebPosSession(String id, Map<String, Object> attributes, GenericValue userLogin, Locale locale, String productStoreId, String facilityId, String currencyUomId, Delegator delegator, LocalDispatcher dispatcher, ShoppingCart cart) {
this.id = id;
this.attributes = attributes;
this.userLogin = userLogin;
@@ -143,7 +144,7 @@
this.currencyUomId = currencyUomId;
}
- public GenericDelegator getDelegator() {
+ public Delegator getDelegator() {
if (UtilValidate.isEmpty(delegator)) {
delegator = GenericDelegator.getGenericDelegator(delegatorName);
}
Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Mon Oct 5 00:08:27 2009
@@ -31,7 +31,7 @@
import org.ofbiz.base.util.UtilFormatOut;
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.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -67,7 +67,7 @@
public WebPosTransaction(WebPosSession session) {
this.webPosSession = session;
this.partyId = "_NA_";
- GenericDelegator delegator = session.getDelegator();
+ Delegator delegator = session.getDelegator();
ShoppingCart cart = session.getCart();
this.ch = new CheckOutHelper(session.getDispatcher(), delegator, cart);
cart.setChannelType("POS_SALES_CHANNEL");
@@ -132,7 +132,7 @@
}
public GenericValue getTerminalState() {
- GenericDelegator delegator = webPosSession.getDelegator();
+ Delegator delegator = webPosSession.getDelegator();
List<GenericValue> states = null;
try {
states = delegator.findList("PosTerminalState", EntityCondition.makeCondition(UtilMisc.toMap("posTerminalId", webPosSession.getId(), "startingTxId", getTransactionId())), null, null, null, false);
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java Mon Oct 5 00:08:27 2009
@@ -34,7 +34,7 @@
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.ObjectType;
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.serialize.SerializeException;
@@ -90,7 +90,7 @@
}
public static Map getApplicationContext(DispatchContext ctx, Map context) throws GenericServiceException {
- final GenericDelegator delegator = ctx.getDelegator();
+ final Delegator delegator = ctx.getDelegator();
final Map result = new HashMap();
try {
result.put("applicationContext",
@@ -105,7 +105,7 @@
}
public static Map completeApplication(DispatchContext ctx, Map context) throws GenericServiceException {
- final GenericDelegator delegator = ctx.getDelegator();
+ final Delegator delegator = ctx.getDelegator();
final String applicationId = (String) context.get("applicationId");
final Map result = new HashMap();
@@ -175,7 +175,7 @@
return result;
}
- private static String insertAppSandbox(GenericDelegator delegator, String workEffortId, String partyId,
+ private static String insertAppSandbox(Delegator delegator, String workEffortId, String partyId,
String roleTypeId, Timestamp fromDate, Map context) throws GenericServiceException {
String dataId = null;
String applicationId = Long.toString((new Date().getTime()));
@@ -205,7 +205,7 @@
return applicationId;
}
- private static GenericValue getApplicationSandbox(GenericDelegator delegator, String applicationId)
+ private static GenericValue getApplicationSandbox(Delegator delegator, String applicationId)
throws GenericServiceException {
try {
GenericValue application =
@@ -216,7 +216,7 @@
}
}
- private static Map getRunTimeContext(GenericDelegator delegator, GenericValue runTimeData)
+ private static Map getRunTimeContext(Delegator delegator, GenericValue runTimeData)
throws GenericServiceException {
try {
return (Map) XmlSerializer.deserialize((String) runTimeData.get("runtimeInfo"), delegator);
@@ -244,7 +244,7 @@
}
}
- private static GenericValue getRuntimeData(GenericDelegator delegator, String applicationId)
+ private static GenericValue getRuntimeData(Delegator delegator, String applicationId)
throws GenericServiceException {
try {
GenericValue application =
@@ -255,7 +255,7 @@
}
}
- private static void getApplicationSignatures(GenericDelegator delegator, GenericValue application,
+ private static void getApplicationSignatures(Delegator delegator, GenericValue application,
Map contextSignature, Map resultSignature) throws GenericEntityException {
Map expresions = null;
// look for the 1st application.
@@ -305,7 +305,7 @@
}
}
- private static GenericValue getWorkEffortPartyAssigment(GenericDelegator delegator, String workEffortId)
+ private static GenericValue getWorkEffortPartyAssigment(Delegator delegator, String workEffortId)
throws GenericServiceException {
Map expresions = new HashMap();
expresions.putAll(UtilMisc.toMap("workEffortId", workEffortId));