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/30 23:59:21 UTC
svn commit: r1163425 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
./ interpretor/ jython/lib/ monitor/
Author: lahiru
Date: Tue Aug 30 21:59:21 2011
New Revision: 1163425
URL: http://svn.apache.org/viewvc?rev=1163425&view=rev
Log:
fixing issue https://issues.apache.org/jira/browse/AIRAVATA-83
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java?rev=1163425&r1=1163424&r2=1163425&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java Tue Aug 30 21:59:21 2011
@@ -55,7 +55,7 @@ public class XBayaConstants {
/**
* DEFAULT_GFAC_URL
*/
- public static final URI DEFAULT_GFAC_URL = URI.create("https://localhost:8080/axis2/services/GFacService");
+ public static final URI DEFAULT_GFAC_URL = URI.create("http://localhost:8080/axis2/services/GFacService");
/**
* DEFAULT_XREGISTRY_URL
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1163425&r1=1163424&r2=1163425&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Tue Aug 30 21:59:21 2011
@@ -210,7 +210,7 @@ public class WorkflowInterpreter {
this.workflow = workflow;
this.isSubWorkflow = subWorkflow;
this.mode = GUI_MODE;
- this.notifier = new NotificationSender(this.configuration.getBrokerURL(), topic);
+ this.notifier = new NotificationSender(this.engine.getMonitor().getConfiguration().getBrokerURL(), topic);
this.topic = topic;
}
@@ -621,7 +621,7 @@ public class WorkflowInterpreter {
} else {
invoker = new GenericInvoker(portTypeQName, WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(wsNode
- .getComponent().getWSDL()), node.getID(), this.configuration.getMessageBoxURL().toString(),
+ .getComponent().getWSDL()), node.getID(), this.engine.getMonitor().getConfiguration().getMessageBoxURL().toString(),
gfacURLString, this.notifier);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1163425&r1=1163424&r2=1163425&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Tue Aug 30 21:59:21 2011
@@ -146,7 +146,7 @@ public class WorkflowInterpretorEventLis
try {
String soapBody = WorkFlowUtils.getSoapBodyContent(message);
XmlElement event = XMLUtil.stringToXmlElement(soapBody);
- handleEvent(new MonitorEvent(event), true, this.workflow.getGraph());
+ handleEvent(new MonitorEvent(event), true, this.workflow.getGraph());
} catch (XMLStreamException e) {
// Just log them because they can be unrelated messages sent to
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java?rev=1163425&r1=1163424&r2=1163425&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java Tue Aug 30 21:59:21 2011
@@ -86,11 +86,12 @@ public class NotificationSender {
this.notifier = NotifierFactory.createNotifier();
URI initiatorWorkflowID = null;
- URI initiatorServiceID = URI.create("XBaya");
+ URI initiatorServiceID = URI.create(StringUtil.convertToJavaIdentifier(topic));
String initiatorWorkflowNodeID = null;
Integer initiatorWorkflowTimeStep = null;
this.context = this.notifier.createTrackingContext(props,eventSink,initiatorWorkflowID,
initiatorServiceID,initiatorWorkflowNodeID,initiatorWorkflowTimeStep);
+ this.context.setTopic(topic);
this.initiator = this.notifier.createEntity(initiatorWorkflowID, initiatorServiceID, initiatorWorkflowNodeID,
initiatorWorkflowTimeStep);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java?rev=1163425&r1=1163424&r2=1163425&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java Tue Aug 30 21:59:21 2011
@@ -44,7 +44,7 @@ public class MonitorUtil {
* Workflow tracking namespace
*/
public static final XmlNamespace WOR_NS = XMLUtil.BUILDER.newNamespace("wor",
- "http://lead.extreme.indiana.edu/namespaces/2006/06/workflow_tracking");
+ "http://airavata.apache.org/schemas/workflow_tracking_types");
/**
* XBaya events namespace
@@ -55,7 +55,7 @@ public class MonitorUtil {
/**
* gotResult
*/
- public static final String GOT_RESULT_EVENT_TAG = "gotResult";
+ public static final String GOT_RESULT_EVENT_TAG = "receivedResult";
/**
* description
@@ -323,6 +323,9 @@ public class MonitorUtil {
return EventType.UNKNOWN;
}
} else if (WOR_NS.equals(ns)) {
+ if (GOT_RESULT_EVENT_TAG.equals(name)) {
+ return EventType.WORKFLOW_TERMINATED;
+ }
for (EventType type : EventType.values()) {
if (type.name.equals(name)) {
return type;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java?rev=1163425&r1=1163424&r2=1163425&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java Tue Aug 30 21:59:21 2011
@@ -142,15 +142,12 @@ public class WsmgClient implements Consu
*/
public void handleNotification(String message) {
try {
- String soapBody = WorkFlowUtils.getSoapBodyContent(message);
- XmlElement event = XMLUtil.stringToXmlElement(soapBody);
+ XmlElement event = XMLUtil.stringToXmlElement(message);
this.monitor.handleNotification(event);
- } catch (XMLStreamException e) {
+ } catch (Exception e) {
// Just log them because they can be unrelated messages sent to
// this topic by accident.
logger.warning("Could not parse received notification: " + message, e);
- } catch (RuntimeException e) {
- logger.warning("Failed to process notification: " + message, e);
}
}