svn commit: r1397220 - in /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor: WorkflowInterpreter.java WorkflowInterpretorSkeleton.java

[la...@apache.org]

Author: lahiru
Date: Thu Oct 11 18:31:07 2012
New Revision: 1397220

URL: http://svn.apache.org/viewvc?rev=1397220&view=rev
Log:
fixing AIRAVATA-601

Modified:
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1397220&r1=1397219&r2=1397220&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Thu Oct 11 18:31:07 2012
@@ -343,6 +343,7 @@ public class WorkflowInterpreter {
 			// we reset all the state
 			cleanup();
 			this.config.getNotifier().cleanup();
+            this.config.getNotifier().workflowFailed(e.getMessage());
 			this.getWorkflow().setExecutionState(WorkflowExecutionState.NONE);
 			raiseException(e);
 		}

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1397220&r1=1397219&r2=1397220&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Thu Oct 11 18:31:07 2012
@@ -224,11 +224,18 @@ public class WorkflowInterpretorSkeleton
      */
 
 	public java.lang.String launchWorkflow(java.lang.String workflowAsString, java.lang.String topic, NameValue[] inputs) throws XMLStreamException {
-        OMElement workflowContext = getWorkflowContextHeader();        Map<String, String> configuration = new HashMap<String, String>();
+        OMElement workflowContext = getWorkflowContextHeader();
+        Map<String, String> configuration = new HashMap<String, String>();
         WorkflowContextHeaderBuilder workflowContextHeaderBuilder = parseContextHeader(workflowContext, configuration);
-        return setupAndLaunch(workflowAsString, topic,
-                (String)configurationContext.getProperty(MYPROXY_USER),(String)configurationContext.getProperty(MYPROXY_PASS),inputs,configuration,runInThread,workflowContextHeaderBuilder);
-	}
+        String s = null;
+        try {
+             s = setupAndLaunch(workflowAsString, topic,
+                    (String) configurationContext.getProperty(MYPROXY_USER), (String) configurationContext.getProperty(MYPROXY_PASS), inputs, configuration, runInThread, workflowContextHeaderBuilder);
+        } catch (XMLStreamException e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        }
+        return s;
+    }
 
     private OMElement getWorkflowContextHeader() {
         MessageContext currentMessageContext = MessageContext.getCurrentMessageContext();