You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by bf...@apache.org on 2011/02/18 01:27:52 UTC

svn commit: r1071845 - /oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/TaskInstance.java

Author: bfoster
Date: Fri Feb 18 00:27:52 2011
New Revision: 1071845

URL: http://svn.apache.org/viewvc?rev=1071845&view=rev
Log:

- more synch task instance methods opened up for use with TaskInstance implementation

-----------------------

Modified:
    oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/TaskInstance.java

Modified: oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/TaskInstance.java
URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/TaskInstance.java?rev=1071845&r1=1071844&r2=1071845&view=diff
==============================================================================
--- oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/TaskInstance.java (original)
+++ oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/TaskInstance.java Fri Feb 18 00:27:52 2011
@@ -118,36 +118,40 @@ public abstract class TaskInstance {
 	public Metadata getMetadata() {
 		return new ControlMetadata(this.staticMetadata, this.dynamicMetadata).asMetadata();
 	}
+
+    protected void update(ExecutingState workflowState, ControlMetadata ctrlMetadata) {
+    	this.synchWithEngine(workflowState, ctrlMetadata);
+    }
     
-    private void syncWorkflowMetadata(ControlMetadata ctrlMetadata) {
-    	try {
-			this.weClient.updateWorkflowMetadata(this.instanceId, this.modelId, ctrlMetadata.asMetadata(ControlMetadata.DYN));
-		}catch (Exception e) {
-			LOG.log(Level.SEVERE, "Failed to update workflow metadata for jobId = " + this.jobId + " ; modelId = " + this.modelId + " : " + e.getMessage(), e);
-		}
+    protected void syncState(ExecutingState workflowState) throws EngineException {
+		this.weClient.setWorkflowState(this.instanceId, this.modelId, workflowState);
     }
-	
-    private void syncInstanceMetadata(ControlMetadata ctrlMetadata) {
+    
+    protected void syncInstanceMetadata(ControlMetadata ctrlMetadata) {
     	try {
     		this.weClient.updateInstanceMetadata(this.jobId, ctrlMetadata.asMetadata());
     	}catch (Exception e) {
     		LOG.log(Level.SEVERE, "Failed to update instance metadata for jobId = " + this.jobId + " ; modelId = " + this.modelId + " : " + e.getMessage(), e);
     	}
     }
-
-    private void syncWorkflowAndInstanceMetadata(Metadata metadata, Metadata instanceMetadata) {
+    
+    protected void syncWorkflowMetadata(ControlMetadata ctrlMetadata) {
     	try {
-			this.weClient.updateWorkflowAndInstance(this.instanceId, this.modelId, this.state, metadata, this.jobId, instanceMetadata);
+			this.weClient.updateWorkflowMetadata(this.instanceId, this.modelId, ctrlMetadata.asMetadata(ControlMetadata.DYN));
 		}catch (Exception e) {
-			LOG.log(Level.SEVERE, "Failed to update workflow and instance metadata for jobId = " + this.jobId + " ; modelId = " + this.modelId + " : " + e.getMessage(), e);
+			LOG.log(Level.SEVERE, "Failed to update workflow metadata for jobId = " + this.jobId + " ; modelId = " + this.modelId + " : " + e.getMessage(), e);
 		}
     }
     
-    private void syncState(WorkflowState workflowState) throws EngineException {
-		this.weClient.setWorkflowState(this.instanceId, this.modelId, workflowState);
+    protected void syncWorkflowAndInstanceMetadata(Metadata metadata, Metadata instanceMetadata) {
+    	try {
+			this.weClient.updateWorkflowAndInstance(this.instanceId, this.modelId, this.state, metadata, this.jobId, instanceMetadata);
+		}catch (Exception e) {
+			LOG.log(Level.SEVERE, "Failed to update workflow and instance metadata for jobId = " + this.jobId + " ; modelId = " + this.modelId + " : " + e.getMessage(), e);
+		}
     }
     
-    private void synchWithEngine(WorkflowState workflowState, ControlMetadata ctrlMetadata) {
+	private void synchWithEngine(WorkflowState workflowState, ControlMetadata ctrlMetadata) {
     	try {
     		Metadata metadata = ctrlMetadata.asMetadata(ControlMetadata.DYN);
 	    	this.addStandardInstanceMetadata(workflowState, ctrlMetadata);
@@ -181,10 +185,6 @@ public abstract class TaskInstance {
     	}
     }
     
-    protected void update(ExecutingState workflowState, ControlMetadata ctrlMetadata) {
-    	this.synchWithEngine(workflowState, ctrlMetadata);
-    }
-    
     public void execute() {
     	ControlMetadata ctrlMetadata = new ControlMetadata(this.staticMetadata, this.dynamicMetadata);
     	this.state = new ExecutingState("");