You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/08/05 18:47:44 UTC
svn commit: r1154307 - in
/incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src:
main/java/org/apache/airavata/commons/
main/java/org/apache/airavata/workflow/tracking/
main/java/org/apache/airavata/workflow/tracking/impl/stat...
Author: lahiru
Date: Fri Aug 5 16:47:44 2011
New Revision: 1154307
URL: http://svn.apache.org/viewvc?rev=1154307&view=rev
Log:
adding refactoring for workflow interpreter.
Modified:
incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/commons/LeadContextHeader.java
incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java
incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java
incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java
incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java
incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java
Modified: incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/commons/LeadContextHeader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/commons/LeadContextHeader.java?rev=1154307&r1=1154306&r2=1154307&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/commons/LeadContextHeader.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/commons/LeadContextHeader.java Fri Aug 5 16:47:44 2011
@@ -183,6 +183,9 @@ public class LeadContextHeader {
setUriValue(NS, "gfac-url", url);
}
+ public void setEventSinkEpr(EndpointReference epr){
+ setUriValue(NS,"event-sink-epr",URI.create(epr.getAddress()));
+ }
public URI getGfacUrl() {
return lookupUriValue(NS, "gfac-url");
}
Modified: incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java?rev=1154307&r1=1154306&r2=1154307&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java Fri Aug 5 16:47:44 2011
@@ -58,13 +58,13 @@ public abstract class AbstractNotifier {
WorkflowTrackingContext workflowTrackingContext = new WorkflowTrackingContext();
workflowTrackingContext.setGlobalAnnotations(golbalProperties);
workflowTrackingContext.setBrokerEpr(epr);
- workflowTrackingContext.setMyself(createEntity(workflowTrackingContext, workflowID, serviceID, workflowNodeID,
+ workflowTrackingContext.setMyself(createEntity(workflowID, serviceID, workflowNodeID,
workflowTimestep));
return workflowTrackingContext;
}
- public InvocationEntity createEntity(WorkflowTrackingContext context, URI workflowID, URI serviceID,
- String workflowNodeID, Integer workflowTimestep) {
+ public InvocationEntity createEntity(URI workflowID, URI serviceID,
+ String workflowNodeID, Integer workflowTimestep) {
InvocationEntityImpl invocationEntityImpl = new InvocationEntityImpl(workflowID, serviceID, workflowNodeID,
workflowTimestep);
return invocationEntityImpl;
Modified: incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java?rev=1154307&r1=1154306&r2=1154307&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java Fri Aug 5 16:47:44 2011
@@ -94,9 +94,7 @@ public interface GenericNotifier {
* responder to an invocation. This object is created for the entity that is invoked and its remote invokee, and/or
* for the entity and the remote entity it invokes.
*
- * @param context
- * current workflow tracking context, this includes in parameter localEntity an InvocationEntity
- * representing this entity
+ *
* @param workflowID
* an URI
* @param serviceID
@@ -105,12 +103,12 @@ public interface GenericNotifier {
* a String
* @param workflowTimestep
* an int
- *
+ *
* @return an InvocationEntity
*
*/
- public InvocationEntity createEntity(WorkflowTrackingContext context, URI workflowID, URI serviceID,
- String workflowNodeID, Integer workflowTimestep);
+ public InvocationEntity createEntity(URI workflowID, URI serviceID,
+ String workflowNodeID, Integer workflowTimestep);
/**
* Send a Log message with level INFO
Modified: incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java?rev=1154307&r1=1154306&r2=1154307&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java Fri Aug 5 16:47:44 2011
@@ -110,7 +110,8 @@ public interface WorkflowNotifier extend
* @param receiver
* identity of this workflow invocation
* @param initiator
- * identity of entity that invoked this workflow
+ * identity of entity
+ * that invoked this workflow
* @param descriptionAndAnnotation
* optional vararg. The first element is used as the human readable description for this notification.
* The subsequent strings need to be serialized XML fragments that are added as annotation to the
Modified: incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java?rev=1154307&r1=1154306&r2=1154307&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java Fri Aug 5 16:47:44 2011
@@ -24,6 +24,7 @@ package org.apache.airavata.workflow.tra
import java.net.URI;
import org.apache.airavata.workflow.tracking.common.InvocationEntity;
+import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext;
import org.apache.airavata.workflow.tracking.types.BaseIDType;
public class InvocationEntityImpl implements InvocationEntity {
Modified: incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java?rev=1154307&r1=1154306&r2=1154307&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java Fri Aug 5 16:47:44 2011
@@ -46,7 +46,7 @@ public class Listener {
*/
public static void main(String[] args) {
- String brokerLocation = args.length > 0 ? args[0] : "rainier.extreme.indiana.edu:12346";
+ String brokerLocation = args.length > 0 ? args[0] : "localhost:8080/axis2/services/EventingService";
String topic = "pickTheTOpicThatWorkflowPublishTheEventsFrom";
Subscription subscription = null;
Modified: incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java?rev=1154307&r1=1154306&r2=1154307&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/workflow-tracking-deprecated/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java Fri Aug 5 16:47:44 2011
@@ -60,7 +60,7 @@ public class SimpleWorkflowExecution ext
*/
Subscription subscription;
Properties configs = new Properties();
- String BROKER_URL = "http://127.0.0.1:8081/axis2/services/EventingService/topic/Foo";
+ String BROKER_URL = "http://127.0.0.1:8080/axis2/services/EventingService/topic/Foo";
private EndpointReference epr = new EndpointReference(BROKER_URL);
@@ -145,7 +145,7 @@ public class SimpleWorkflowExecution ext
// BEGIN SERVICE1
{
// prepare to invoke service1
- InvocationEntity service1 = notifier.createEntity(context, myServiceID, SERVICE_1, "NODE1", 1);
+ InvocationEntity service1 = notifier.createEntity(myServiceID, SERVICE_1, "NODE1", 1);
InvocationContext service1Invocation = notifier.invokingService(context, service1,
XmlObject.Factory.parse("<soapHeader/>"), XmlObject.Factory.parse("<soapBody>input1</soapBody>"),
"This workflow is invoking a service");
@@ -183,7 +183,7 @@ public class SimpleWorkflowExecution ext
// BEGIN SERVICE2
{
// prepare to invoke service1
- InvocationEntity service2 = notifier.createEntity(context, myServiceID, SERVICE_2, "NODE2", 2);
+ InvocationEntity service2 = notifier.createEntity(myServiceID, SERVICE_2, "NODE2", 2);
InvocationContext service1Invocation = notifier.invokingService(context, service2,
XmlObject.Factory.parse("<soapHeader/>"),
XmlObject.Factory.parse("<soapBody>input2,input3</soapBody>"),
@@ -412,7 +412,7 @@ public class SimpleWorkflowExecution ext
{
GenericNotifier notifier = NotifierFactory.createGenericNotifier();
- InvocationEntity initiatingService = notifier.createEntity(context, null, SERVICE_0, null, null);
+ InvocationEntity initiatingService = notifier.createEntity(null, SERVICE_0, null, null);
runWorkflow1(initiatingService, null, WORKFLOW_1, null, null);
}