You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/09/01 18:28:45 UTC
svn commit: r1164139 - in
/incubator/airavata/trunk/modules/commons/workflow-tracking/src:
main/java/org/apache/airavata/workflow/tracking/
test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/
Author: patanachai
Date: Thu Sep 1 16:28:44 2011
New Revision: 1164139
URL: http://svn.apache.org/viewvc?rev=1164139&view=rev
Log:
Change interface method to use String instead of Axis2 EPR
Modified:
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java?rev=1164139&r1=1164138&r2=1164139&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java Thu Sep 1 16:28:44 2011
@@ -54,11 +54,11 @@ public abstract class AbstractNotifier {
}
- public WorkflowTrackingContext createTrackingContext(Properties golbalProperties, EndpointReference epr,
+ public WorkflowTrackingContext createTrackingContext(Properties golbalProperties, String epr,
URI workflowID, URI serviceID, String workflowNodeID, Integer workflowTimestep) {
WorkflowTrackingContext workflowTrackingContext = new WorkflowTrackingContext();
workflowTrackingContext.setGlobalAnnotations(golbalProperties);
- workflowTrackingContext.setBrokerEpr(epr);
+ workflowTrackingContext.setBrokerEpr(new EndpointReference(epr));
workflowTrackingContext.setMyself(createEntity(workflowID, serviceID, workflowNodeID, workflowTimestep));
return workflowTrackingContext;
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java?rev=1164139&r1=1164138&r2=1164139&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java Thu Sep 1 16:28:44 2011
@@ -54,7 +54,7 @@ public interface GenericNotifier {
* @param epr
* @return
*/
- public WorkflowTrackingContext createTrackingContext(Properties golbalProperties, EndpointReference epr,
+ public WorkflowTrackingContext createTrackingContext(Properties golbalProperties, String epr,
URI workflowID, URI serviceID, String workflowNodeID, Integer workflowTimestep);
/**
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java?rev=1164139&r1=1164138&r2=1164139&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java Thu Sep 1 16:28:44 2011
@@ -61,8 +61,6 @@ public class SimpleWorkflowExecution ext
Properties configs = new Properties();
String BROKER_URL = "http://127.0.0.1:8080/axis2/services/EventingService/topic/Foo";
- private EndpointReference epr = new EndpointReference(BROKER_URL);
-
@BeforeClass
public static void setUpBeforeClass() throws Exception {
@@ -134,7 +132,7 @@ public class SimpleWorkflowExecution ext
assert WORKFLOW_1.equals(myServiceID);
WorkflowNotifier notifier = NotifierFactory.createWorkflowNotifier();
- WorkflowTrackingContext context = notifier.createTrackingContext(new Properties(), epr, myWorkflowID,
+ WorkflowTrackingContext context = notifier.createTrackingContext(new Properties(), BROKER_URL, myWorkflowID,
myServiceID, myNodeID, myTimestep);
InvocationContext myInvocation = notifier.workflowInvoked(context, myInvoker,
@@ -240,7 +238,7 @@ public class SimpleWorkflowExecution ext
// if we were not publishing data products, a serviceNotifier would have
// sufficed
ProvenanceNotifier notifier = NotifierFactory.createProvenanceNotifier();
- WorkflowTrackingContext context = notifier.createTrackingContext(null, epr, myWorkflowID, myServiceID,
+ WorkflowTrackingContext context = notifier.createTrackingContext(null, BROKER_URL, myWorkflowID, myServiceID,
myNodeID, myTimestep);
InvocationContext invocationContext = notifier.serviceInvoked(context, myInvoker,
"I (service1) was invoked by my invoker",
@@ -322,7 +320,7 @@ public class SimpleWorkflowExecution ext
ProvenanceNotifier notifier = NotifierFactory.createProvenanceNotifier();
// received request
- WorkflowTrackingContext context = notifier.createTrackingContext(null, epr, myWorkflowID, myServiceID,
+ WorkflowTrackingContext context = notifier.createTrackingContext(null, BROKER_URL, myWorkflowID, myServiceID,
myNodeID, myTimestep);
InvocationContext invocationContext = notifier.serviceInvoked(context, myInvoker,
"I (service2) was invoked by my invoker");
@@ -390,7 +388,7 @@ public class SimpleWorkflowExecution ext
public void runSample() throws Exception {
notifier = NotifierFactory.createNotifier();
- WorkflowTrackingContext context = notifier.createTrackingContext(null, epr, WORKFLOW_1, SERVICE_0, null, null);
+ WorkflowTrackingContext context = notifier.createTrackingContext(null, BROKER_URL, WORKFLOW_1, SERVICE_0, null, null);
// create workflow and service instances
{