incubator-airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1239270 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: interpretor/WorkflowInterpreter.java jython/lib/ServiceNotificationSender.java
Date Wed, 01 Feb 2012 19:09:54 GMT
Author: lahiru
Date: Wed Feb  1 19:09:54 2012
New Revision: 1239270

URL: http://svn.apache.org/viewvc?rev=1239270&view=rev
Log:
fixing AIRAVATA-271,AIRAVATA-270

Modified:
    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/jython/lib/ServiceNotificationSender.java

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=1239270&r1=1239269&r2=1239270&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
Wed Feb  1 19:09:54 2012
@@ -290,7 +290,7 @@ public class WorkflowInterpreter {
 				if (this.mode == GUI_MODE) {
 					this.engine.getGUI().getGraphCanvas().repaint();
 				}
-				keywords[i] = ((InputNode) node).getConfiguredName();
+				keywords[i] = ((InputNode) node).getName();
 				values[i] = ((InputNode) node).getDefaultValue();
 			}
 			this.notifier.workflowStarted(values, keywords);

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java?rev=1239270&r1=1239269&r2=1239270&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java
Wed Feb  1 19:09:54 2012
@@ -145,9 +145,18 @@ public class ServiceNotificationSender i
             } else {
                 message += ", ";
             }
+
             String name = (String) partIt.next();
             Object value = inputs.getObjectPart(name);
-            message += name + "=" + value;
+            if(value instanceof org.xmlpull.v1.builder.XmlElement){
+                message += name + "=";
+                Iterator children = ((org.xmlpull.v1.builder.XmlElement) value).children();
+                while (children.hasNext()){
+                    message += children.next();
+                }
+            }else{
+                message += name + "=" + value;
+            }
         }
         XmlObject header = null;
         XmlObject body;
@@ -178,7 +187,15 @@ public class ServiceNotificationSender i
             }
             String name = (String) partIt.next();
             Object value = outputs.getObjectPart(name);
-            message += name + "=" + value;
+            if(value instanceof org.xmlpull.v1.builder.XmlElement){
+                message += name + "=";
+                Iterator children = ((org.xmlpull.v1.builder.XmlElement) value).children();
+                while (children.hasNext()){
+                    message += children.next();
+                }
+            }else{
+             message += name + "=" + value;
+            }
         }
         XmlObject header = null;
         XmlObject body;



Mime
View raw message