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/03/01 18:35:13 UTC

svn commit: r1075936 - in /oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow: engine/ server/channel/ server/channel/rmi/ server/channel/xmlrpc/

Author: bfoster
Date: Tue Mar  1 17:35:13 2011
New Revision: 1075936

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

- updates to allow Root workflow metadata and processorInfo to be retrieved without a modelId

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

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/MultiCommunicationChannelClient.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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -93,6 +93,8 @@ public interface WorkflowEngine {
     
     public WorkflowInstanceRepository getInstanceRepository() throws EngineException;
 
+    public ProcessorInfo getProcessorInfo(String instanceId) throws EngineException;
+
     public ProcessorInfo getProcessorInfo(String instanceId, String modelId) throws EngineException;
     
     public void updateWorkflowMetadata(String instanceId, String modelId, Metadata metadata) throws EngineException;
@@ -105,6 +107,8 @@ public interface WorkflowEngine {
 
     public void setWorkflowPriority(String instanceId, String modelId, Priority priority) throws EngineException;
     
+    public Metadata getWorkflowMetadata(String instanceId) throws EngineException;
+
     public Metadata getWorkflowMetadata(String instanceId, String modelId) throws EngineException;
     
     public Metadata getInstanceMetadata(String jobId) 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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -163,6 +163,14 @@ public class WorkflowEngineClient implem
 		}
     }
     
+    public ProcessorInfo getProcessorInfo(String instanceId) throws EngineException {
+		try {
+			return this.client.getProcessorInfo(instanceId);
+		}catch (Exception e) {
+			throw new EngineException(e);
+		}
+    }
+    
     public ProcessorInfo getProcessorInfo(String instanceId, String modelId) throws EngineException {
 		try {
 			return this.client.getProcessorInfo(instanceId, modelId);
@@ -179,6 +187,14 @@ public class WorkflowEngineClient implem
     	}
     }
 	
+	public Metadata getWorkflowMetadata(String instanceId) throws EngineException {
+		try {
+			return this.client.getWorkflowMetadata(instanceId);
+		}catch (Exception e) {
+			throw new EngineException(e);
+		}
+	}
+	
 	public Metadata getWorkflowMetadata(String instanceId,
 			String modelId) throws EngineException {
 		try {

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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -306,11 +306,19 @@ public class WorkflowEngineLocal impleme
 		return new Vector<WorkflowGraph>(this.workflowGraphs.values());
     }
     
+    public ProcessorInfo getProcessorInfo(String instanceId) throws EngineException {
+    	return this.queueManager.getWorkflowProcessor(instanceId).getProcessorInfo();
+    }
+
     public ProcessorInfo getProcessorInfo(String instanceId, String modelId) throws EngineException {
     	WorkflowProcessor wp = WorkflowUtils.findProcessor(this.queueManager.getWorkflowProcessor(instanceId), modelId);
     	return wp.getProcessorInfo();
     }
 
+	public Metadata getWorkflowMetadata(String instanceId) throws EngineException {
+		return this.queueManager.getWorkflowProcessor(instanceId).getDynamicMetadata();
+	}
+	
 	public Metadata getWorkflowMetadata(String instanceId,
 			String modelId) throws EngineException {
 		return WorkflowUtils.findProcessor(this.queueManager.getWorkflowProcessor(instanceId), modelId).getDynamicMetadata();

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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -181,6 +181,15 @@ public abstract class AbstractCommunicat
 			throw new Exception("Failed to get supported processor ids from engine : " + e.getMessage(), e);
 		}
     }
+
+    public ProcessorInfo getProcessorInfo(String instanceId) throws Exception {
+    	try {
+    		return this.workflowEngine.getProcessorInfo(instanceId);
+		}catch (Exception e) {
+			LOG.log(Level.SEVERE, "Failed to get processor info for workflow [instanceid='" + instanceId  + "'] from engine : " + e.getMessage(), e);
+			throw new Exception("Failed to get processor info for workflow [instanceid='" + instanceId  + "'] from engine : " + e.getMessage(), e);
+		}
+    }
     
     public ProcessorInfo getProcessorInfo(String instanceId, String modelId) throws Exception {
     	try {
@@ -200,7 +209,16 @@ public abstract class AbstractCommunicat
 		}
     }
     
