You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/01/21 19:49:02 UTC
svn commit: r498425 [2/4] - in /ofbiz/trunk: ./ framework/entity/fieldtype/
framework/shark/ framework/shark/entitydef/
framework/shark/src/org/enhydra/shark/ framework/shark/src/org/ofbiz/shark/
framework/shark/src/org/ofbiz/shark/audit/ framework/sha...
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/audit/EventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/audit/EventAudit.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/audit/EventAudit.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/audit/EventAudit.java Sun Jan 21 10:48:58 2007
@@ -42,7 +42,7 @@
this.eventAuditId = eventAuditId;
if (this.delegator != null) {
try {
- this.eventAudit = delegator.findByPrimaryKey("WfEventAudit", UtilMisc.toMap("eventAuditId", eventAuditId));
+ this.eventAudit = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId));
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -54,114 +54,115 @@
public EventAudit(EntityAuditMgr mgr, GenericDelegator delegator) {
super(mgr, delegator);
this.newValue = true;
- this.eventAuditId = delegator.getNextSeqId("WfEventAudit");
- this.eventAudit = delegator.makeValue("WfEventAudit", UtilMisc.toMap("eventAuditId", eventAuditId));
+ this.eventAuditId = delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfEventAudit);
+ this.eventAudit = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId));
}
public EventAudit(EntityAuditMgr mgr, GenericValue eventAudit) {
super(mgr, eventAudit.getDelegator());
- this.eventAuditId = eventAudit.getString("eventAuditId");
+ this.eventAuditId = eventAudit.getString(org.ofbiz.shark.SharkConstants.eventAuditId);
this.eventAudit = eventAudit;
}
public String getEventAuditId() {
- return eventAudit.getString("eventAuditId");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.eventAuditId);
}
public void setUTCTime(String ts) {
- eventAudit.set("auditTime", ts);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.auditTime, ts);
}
public String getUTCTime() {
- return eventAudit.getString("auditTime");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.auditTime);
}
public void setType(String t) {
- eventAudit.set("auditType", t);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.auditType, t);
}
public String getType() {
- return eventAudit.getString("auditType");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.auditType);
}
public void setActivityId(String aId) {
- eventAudit.set("activityId", aId);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.activityId, aId);
}
public String getActivityId() {
- return eventAudit.getString("activityId");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.activityId);
}
public void setActivityName(String an) {
- eventAudit.set("activityName", an);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.activityName, an);
}
public String getActivityName() {
- return eventAudit.getString("activityName");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.activityName);
}
public void setProcessId(String pId) {
- eventAudit.set("processId", pId);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.processId, pId);
}
public String getProcessId() {
- return eventAudit.getString("processId");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.processId);
}
public void setProcessName(String pn) {
- eventAudit.set("processName", pn);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.processName, pn);
}
public String getProcessName() {
- return eventAudit.getString("processName");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.processName);
}
public void setProcessDefinitionName(String pdn) {
- eventAudit.set("processDefName", pdn);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.processDefName, pdn);
}
public String getProcessDefinitionName() {
- return eventAudit.getString("processDefName");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.processDefName);
}
public void setProcessDefinitionVersion(String pdv) {
- eventAudit.set("processDefVer", pdv);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.processDefVer, pdv);
}
public String getProcessDefinitionVersion() {
- return eventAudit.getString("processDefVer");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.processDefVer);
}
public void setActivityDefinitionId(String adId) {
- eventAudit.set("activityDefId", adId);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.activityDefId, adId);
}
public String getActivityDefinitionId() {
- return eventAudit.getString("activityDefId");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.activityDefId);
}
- public void setActivitySetDefinitionId(String s) {
- // TODO: Implement Me!
+ public void setActivitySetDefinitionId(String adId) {
+ eventAudit.set(org.ofbiz.shark.SharkConstants.activitySetDefId, adId);
}
- public String getActivitySetDefinitionId() {
- return null; // TODO: Implement Me!
+ public String getActivitySetDefinitionId()
+ {
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.activitySetDefId);
}
public void setProcessDefinitionId(String pdId) {
- eventAudit.set("processDefId", pdId);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.processDefId, pdId);
}
public String getProcessDefinitionId() {
- return eventAudit.getString("processDefId");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.processDefId);
}
public void setPackageId(String pkgId) {
- eventAudit.set("packageId", pkgId);
+ eventAudit.set(org.ofbiz.shark.SharkConstants.packageId, pkgId);
}
public String getPackageId() {
- return eventAudit.getString("packageId");
+ return eventAudit.getString(org.ofbiz.shark.SharkConstants.packageId);
}
public void store() throws GenericEntityException {
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/audit/StateEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/audit/StateEventAudit.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/audit/StateEventAudit.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/audit/StateEventAudit.java Sun Jan 21 10:48:58 2007
@@ -39,7 +39,7 @@
super(mgr, delegator, eventAuditId);
if (this.delegator != null) {
try {
- this.stateEventAudit = delegator.findByPrimaryKey("WfStateEventAudit", UtilMisc.toMap("eventAuditId", eventAuditId));
+ this.stateEventAudit = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfStateEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, eventAuditId));
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -51,28 +51,28 @@
public StateEventAudit(EntityAuditMgr mgr, GenericDelegator delegator) {
super(mgr, delegator);
this.newValue = true;
- this.stateEventAudit = delegator.makeValue("WfStateEventAudit", UtilMisc.toMap("eventAuditId", this.eventAuditId));
+ this.stateEventAudit = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfStateEventAudit, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.eventAuditId, this.eventAuditId));
}
public StateEventAudit(EntityAuditMgr mgr, GenericValue stateEventAudit) {
- super(mgr, stateEventAudit.getDelegator(), stateEventAudit.getString("eventAuditId"));
+ super(mgr, stateEventAudit.getDelegator(), stateEventAudit.getString(org.ofbiz.shark.SharkConstants.eventAuditId));
this.stateEventAudit = stateEventAudit;
}
public void setOldState(String os) {
- stateEventAudit.set("oldState", os);
+ stateEventAudit.set(org.ofbiz.shark.SharkConstants.oldState, os);
}
public String getOldState() {
- return stateEventAudit.getString("oldState");
+ return stateEventAudit.getString(org.ofbiz.shark.SharkConstants.oldState);
}
public void setNewState(String ns) {
- stateEventAudit.set("newState", ns);
+ stateEventAudit.set(org.ofbiz.shark.SharkConstants.newState, ns);
}
public String getNewState() {
- return stateEventAudit.getString("newState");
+ return stateEventAudit.getString(org.ofbiz.shark.SharkConstants.newState);
}
public void store() throws GenericEntityException {
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java Sun Jan 21 10:48:58 2007
@@ -23,6 +23,7 @@
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.shark.container.SharkContainer;
import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.common.login.LoginServices;
import org.enhydra.shark.api.internal.authentication.AuthenticationManager;
import org.enhydra.shark.api.internal.working.CallbackUtilities;
@@ -44,18 +45,24 @@
GenericDelegator delegator = SharkContainer.getDelegator();
GenericValue sharkUser = null;
try {
- sharkUser = delegator.findByPrimaryKey("SharkUser", UtilMisc.toMap("userName", userName));
+ sharkUser = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.SharkUser, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.userName, userName));
} catch (GenericEntityException e) {
throw new RootException(e);
}
-
+
if (sharkUser != null) {
- String registeredPwd = sharkUser.getString("passwd");
+ String registeredPwd = sharkUser.getString(org.ofbiz.shark.SharkConstants.passwd);
if (password.equals(registeredPwd)) {
return true;
+ } else if (LoginServices.getPasswordHash(password).equals(registeredPwd)){
+ return true;
+ } else if (LoginServices.getPasswordHash(registeredPwd).equals(password)){
+ return true;
+ } else {
+ return false;
}
}
-
+
return false;
}
}
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java Sun Jan 21 10:48:58 2007
@@ -20,9 +20,13 @@
import java.util.Map;
+import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityCrypto;
import org.ofbiz.shark.container.SharkContainer;
import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.common.login.LoginServices;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ServiceUtil;
@@ -45,27 +49,27 @@
}
public boolean validateUser(UserTransaction userTransaction, String userName, String password) throws RootException {
- String service = ServiceConfigUtil.getElementAttr("authorization", "service-name");
- if (service == null) {
- throw new RootException("No Authentication Service Defined");
- }
-
- LocalDispatcher dispatcher = SharkContainer.getDispatcher();
- Map context = UtilMisc.toMap("login.username", userName, "login.password", password, "isServiceAuth", new Boolean(true));
- Map serviceResult = null;
+ GenericDelegator delegator = SharkContainer.getDelegator();
+ String p = null;
+ GenericValue adminUser = null;
+ String pass_hash = LoginServices.getPasswordHash(password);
try {
- serviceResult = dispatcher.runSync(service, context);
- } catch (GenericServiceException e) {
- throw new RootException(e);
- }
-
- if (!ServiceUtil.isError(serviceResult)) {
- GenericValue userLogin = (GenericValue) serviceResult.get("userLogin");
- if (userLogin != null) {
+ adminUser = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", userName));
+ String a = adminUser.getString("userLoginId");
+ p = adminUser.getString("currentPassword");
+ } catch (GenericEntityException e) {}
+ if (adminUser != null) {
+ if (password.equals(p)) {
return true;
+ } else if (LoginServices.getPasswordHash(password).equals(p)){
+ return true;
+ } else if (LoginServices.getPasswordHash(p).equals(password)){
+ return true;
+ } else {
+ return false;
}
+
}
-
return false;
}
}
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/container/SharkContainer.java Sun Jan 21 10:48:58 2007
@@ -19,38 +19,46 @@
package org.ofbiz.shark.container;
import java.util.Properties;
+import java.util.StringTokenizer;
+import org.enhydra.shark.Shark;
+import org.enhydra.shark.api.SharkTransaction;
+import org.enhydra.shark.api.TransactionException;
+import org.enhydra.shark.api.client.wfbase.BaseException;
+import org.enhydra.shark.api.client.wfservice.AdminInterface;
+import org.enhydra.shark.api.client.wfservice.ConnectFailed;
+import org.enhydra.shark.api.client.wfservice.ExecutionAdministration;
+import org.enhydra.shark.api.client.wfservice.NotConnected;
+import org.enhydra.shark.api.client.wfservice.RepositoryMgr;
+import org.enhydra.shark.api.client.wfservice.SharkConnection;
+import org.enhydra.shark.corba.poa.SharkCORBAServer;
import org.ofbiz.base.container.Container;
-import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.container.ContainerConfig;
+import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.GeneralRuntimeException;
-import org.ofbiz.service.LocalDispatcher;
-import org.ofbiz.service.GenericDispatcher;
-import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
-
-import org.enhydra.shark.Shark;
-import org.enhydra.shark.corba.SharkCORBAServer;
-import org.enhydra.shark.api.client.wfservice.AdminInterface;
-import org.enhydra.shark.api.client.wfservice.RepositoryMgr;
-import org.enhydra.shark.api.client.wfservice.SharkConnection;
-import org.enhydra.shark.api.client.wfservice.ExecutionAdministration;
-import org.enhydra.shark.api.client.wfservice.ConnectFailed;
-import org.enhydra.shark.api.client.wfservice.NotConnected;
-import org.enhydra.shark.api.client.wfbase.BaseException;
-import org.enhydra.shark.api.SharkTransaction;
-import org.enhydra.shark.api.TransactionException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.service.GenericDispatcher;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
/**
* Shark Workflow Engine Container
*/
-public class SharkContainer implements Container, Runnable {
+
+/**
+ * Shark Workflow Engine Container
+ *
+ * @author <a href="mailto:jaz@ofbiz.org">Andy Zeneski</a>
+ * @since 3.1
+ */
+public class SharkContainer implements Container, Runnable
+{
public static final String module = SharkContainer.class.getName();
private static GenericDelegator delegator = null;
@@ -62,7 +70,7 @@
protected String configFile = null;
private SharkCORBAServer corbaServer = null;
private Thread orbThread = null;
-
+
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String)
*/
@@ -123,7 +131,7 @@
Debug.logWarning("Invalid admin-user; UserLogin not found not starting Shark!", module);
return false;
}
-
+
SharkContainer.adminPass = adminPassProp.value;
// set the Shark configuration
@@ -150,11 +158,11 @@
}
}
}
-
// re-eval current assignments
ExecutionAdministration exAdmin = SharkContainer.getAdminInterface().getExecutionAdministration();
try {
- exAdmin.connect(adminUser.getString("userLoginId"), SharkContainer.adminPass, null, null);
+ //exAdmin.connect(adminUser.getString("userLoginId"), SharkContainer.adminPass, null, null);
+ exAdmin.connect(adminUser.getString("userLoginId"), adminUser.getString("currentPassword"), null, null);
// this won't work with encrypted passwords: exAdmin.connect(adminUser.getString("userLoginId"), adminUser.getString("currentPassword"), null, null);
exAdmin.reevaluateAssignments();
exAdmin.disconnect();
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ActivityIteratorCondExprBldr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ActivityIteratorCondExprBldr.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ActivityIteratorCondExprBldr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ActivityIteratorCondExprBldr.java Sun Jan 21 10:48:58 2007
@@ -22,23 +22,27 @@
import org.enhydra.shark.api.RootException;
import org.enhydra.shark.api.common.ActivityIteratorExpressionBuilder;
+import org.ofbiz.base.util.Debug;
import org.ofbiz.entity.condition.EntityExpr;
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.model.ModelKeyMap;
-
public class ActivityIteratorCondExprBldr extends BaseEntityCondExprBldr implements ActivityIteratorExpressionBuilder {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
protected boolean addedProcess = false;
public ActivityIteratorCondExprBldr() {
- this.addEntity("WFAC", "WfActivity");
+ this.addEntity("WFAC", org.ofbiz.shark.SharkConstants.WfActivity);
this.addAllFields("WFAC");
}
public void addProcess(String field, String fieldAlias) {
if (!addedProcess) {
- this.addEntity("WFPR", "WfProcess");
- this.addLink("WFAC", "WFAC", false, ModelKeyMap.makeKeyMapList("processId"));
+ this.addEntity("WFPR", org.ofbiz.shark.SharkConstants.WfProcess);
+ this.addLink("WFAC", "WFAC", false, ModelKeyMap.makeKeyMapList(org.ofbiz.shark.SharkConstants.processId));
}
this.addField("WFPR", field, fieldAlias);
}
@@ -61,26 +65,26 @@
// WfProcess conditions
public ActivityIteratorExpressionBuilder addPackageIdEquals(String s) {
- this.addProcess("packageId", "packageId");
- this.addCondition(new EntityExpr("packageId", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addProcess(org.ofbiz.shark.SharkConstants.packageId, org.ofbiz.shark.SharkConstants.packageId);
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.packageId, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addProcessDefIdEquals(String s) {
- this.addProcess("definitionId", "procDefId");
+ this.addProcess(org.ofbiz.shark.SharkConstants.definitionId, "procDefId");
this.addCondition(new EntityExpr("procDefId", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addMgrNameEquals(String s) {
- this.addProcess("mgrName", "mgrName");
- this.addCondition(new EntityExpr("mgrName", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addProcess(org.ofbiz.shark.SharkConstants.mgrName, org.ofbiz.shark.SharkConstants.mgrName);
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.mgrName, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addVersionEquals(String s) {
- this.addProcess("packageVer", "packageVer");
- this.addCondition(new EntityExpr("packageVer", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addProcess(org.ofbiz.shark.SharkConstants.packageVer, org.ofbiz.shark.SharkConstants.packageVer);
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.packageVer, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
@@ -89,42 +93,42 @@
}
public ActivityIteratorExpressionBuilder addProcessStateEquals(String s) {
- this.addProcess("packageVer", "packageVer");
- this.addCondition(new EntityExpr("packageVer", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addProcess(org.ofbiz.shark.SharkConstants.packageVer, org.ofbiz.shark.SharkConstants.packageVer);
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.packageVer, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addProcessStateStartsWith(String s) {
- this.addProcess("currentState", "procState");
+ this.addProcess(org.ofbiz.shark.SharkConstants.currentState, "procState");
this.addCondition(new EntityExpr("procState", isNotSet ? EntityOperator.NOT_LIKE : EntityOperator.LIKE, s + "%"));
return this;
}
public ActivityIteratorExpressionBuilder addProcessIdEquals(String s) {
- this.addCondition(new EntityExpr("processId", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.processId, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addProcessNameEquals(String s) {
- this.addProcess("processName", "processName");
- this.addCondition(new EntityExpr("processName", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addProcess(org.ofbiz.shark.SharkConstants.processName, org.ofbiz.shark.SharkConstants.processName);
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.processName, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addProcessPriorityEquals(int i) {
- this.addProcess("priority", "procPriority");
+ this.addProcess(org.ofbiz.shark.SharkConstants.priority, "procPriority");
this.addCondition(new EntityExpr("procPriority", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Long(i)));
return this;
}
public ActivityIteratorExpressionBuilder addProcessDescriptionEquals(String s) {
- this.addProcess("description", "procDesc");
+ this.addProcess(org.ofbiz.shark.SharkConstants.description, "procDesc");
this.addCondition(new EntityExpr("procDesc", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addProcessDescriptionContains(String s) {
- this.addProcess("description", "procDesc");
+ this.addProcess(org.ofbiz.shark.SharkConstants.description, "procDesc");
this.addCondition(new EntityExpr("procDesc", isNotSet ? EntityOperator.NOT_LIKE : EntityOperator.LIKE, "%" + s + "%"));
return this;
}
@@ -192,82 +196,82 @@
// WfActivity Conditions
public ActivityIteratorExpressionBuilder addStateEquals(String s) {
- this.addCondition(new EntityExpr("currentState", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.currentState, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addStateStartsWith(String s) {
- this.addCondition(new EntityExpr("currentState", isNotSet ? EntityOperator.NOT_LIKE : EntityOperator.LIKE, s + "%"));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.currentState, isNotSet ? EntityOperator.NOT_LIKE : EntityOperator.LIKE, s + "%"));
return this;
}
public ActivityIteratorExpressionBuilder addIdEquals(String s) {
- this.addCondition(new EntityExpr("activityId", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.activityId, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addNameEquals(String s) {
- this.addCondition(new EntityExpr("activityName", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.activityName, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addPriorityEquals(int i) {
- this.addCondition(new EntityExpr("priority", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Long(i)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.priority, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Long(i)));
return this;
}
public ActivityIteratorExpressionBuilder addDescriptionEquals(String s) {
- this.addCondition(new EntityExpr("description", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.description, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ActivityIteratorExpressionBuilder addDescriptionContains(String s) {
- this.addCondition(new EntityExpr("description", isNotSet ? EntityOperator.NOT_LIKE : EntityOperator.LIKE, "%" + s + "%"));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.description, isNotSet ? EntityOperator.NOT_LIKE : EntityOperator.LIKE, "%" + s + "%"));
return this;
}
public ActivityIteratorExpressionBuilder addActivatedTimeEquals(long l) {
- this.addCondition(new EntityExpr("activatedTime", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.activatedTime, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Timestamp(l)));
return this;
}
public ActivityIteratorExpressionBuilder addActivatedTimeBefore(long l) {
- this.addCondition(new EntityExpr("activatedTime", isNotSet ? EntityOperator.LESS_THAN : EntityOperator.GREATER_THAN_EQUAL_TO, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.activatedTime, isNotSet ? EntityOperator.LESS_THAN : EntityOperator.GREATER_THAN_EQUAL_TO, new Timestamp(l)));
return this;
}
public ActivityIteratorExpressionBuilder addActivatedTimeAfter(long l) {
- this.addCondition(new EntityExpr("activatedTime", isNotSet ? EntityOperator.GREATER_THAN : EntityOperator.LESS_THAN_EQUAL_TO, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.activatedTime, isNotSet ? EntityOperator.GREATER_THAN : EntityOperator.LESS_THAN_EQUAL_TO, new Timestamp(l)));
return this;
}
public ActivityIteratorExpressionBuilder addLastStateTimeEquals(long l) {
- this.addCondition(new EntityExpr("lastStateTime", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.lastStateTime, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Timestamp(l)));
return this;
}
public ActivityIteratorExpressionBuilder addLastStateTimeBefore(long l) {
- this.addCondition(new EntityExpr("lastStateTime", isNotSet ? EntityOperator.LESS_THAN : EntityOperator.GREATER_THAN_EQUAL_TO, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.lastStateTime, isNotSet ? EntityOperator.LESS_THAN : EntityOperator.GREATER_THAN_EQUAL_TO, new Timestamp(l)));
return this;
}
public ActivityIteratorExpressionBuilder addLastStateTimeAfter(long l) {
- this.addCondition(new EntityExpr("lastStateTime", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.lastStateTime, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Timestamp(l)));
return this;
}
public ActivityIteratorExpressionBuilder addAcceptedTimeEquals(long l) {
- this.addCondition(new EntityExpr("acceptedTime", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.acceptedTime, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Timestamp(l)));
return this;
}
public ActivityIteratorExpressionBuilder addAcceptedTimeBefore(long l) {
- this.addCondition(new EntityExpr("acceptedTime", isNotSet ? EntityOperator.LESS_THAN : EntityOperator.GREATER_THAN_EQUAL_TO, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.acceptedTime, isNotSet ? EntityOperator.LESS_THAN : EntityOperator.GREATER_THAN_EQUAL_TO, new Timestamp(l)));
return this;
}
public ActivityIteratorExpressionBuilder addAcceptedTimeAfter(long l) {
- this.addCondition(new EntityExpr("acceptedTime", isNotSet ? EntityOperator.GREATER_THAN : EntityOperator.LESS_THAN_EQUAL_TO, new Timestamp(l)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.acceptedTime, isNotSet ? EntityOperator.GREATER_THAN : EntityOperator.LESS_THAN_EQUAL_TO, new Timestamp(l)));
return this;
}
@@ -288,55 +292,183 @@
return this;
}
- public ActivityIteratorExpressionBuilder addVariableEquals(String s, String s1) {
+ public ActivityIteratorExpressionBuilder addVariableEquals(String s, String s1)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addVariableEquals(String s, String s1)", module);
return this;
}
- public ActivityIteratorExpressionBuilder addVariableEquals(String s, long l) {
+ public ActivityIteratorExpressionBuilder addVariableEquals(String s, long l)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addVariableEquals(String s, long l)", module);
return this;
}
- public ActivityIteratorExpressionBuilder addVariableGreaterThan(String s, long l) {
+ public ActivityIteratorExpressionBuilder addVariableGreaterThan(String s, long l)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addVariableGreaterThan(String s, long l)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addVariableLessThan(String s, long l) {
+ public ActivityIteratorExpressionBuilder addVariableLessThan(String s, long l)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addVariableLessThan(String s, long l)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addVariableEquals(String s, double v) {
+ public ActivityIteratorExpressionBuilder addVariableEquals(String s, double v)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addVariableEquals(String s, double v)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addVariableGreaterThan(String s, double v) {
+ public ActivityIteratorExpressionBuilder addVariableGreaterThan(String s, double v)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addVariableGreaterThan(String s, double v)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addVariableLessThan(String s, double v) {
+ public ActivityIteratorExpressionBuilder addVariableLessThan(String s, double v)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addVariableLessThan(String s, double v)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addActivitySetDefId(String s) {
+ public ActivityIteratorExpressionBuilder addActivitySetDefId(String s)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addActivitySetDefId(String s)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addDefinitionId(String s) {
+ public ActivityIteratorExpressionBuilder addDefinitionId(String s)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addDefinitionId(String s)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addIsAccepted() {
+ public ActivityIteratorExpressionBuilder addIsAccepted()
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addIsAccepted()",module);
return this;
}
- public ActivityIteratorExpressionBuilder addResourceUsername(String s) {
+ public ActivityIteratorExpressionBuilder addResourceUsername(String s)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addResourceUsername(String s)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addExpression(String s) {
+ public ActivityIteratorExpressionBuilder addExpression(String s)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addExpression(String s)",module);
return this;
}
- public ActivityIteratorExpressionBuilder addExpression(ActivityIteratorExpressionBuilder eieb) {
+ public ActivityIteratorExpressionBuilder addExpression(ActivityIteratorExpressionBuilder eieb)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addExpression(ActivityIteratorExpressionBuilder eieb)",module);
return this;
+ }
+
+ public ActivityIteratorExpressionBuilder addIsMgrEnabled()
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addIsMgrEnabled()",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder addProcessCreatedTimeEquals(long arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addProcessCreatedTimeEquals(long arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder addProcessCreatedTimeBefore(long arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addProcessCreatedTimeBefore(long arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder addProcessCreatedTimeAfter(long arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder addProcessCreatedTimeAfter(long arg0)", module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderById(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderById(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByActivitySetDefId(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByActivitySetDefId(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByDefinitionId(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByDefinitionId(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByProcessId(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByProcessId(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByResourceUsername(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByResourceUsername(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByProcessDefName(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByProcessDefName(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByState(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByState(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByPerformer(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByPerformer(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByPriority(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByPriority(boolean arg0)", module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByName(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByName(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByActivatedTime(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByActivatedTime(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByAcceptedTime(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByAcceptedTime(boolean arg0)",module);
+ return null;
+ }
+
+ public ActivityIteratorExpressionBuilder setOrderByLastStateTime(boolean arg0)
+ {
+ Debug.logInfo("Call : ActivityIteratorExpressionBuilder setOrderByLastStateTime(boolean arg0)",module);
+ return null;
}
}
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/AssignmentIteratorCondExprBldr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/AssignmentIteratorCondExprBldr.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/AssignmentIteratorCondExprBldr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/AssignmentIteratorCondExprBldr.java Sun Jan 21 10:48:58 2007
@@ -19,11 +19,17 @@
package org.ofbiz.shark.expression;
import org.enhydra.shark.api.common.AssignmentIteratorExpressionBuilder;
+import org.ofbiz.base.util.Debug;
public class AssignmentIteratorCondExprBldr extends BaseEntityCondExprBldr implements AssignmentIteratorExpressionBuilder {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public AssignmentIteratorCondExprBldr() {
- this.addEntity("WFAS", "WfAssignment");
+ this.addEntity("WFAS", org.ofbiz.shark.SharkConstants.WfAssignment);
this.addAllFields("WFAS");
}
@@ -43,34 +49,84 @@
}
public AssignmentIteratorExpressionBuilder addUsernameEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addUsernameEquals(String s)",module); return null;
}
public AssignmentIteratorExpressionBuilder addProcessIdEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addProcessIdEquals(String s)",module); return null;
}
public AssignmentIteratorExpressionBuilder addIsAccepted() {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addIsAccepted()",module); return null;
}
public AssignmentIteratorExpressionBuilder addPackageIdEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addPackageIdEquals(String s)",module); return null;
}
public AssignmentIteratorExpressionBuilder addPackageVersionEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addPackageVersionEquals(String s)",module); return null;
}
public AssignmentIteratorExpressionBuilder addProcessDefEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addProcessDefEquals(String s)",module); return null;
}
public AssignmentIteratorExpressionBuilder addActivitySetDefEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addActivitySetDefEquals(String s)",module); return null;
}
public AssignmentIteratorExpressionBuilder addActivityDefEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addActivityDefEquals(String s)",module); return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder addProcessDefIdEquals(String arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addProcessDefIdEquals(String arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder addActivitySetDefIdEquals(String arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addActivitySetDefIdEquals(String arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder addActivityDefIdEquals(String arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addActivityDefIdEquals(String arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder addActivityIdEquals(String arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addActivityIdEquals(String arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder addExpression(String arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addExpression(String arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder addExpression(AssignmentIteratorExpressionBuilder arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder addExpression(AssignmentIteratorExpressionBuilder arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder setOrderByUsername(boolean arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder setOrderByUsername(boolean arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder setOrderByProcessId(boolean arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder setOrderByProcessId(boolean arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder setOrderByCreatedTime(boolean arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder setOrderByCreatedTime(boolean arg0)",module);
+ return null;
+ }
+
+ public AssignmentIteratorExpressionBuilder setOrderByAccepted(boolean arg0) {
+ Debug.logInfo("Call : AssignmentIteratorExpressionBuilder setOrderByAccepted(boolean arg0)",module);
+ return null;
}
}
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ProcessIteratorCondExprBldr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ProcessIteratorCondExprBldr.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ProcessIteratorCondExprBldr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ProcessIteratorCondExprBldr.java Sun Jan 21 10:48:58 2007
@@ -20,146 +20,223 @@
import org.enhydra.shark.api.common.ProcessIteratorExpressionBuilder;
import org.enhydra.shark.api.RootException;
+import org.ofbiz.base.util.Debug;
public class ProcessIteratorCondExprBldr extends BaseEntityCondExprBldr implements ProcessIteratorExpressionBuilder {
-
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public ProcessIteratorExpressionBuilder and() {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder and()",module); return null;
}
public ProcessIteratorExpressionBuilder or() {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder or()",module); return null;
}
public ProcessIteratorExpressionBuilder not() {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder not() ",module); return null;
}
public ProcessIteratorExpressionBuilder addPackageIdEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addPackageIdEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addProcessDefIdEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addProcessDefIdEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addMgrNameEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addMgrNameEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addVersionEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVersionEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addIsEnabled() {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addIsEnabled()",module); return null;
}
public ProcessIteratorExpressionBuilder addStateEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addStateEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addStateStartsWith(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addStateStartsWith(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addIdEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addIdEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addNameEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addNameEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addPriorityEquals(int i) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addPriorityEquals(int i)",module); return null;
}
public ProcessIteratorExpressionBuilder addDescriptionEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addDescriptionEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addDescriptionContains(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addDescriptionContains(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addRequesterIdEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addRequesterIdEquals(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addStartTimeEquals(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addStartTimeEquals(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addStartTimeBefore(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addStartTimeBefore(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addStartTimeAfter(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addStartTimeAfter(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addLastStateTimeEquals(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addLastStateTimeEquals(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addLastStateTimeBefore(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addLastStateTimeBefore(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addLastStateTimeAfter(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addLastStateTimeAfter(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addActiveActivitiesCountEquals(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addActiveActivitiesCountEquals(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addActiveActivitiesCountGreaterThan(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addActiveActivitiesCountGreaterThan(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addActiveActivitiesCountLessThan(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addActiveActivitiesCountLessThan(long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addVariableEquals(String s, Object o) throws RootException {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVariableEquals(String s, Object o)",module); return null;
}
public ProcessIteratorExpressionBuilder addVariableEquals(String s, String s1) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVariableEquals(String s, String s1)",module); return null;
}
public ProcessIteratorExpressionBuilder addVariableEquals(String s, long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVariableEquals(String s, long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addVariableGreaterThan(String s, long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVariableGreaterThan(String s, long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addVariableLessThan(String s, long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVariableLessThan(String s, long l)",module); return null;
}
public ProcessIteratorExpressionBuilder addVariableEquals(String s, double v) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVariableEquals(String s, double v)",module); return null;
}
public ProcessIteratorExpressionBuilder addVariableGreaterThan(String s, double v) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVariableGreaterThan(String s, double v)",module); return null;
}
public ProcessIteratorExpressionBuilder addVariableLessThan(String s, double v) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addVariableLessThan(String s, double v)",module); return null;
}
public ProcessIteratorExpressionBuilder addExpression(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addExpression(String s)",module); return null;
}
public ProcessIteratorExpressionBuilder addExpression(ProcessIteratorExpressionBuilder processIteratorExpressionBuilder) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addExpression(ProcessIteratorExpressionBuilder processIteratorExpressionBuilder)",module); return null;
+ }
+
+ public ProcessIteratorExpressionBuilder addIsMgrEnabled()
+ {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addIsMgrEnabled()",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder addRequesterUsernameEquals(String arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addRequesterUsernameEquals(String arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder addCreatedTimeEquals(long arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addCreatedTimeEquals(long arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder addCreatedTimeBefore(long arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addCreatedTimeBefore(long arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder addCreatedTimeAfter(long arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder addCreatedTimeAfter(long arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderByMgrName(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderByMgrName(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderById(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderById(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderByName(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderByName(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderByState(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderByState(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderByPriority(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderByPriority(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderByCreatedTime(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderByCreatedTime(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderByStartTime(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderByStartTime(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderByLastStateTime(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderByLastStateTime(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessIteratorExpressionBuilder setOrderByResourceRequesterId(boolean arg0) {
+ Debug.logInfo("Call : ProcessIteratorExpressionBuilder setOrderByResourceRequesterId(boolean arg0)",module);
+ return null;
}
}
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ProcessMgrIteratorCondExprBldr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ProcessMgrIteratorCondExprBldr.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ProcessMgrIteratorCondExprBldr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ProcessMgrIteratorCondExprBldr.java Sun Jan 21 10:48:58 2007
@@ -19,13 +19,19 @@
package org.ofbiz.shark.expression;
import org.enhydra.shark.api.common.ProcessMgrIteratorExpressionBuilder;
+import org.ofbiz.base.util.Debug;
import org.ofbiz.entity.condition.EntityExpr;
import org.ofbiz.entity.condition.EntityOperator;
public class ProcessMgrIteratorCondExprBldr extends BaseEntityCondExprBldr implements ProcessMgrIteratorExpressionBuilder {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public ProcessMgrIteratorCondExprBldr() {
- this.addEntity("WFPM", "WfProcessMgr");
+ this.addEntity("WFPM", org.ofbiz.shark.SharkConstants.WfProcessMgr);
this.addAllFields("WFPM");
}
@@ -45,27 +51,27 @@
}
public ProcessMgrIteratorExpressionBuilder addPackageIdEquals(String s) {
- this.addCondition(new EntityExpr("packageId", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.packageId, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ProcessMgrIteratorExpressionBuilder addProcessDefIdEquals(String s) {
- this.addCondition(new EntityExpr("definitionId", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.definitionId, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ProcessMgrIteratorExpressionBuilder addNameEquals(String s) {
- this.addCondition(new EntityExpr("mgrName", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.mgrName, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ProcessMgrIteratorExpressionBuilder addVersionEquals(String s) {
- this.addCondition(new EntityExpr("packageVer", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.packageVer, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, s));
return this;
}
public ProcessMgrIteratorExpressionBuilder addIsEnabled() {
- this.addCondition(new EntityExpr("currentState", isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Long(0)));
+ this.addCondition(new EntityExpr(org.ofbiz.shark.SharkConstants.currentState, isNotSet ? EntityOperator.NOT_EQUAL : EntityOperator.EQUALS, new Long(0)));
return this;
}
@@ -85,5 +91,50 @@
this.addCondition(((BaseEntityCondExprBldr) builder).getCondition());
}
return this;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder addCreatedTimeEquals(long arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder addCreatedTimeEquals(long arg0)",module);
+ return null;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder addCreatedTimeBefore(long arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder addCreatedTimeBefore(long arg0)",module);
+ return null;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder addCreatedTimeAfter(long arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder addCreatedTimeAfter(long arg0)",module);
+ return null;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder setOrderByPackageId(boolean arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder setOrderByPackageId(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder setOrderByProcessDefId(boolean arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder setOrderByProcessDefId(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder setOrderByName(boolean arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder setOrderByName(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder setOrderByVersion(boolean arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder setOrderByVersion(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder setOrderByCreatedTime(boolean arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder setOrderByCreatedTime(boolean arg0)",module);
+ return null;
+ }
+
+ public ProcessMgrIteratorExpressionBuilder setOrderByEnabled(boolean arg0) {
+ Debug.logInfo("Call : ProcessMgrIteratorExpressionBuilder setOrderByEnabled(boolean arg0)",module);
+ return null;
}
}
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ResourceIteratorCondExprBldr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ResourceIteratorCondExprBldr.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ResourceIteratorCondExprBldr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/ResourceIteratorCondExprBldr.java Sun Jan 21 10:48:58 2007
@@ -19,42 +19,51 @@
package org.ofbiz.shark.expression;
import org.enhydra.shark.api.common.ResourceIteratorExpressionBuilder;
-
+import org.ofbiz.base.util.Debug;
public class ResourceIteratorCondExprBldr extends BaseEntityCondExprBldr implements ResourceIteratorExpressionBuilder {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public ResourceIteratorExpressionBuilder and() {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder and()",module); return null;
}
public ResourceIteratorExpressionBuilder or() {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder or()",module); return null;
}
public ResourceIteratorExpressionBuilder not() {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder not() ",module); return null;
}
public ResourceIteratorExpressionBuilder addUsernameEquals(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder addUsernameEquals(String s)",module); return null;
}
public ResourceIteratorExpressionBuilder addAssignemtCountEquals(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder addAssignemtCountEquals(long l)",module); return null;
}
public ResourceIteratorExpressionBuilder addAssignemtCountLessThan(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder addAssignemtCountLessThan(long l)",module); return null;
}
public ResourceIteratorExpressionBuilder addAssignemtCountGreaterThan(long l) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder addAssignemtCountGreaterThan(long l)",module); return null;
}
public ResourceIteratorExpressionBuilder addExpression(String s) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder addExpression(String s)",module); return null;
}
public ResourceIteratorExpressionBuilder addExpression(ResourceIteratorExpressionBuilder resourceIteratorExpressionBuilder) {
- return null; // TODO: Implement Me!
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder addExpression(ResourceIteratorExpressionBuilder resourceIteratorExpressionBuilder)",module); return null;
+ }
+
+ public ResourceIteratorExpressionBuilder setOrderByUsername(boolean arg0) {
+ Debug.logInfo("Call : ResourceIteratorExpressionBuilder setOrderByUsername(boolean arg0)",module); return null;
}
}
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java Sun Jan 21 10:48:58 2007
@@ -43,7 +43,7 @@
this.delegator = delegator;
if (this.delegator != null) {
try {
- this.activity = delegator.findByPrimaryKey("WfActivity", UtilMisc.toMap("activityId", activityId));
+ this.activity = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfActivity, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityId, activityId));
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
@@ -60,7 +60,7 @@
public Activity(EntityPersistentMgr mgr, GenericDelegator delegator) {
super(mgr, delegator);
this.newValue = true;
- this.activity = delegator.makeValue("WfActivity", null);
+ this.activity = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfActivity, null);
}
public static Activity getInstance(EntityPersistentMgr mgr, GenericValue activity) {
@@ -87,124 +87,125 @@
}
public void setId(String s) {
- activity.set("activityId", s);
+ activity.set(org.ofbiz.shark.SharkConstants.activityId, s);
}
public String getId() {
- return activity.getString("activityId");
+ return activity.getString(org.ofbiz.shark.SharkConstants.activityId);
}
public void setActivitySetDefinitionId(String asdId) {
- activity.set("setDefinitionId", asdId);
+ activity.set(org.ofbiz.shark.SharkConstants.setDefinitionId, asdId);
}
public String getActivitySetDefinitionId() {
- return activity.getString("setDefinitionId");
+ return activity.getString(org.ofbiz.shark.SharkConstants.setDefinitionId);
}
public void setActivityDefinitionId(String s) {
- activity.set("definitionId", s);
+ activity.set(org.ofbiz.shark.SharkConstants.definitionId, s);
}
public String getActivityDefinitionId() {
- return activity.getString("definitionId");
+ return activity.getString(org.ofbiz.shark.SharkConstants.definitionId);
}
public void setProcessId(String s) {
- activity.set("processId", s);
+ activity.set(org.ofbiz.shark.SharkConstants.processId, s);
}
public String getProcessId() {
- return activity.getString("processId");
+ return activity.getString(org.ofbiz.shark.SharkConstants.processId);
}
public void setSubflowProcessId(String s) {
- activity.set("subFlowId", s);
+ activity.set(org.ofbiz.shark.SharkConstants.subFlowId, s);
}
public String getSubflowProcessId() {
- return activity.getString("subFlowId");
+ return activity.getString(org.ofbiz.shark.SharkConstants.subFlowId);
}
public void setSubflowAsynchronous(boolean b) {
- activity.set("isSubAsync", (b ? "Y" : "N"));
+ activity.set(org.ofbiz.shark.SharkConstants.isSubAsync, (b ? "Y" : "N"));
}
public boolean isSubflowAsynchronous() {
- String isAsync = activity.getString("isSubAsync");
- return isAsync != null && isAsync.equals("Y") ? true : false;
+ String isAsync = activity.getString(org.ofbiz.shark.SharkConstants.isSubAsync);
+ return isAsync != null && isAsync.equals("Y") ? true : false;
}
public void setResourceUsername(String s) {
- activity.set("resourceUser", s);
+ activity.set(org.ofbiz.shark.SharkConstants.resourceUser, s);
}
public String getResourceUsername() {
- return activity.getString("resourceUser");
+ return activity.getString(org.ofbiz.shark.SharkConstants.resourceUser);
}
public void setState(String s) {
- activity.set("currentState", s);
+ activity.set(org.ofbiz.shark.SharkConstants.currentState, s);
}
public String getState() {
- return activity.getString("currentState");
+ return activity.getString(org.ofbiz.shark.SharkConstants.currentState);
}
public void setBlockActivityId(String s) {
- activity.set("blockId", s);
+ activity.set(org.ofbiz.shark.SharkConstants.blockId, s);
}
public String getBlockActivityId() {
- return activity.getString("blockId");
+ return activity.getString(org.ofbiz.shark.SharkConstants.blockId);
}
public String getName() {
- return activity.getString("activityName");
+ return activity.getString(org.ofbiz.shark.SharkConstants.activityName);
}
public void setName(String s) {
- activity.set("activityName", s);
+ activity.set(org.ofbiz.shark.SharkConstants.activityName, s);
}
public String getDescription() {
- return activity.getString("description");
+ return activity.getString(org.ofbiz.shark.SharkConstants.description);
}
public void setDescription(String s) {
- activity.set("description", s);
+ activity.set(org.ofbiz.shark.SharkConstants.description, s);
}
- public int getPriority() {
- return activity.getLong("priority").intValue();
+ public short getPriority() {
+ return activity.getLong(org.ofbiz.shark.SharkConstants.priority).shortValue();
}
public void setPriority(int i) {
- activity.set("priority", new Long(i));
+ activity.set(org.ofbiz.shark.SharkConstants.priority, new Long(i));
}
public long getLastStateTime() {
- return activity.get("lastStateTime") != null ? activity.getTimestamp("lastStateTime").getTime() : 0;
+ return activity.get(org.ofbiz.shark.SharkConstants.lastStateTime) != null ? activity.getLong(org.ofbiz.shark.SharkConstants.lastStateTime).longValue() : 0;
}
public void setLastStateTime(long timestamp) {
- activity.set("lastStateTime", UtilDateTime.getTimestamp(timestamp));
+ activity.set(org.ofbiz.shark.SharkConstants.lastStateTime, new Long(timestamp));
}
public long getAcceptedTime() {
- return activity.get("acceptedTime") != null ? activity.getTimestamp("acceptedTime").getTime() : 0;
+ return activity.get(org.ofbiz.shark.SharkConstants.acceptedTime) != null ? activity.getLong(org.ofbiz.shark.SharkConstants.acceptedTime).longValue() : 0;
}
- public void setAcceptedTime(long timestamp) {
- activity.set("acceptedTime", UtilDateTime.getTimestamp(timestamp));
+ public void setAcceptedTime(long timestamp)
+ {
+ activity.set(org.ofbiz.shark.SharkConstants.acceptedTime, new Long(timestamp));
}
public long getActivatedTime() {
- return activity.get("activatedTime") != null ? activity.getTimestamp("activatedTime").getTime() : 0;
+ return activity.get(org.ofbiz.shark.SharkConstants.activatedTime) != null ? activity.getLong(org.ofbiz.shark.SharkConstants.activatedTime).longValue() : 0;
}
public void setActivatedTime(long timestamp) {
- activity.set("activatedTime", UtilDateTime.getTimestamp(timestamp));
+ activity.set(org.ofbiz.shark.SharkConstants.activatedTime, new Long(timestamp));
}
public void store() throws GenericEntityException {
@@ -227,5 +228,31 @@
delegator.removeValue(activity);
Debug.log("**** REMOVED : " + this, module);
}
+ }
+
+ public void setProcessMgrName(String arg0)
+ {
+ activity.set(org.ofbiz.shark.SharkConstants.processMgrName, arg0);
+ }
+
+ public String getProcessMgrName() {
+ return (String)activity.get(org.ofbiz.shark.SharkConstants.processMgrName);
+ }
+
+ public void setPriority(short arg0) {
+ activity.set(org.ofbiz.shark.SharkConstants.priority, new Long(arg0));
+ }
+
+
+ public long getLimitTime() {
+ if (this.activity.get(org.ofbiz.shark.SharkConstants.timeLimit) != null) {
+ return this.activity.getLong(org.ofbiz.shark.SharkConstants.timeLimit).longValue();
+ } else {
+ return -1;
+ }
+ }
+
+ public void setLimitTime(long timeLimit) {
+ activity.set(org.ofbiz.shark.SharkConstants.timeLimit, new Long(timeLimit));
}
}
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/ActivityVariable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/ActivityVariable.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/ActivityVariable.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/ActivityVariable.java Sun Jan 21 10:48:58 2007
@@ -32,6 +32,7 @@
/**
* Persistance Object
*/
+
public class ActivityVariable extends InstanceEntityObject implements ActivityVariablePersistenceInterface {
public static final String module = ActivityVariable.class.getName();
@@ -44,7 +45,7 @@
this.delegator = delegator;
if (this.delegator != null) {
try {
- this.activityVariable = delegator.findByPrimaryKey("WfActivityVariable", UtilMisc.toMap("activityVariableId", activityVariableId));
+ this.activityVariable = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfActivityVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityVariableId, activityVariableId));
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
@@ -61,7 +62,7 @@
public ActivityVariable(EntityPersistentMgr mgr, GenericDelegator delegator) {
super(mgr, delegator);
this.newValue = true;
- this.activityVariable = delegator.makeValue("WfActivityVariable", UtilMisc.toMap("activityVariableId", delegator.getNextSeqId("WfActivityVariable")));
+ this.activityVariable = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfActivityVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityVariableId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfActivityVariable)));
Debug.log("******* New activity variable created", module);
}
@@ -89,42 +90,42 @@
}
public void setActivityId(String aId) {
- activityVariable.set("activityId", aId);
+ activityVariable.set(org.ofbiz.shark.SharkConstants.activityId, aId);
}
public String getActivityId() {
- return activityVariable.getString("activityId");
+ return activityVariable.getString(org.ofbiz.shark.SharkConstants.activityId);
}
public void setDefinitionId(String defId) {
- activityVariable.set("definitionId", defId);
+ activityVariable.set(org.ofbiz.shark.SharkConstants.definitionId, defId);
}
public String getDefinitionId() {
- return activityVariable.getString("definitionId");
+ return activityVariable.getString(org.ofbiz.shark.SharkConstants.definitionId);
}
public void setValue(Object val) {
if (val instanceof String) {
- activityVariable.set("valueField", "strValue");
- activityVariable.set("strValue", val);
+ activityVariable.set(org.ofbiz.shark.SharkConstants.valueField, org.ofbiz.shark.SharkConstants.strValue);
+ activityVariable.set(org.ofbiz.shark.SharkConstants.strValue, val);
} else if (val instanceof Number) {
if (val instanceof Double) {
- activityVariable.set("valueField", "dblValue");
- activityVariable.set("dblValue", val);
+ activityVariable.set(org.ofbiz.shark.SharkConstants.valueField, org.ofbiz.shark.SharkConstants.dblValue);
+ activityVariable.set(org.ofbiz.shark.SharkConstants.dblValue, val);
} else {
- activityVariable.set("valueField", "numValue");
- activityVariable.set("numValue", val);
+ activityVariable.set(org.ofbiz.shark.SharkConstants.valueField, org.ofbiz.shark.SharkConstants.numValue);
+ activityVariable.set(org.ofbiz.shark.SharkConstants.numValue, val);
}
} else {
byte[] value = UtilObject.getBytes(val);
- activityVariable.setBytes("objValue", (value != null ? value : null));
+ activityVariable.setBytes(org.ofbiz.shark.SharkConstants.objValue, (value != null ? value : null));
}
}
public Object getValue() {
- String fieldName = activityVariable.getString("valueField");
- if ("objValue".equals(fieldName)) {
+ String fieldName = activityVariable.getString(org.ofbiz.shark.SharkConstants.valueField);
+ if (org.ofbiz.shark.SharkConstants.objValue.equals(fieldName)) {
byte[] value = activityVariable.getBytes(fieldName);
return UtilObject.getObject(value);
} else {
@@ -133,12 +134,12 @@
}
public void setResultVariable(boolean modified) {
- activityVariable.set("isModified", (modified ? "Y" : "N"));
+ activityVariable.set(org.ofbiz.shark.SharkConstants.isModified, (modified ? "Y" : "N"));
}
public boolean isResultVariable() {
- return (activityVariable.get("isModified") != null ?
- ("Y".equals(activityVariable.getString("isModified")) ? true : false) : false);
+ return (activityVariable.get(org.ofbiz.shark.SharkConstants.isModified) != null ?
+ ("Y".equals(activityVariable.getString(org.ofbiz.shark.SharkConstants.isModified)) ? true : false) : false);
}
public void store() throws GenericEntityException {
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java Sun Jan 21 10:48:58 2007
@@ -30,6 +30,7 @@
/**
* Persistance Object
*/
+
public class AndJoinEntry extends InstanceEntityObject implements AndJoinEntryInterface {
public static final String module = AndJoinEntry.class.getName();
@@ -41,7 +42,7 @@
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.andJoin = delegator.findByPrimaryKey("WfAndJoin", UtilMisc.toMap("andJoinId", andJoinId));
+ this.andJoin = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfAndJoin, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.andJoinId, andJoinId));
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
@@ -58,7 +59,7 @@
public AndJoinEntry(EntityPersistentMgr mgr, GenericDelegator delegator) {
super(mgr, delegator);
this.newValue = true;
- this.andJoin = delegator.makeValue("WfAndJoin", UtilMisc.toMap("andJoinId", delegator.getNextSeqId("WfAndJoin")));
+ this.andJoin = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfAndJoin, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.andJoinId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfAndJoin)));
}
public static AndJoinEntry getInstance(EntityPersistentMgr mgr, GenericValue andJoin) {
@@ -85,35 +86,35 @@
}
public void setProcessId(String procId) {
- andJoin.set("processId", procId);
+ andJoin.set(org.ofbiz.shark.SharkConstants.processId, procId);
}
public String getProcessId() {
- return andJoin.getString("processId");
+ return andJoin.getString(org.ofbiz.shark.SharkConstants.processId);
}
public void setActivitySetDefinitionId(String asdId) {
- andJoin.set("activitySetDefId", asdId);
+ andJoin.set(org.ofbiz.shark.SharkConstants.activitySetDefId, asdId);
}
public String getActivitySetDefinitionId() {
- return andJoin.getString("activitySetDefId");
+ return andJoin.getString(org.ofbiz.shark.SharkConstants.activitySetDefId);
}
public void setActivityDefinitionId(String adId) {
- andJoin.set("activityDefId", adId);
+ andJoin.set(org.ofbiz.shark.SharkConstants.activityDefId, adId);
}
public String getActivityDefinitionId() {
- return andJoin.getString("activityDefId");
+ return andJoin.getString(org.ofbiz.shark.SharkConstants.activityDefId);
}
public void setActivityId(String actId) {
- andJoin.set("activityId", actId);
+ andJoin.set(org.ofbiz.shark.SharkConstants.activityId, actId);
}
public String getActivityId() {
- return andJoin.getString("activityId");
+ return andJoin.getString(org.ofbiz.shark.SharkConstants.activityId);
}
public void store() throws GenericEntityException {
Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java?view=diff&rev=498425&r1=498424&r2=498425
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java Sun Jan 21 10:48:58 2007
@@ -30,6 +30,7 @@
/**
* Persistance Object
*/
+
public class Assignment extends InstanceEntityObject implements AssignmentPersistenceInterface {
public static final String module = Assignment.class.getName();
@@ -41,7 +42,7 @@
super(mgr, delegator);
if (this.delegator != null) {
try {
- this.assignment = delegator.findByPrimaryKey("WfAssignment", UtilMisc.toMap("activityId", activityId, "userName", userName));
+ this.assignment = delegator.findByPrimaryKey(org.ofbiz.shark.SharkConstants.WfAssignment, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityId, activityId, org.ofbiz.shark.SharkConstants.userName, userName));
} catch (GenericEntityException e) {
throw new PersistenceException(e);
}
@@ -58,7 +59,7 @@
public Assignment(EntityPersistentMgr mgr, GenericDelegator delegator) {
super(mgr, delegator);
this.newValue = true;
- this.assignment = delegator.makeValue("WfAssignment", null);
+ this.assignment = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfAssignment, null);
Debug.log("******* New assignment created", module);
}
@@ -86,7 +87,7 @@
}
public void setActivityId(String actId) {
- assignment.set("activityId", actId);
+ assignment.set(org.ofbiz.shark.SharkConstants.activityId, actId);
Debug.log("Set activityId on assignment : " + actId, module);
// set the processId - kludge
/* should not be needed anymore
@@ -102,33 +103,33 @@
}
public String getActivityId() {
- return assignment.getString("activityId");
+ return assignment.getString(org.ofbiz.shark.SharkConstants.activityId);
}
public void setResourceUsername(String username) {
- assignment.set("userName", username);
+ assignment.set(org.ofbiz.shark.SharkConstants.userName, username);
Debug.log("Set userName on assignment : " + username, module);
}
public String getResourceUsername() {
- return assignment.getString("userName");
+ return assignment.getString(org.ofbiz.shark.SharkConstants.userName);
}
public void setProcessId(String procId) {
- assignment.set("processId", procId);
+ assignment.set(org.ofbiz.shark.SharkConstants.processId, procId);
Debug.log("Set processId on assignment : " + procId, module);
}
public String getProcessId() {
- return assignment.getString("processId");
+ return assignment.getString(org.ofbiz.shark.SharkConstants.processId);
}
public void setValid(boolean valid) {
- assignment.set("isValid", valid ? "Y" : "N");
+ assignment.set(org.ofbiz.shark.SharkConstants.isValid, valid ? "Y" : "N");
}
public boolean isValid() {
- return (assignment.get("isValid") == null ? false : "Y".equalsIgnoreCase(assignment.getString("isValid")));
+ return (assignment.get(org.ofbiz.shark.SharkConstants.isValid) == null ? false : "Y".equalsIgnoreCase(assignment.getString(org.ofbiz.shark.SharkConstants.isValid)));
}
public void store() throws GenericEntityException {
@@ -152,5 +153,24 @@
delegator.removeValue(assignment);
Debug.log("**** REMOVED : " + this, module);
}
+ }
+
+ public void setProcessMgrName(String s)
+ {
+ assignment.set(org.ofbiz.shark.SharkConstants.mgrName, s);
+ }
+
+ public String getProcessMgrName() {
+ return assignment.getString(org.ofbiz.shark.SharkConstants.mgrName);
+ }
+
+ public void setAccepted(boolean valid)
+ {
+ assignment.set(org.ofbiz.shark.SharkConstants.accepted, valid ? "Y" : "N");
+
+ }
+
+ public boolean isAccepted() {
+ return (assignment.get(org.ofbiz.shark.SharkConstants.accepted) == null ? false : "Y".equalsIgnoreCase(assignment.getString(org.ofbiz.shark.SharkConstants.accepted)));
}
}