You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/12 23:22:00 UTC
svn commit: r1337684 - in
/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark: audit/ auth/
container/ instance/ mapping/ repository/ requester/ user/
Author: doogie
Date: Sat May 12 21:22:00 2012
New Revision: 1337684
URL: http://svn.apache.org/viewvc?rev=1337684&view=rev
Log:
DEPRECATION: specialpurpose/shark: findByPrimaryKey variants replaced
with findOne
Modified:
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/AssignmentEventAudit.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/CreateProcessEventAudit.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/DataEventAudit.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/EventAudit.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/audit/StateEventAudit.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Deadline.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -40,7 +40,7 @@ public class AssignmentEventAudit extend
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
- this.assignmentEventAudit = delegator.findByPrimaryKey("WfAssignmentEventAudit", UtilMisc.toMap("eventAuditId", eventAuditId));
+ this.assignmentEventAudit = delegator.findOne("WfAssignmentEventAudit", UtilMisc.toMap("eventAuditId", eventAuditId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -39,7 +39,7 @@ public class CreateProcessEventAudit ext
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
- this.createProcessEventAudit = delegator.findByPrimaryKey("WfCreateProcessEventAudit", UtilMisc.toMap("eventAuditId", eventAuditId));
+ this.createProcessEventAudit = delegator.findOne("WfCreateProcessEventAudit", UtilMisc.toMap("eventAuditId", eventAuditId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -46,7 +46,7 @@ public class DataEventAudit extends Even
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
- this.dataEventAudit = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfDataEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId));
+ this.dataEventAudit = delegator.findOne(org.ofbiz.shark.SharkConstants.WfDataEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -42,7 +42,7 @@ public class EventAudit extends AuditEnt
this.eventAuditId = eventAuditId;
if (this.delegator != null) {
try {
- this.eventAudit = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId));
+ this.eventAudit = delegator.findOne(org.ofbiz.shark.SharkConstants.WfEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -39,7 +39,7 @@ public class StateEventAudit extends Eve
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
- this.stateEventAudit = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfStateEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId));
+ this.stateEventAudit = delegator.findOne(org.ofbiz.shark.SharkConstants.WfStateEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -46,7 +46,7 @@ public class GenericAuthenticationMgr im
Delegator delegator = SharkContainer.getDelegator();
GenericValue sharkUser = null;
try {
- sharkUser = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkUser, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, userName));
+ sharkUser = delegator.findOne(org.ofbiz.shark.SharkConstants.SharkUser, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, userName), false);
} catch (GenericEntityException e) {
throw new RootException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -55,7 +55,7 @@ public class OfbizAuthenticationMgr impl
GenericValue adminUser = null;
String pass_hash = HashCrypt.getDigestHash(password, LoginServices.getHashType());
try {
- adminUser = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", userName));
+ adminUser = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userName), false);
String a = adminUser.getString("userLoginId");
p = adminUser.getString("currentPassword");
} catch (GenericEntityException e) {}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -114,7 +114,7 @@ public class SharkContainer implements C
// get the admin user
try {
- SharkContainer.adminUser = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", adminProp.value));
+ SharkContainer.adminUser = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", adminProp.value), false);
} catch (GenericEntityException e) {
throw new ContainerException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -43,7 +43,7 @@ public class Activity extends InstanceEn
this.delegator = delegator;
if (this.delegator != null) {
try {
- this.activity = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfActivity, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityId, activityId));
+ this.activity = delegator.findOne(org.ofbiz.shark.SharkConstants.WfActivity, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityId, activityId), false);
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -45,7 +45,7 @@ public class ActivityVariable extends In
this.delegator = delegator;
if (this.delegator != null) {
try {
- this.activityVariable = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfActivityVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityVariableId, activityVariableId));
+ this.activityVariable = delegator.findOne(org.ofbiz.shark.SharkConstants.WfActivityVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityVariableId, activityVariableId), false);
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -42,7 +42,7 @@ public class AndJoinEntry extends Instan
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.andJoin = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfAndJoin, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.andJoinId, andJoinId));
+ this.andJoin = delegator.findOne(org.ofbiz.shark.SharkConstants.WfAndJoin, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.andJoinId, andJoinId), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -42,7 +42,7 @@ public class Assignment extends Instance
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.assignment = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfAssignment, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityId, activityId, org.ofbiz.shark.SharkConstants.userName, userName));
+ this.assignment = delegator.findOne(org.ofbiz.shark.SharkConstants.WfAssignment, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityId, activityId, org.ofbiz.shark.SharkConstants.userName, userName), false);
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -44,7 +44,7 @@ public class Deadline extends InstanceEn
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.deadline = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfDeadline, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.deadlineId, deadlineId));
+ this.deadline = delegator.findOne(org.ofbiz.shark.SharkConstants.WfDeadline, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.deadlineId, deadlineId), false);
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -47,7 +47,7 @@ public class Process extends InstanceEnt
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.process = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfProcess, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, processId));
+ this.process = delegator.findOne(org.ofbiz.shark.SharkConstants.WfProcess, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, processId), false);
} catch (GenericEntityException e) {
Debug.logError("Invalid delegator object passed", module);
e.printStackTrace();
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -41,7 +41,7 @@ public class ProcessMgr extends Instance
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.processMgr = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfProcessMgr, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.mgrName, name));
+ this.processMgr = delegator.findOne(org.ofbiz.shark.SharkConstants.WfProcessMgr, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.mgrName, name), false);
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -43,7 +43,7 @@ public class ProcessVariable extends Ins
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.processVariable = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfProcessVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processVariableId, processVariableId));
+ this.processVariable = delegator.findOne(org.ofbiz.shark.SharkConstants.WfProcessVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processVariableId, processVariableId), false);
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -42,7 +42,7 @@ public class Resource extends InstanceEn
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.resource = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfResource, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, name));
+ this.resource = delegator.findOne(org.ofbiz.shark.SharkConstants.WfResource, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, name), false);
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -39,7 +39,7 @@ public class EntityApplicationMap implem
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));
+ this.application = delegator.findOne(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), false);
} catch (GenericEntityException e) {
throw new RootException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -43,7 +43,7 @@ public class EntityParticipantMap implem
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));
+ this.participant = delegator.findOne(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), false);
} catch (GenericEntityException e) {
throw new RootException(e);
}
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -281,7 +281,7 @@ public class EntityRepositoryMgr impleme
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));
+ xpdl = delegator.findOne(org.ofbiz.shark.SharkConstants.WfRepository, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.xpdlId, xpdlId, org.ofbiz.shark.SharkConstants.xpdlVersion, xpdlVersion), false);
if (!includeHistorical && xpdl.get(org.ofbiz.shark.SharkConstants.isHistorical) != null && xpdl.getString(org.ofbiz.shark.SharkConstants.isHistorical).equalsIgnoreCase("Y")) {
xpdl = null;
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -158,8 +158,8 @@ public abstract class AbstractRequester
if (userLogin == null && this.userLoginId != null) {
Delegator delegator = this.getDelegator();
if (delegator != null) {
- this.userLogin = delegator.findByPrimaryKey("UserLogin",
- UtilMisc.toMap("userLoginId", this.userLoginId));
+ this.userLogin = delegator.findOne("UserLogin",
+ UtilMisc.toMap("userLoginId", this.userLoginId), false);
}
}
return this.userLogin;
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -402,7 +402,7 @@ public class GenericUserGroupMgr impleme
Delegator delegator = SharkContainer.getDelegator();
GenericValue value = null;
try {
- value = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkUser, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, username));
+ value = delegator.findOne(org.ofbiz.shark.SharkConstants.SharkUser, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, username), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
throw new RootException(e);
@@ -414,7 +414,7 @@ public class GenericUserGroupMgr impleme
Delegator delegator = SharkContainer.getDelegator();
GenericValue value = null;
try {
- value = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkGroup, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.groupName, groupName));
+ value = delegator.findOne(org.ofbiz.shark.SharkConstants.SharkGroup, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.groupName, groupName), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
throw new RootException(e);
@@ -426,7 +426,7 @@ public class GenericUserGroupMgr impleme
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));
+ member = delegator.findOne(org.ofbiz.shark.SharkConstants.SharkGroupMember, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.groupName, groupName, org.ofbiz.shark.SharkConstants.userName, username), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
throw new RootException(e);
@@ -438,7 +438,7 @@ public class GenericUserGroupMgr impleme
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));
+ rollup = delegator.findOne(org.ofbiz.shark.SharkConstants.SharkGroupRollup, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.parentGroupName, parentGroup, org.ofbiz.shark.SharkConstants.groupName, group), false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
throw new RootException(e);
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=1337684&r1=1337683&r2=1337684&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 Sat May 12 21:22:00 2012
@@ -202,7 +202,7 @@ public class PartyUserGroupMgr implement
protected GenericValue getUserLogin(String username) throws RootException {
GenericValue userLogin = null;
try {
- userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", username));
+ userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", username), false);
} catch (GenericEntityException e) {
throw new RootException(e);
}