-	public Metadata getWorkflowMetadata(String instanceId,
+	public Metadata getWorkflowMetadata(String instanceId) throws Exception {
+		try {
+			return this.workflowEngine.getWorkflowMetadata(instanceId);
+		}catch (Exception e) {
+			LOG.log(Level.SEVERE, "Failed to get workflow metadata [instanceid='" + instanceId  + "'] from engine : " + e.getMessage(), e);
+			throw new Exception("Failed to get workflow metadata [instanceid='" + instanceId  + "'] from engine : " + e.getMessage(), e);
+		}
+	}
+
+    public Metadata getWorkflowMetadata(String instanceId,
 			String modelId) throws Exception {
 		try {
 			return this.workflowEngine.getWorkflowMetadata(instanceId, modelId);

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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -85,6 +85,8 @@ public interface CommunicationChannelCli
     
     public List<WorkflowGraph> getWorkflowGraphs() throws Exception;
     
+    public ProcessorInfo getProcessorInfo(String instanceId) throws Exception;
+    
     public ProcessorInfo getProcessorInfo(String instanceId, String modelId) throws Exception;
 
     public WorkflowInstanceRepository getInstanceRepository() throws Exception;
@@ -99,6 +101,8 @@ public interface CommunicationChannelCli
 
     public void setWorkflowPriority(String instanceId, String modelId, Priority priority) throws Exception;
     
+    public Metadata getWorkflowMetadata(String instanceId) throws Exception;
+
     public Metadata getWorkflowMetadata(String instanceId, String modelId) throws Exception;
     
     public Metadata getInstanceMetadata(String jobId) 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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -163,6 +163,10 @@ public class MultiCommunicationChannelCl
 		return useClient.getPage(pageInfo, queryExpression);
 	}
 
+	public ProcessorInfo getProcessorInfo(String instanceId) throws Exception {
+		return useClient.getProcessorInfo(instanceId);
+	}
+	
 	public ProcessorInfo getProcessorInfo(String instanceId, String modelId)
 			throws Exception {
 		return useClient.getProcessorInfo(instanceId, modelId);
@@ -200,6 +204,10 @@ public class MultiCommunicationChannelCl
 		return useClient.getWorkflowGraphs();
 	}
 
+	public Metadata getWorkflowMetadata(String instanceId) throws Exception {
+		return useClient.getWorkflowMetadata(instanceId);
+	}
+	
 	public Metadata getWorkflowMetadata(String instanceId, String modelId)
 			throws Exception {
 		return useClient.getWorkflowMetadata(instanceId, modelId);

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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -131,6 +131,10 @@ public class RmiCommunicationChannelClie
 		return (List<WorkflowGraph>) this.serializer.deserializeObject(List.class, this.getRmiServer().rmi_getWorkflowGraphs());
     }
     
+    public ProcessorInfo getProcessorInfo(String instanceId) throws Exception {
+		return this.serializer.deserializeObject(ProcessorInfo.class, this.getRmiServer().rmi_getProcessorInfo(instanceId));
+    }
+    
     public ProcessorInfo getProcessorInfo(String instanceId, String modelId) throws Exception {
 		return this.serializer.deserializeObject(ProcessorInfo.class, this.getRmiServer().rmi_getProcessorInfo(instanceId, modelId));
     }
@@ -159,6 +163,10 @@ public class RmiCommunicationChannelClie
 		this.getRmiServer().rmi_setWorkflowPriority(instanceId, modelId, this.serializer.serializeObject(priority));
     }
     
+    public Metadata getWorkflowMetadata(String instanceId) throws Exception {
+		return this.serializer.deserializeObject(Metadata.class, this.getRmiServer().rmi_getWorkflowMetadata(instanceId));
+    }
+    
     public Metadata getWorkflowMetadata(String instanceId, String modelId) throws Exception {
 		return this.serializer.deserializeObject(Metadata.class, this.getRmiServer().rmi_getWorkflowMetadata(instanceId, modelId));
     }

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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -231,6 +231,14 @@ public class RmiCommunicationChannelServ
 		}
     }
     
+    public String rmi_getProcessorInfo(String instanceId) throws RemoteException {
+		try {
+			return this.serializer.serializeObject(this.getProcessorInfo(instanceId));
+		}catch (Exception e) {
+			throw new RemoteException(e.getMessage(), e);
+		}
+    }
+    
     public String rmi_getProcessorInfo(String instanceId, String modelId) throws RemoteException {
 		try {
 			return this.serializer.serializeObject(this.getProcessorInfo(instanceId, modelId));
@@ -295,6 +303,14 @@ public class RmiCommunicationChannelServ
 		}
     }
     
