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 2009/03/22 01:38:35 UTC
svn commit: r757110 [1/2] - in
/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow: ./ client/
definition/ impl/
Author: doogie
Date: Sun Mar 22 00:38:34 2009
New Revision: 757110
URL: http://svn.apache.org/viewvc?rev=757110&view=rev
Log:
Fix purely empty whitespace lines, and remove trailing whitespace.
Modified:
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/ServiceCondition.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityAbstractImplementation.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImplementationFact.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityLoopImplementation.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityNoImplementation.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityRouteImplementation.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfAssignmentImpl.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfEventAuditImpl.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessMgrImpl.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfRequesterImpl.java
ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadyRunning.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/AlreadySuspended.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotChangeRequester.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotComplete.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotResume.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStart.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotStop.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/CannotSuspend.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/EvaluationException.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,15 +22,15 @@
* Transition Evaluation Workflow Exception
*/
public class EvaluationException extends WfException {
-
+
public EvaluationException() {
super();
}
-
+
public EvaluationException(String msg) {
super(msg);
}
-
+
public EvaluationException(String msg, Throwable nested) {
super(msg, nested);
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/HistoryNotAvailable.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidData.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidPerformer.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidRequester.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidResource.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/InvalidState.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotAssigned.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotEnabled.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotRunning.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/NotSuspended.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/RequesterRequired.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/ResultNotAvailable.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/SourceNotAvailable.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionCondition.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,7 +26,7 @@
* TransitionCondition - Interface for implementing transition conditions
*/
public interface TransitionCondition {
-
+
/**
* Evaluate a condition and return the result as a Boolean
* @param context Map of environment info (processContext) for use in evaluation
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/TransitionNotAllowed.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/UpdateNotAllowed.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -55,7 +55,7 @@
public static final String module = WfApplicationServices.class.getName();
- /**
+ /**
* Activate an application by inserting expected arguments in
* the ApplicationSandbox table.
*
@@ -77,8 +77,8 @@
final String partyId = (String) weAssigment.get("partyId");
final String roleTypeId = (String) weAssigment.get("roleTypeId");
final Timestamp fromDate = (Timestamp) weAssigment.get("fromDate");
- result.put("applicationId", insertAppSandbox(ctx.getDelegator(), workEffortId, partyId,
- roleTypeId, fromDate, context));
+ result.put("applicationId", insertAppSandbox(ctx.getDelegator(), workEffortId, partyId,
+ roleTypeId, fromDate, context));
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
} catch (GenericServiceException we) {
we.printStackTrace();
@@ -93,8 +93,8 @@
final GenericDelegator delegator = ctx.getDelegator();
final Map result = new HashMap();
try {
- result.put("applicationContext",
- getRunTimeContext(delegator, getRuntimeData(delegator, (String) context.get("applicationId"))));
+ result.put("applicationContext",
+ getRunTimeContext(delegator, getRuntimeData(delegator, (String) context.get("applicationId"))));
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
} catch (GenericServiceException we) {
we.printStackTrace();
@@ -130,7 +130,7 @@
if (((Map) context.get("result")).containsKey(name))
value = ((Map) context.get("result")).get(name);
if (value != null)
- resultContext.put(name,
+ resultContext.put(name,
ObjectType.simpleTypeConvert(value, (String) resultSignature.get(name), null, null));
}
runTimeContext.putAll(resultContext);
@@ -175,7 +175,7 @@
return result;
}
- private static String insertAppSandbox(GenericDelegator delegator, String workEffortId, String partyId,
+ private static String insertAppSandbox(GenericDelegator delegator, String workEffortId, String partyId,
String roleTypeId, Timestamp fromDate, Map context) throws GenericServiceException {
String dataId = null;
String applicationId = Long.toString((new Date().getTime()));
@@ -192,7 +192,7 @@
} catch (IOException ioe) {
throw new GenericServiceException(ioe.getMessage(), ioe);
}
- Map aFields = UtilMisc.toMap("applicationId", applicationId, "workEffortId", workEffortId,
+ Map aFields = UtilMisc.toMap("applicationId", applicationId, "workEffortId", workEffortId,
"partyId", partyId, "roleTypeId", roleTypeId, "fromDate", fromDate, "runtimeDataId", dataId);
GenericValue appV = null;
@@ -255,9 +255,9 @@
}
}
- private static void getApplicationSignatures(GenericDelegator delegator, GenericValue application,
- Map contextSignature, Map resultSignature) throws GenericEntityException {
- Map expresions = null;
+ private static void getApplicationSignatures(GenericDelegator delegator, GenericValue application,
+ Map contextSignature, Map resultSignature) throws GenericEntityException {
+ Map expresions = null;
// look for the 1st application.
final GenericValue workEffort =
delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", application.get("workEffortId")));
@@ -317,7 +317,7 @@
final Collection assigments = delegator.findByAnd("WorkEffortPartyAssignment", expresions, orderBy);
if (assigments.isEmpty()) {
Debug.logError("No accepted activities found for the workEffortId=" + workEffortId, module);
- throw new GenericServiceException("Can not find WorkEffortPartyAssignment for the Workflow service. WorkEffortId=" + workEffortId);
+ throw new GenericServiceException("Can not find WorkEffortPartyAssignment for the Workflow service. WorkEffortId=" + workEffortId);
}
if (assigments.size() != 1)
Debug.logWarning("More than one accepted activities found for the workEffortId=" + workEffortId, module);
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfException.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,12 +38,12 @@
* WfFactory - Workflow Factory Class
*/
public class WfFactory {
-
+
public static final String module = WfFactory.class.getName();
-
+
protected static UtilCache wfProcessMgrCache = new UtilCache("workflow.processmgr");
protected static UtilCache wfClientCache = new UtilCache("workflow.client");
-
+
/**
* Creates a new {@link WfActivity} instance.
* @param value GenericValue object defining this activity.
@@ -54,7 +54,7 @@
public static WfActivity getWfActivity(GenericValue value, String process) throws WfException {
if (value == null) throw new WfException("Activity definition value object cannot be null");
if (process == null) throw new WfException("Parent process WorkEffort key cannot be null");
- return new WfActivityImpl(value, process);
+ return new WfActivityImpl(value, process);
}
public static WfActivity getWfActivity(GenericDelegator delegator, String workEffortId) throws WfException {
@@ -68,11 +68,11 @@
* @return An instance of the WfAssignment Interface
* @throws WfException
*/
- public static WfAssignment getWfAssignment(WfActivity activity, WfResource resource, Timestamp fromDate, boolean create) throws WfException {
+ public static WfAssignment getWfAssignment(WfActivity activity, WfResource resource, Timestamp fromDate, boolean create) throws WfException {
if (activity == null) throw new WfException("WfActivity cannot be null");
if (resource == null) throw new WfException("WfResource cannot be null");
- if (fromDate == null) fromDate = new Timestamp(new Date().getTime());
- return new WfAssignmentImpl(activity, resource, fromDate, create);
+ if (fromDate == null) fromDate = new Timestamp(new Date().getTime());
+ return new WfAssignmentImpl(activity, resource, fromDate, create);
}
public static WfAssignment getWfAssignment(GenericDelegator delegator, String work, String party, String role, Timestamp from) throws WfException {
@@ -81,7 +81,7 @@
return getWfAssignment(act, res, from, false);
}
- /**
+ /**
* Creates a new {@link WfProcess} instance.
* @param value The GenericValue object for the process definition.
* @param mgr The WfProcessMgr which is managing this process.
@@ -91,7 +91,7 @@
public static WfProcess getWfProcess(GenericValue value, WfProcessMgr mgr) throws WfException {
if (value == null) throw new WfException("Process definition value object cannot be null");
if (mgr == null) throw new WfException("WfProcessMgr cannot be null");
- return new WfProcessImpl(value, mgr);
+ return new WfProcessImpl(value, mgr);
}
public static WfProcess getWfProcess(GenericDelegator delegator, String workEffortId) throws WfException {
@@ -100,12 +100,12 @@
WfProcess process = null;
try {
process = new WfProcessImpl(delegator, workEffortId);
- } catch (WfException e) {
+ } catch (WfException e) {
try {
WfActivity act = WfFactory.getWfActivity(delegator, workEffortId);
if (act != null) {
process = act.container();
- } else {
+ } else {
throw e;
}
} catch (WfException e2) {
@@ -118,10 +118,10 @@
if (process == null) {
throw new WfException("No process object found");
}
- return process;
+ return process;
}
- /**
+ /**
* Creates a new {@link WfProcessMgr} instance.
* @param delegator The GenericDelegator to use for this manager.
* @param pkg The Workflow Package ID.
@@ -135,19 +135,19 @@
if (delegator == null) throw new WfException("Delegator cannot be null");
if (pkg == null) throw new WfException("Workflow package id cannot be null.");
if (pid == null) throw new WfException("Workflow process id cannot be null");
-
+
String key = delegator.getDelegatorName() + ":" + pkg + ":" + pkver + ":" + pid + ":" + pver;
if (!wfProcessMgrCache.containsKey(key)) {
synchronized (WfFactory.class) {
- if (!wfProcessMgrCache.containsKey(key)) {
+ if (!wfProcessMgrCache.containsKey(key)) {
wfProcessMgrCache.put(key, new WfProcessMgrImpl(delegator, pkg, pkver, pid, pver));
}
}
}
- return (WfProcessMgr) wfProcessMgrCache.get(key);
+ return (WfProcessMgr) wfProcessMgrCache.get(key);
}
- /**
+ /**
* Creates a new {@link WfRequester} instance.
* @return An instance of the WfRequester Interface.
* @throws WfException
@@ -156,7 +156,7 @@
return new WfRequesterImpl();
}
- /**
+ /**
* Creates a new {@link WfResource} instance.
* @param value The GenericValue object of the WorkflowParticipant
* @throws WfException
@@ -164,10 +164,10 @@
*/
public static WfResource getWfResource(GenericValue value) throws WfException {
if (value == null) throw new WfException("Value object for WfResource definition cannot be null");
- return new WfResourceImpl(value);
+ return new WfResourceImpl(value);
}
- /**
+ /**
* Creates a new {@link WfResource} instance.
* @param delegator The GenericDelegator for this instance
* @param key The key for the resource
@@ -178,13 +178,13 @@
* @throws WfException
*/
public static WfResource getWfResource(GenericDelegator delegator, String key, String name, String party, String role) throws WfException {
- if (delegator == null) throw new WfException("Delegator cannot be null");
+ if (delegator == null) throw new WfException("Delegator cannot be null");
if (party == null) party = "_NA_";
if (role == null) role = "_NA_";
- return new WfResourceImpl(delegator, key, name, party, role);
+ return new WfResourceImpl(delegator, key, name, party, role);
}
- /**
+ /**
* Creates a new {@link WfEventAudit} instance.
* @return An instance of the WfEventAudit Interface.
* @throws WfException
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -105,15 +105,15 @@
* @throws AlreadyRunning
*/
public void start() throws WfException, CannotStart, AlreadyRunning;
-
+
/**
* Starts the Workflow process on the defined activity
- * @param activityId The activity to start
+ * @param activityId The activity to start
* @throws WfException
* @throws CannotStart
* @throws AlreadyRunning
*/
- public void start(String activityId) throws WfException, CannotStart, AlreadyRunning;
+ public void start(String activityId) throws WfException, CannotStart, AlreadyRunning;
/**
* @param state
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfRequester.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,21 +26,21 @@
*/
public interface WfResource {
- /**
+ /**
* Gets the number of work items
* @throws WfException
* @return Count of work items
*/
public int howManyWorkItem() throws WfException;
- /**
+ /**
* Gets an iterator of work items
* @throws WfException
* @return Iterator of work items
*/
public Iterator getIteratorWorkItem() throws WfException;
- /**
+ /**
* Gets the work items
* @param maxNumber
* @throws WfException
@@ -48,7 +48,7 @@
*/
public List getSequenceWorkItem(int maxNumber) throws WfException;
- /**
+ /**
* Checks if an assignment object is associated with this resource
* @param member The assignment object to check
* @throws WfException
@@ -56,35 +56,35 @@
*/
public boolean isMemberOfWorkItems(WfAssignment member) throws WfException;
- /**
+ /**
* Gets the resource key.
* @throws WfException
* @return String of the resouce key.
*/
public String resourceKey() throws WfException;
- /**
+ /**
* Gets the resource name
* @throws WfException
* @return String of the resource name
*/
public String resourceName() throws WfException;
- /**
+ /**
* Gets the role id of this resource
* @throws WfException
* @return String role id of this participant or null if none
*/
public String resourceRoleId() throws WfException;
- /**
+ /**
* Gets the party id of this resource
* @throws WfException
* @return String party id of this participant or null if none
*/
public String resourcePartyId() throws WfException;
- /**
+ /**
* Release the resouce from the assignement
* @param fromAssigment
* @param releaseInfo
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WfUtil.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,23 +26,23 @@
* WorkflowUtil - Workflow Engine Utilities
*/
public final class WfUtil {
-
+
private static final Map typeMap = UtilMisc.toMap("WDT_BOOLEAN", "java.lang.Boolean",
- "WDT_STRING", "java.lang.String", "WDT_INTEGER", "java.lang.Long",
+ "WDT_STRING", "java.lang.String", "WDT_INTEGER", "java.lang.Long",
"WDT_FLOAT", "java.lang.Double", "WDT_DATETIME", "java.sql.Timestamp");
-
+
/**
* Gets the Java type from a XPDL datatype
* @param xpdlType XPDL data type to be translated
* @return Java Class name equivalence to the XPDL data type
*/
- public static final String getJavaType(String xpdlType) {
+ public static final String getJavaType(String xpdlType) {
if (typeMap.containsKey(xpdlType))
return (String) typeMap.get(xpdlType);
else
return "java.lang.Object";
}
-
+
/**
* Returns the OFB status code which refers to the passed OMG status code
* @param state
@@ -78,6 +78,6 @@
}
return null;
}
-
-
+
+
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -52,7 +52,7 @@
public WorkflowEngine(ServiceDispatcher dispatcher) {
super(dispatcher);
}
-
+
/**
* @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map)
*/
@@ -61,25 +61,25 @@
runAsync(localName, modelService, context, waiter, false);
return waiter.waitForResult();
}
-
+
/**
* @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map)
*/
public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException {
runAsync(localName, modelService, context, null, false);
}
-
+
/**
* @see org.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map, boolean)
*/
public void runAsync(String localName, ModelService modelService, Map context, boolean persist) throws GenericServiceException {
runAsync(localName, modelService, context, null, persist);
}
-
+
/**
* @see org.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map, org.ofbiz.service.GenericRequester, boolean)
*/
- public void runAsync(String localName, ModelService modelService, Map context, GenericRequester requester, boolean persist) throws GenericServiceException {
+ public void runAsync(String localName, ModelService modelService, Map context, GenericRequester requester, boolean persist) throws GenericServiceException {
Transaction parentTrans = null;
boolean beganTransaction = false;
try {
@@ -90,7 +90,7 @@
} catch (GenericTransactionException e) {
Debug.logError(e, "Cannot begin nested transaction: " + e.getMessage(), module);
}
-
+
// Build the requester
WfRequester req = null;
try {
@@ -166,7 +166,7 @@
Debug.logError(e, "Un-handled process exception", module);
throw new GenericServiceException(e.getMessage(), e);
}
-
+
// Assign the owner of the process
GenericValue userLogin = null;
if (context.containsKey("userLogin")) {
@@ -198,10 +198,10 @@
throw new GenericServiceException(errMsg);
}
}
-
+
// Grab the locale from the context
Locale locale = (Locale) context.remove("locale");
-
+
// Grab the starting activityId from the context
String startActivityId = (String) context.remove("startWithActivityId");
@@ -221,7 +221,7 @@
}
throw new GenericServiceException(wfe.getMessage(), wfe);
}
-
+
// Set the initial locale - (in context)
if (locale != null) {
try {
@@ -237,8 +237,8 @@
throw new GenericServiceException(wfe.getMessage(), wfe);
}
}
-
- // Use the WorkflowRunner to start the workflow in a new thread
+
+ // Use the WorkflowRunner to start the workflow in a new thread
try {
Job job = new WorkflowRunner(process, requester, startActivityId);
if (Debug.verboseOn()) Debug.logVerbose("Created WorkflowRunner: " + job, module);
@@ -251,7 +251,7 @@
}
throw new GenericServiceException(je.getMessage(), je);
}
-
+
try {
TransactionUtil.commit(beganTransaction);
} catch (GenericTransactionException e) {
@@ -307,7 +307,7 @@
process.start(startActivityId);
else
process.start();
- } catch (Exception e) {
+ } catch (Exception e) {
Debug.logError(e, module);
if (requester != null)
requester.receiveResult(null);
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,7 +30,7 @@
* Workflow Client API - Start Activity Async-Job
*/
public class StartActivityJob extends AbstractJob {
-
+
public static final String module = StartActivityJob.class.getName();
protected WfActivity activity = null;
@@ -39,9 +39,9 @@
public StartActivityJob(WfActivity activity) {
this(activity, null);
}
-
+
public StartActivityJob(WfActivity activity, GenericRequester requester) {
- super(activity.toString() + "." + System.currentTimeMillis(), activity.toString());
+ super(activity.toString() + "." + System.currentTimeMillis(), activity.toString());
this.activity = activity;
this.requester = requester;
runtime = new Date().getTime();
@@ -55,17 +55,17 @@
/**
* @see org.ofbiz.service.job.Job#exec()
*/
- public void exec() {
+ public void exec() {
try {
- Debug.logVerbose("Executing job now : " + activity, module);
+ Debug.logVerbose("Executing job now : " + activity, module);
activity.activate();
if (requester != null)
requester.receiveResult(new HashMap());
- } catch (Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "Start Activity [" + activity + "] Failed", module);
if (requester != null)
requester.receiveThrowable(e);
- }
+ }
finish();
}
}
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,24 +44,24 @@
public class WorkflowClient {
public static final String module = WorkflowClient.class.getName();
-
+
protected GenericDelegator delegator = null;
protected LocalDispatcher dispatcher = null;
-
+
protected WorkflowClient() {}
-
+
/**
* Get a new instance of the Workflow Client
* @param delegator the GenericDelegator object which matchs the delegator used by the workflow engine.
* @param dispatcher a LocalDispatcher object to invoke the workflow services.
- */
+ */
public WorkflowClient(GenericDelegator delegator, LocalDispatcher dispatcher) {
if (delegator == null)
throw new IllegalArgumentException("GenericDelegator cannot be null");
if (dispatcher == null)
throw new IllegalArgumentException("LocalDispatcher cannot be null");
this.delegator = delegator;
- this.dispatcher = dispatcher;
+ this.dispatcher = dispatcher;
}
/**
@@ -70,7 +70,7 @@
* *** Note the delegator from this object must match the delegator used by the workflow engine.
*/
public WorkflowClient(DispatchContext context) {
- this(context.getDelegator(), context.getDispatcher());
+ this(context.getDelegator(), context.getDispatcher());
}
/**
@@ -82,7 +82,7 @@
* @return The new assignment object.
* @throws WfException
*/
- public WfAssignment assign(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate, boolean append) throws WfException {
+ public WfAssignment assign(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate, boolean append) throws WfException {
WfActivity activity = WfFactory.getWfActivity(delegator, workEffortId);
WfResource resource = WfFactory.getWfResource(delegator, null, null, partyId, roleTypeId);
@@ -106,7 +106,7 @@
* @throws WfException
*/
public void accept(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate) throws WfException {
- WfAssignment assign = WfFactory.getWfAssignment(delegator, workEffortId, partyId, roleTypeId, fromDate);
+ WfAssignment assign = WfFactory.getWfAssignment(delegator, workEffortId, partyId, roleTypeId, fromDate);
assign.accept();
}
@@ -119,7 +119,7 @@
* @return GenericResultWaiter of the start job.
* @throws WfException
*/
- public void acceptAndStart(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate) throws WfException {
+ public void acceptAndStart(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate) throws WfException {
accept(workEffortId, partyId, roleTypeId, fromDate);
start(workEffortId);
}
@@ -136,15 +136,15 @@
* @return The new assignment object.
* @throws WfException
*/
- public WfAssignment delegate(String workEffortId, String fromPartyId, String fromRoleTypeId, Timestamp fromFromDate, String toPartyId, String toRoleTypeId, Timestamp toFromDate) throws WfException {
+ public WfAssignment delegate(String workEffortId, String fromPartyId, String fromRoleTypeId, Timestamp fromFromDate, String toPartyId, String toRoleTypeId, Timestamp toFromDate) throws WfException {
WfActivity activity = WfFactory.getWfActivity(delegator, workEffortId);
WfAssignment fromAssign = null;
-
+
// check status and delegateAfterStart attribute
- if (activity.state().equals("open.running") && !activity.getDefinitionObject().getBoolean("delegateAfterStart").booleanValue())
+ if (activity.state().equals("open.running") && !activity.getDefinitionObject().getBoolean("delegateAfterStart").booleanValue())
throw new WfException("This activity cannot be delegated once it has been started");
-
- if (fromPartyId == null && fromRoleTypeId == null && fromFromDate == null) {
+
+ if (fromPartyId == null && fromRoleTypeId == null && fromFromDate == null) {
Iterator i = activity.getIteratorAssignment();
fromAssign = (WfAssignment) i.next();
if (i.hasNext()) {
@@ -155,12 +155,12 @@
if (fromAssign == null) {
fromAssign = WfFactory.getWfAssignment(delegator, workEffortId, fromPartyId, fromRoleTypeId, fromFromDate);
- }
- fromAssign.delegate();
-
+ }
+ fromAssign.delegate();
+
// check for a restartOnDelegate
WfActivity newActivity = null;
- if (activity.getDefinitionObject().getBoolean("restartOnDelegate").booleanValue()) {
+ if (activity.getDefinitionObject().getBoolean("restartOnDelegate").booleanValue()) {
// this only applies to running single assignment activities
if (activity.state().equals("open.running") && activity.howManyAssignment() == 0) {
try {
@@ -172,16 +172,16 @@
}
String parentProcessId = activity.container().runtimeKey();
newActivity = WfFactory.getWfActivity(activity.getDefinitionObject(), parentProcessId);
- }
- }
-
+ }
+ }
+
WfAssignment assign = null;
if (newActivity != null) {
assign = assign(newActivity.runtimeKey(), toPartyId, toRoleTypeId, toFromDate, true);
} else {
assign = assign(workEffortId, toPartyId, toRoleTypeId, toFromDate, true);
}
-
+
return assign;
}
@@ -195,21 +195,21 @@
* @return GenericResultWaiter of the start job.
* @throws WfException
*/
- public void delegateAndAccept(String workEffortId, String fromPartyId, String fromRoleTypeId, Timestamp fromFromDate, String toPartyId, String toRoleTypeId, Timestamp toFromDate, boolean start) throws WfException {
- WfAssignment assign = delegate(workEffortId, fromPartyId, fromRoleTypeId, fromFromDate, toPartyId, toRoleTypeId, toFromDate);
+ public void delegateAndAccept(String workEffortId, String fromPartyId, String fromRoleTypeId, Timestamp fromFromDate, String toPartyId, String toRoleTypeId, Timestamp toFromDate, boolean start) throws WfException {
+ WfAssignment assign = delegate(workEffortId, fromPartyId, fromRoleTypeId, fromFromDate, toPartyId, toRoleTypeId, toFromDate);
assign.accept();
Debug.logVerbose("Delegated assignment.", module);
-
+
if (start) {
Debug.logVerbose("Starting activity.", module);
if (!activityRunning(assign.activity())) {
start(assign.activity().runtimeKey());
- } else {
+ } else {
Debug.logWarning("Activity already running; not starting.", module);
}
} else {
Debug.logVerbose("Not starting assignment.", module);
- }
+ }
}
/**
@@ -220,15 +220,15 @@
*/
public void start(String workEffortId) throws WfException {
if (dispatcher == null) {
- throw new WfException("LocalDispatcher is null; cannot create job for activity startup");
+ throw new WfException("LocalDispatcher is null; cannot create job for activity startup");
}
-
+
WfActivity activity = WfFactory.getWfActivity(delegator, workEffortId);
if (Debug.verboseOn()) Debug.logVerbose("Starting activity: " + activity.name(), module);
if (activityRunning(activity))
throw new WfException("Activity is already running");
-
+
Job job = new StartActivityJob(activity);
if (Debug.verboseOn()) Debug.logVerbose("Job: " + job, module);
@@ -237,7 +237,7 @@
} catch (JobManagerException e) {
throw new WfException(e.getMessage(), e);
}
-
+
}
/**
@@ -249,13 +249,13 @@
* @return GenericResultWaiter for the complete job.
* @throws WfException
*/
- public void complete(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate, Map result) throws WfException {
+ public void complete(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate, Map result) throws WfException {
WfAssignment assign = WfFactory.getWfAssignment(delegator, workEffortId, partyId, roleTypeId, fromDate);
if (result != null && result.size() > 0)
assign.setResult(result);
- assign.complete();
+ assign.complete();
}
-
+
/**
* Suspend an activity
* @param workEffortId The WorkEffort entity key for the activity object
@@ -263,14 +263,14 @@
*/
public void suspend(String workEffortId) throws WfException {
WfActivity activity = WfFactory.getWfActivity(delegator, workEffortId);
-
+
if (Debug.verboseOn()) Debug.logVerbose("Suspending activity: " + activity.name(), module);
if (!activityRunning(activity))
throw new WfException("Activity is not running");
-
+
activity.suspend();
- }
-
+ }
+
/**
* Resume an activity
* @param workEffortId The WorkEffort entity key for the activity object
@@ -285,17 +285,17 @@
activity.resume();
}
-
+
/**
* Abort a process
* @param workEffortId The workeffort entity key for the process to abort
* @throws WfException
*/
public void abortProcess(String workEffortId) throws WfException {
- WfProcess process = WfFactory.getWfProcess(delegator, workEffortId);
+ WfProcess process = WfFactory.getWfProcess(delegator, workEffortId);
process.abort();
}
-
+
/**
* Append data to the execution object's process context.
* @param workEffortId The WorkEffort entity key for the execution object.
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -46,7 +46,7 @@
* Workflow Services - 'Services' and 'Workers' for interaction with Workflow API
*/
public class WorkflowServices {
-
+
public static final String module = WorkflowServices.class.getName();
// -------------------------------------------------------------------
@@ -59,7 +59,7 @@
GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
-
+
// if we passed in an activity id, lets get the process id instead
try {
GenericValue testObject = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId));
@@ -81,8 +81,8 @@
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR);
result.put(ModelService.ERROR_MESSAGE, "Problems looking up runtime object; invalid id");
return result;
- }
-
+ }
+
GenericValue userLogin = (GenericValue) context.get("userLogin");
if (!hasPermission(security, workEffortId, userLogin)) {
@@ -100,12 +100,12 @@
}
return result;
}
-
- /** Suspend activity */
+
+ /** Suspend activity */
public static Map suspendActivity(DispatchContext ctx, Map context) {
Map result = new HashMap();
Security security = ctx.getSecurity();
- String workEffortId = (String) context.get("workEffortId");
+ String workEffortId = (String) context.get("workEffortId");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -125,7 +125,7 @@
}
return result;
}
-
+
/** Resume activity */
public static Map resumeActivity(DispatchContext ctx, Map context) {
Map result = new HashMap();
@@ -149,7 +149,7 @@
result.put(ModelService.ERROR_MESSAGE, we.getMessage());
}
return result;
- }
+ }
/** Change the state of an activity */
public static Map changeActivityState(DispatchContext ctx, Map context) {
@@ -282,10 +282,10 @@
String roleType = (String) context.get("roleTypeId");
Timestamp fromDate = (Timestamp) context.get("fromDate");
- try {
+ try {
WorkflowClient client = WfFactory.getClient(ctx);
- client.acceptAndStart(workEffortId, partyId, roleType, fromDate);
- result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
+ client.acceptAndStart(workEffortId, partyId, roleType, fromDate);
+ result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
} catch (WfException we) {
we.printStackTrace();
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR);
@@ -294,7 +294,7 @@
return result;
}
-
+
/** Delegate an assignment */
public static Map delegateAssignment(DispatchContext ctx, Map context) {
Map result = new HashMap();
@@ -304,8 +304,8 @@
Timestamp fromFromDate = (Timestamp) context.get("fromFromDate");
String toParty = (String) context.get("toPartyId");
String toRole = (String) context.get("toRoleTypeId");
- Timestamp toFromDate = (Timestamp) context.get("toFromDate");
-
+ Timestamp toFromDate = (Timestamp) context.get("toFromDate");
+
// optional fromDate (default now)
if (toFromDate == null)
toFromDate = UtilDateTime.nowTimestamp();
@@ -321,7 +321,7 @@
}
return result;
}
-
+
/** Delegate, accept an assignment */
public static Map delegateAcceptAssignment(DispatchContext ctx, Map context) {
Map result = new HashMap();
@@ -332,20 +332,20 @@
String toParty = (String) context.get("toPartyId");
String toRole = (String) context.get("toRoleTypeId");
Timestamp toFromDate = (Timestamp) context.get("toFromDate");
- Boolean startObj = (Boolean) context.get("startActivity");
-
+ Boolean startObj = (Boolean) context.get("startActivity");
+
// optional start activity (default false)
boolean start = false;
if (startObj != null)
start = startObj.booleanValue();
-
+
// optional fromDate (default now)
if (toFromDate == null)
toFromDate = UtilDateTime.nowTimestamp();
-
+
try {
WorkflowClient client = new WorkflowClient(ctx);
- client.delegateAndAccept(workEffortId, fromParty, fromRole, fromFromDate, toParty, toRole, toFromDate, start);
+ client.delegateAndAccept(workEffortId, fromParty, fromRole, fromFromDate, toParty, toRole, toFromDate, start);
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
} catch (WfException we) {
we.printStackTrace();
@@ -353,8 +353,8 @@
result.put(ModelService.ERROR_MESSAGE, we.getMessage());
}
return result;
- }
-
+ }
+
/** Accept a role assignment and attempt to start the activity */
public static Map acceptRoleAssignment(DispatchContext ctx, Map context) {
Map result = new HashMap();
@@ -362,10 +362,10 @@
String partyId = (String) context.get("partyId");
String roleType = (String) context.get("roleTypeId");
Timestamp fromDate = (Timestamp) context.get("fromDate");
-
+
try {
WorkflowClient client = new WorkflowClient(ctx);
- client.delegateAndAccept(workEffortId, "_NA_", roleType, fromDate, partyId, roleType, fromDate, true);
+ client.delegateAndAccept(workEffortId, "_NA_", roleType, fromDate, partyId, roleType, fromDate, true);
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
} catch (WfException we) {
we.printStackTrace();
@@ -383,7 +383,7 @@
String partyId = (String) context.get("partyId");
String roleType = (String) context.get("roleTypeId");
Timestamp fromDate = (Timestamp) context.get("fromDate");
- Map actResults = (Map) context.get("result");
+ Map actResults = (Map) context.get("result");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -392,10 +392,10 @@
result.put(ModelService.ERROR_MESSAGE, "You do not have permission to access this assignment");
return result;
}
-
+
try {
WorkflowClient client = WfFactory.getClient(ctx);
- client.complete(workEffortId, partyId, roleType, fromDate, actResults);
+ client.complete(workEffortId, partyId, roleType, fromDate, actResults);
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
} catch (WfException we) {
we.printStackTrace();
Modified: ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java?rev=757110&r1=757109&r2=757110&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java (original)
+++ ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/definition/DefinitionParserException.java Sun Mar 22 00:38:34 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY