Author: bfoster
Date: Thu Feb 24 23:07:28 2011
New Revision: 1074346
URL: http://svn.apache.org/viewvc?rev=1074346&view=rev
Log:
- added a getWorkflowState method to server
- added TaskInstance which allows workflows to be spawned and will run every
BlockTimeInterval minutes to check if the workflows have completed . . .
returns success if all spawned workflows complete . . . if any fail, it will
fail . . . otherwise blocks
Added:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java
(with props)
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
Thu Feb 24 23:07:28 2011
@@ -145,6 +145,8 @@ public interface WorkflowEngine {
public ProcessorSkeleton getWorkflow(String instanceId) throws
EngineException;
+ public WorkflowState getWorkflowState(String instanceId) throws
EngineException;
+
public QueryPage getNextPage(QueryPage page) throws EngineException;
public QueryPage getPage(PageInfo pageInfo, QueryExpression
queryExpression) throws EngineException;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java
Thu Feb 24 23:07:28 2011
@@ -167,10 +167,17 @@ public class WorkflowEngineClient implem
try {
return this.client.getProcessorInfo(instanceId,
modelId);
}catch (Exception e) {
- e.printStackTrace();
- return null;
+ throw new EngineException(e);
}
}
+
+ public WorkflowState getWorkflowState(String instanceId) throws
EngineException {
+ try {
+ return this.client.getWorkflowState(instanceId);
+ }catch (Exception e) {
+ throw new EngineException(e);
+ }
+ }
public Metadata getWorkflowMetadata(String instanceId,
String modelId) throws EngineException {
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
Thu Feb 24 23:07:28 2011
@@ -456,6 +456,10 @@ public class WorkflowEngineLocal impleme
return this.queueManager.getWorkflowProcessor(instanceId).getSkeleton();
}
+ public WorkflowState getWorkflowState(String instanceId) throws
EngineException {
+ return this.queueManager.getWorkflowProcessor(instanceId).getState();
+ }
+
public QueryPage getNextPage(QueryPage page) throws EngineException {
try {
return this.instanceRepo.getNextPage(page);
Added:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java?rev=1074346&view=auto
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java
(added)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java
Thu Feb 24 23:07:28 2011
@@ -0,0 +1,125 @@
+package org.apache.oodt.cas.workflow.instance;
+
+import java.util.List;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.engine.WorkflowEngineClient;
+import org.apache.oodt.cas.workflow.metadata.ControlMetadata;
+import org.apache.oodt.cas.workflow.state.WorkflowState;
+import org.apache.oodt.cas.workflow.state.done.FailureState;
+import org.apache.oodt.cas.workflow.state.done.SuccessState;
+import org.apache.oodt.cas.workflow.state.results.ResultsBailState;
+import org.apache.oodt.cas.workflow.state.results.ResultsFailureState;
+import org.apache.oodt.cas.workflow.state.results.ResultsState;
+import org.apache.oodt.cas.workflow.state.results.ResultsSuccessState;
+
+public class WorkflowConnectTaskInstance extends TaskInstance {
+
+ private static final Logger LOG =
Logger.getLogger(WorkflowConnectTaskInstance.class.getName());
+
+ public static final String N_CALCULATOR_CLASS =
"WorkflowConnect/NCalculator/Class";
+ public static final String N_MET_MOD_CLASS =
"WorkflowConnect/NMetadataModifier/Class";
+ public static final String SPAWN_MODEL_ID = "WorkflowConnect/ModelId";
+ public static final String SPAWNED_WORKFLOWS =
"WorkflowConnect/SpawnedWorkflows/InstanceIds";
+ public static final String SPAWNED_BY_WORKFLOW =
"WorkflowConnect/SpawnedByWorkflow/InstanceId";
+
+ private WorkflowEngineClient weClient;
+
+ @Override
+ public void setNotifyEngine(WorkflowEngineClient weClient) {
+ super.setNotifyEngine(weClient);
+ this.weClient = weClient;
+ }
+
+ @Override
+ protected ResultsState performExecution(ControlMetadata ctrlMetadata) {
+ if (ctrlMetadata.getMetadata(SPAWNED_WORKFLOWS) == null) {
+
+ //Get Spawn ModelId
+ String spawnModelId =
ctrlMetadata.getMetadata(SPAWN_MODEL_ID);
+ if (spawnModelId == null)
+ return new ResultsFailureState("Must specify '"
+ SPAWN_MODEL_ID + "'");
+
+ //Get NCalculator Class
+ String nCalClass =
ctrlMetadata.getMetadata(N_CALCULATOR_CLASS);
+ if (nCalClass == null)
+ return new ResultsFailureState("Must specify '"
+ N_CALCULATOR_CLASS + "'");
+
+ //Load NCalculator Class
+ NCalculator calculator = null;
+ try {
+ calculator = (NCalculator)
Class.forName(nCalClass).newInstance();
+ }catch (Exception e) {
+ LOG.log(Level.SEVERE, "Failed to load
NCalculator class '" + nCalClass + "' : " + e.getMessage(), e);
+ return new ResultsFailureState("Failed to load
NCalculator class '" + nCalClass + "' : " + e.getMessage());
+ }
+
+ //Load NMetModClass if specified
+ String nMetModClass =
ctrlMetadata.getMetadata(N_MET_MOD_CLASS);
+ NMetadataModification nMetMod = null;
+ if (nMetModClass != null) {
+ try {
+ nMetMod = (NMetadataModification)
Class.forName(nMetModClass).newInstance();
+ }catch (Exception e) {
+ LOG.log(Level.SEVERE, "Failed to load
NMetadataModification class '" + nMetModClass + "' : " + e.getMessage(), e);
+ return new ResultsFailureState("Failed
to load NMetadataModification class '" + nMetModClass + "' : " +
e.getMessage());
+ }
+ }
+
+ int n = calculator.determineN(ctrlMetadata);
+ Metadata spawnWorkflowMet = ctrlMetadata.asMetadata();
+ Vector<String> spawnedInstanceId = new Vector<String>();
+ for (int i = 0; i < n; i++) {
+ Metadata curWorkflowMet = new
Metadata(spawnWorkflowMet);
+ if (nMetMod != null)
+ nMetMod.prepare(n, curWorkflowMet);
+ try {
+
curWorkflowMet.replaceMetadata(SPAWNED_BY_WORKFLOW, this.getInstanceId());
+
spawnedInstanceId.add(this.weClient.startWorkflow(spawnModelId,
curWorkflowMet));
+ }catch (Exception e) {
+ LOG.log(Level.SEVERE, "Failed to start
workflow ModelId '" + spawnModelId + "' : " + e.getMessage(), e);
+ return new ResultsFailureState("Failed
to start workflow ModelId '" + spawnModelId + "' : " + e.getMessage());
+ }
+ }
+ ctrlMetadata.replaceLocalMetadata(SPAWNED_WORKFLOWS,
spawnedInstanceId);
+
ctrlMetadata.setAsWorkflowMetadataKey(SPAWNED_WORKFLOWS);
+
+ return new ResultsBailState("Waiting for " + n + " of "
+ n + " spawned workflows to complete");
+ }else {
+
+ int nDone = 0;
+ List<String> spawnedInstanceIds =
ctrlMetadata.getAllMetadata(SPAWNED_WORKFLOWS);
+ for (String spawnedInstanceId : spawnedInstanceIds) {
+ try {
+ WorkflowState state =
this.weClient.getWorkflowState(spawnedInstanceId);
+ if (state instanceof FailureState)
+ return new
ResultsFailureState("Spawned workflow [InstanceId='" + spawnedInstanceId + "']
failed");
+ else if (state instanceof SuccessState)
+ nDone++;
+ }catch (Exception e) {
+ return new ResultsFailureState("Failed
to get state of spawned workflow [InstanceId='" + spawnedInstanceId + "']");
+ }
+ }
+ if (nDone == spawnedInstanceIds.size())
+ return new ResultsSuccessState("All spawned
workflow completed successfully");
+ else
+ return new ResultsBailState("Waiting on " +
(spawnedInstanceIds.size() - nDone) + " of " + spawnedInstanceIds.size() + "
spawned workflows to finish");
+ }
+ }
+
+ public interface NCalculator {
+
+ public int determineN(ControlMetadata ctrlMetadata);
+
+ }
+
+ public interface NMetadataModification {
+
+ public void prepare(int n, Metadata metadata);
+
+ }
+
+}
Propchange:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java
Thu Feb 24 23:07:28 2011
@@ -191,6 +191,15 @@ public abstract class AbstractCommunicat
}
}
+ public WorkflowState getWorkflowState(String instanceId) throws Exception {
+ try {
+ return this.workflowEngine.getWorkflowState(instanceId);
+ }catch (Exception e) {
+ LOG.log(Level.SEVERE, "Failed to get workflow state
[instanceid='" + instanceId + "'] from engine : " + e.getMessage(), e);
+ throw new Exception("Failed to get workflow state
[instanceid='" + instanceId + "'] from engine : " + e.getMessage(), e);
+ }
+ }
+
public Metadata getWorkflowMetadata(String instanceId,
String modelId) throws Exception {
try {
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java
Thu Feb 24 23:07:28 2011
@@ -139,6 +139,8 @@ public interface CommunicationChannelCli
public ProcessorSkeleton getWorkflow(String instanceId) throws Exception;
+ public WorkflowState getWorkflowState(String instanceId) throws Exception;
+
public QueryPage getNextPage(QueryPage page) throws Exception;
public QueryPage getPage(PageInfo pageInfo, QueryExpression
queryExpression) throws Exception;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java
Thu Feb 24 23:07:28 2011
@@ -146,6 +146,8 @@ public interface CommunicationChannelSer
public ProcessorSkeleton getWorkflow(String instanceId) throws Exception;
+ public WorkflowState getWorkflowState(String instanceId) throws Exception;
+
public QueryPage getNextPage(QueryPage page) throws Exception;
public QueryPage getPage(PageInfo pageInfo, QueryExpression
queryExpression) throws Exception;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java
Thu Feb 24 23:07:28 2011
@@ -192,6 +192,10 @@ public class MultiCommunicationChannelCl
return useClient.getWorkflowGraph(modelId);
}
+ public WorkflowState getWorkflowState(String instanceId) throws Exception {
+ return useClient.getWorkflowState(instanceId);
+ }
+
public List<WorkflowGraph> getWorkflowGraphs() throws Exception {
return useClient.getWorkflowGraphs();
}
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelServer.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelServer.java
Thu Feb 24 23:07:28 2011
@@ -37,10 +37,5 @@ public class MultiCommunicationChannelSe
for (CommunicationChannelServer server : servers)
server.startup();
}
-
-// public void shutdown() throws Exception {
-// for (CommunicationChannelServer server : servers)
-// server.shutdown();
-// }
}
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java
Thu Feb 24 23:07:28 2011
@@ -163,6 +163,10 @@ public class RmiCommunicationChannelClie
return this.serializer.deserializeObject(Metadata.class,
this.getRmiServer().rmi_getWorkflowMetadata(instanceId, modelId));
}
+ public WorkflowState getWorkflowState(String instanceId) throws Exception {
+ return this.serializer.deserializeObject(WorkflowState.class,
this.getRmiServer().rmi_getWorkflowState(instanceId));
+ }
+
public Metadata getInstanceMetadata(String jobId) throws Exception {
return this.serializer.deserializeObject(Metadata.class,
this.getRmiServer().rmi_getInstanceMetadata(jobId));
}
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java
Thu Feb 24 23:07:28 2011
@@ -239,6 +239,14 @@ public class RmiCommunicationChannelServ
}
}
+ public String rmi_getWorkflowState(String instanceId) throws
RemoteException {
+ try {
+ return
this.serializer.serializeObject(this.rmi_getWorkflowState(instanceId));
+ }catch (Exception e) {
+ throw new RemoteException(e.getMessage(), e);
+ }
+ }
+
public String rmi_getInstanceRepository() throws RemoteException {
try {
return
this.serializer.serializeObject(this.getInstanceRepository());
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java
Thu Feb 24 23:07:28 2011
@@ -121,4 +121,6 @@ public interface RmiCommunicationChannel
public String rmi_getMetadata(String page) throws RemoteException;
+ public String rmi_getWorkflowState(String instanceId) throws
RemoteException;
+
}
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java
Thu Feb 24 23:07:28 2011
@@ -86,6 +86,8 @@ public interface RmiCommunicationChannel
public ProcessorInfo getProcessorInfo(String instanceId, String modelId)
throws Exception;
+ public WorkflowState getWorkflowState(String instanceId) throws Exception;
+
public void updateWorkflowMetadata(String instanceId, String modelId,
Metadata metadata) throws Exception;
public void updateInstanceMetadata(String jobId, Metadata metadata) throws
Exception;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
Thu Feb 24 23:07:28 2011
@@ -186,6 +186,12 @@ public class XmlRpcCommunicationChannelC
return this.serializer.deserializeObject(Metadata.class,
(String)
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() +
".xmlrpc_getWorkflowMetadata", args));
}
+ public WorkflowState getWorkflowState(String instanceId) throws Exception {
+ Vector<Object> args = new Vector<Object>();
+ args.add(instanceId);
+ return this.serializer.deserializeObject(WorkflowState.class,
(String)
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() +
".xmlrpc_getWorkflowState", args));
+ }
+
public void pauseWorkflow(String instanceId)
throws Exception {
Vector<Object> args = new Vector<Object>();
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
Thu Feb 24 23:07:28 2011
@@ -250,6 +250,10 @@ public class XmlRpcCommunicationChannelS
public String xmlrpc_getWorkflow(String instanceId) throws Exception {
return
this.serializer.serializeObject(this.getWorkflow(instanceId));
}
+
+ public String xmlrpc_getWorkflowState(String instanceId) throws
Exception {
+ return
this.serializer.serializeObject(this.getWorkflowState(instanceId));
+ }
public String xmlrpc_getMetadata(String page) throws Exception {
return
this.serializer.serializeObject(this.getMetadata(this.serializer.deserializeObject(QueryPage.class,
page)));
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java?rev=1074346&r1=1074345&r2=1074346&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java
Thu Feb 24 23:07:28 2011
@@ -50,6 +50,8 @@ public interface XmlRpcCommunicationServ
public String xmlrpc_getProcessorInfo(String instanceId, String modelId)
throws Exception;
+ public String xmlrpc_getWorkflowState(String instanceId) throws
Exception;
+
public String xmlrpc_getWorkflowMetadata(String instanceId, String
modelId) throws Exception;
public String xmlrpc_pauseWorkflow(String instanceId) throws Exception;