+    public String rmi_getWorkflowMetadata(String instanceId) throws RemoteException {
+		try {
+			return this.serializer.serializeObject(this.getWorkflowMetadata(instanceId));
+		}catch (Exception e) {
+			throw new RemoteException(e.getMessage(), e);
+		}
+    }
+    
     public String rmi_getWorkflowMetadata(String instanceId, String modelId) throws RemoteException {
 		try {
 			return this.serializer.serializeObject(this.getWorkflowMetadata(instanceId, modelId));

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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -60,7 +60,9 @@ public interface RmiCommunicationChannel
     public String rmi_getModels() throws RemoteException;
     
     public String rmi_getWorkflowGraphs() throws RemoteException;
-    
+
+    public String rmi_getProcessorInfo(String instanceId) throws RemoteException;
+
     public String rmi_getProcessorInfo(String instanceId, String modelId) throws RemoteException;
 
     public String rmi_getInstanceRepository() throws RemoteException;
@@ -74,7 +76,9 @@ public interface RmiCommunicationChannel
     public void rmi_setWorkflowState(String instanceId, String modelId, String state) throws RemoteException;
 
     public void rmi_setWorkflowPriority(String instanceId, String modelId, String priority) throws RemoteException;
-    
+
+    public String rmi_getWorkflowMetadata(String instanceId) throws RemoteException;
+
     public String rmi_getWorkflowMetadata(String instanceId, String modelId) throws RemoteException;
     
     public String rmi_getInstanceMetadata(String jobId) 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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -84,6 +84,8 @@ public interface RmiCommunicationChannel
     
     public WorkflowInstanceRepository getInstanceRepository() throws Exception;
 
+    public ProcessorInfo getProcessorInfo(String instanceId) throws Exception;
+
     public ProcessorInfo getProcessorInfo(String instanceId, String modelId) throws Exception;
     
     public WorkflowState getWorkflowState(String instanceId) throws Exception;
@@ -95,7 +97,9 @@ public interface RmiCommunicationChannel
     public void setWorkflowState(String instanceId, String modelId, WorkflowState state) throws Exception;
 
     public void setWorkflowPriority(String instanceId, String modelId, Priority priority) throws Exception;
-    
+
+    public Metadata getWorkflowMetadata(String instanceId) throws Exception;
+
     public Metadata getWorkflowMetadata(String instanceId, String modelId) throws Exception;
     
     public Metadata getInstanceMetadata(String jobId) 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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -171,6 +171,12 @@ public class XmlRpcCommunicationChannelC
 		return this.serializer.deserializeObject(List.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_getWorkflowGraphs", args));
 	}
 	
+    public ProcessorInfo getProcessorInfo(String instanceId) throws Exception {
+		Vector<Object> args = new Vector<Object>();
+		args.add(instanceId);
+		return this.serializer.deserializeObject(ProcessorInfo.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_getProcessorInfo", args));
+    }
+	
     public ProcessorInfo getProcessorInfo(String instanceId, String modelId) throws Exception {
 		Vector<Object> args = new Vector<Object>();
 		args.add(instanceId);
@@ -178,6 +184,12 @@ public class XmlRpcCommunicationChannelC
 		return this.serializer.deserializeObject(ProcessorInfo.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_getProcessorInfo", args));
     }
 
+	public Metadata getWorkflowMetadata(String instanceId) throws Exception {
+		Vector<Object> args = new Vector<Object>();
+		args.add(instanceId);
+		return this.serializer.deserializeObject(Metadata.class, (String) this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() + ".xmlrpc_getWorkflowMetadata", args));
+	}
+    
 	public Metadata getWorkflowMetadata(String instanceId,
 			String modelId) 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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -113,10 +113,18 @@ public class XmlRpcCommunicationChannelS
 		return this.serializer.serializeObject(this.xmlrpc_getSupportedProcessorIds());
 	}
 
+    public String xmlrpc_getProcessorInfo(String instanceId) throws Exception {
+		return this.serializer.serializeObject(this.getProcessorInfo(instanceId));
+    }
+    
     public String xmlrpc_getProcessorInfo(String instanceId, String modelId) throws Exception {
 		return this.serializer.serializeObject(this.getProcessorInfo(instanceId, modelId));
     }
     
+	public String xmlrpc_getWorkflowMetadata(String instanceId) throws Exception {
+		return this.serializer.serializeObject(this.getWorkflowMetadata(instanceId));
+	}
+	
 	public String xmlrpc_getWorkflowMetadata(String instanceId, String modelId) throws Exception {
 		return this.serializer.serializeObject(this.getWorkflowMetadata(instanceId, modelId));
 	}

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=1075936&r1=1075935&r2=1075936&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 Tue Mar  1 17:35:13 2011
@@ -48,10 +48,14 @@ public interface XmlRpcCommunicationServ
 
 	public String xmlrpc_getWorkflowGraphs() throws Exception;
 
+	public String xmlrpc_getProcessorInfo(String instanceId) throws Exception;
+
     public String xmlrpc_getProcessorInfo(String instanceId, String modelId) throws Exception;
 	
 	public String xmlrpc_getWorkflowState(String instanceId) throws Exception;
 	
+	public String xmlrpc_getWorkflowMetadata(String instanceId) throws Exception;
+	
 	public String xmlrpc_getWorkflowMetadata(String instanceId, String modelId) throws Exception;
 
 	public String xmlrpc_pauseWorkflow(String instanceId) throws Exception;