You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@oodt.apache.org by "Mattmann, Chris A (3980)" <ch...@jpl.nasa.gov> on 2014/11/12 01:16:51 UTC
Re: svn commit: r1638569 - in
/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow:
repository/PackagedWorkflowRepository.java system/XmlRpcWorkflowManager.java
system/XmlRpcWorkflowManagerClient.java
Thanks Varun please don¹t forget to update CHANGES.txt. Thanks!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Chris Mattmann, Ph.D.
Chief Architect
Instrument Software and Science Data Systems Section (398)
NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
Office: 168-519, Mailstop: 168-527
Email: chris.a.mattmann@nasa.gov
WWW: http://sunset.usc.edu/~mattmann/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adjunct Associate Professor, Computer Science Department
University of Southern California, Los Angeles, CA 90089 USA
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-----Original Message-----
From: "varunr@apache.org" <va...@apache.org>
Reply-To: "dev@oodt.apache.org" <de...@oodt.apache.org>
Date: Tuesday, November 11, 2014 at 3:25 PM
To: "commits@oodt.apache.org" <co...@oodt.apache.org>
Subject: svn commit: r1638569 - in
/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow:
repository/PackagedWorkflowRepository.java
system/XmlRpcWorkflowManager.java system/XmlRpcWorkflowManagerClient.java
>Author: varunr
>Date: Tue Nov 11 23:25:39 2014
>New Revision: 1638569
>
>URL: http://svn.apache.org/r1638569
>Log:
>See: https://reviews.apache.org/r/15936/
>
>
>Modified:
>
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
>PackagedWorkflowRepository.java
>
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>pcWorkflowManager.java
>
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>pcWorkflowManagerClient.java
>
>Modified:
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
>PackagedWorkflowRepository.java
>URL:
>http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/
>oodt/cas/workflow/repository/PackagedWorkflowRepository.java?rev=1638569&r
>1=1638568&r2=1638569&view=diff
>==========================================================================
>====
>---
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
>PackagedWorkflowRepository.java (original)
>+++
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
>PackagedWorkflowRepository.java Tue Nov 11 23:25:39 2014
>@@ -334,13 +334,19 @@ public class PackagedWorkflowRepository
> workflowId = UUID.randomUUID().toString();
> workflow.setId(workflowId);
> }
>-
>- Graph graph = new Graph();
>- graph.setExecutionType("sequential");
>- ParentChildWorkflow pcw = new ParentChildWorkflow(graph);
>- pcw.setName(workflow.getName());
>- pcw.setTasks(workflow.getTasks());
>- pcw.setId(workflow.getId());
>+
>+ ParentChildWorkflow pcw = null;
>+ if(workflow instanceof ParentChildWorkflow) {
>+ pcw = (ParentChildWorkflow) workflow;
>+ }
>+ else {
>+ Graph graph = new Graph();
>+ graph.setExecutionType("sequential");
>+ pcw = new ParentChildWorkflow(graph);
>+ pcw.setName(workflow.getName());
>+ pcw.setTasks(workflow.getTasks());
>+ pcw.setId(workflow.getId());
>+ }
> this.workflows.put(pcw.getId(), pcw);
> this.eventWorkflowMap.put(workflowId,
>Collections.singletonList(pcw));
>
>@@ -639,7 +645,7 @@ public class PackagedWorkflowRepository
> graph.setCond(cond);
> if (graph.getParent() != null) {
> if (graph.getParent().getWorkflow() != null) {
>- System.out.println("Adding condition: [" +
>cond.getConditionName()
>+ LOG.log(Level.FINEST, "Adding condition: [" +
>cond.getConditionName()
> + "] to parent workflow: ["
> + graph.getParent().getWorkflow().getName() + "]");
> graph.getParent().getWorkflow().getConditions().add(cond);
>
>Modified:
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>pcWorkflowManager.java
>URL:
>http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/
>oodt/cas/workflow/system/XmlRpcWorkflowManager.java?rev=1638569&r1=1638568
>&r2=1638569&view=diff
>==========================================================================
>====
>---
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>pcWorkflowManager.java (original)
>+++
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>pcWorkflowManager.java Tue Nov 11 23:25:39 2014
>@@ -79,7 +79,7 @@ public class XmlRpcWorkflowManager {
> private final int webServerPort;
> private WebServer webServer;
> private final WorkflowEngine engine;
>- private final WorkflowRepository repo;
>+ private WorkflowRepository repo;
>
> public XmlRpcWorkflowManager() {
> this(DEFAULT_WEB_SERVER_PORT);
>@@ -112,6 +112,12 @@ public class XmlRpcWorkflowManager {
> return false;
> }
>
>+ public boolean refreshRepository()
>+ throws RepositoryException {
>+ repo = getWorkflowRepositoryFromProperty();
>+ return true;
>+ }
>+
> public String executeDynamicWorkflow(Vector<String> taskIds, Hashtable
>metadata)
> throws RepositoryException, EngineException {
> if (taskIds == null || (taskIds != null && taskIds.size() == 0))
>
>Modified:
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>pcWorkflowManagerClient.java
>URL:
>http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/
>oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java?rev=1638569&r1=1
>638568&r2=1638569&view=diff
>==========================================================================
>====
>---
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>pcWorkflowManagerClient.java (original)
>+++
>oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>pcWorkflowManagerClient.java Tue Nov 11 23:25:39 2014
>@@ -76,6 +76,20 @@ public class XmlRpcWorkflowManagerClient
> workflowManagerUrl = url;
> }
>
>+ public boolean refreshRepository()
>+ throws Exception {
>+ try {
>+ return ((Boolean) client.execute(
>+ "workflowmgr.refreshRepository", new Vector()))
>+ .booleanValue();
>+ } catch (XmlRpcException e) {
>+ e.printStackTrace();
>+ throw new Exception(e.getMessage());
>+ } catch (IOException e) {
>+ throw new Exception(e.getMessage());
>+ }
>+ }
>+
> public String executeDynamicWorkflow(List<String> taskIds, Metadata
>metadata)
> throws Exception {
> Vector argList = new Vector();
>
>
Re: svn commit: r1638569 - in /oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow: repository/PackagedWorkflowRepository.java system/XmlRpcWorkflowManager.java system/XmlRpcWorkflowManagerClient.java
Posted by Varun Ratnakar <va...@gmail.com>.
Oops, done.
> On 12 Nov 2014, at 00:16, Mattmann, Chris A (3980) <ch...@jpl.nasa.gov> wrote:
>
> Thanks Varun please don¹t forget to update CHANGES.txt. Thanks!
>
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> Chris Mattmann, Ph.D.
> Chief Architect
> Instrument Software and Science Data Systems Section (398)
> NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
> Office: 168-519, Mailstop: 168-527
> Email: chris.a.mattmann@nasa.gov
> WWW: http://sunset.usc.edu/~mattmann/
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> Adjunct Associate Professor, Computer Science Department
> University of Southern California, Los Angeles, CA 90089 USA
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>
>
>
>
>
>
> -----Original Message-----
> From: "varunr@apache.org" <va...@apache.org>
> Reply-To: "dev@oodt.apache.org" <de...@oodt.apache.org>
> Date: Tuesday, November 11, 2014 at 3:25 PM
> To: "commits@oodt.apache.org" <co...@oodt.apache.org>
> Subject: svn commit: r1638569 - in
> /oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow:
> repository/PackagedWorkflowRepository.java
> system/XmlRpcWorkflowManager.java system/XmlRpcWorkflowManagerClient.java
>
>> Author: varunr
>> Date: Tue Nov 11 23:25:39 2014
>> New Revision: 1638569
>>
>> URL: http://svn.apache.org/r1638569
>> Log:
>> See: https://reviews.apache.org/r/15936/
>>
>>
>> Modified:
>>
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
>> PackagedWorkflowRepository.java
>>
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>> pcWorkflowManager.java
>>
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>> pcWorkflowManagerClient.java
>>
>> Modified:
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
>> PackagedWorkflowRepository.java
>> URL:
>> http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/
>> oodt/cas/workflow/repository/PackagedWorkflowRepository.java?rev=1638569&r
>> 1=1638568&r2=1638569&view=diff
>> ==========================================================================
>> ====
>> ---
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
>> PackagedWorkflowRepository.java (original)
>> +++
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/
>> PackagedWorkflowRepository.java Tue Nov 11 23:25:39 2014
>> @@ -334,13 +334,19 @@ public class PackagedWorkflowRepository
>> workflowId = UUID.randomUUID().toString();
>> workflow.setId(workflowId);
>> }
>> -
>> - Graph graph = new Graph();
>> - graph.setExecutionType("sequential");
>> - ParentChildWorkflow pcw = new ParentChildWorkflow(graph);
>> - pcw.setName(workflow.getName());
>> - pcw.setTasks(workflow.getTasks());
>> - pcw.setId(workflow.getId());
>> +
>> + ParentChildWorkflow pcw = null;
>> + if(workflow instanceof ParentChildWorkflow) {
>> + pcw = (ParentChildWorkflow) workflow;
>> + }
>> + else {
>> + Graph graph = new Graph();
>> + graph.setExecutionType("sequential");
>> + pcw = new ParentChildWorkflow(graph);
>> + pcw.setName(workflow.getName());
>> + pcw.setTasks(workflow.getTasks());
>> + pcw.setId(workflow.getId());
>> + }
>> this.workflows.put(pcw.getId(), pcw);
>> this.eventWorkflowMap.put(workflowId,
>> Collections.singletonList(pcw));
>>
>> @@ -639,7 +645,7 @@ public class PackagedWorkflowRepository
>> graph.setCond(cond);
>> if (graph.getParent() != null) {
>> if (graph.getParent().getWorkflow() != null) {
>> - System.out.println("Adding condition: [" +
>> cond.getConditionName()
>> + LOG.log(Level.FINEST, "Adding condition: [" +
>> cond.getConditionName()
>> + "] to parent workflow: ["
>> + graph.getParent().getWorkflow().getName() + "]");
>> graph.getParent().getWorkflow().getConditions().add(cond);
>>
>> Modified:
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>> pcWorkflowManager.java
>> URL:
>> http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/
>> oodt/cas/workflow/system/XmlRpcWorkflowManager.java?rev=1638569&r1=1638568
>> &r2=1638569&view=diff
>> ==========================================================================
>> ====
>> ---
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>> pcWorkflowManager.java (original)
>> +++
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>> pcWorkflowManager.java Tue Nov 11 23:25:39 2014
>> @@ -79,7 +79,7 @@ public class XmlRpcWorkflowManager {
>> private final int webServerPort;
>> private WebServer webServer;
>> private final WorkflowEngine engine;
>> - private final WorkflowRepository repo;
>> + private WorkflowRepository repo;
>>
>> public XmlRpcWorkflowManager() {
>> this(DEFAULT_WEB_SERVER_PORT);
>> @@ -112,6 +112,12 @@ public class XmlRpcWorkflowManager {
>> return false;
>> }
>>
>> + public boolean refreshRepository()
>> + throws RepositoryException {
>> + repo = getWorkflowRepositoryFromProperty();
>> + return true;
>> + }
>> +
>> public String executeDynamicWorkflow(Vector<String> taskIds, Hashtable
>> metadata)
>> throws RepositoryException, EngineException {
>> if (taskIds == null || (taskIds != null && taskIds.size() == 0))
>>
>> Modified:
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>> pcWorkflowManagerClient.java
>> URL:
>> http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/
>> oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java?rev=1638569&r1=1
>> 638568&r2=1638569&view=diff
>> ==========================================================================
>> ====
>> ---
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>> pcWorkflowManagerClient.java (original)
>> +++
>> oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlR
>> pcWorkflowManagerClient.java Tue Nov 11 23:25:39 2014
>> @@ -76,6 +76,20 @@ public class XmlRpcWorkflowManagerClient
>> workflowManagerUrl = url;
>> }
>>
>> + public boolean refreshRepository()
>> + throws Exception {
>> + try {
>> + return ((Boolean) client.execute(
>> + "workflowmgr.refreshRepository", new Vector()))
>> + .booleanValue();
>> + } catch (XmlRpcException e) {
>> + e.printStackTrace();
>> + throw new Exception(e.getMessage());
>> + } catch (IOException e) {
>> + throw new Exception(e.getMessage());
>> + }
>> + }
>> +
>> public String executeDynamicWorkflow(List<String> taskIds, Metadata
>> metadata)
>> throws Exception {
>> Vector argList = new Vector();
>>
>>
>