You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2011/09/02 22:46:48 UTC
svn commit: r1164705 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
./ amazonEC2/gui/ appwrapper/ datadriven/ graph/dynamic/ graph/dynamic/gui/
graph/ws/ interpretor/ ode/ ode/gui/ pegasus/gui/ streaming/ tave...
Author: chathura
Date: Fri Sep 2 20:46:46 2011
New Revision: 1164705
URL: http://svn.apache.org/viewvc?rev=1164705&view=rev
Log:
Code Cleanup:
Removing noops
Removing Sysouts that are not part of tooling
Remove printing exceptions to logging them
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonS3UtilsWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/S3Uploader.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/datadriven/WorkflowHarvester.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/XmlBeansFiler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.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/ode/ODEClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamTransformer.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java Fri Sep 2 20:46:46 2011
@@ -188,11 +188,7 @@ public class GpelWorkflowClient implemen
GPELClient client = new GPELClient(XBayaConstants.DEFAULT_GPEL_ENGINE_URL, credential);
client.deploy(workflow, false);
GcInstance instance = client.instantiate(workflow, XBayaConstants.DEFAULT_DSC_URL, topic);
- System.out.println("===============================================");
- System.out.println(instance.getId());
- System.out.println(instance.getInstanceId());
WsdlDefinitions wsdl = client.start(instance);
- System.out.println(workflow.getGPELTemplateID());
LEADWorkflowInvoker invoker = null;
try {
@@ -213,7 +209,6 @@ public class GpelWorkflowClient implemen
invoker.setInputs(inputs);
final LEADWorkflowInvoker workflowInvoker = invoker;
- System.out.println("Invoking .....");
new Thread() {
@Override
@@ -231,7 +226,6 @@ public class GpelWorkflowClient implemen
}
}.start();
- System.out.println("Done Invoking.");
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ProxyServiceTester.java Fri Sep 2 20:46:46 2011
@@ -62,7 +62,6 @@ public class ProxyServiceTester {
private void runClient() {
// logger.info("Invoking operation deploy using WSDL from " + wsdlLoc);
try {
- System.out.println("Invoking operation deploy using WSDL from " + wsdlLoc);
WSIFAsyncResponsesCorrelator correlator;
correlator = null;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java Fri Sep 2 20:46:46 2011
@@ -37,10 +37,6 @@ public class XBaya {
private XBayaEngine engine;
- public static Vector<String> time = new Vector<String>();
- //
- // public static Vector<String> all = new Vector<String>();
-
public static int preservice = 0;
/**
@@ -52,107 +48,6 @@ public class XBaya {
parseArguments(args);
try {
this.engine = new XBayaEngine(this.config);
- //
- // new MyProxyDialog(this.engine).show();
- // try {
- // URLComponentRegistry serviceRegistry = new URLComponentRegistry(
- // new URI(
- // "https://pagodatree.cs.indiana.edu:17443/axis2/services/Echo?wsdl"));
- //
- // new ComponentRegistryLoader(engine).load(serviceRegistry);
- // ComponentTreeNode com = (ComponentTreeNode) serviceRegistry
- // .getComponentTree().getChildAt(0);
- // GraphCanvas graphCanvas = this.engine.getGUI().getGraphCanvas();
- // boolean stream = true;
- // for (int g = 29; g < 31; ++g) {
- // int nodes = g;
- // for (int z = 0; z < 20; ++z) {
- // for (int i = nodes; i < nodes + 1; i++) {
- // this.engine.getGUI().closeGraphCanvas();
- // this.engine.getGUI().closeGraphCanvas();
- // DataPort inputPort;
- //
- // InputNode in = (InputNode) graphCanvas.addNode(
- // new InputComponent(), new Point(10, 10));
- // if (stream) {
- // StreamSourceComponent streamSourceComponent = new StreamSourceComponent();
- // StreamSourceNode strsrc = (StreamSourceNode) graphCanvas
- // .addNode(streamSourceComponent,
- // new Point(5, 5));
- // strsrc.addInputNode(in);
- // }
- // Port outputPort = in.getOutputPort(0);
- // for (int j = 0; j < i; j++) {
- //
- // Node node = graphCanvas.addNode(
- // com.getComponentReference()
- // .getComponent(), new Point(
- // 50 + 50 * j, 50 + 50 * j));
- // graphCanvas.getGraph().addEdge(outputPort,
- // node.getInputPort(0));
- // // inputPort = node.getInputPort(0);
- // outputPort = node.getOutputPort(0);
- // }
- //
- // Node outnode = graphCanvas.addNode(
- // new OutputComponent(), new Point(10, 300));
- // graphCanvas.getGraph().addEdge(outputPort,
- // outnode.getInputPort(0));
- //
- // graphCanvas.setNameAndDescription(StringUtil
- // .convertToJavaIdentifier("WttTest" + i),
- // "WFTest" + i);
- // ((GraphImpl) graphCanvas.getGraph())
- // .setID("WttTest" + i);
- // new ODEDeploymentWindow(this.engine).deploy();
- //
- // Thread.sleep(10000);
- // }
- //
- // }
- //
- //
- //
- // int c = 29;
- // FileWriter out = new FileWriter(g+"out"+c+".txt");
- // for (int i = 0; i < time.size(); ++i) {
- // if(i%20 == 0 && 1 != 0){
- // System.out.println("----------------------------"+c);
- // ++c;
- // out.close();
- // out = new FileWriter(g+"out"+c+".txt");
- // }
- // System.out.println(time.get(i));
- // out.write(time.get(i)+"\n");
- //
- // }
- //
- // }
- // // for (int i = 0; i < time.size(); ++i) {
- // // if (i % 2 == 0) {
- // // String type = time.get(i);
- // // System.out.println(type);
- // //
- // // }
- // //
- // // }
- // // System.out.println();
- // // System.out.println();
- // // System.out.println() ;
- // // for (int i = 0; i < time.size(); ++i) {
- // // if (i % 2 != 0) {
- // // String type = time.get(i);
- // // System.out.println(type);
- // //
- // // }
- // //
- // // }
- // //
- //
- // } catch (Exception e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // }
} catch (RuntimeException e) {
logger.caught(e);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java Fri Sep 2 20:46:46 2011
@@ -30,6 +30,7 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
@@ -206,15 +207,11 @@ public class AmazonEC2InvokerWindow {
public void receiveResultjobSubmitOperation(JobSubmissionReceipt result) {
JOptionPane.showMessageDialog(null, "Job Submitted, ID: " + result.getJobFlowID(), "",
JOptionPane.INFORMATION_MESSAGE);
- // System.out.println("In call back, response is: "
- // + result.getJobFlowID());
}
@Override
public void receiveErrorjobSubmitOperation(java.lang.Exception e) {
JOptionPane.showMessageDialog(null, "Job Sumit Failed!", "", JOptionPane.ERROR_MESSAGE);
- // System.out.println("In call back, exception thrown!");
- // e.printStackTrace();
}
@Override
@@ -224,8 +221,7 @@ public class AmazonEC2InvokerWindow {
@Override
public void receiveErrorjobStatus(java.lang.Exception e) {
- System.out.println("In call back, exception thrown!");
- e.printStackTrace();
+ throw new XBayaRuntimeException(e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonS3UtilsWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonS3UtilsWindow.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonS3UtilsWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonS3UtilsWindow.java Fri Sep 2 20:46:46 2011
@@ -159,7 +159,6 @@ public class AmazonS3UtilsWindow {
@Override
public void actionPerformed(ActionEvent e) {
- System.out.println(AmazonCredential.getInstance().getAwsAccessKeyId());
if (AmazonCredential.getInstance().getAwsAccessKeyId().isEmpty()
|| AmazonCredential.getInstance().getAwsSecretAccessKey().isEmpty()) {
JOptionPane.showMessageDialog(AmazonS3UtilsWindow.this.dialog.getDialog(),
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/S3Uploader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/S3Uploader.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/S3Uploader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/S3Uploader.java Fri Sep 2 20:46:46 2011
@@ -81,7 +81,6 @@ public class S3Uploader implements Cance
index = filePath.lastIndexOf('\\');
}
fileName = filePath.substring(index + 1, filePath.length());
- System.out.println(filePath);
try {
S3Object s3Object = new S3Object(new File(filePath));
s3.putObject(bucket, s3Object);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java Fri Sep 2 20:46:46 2011
@@ -398,7 +398,6 @@ public class HostDescriptionRegistration
hostBean.setSshEnabled(this.sshEnabledCheckBox.isSelected());
hostBean.setGateKeeperJobManager(this.jobManagerComboBox.getText());
hostBean.setGateKeeperendPointReference(this.gateKeeprEndpointComboBox.getText());
- System.out.println(this.gateKeeprEndpointComboBox.getText());
hostBean.setWsGram(this.wsGramPresentCheckBox.isSelected());
hostBean.setGridFtpendPointReference(this.gridFTPEndPointComboBox.getText());
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/datadriven/WorkflowHarvester.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/datadriven/WorkflowHarvester.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/datadriven/WorkflowHarvester.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/datadriven/WorkflowHarvester.java Fri Sep 2 20:46:46 2011
@@ -135,20 +135,6 @@ public class WorkflowHarvester {
* @param clone
*/
private void removeUnnecessaryNodes(Node node, Port candidatePort, Workflow workflow) {
- // System.out.println("===============================================");
- // System.out.println(node.getID());
- // System.out.println(candidatePort.getID());
- // System.out.println(candidatePort.getFromPort().getEdges().size());
- // System.out.println(candidatePort.getFromPort().getToPorts().size());
- //
- // if (/*
- // * node.getID().equals("NAM_Lateral_Boundary_V5_2_9_Pub_Interpolater"
- // * ) &&
- // */
- // candidatePort.getFromNode().getID()
- // .equals("CrossCuttingConfigurations")) {
- // System.out.println("Crosscuting");
- // }
if (candidatePort.getFromPort().getEdges().size() == 1) {
Node fromNode = candidatePort.getFromNode();
try {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java Fri Sep 2 20:46:46 2011
@@ -164,7 +164,6 @@ public class BasicTypeMapping {
}
public static Object getObjectOfType(QName qName, Object obj) {
- System.out.println(qName + " " + obj.getClass() + " " + obj);
return getObjectOfType(getSimpleTypeIndex(qName), obj);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java Fri Sep 2 20:46:46 2011
@@ -336,7 +336,6 @@ public class DynamicNodeWindow {
if (null != fromPort && fromPort instanceof DataPort) {
DataPort fromDataPort = (DataPort) fromPort;
WsdlDefinitions wsdl = engine.getWorkflow().getWSDLs().get(fromWsNode.getWSDLID());
- System.out.println(xsul5.XmlConstants.BUILDER.serializeToString(wsdl.xml()));
Iterator<XmlNamespace> itr = wsdl.xml().namespaces().iterator();
try {
XmlElement schema = wsdl.getTypes().element("schema").clone();
@@ -360,7 +359,6 @@ public class DynamicNodeWindow {
e.printStackTrace();
}
- System.out.println(fromDataPort.getType());
typesPath = rootDir.getCanonicalPath() + File.separatorChar + "mytype.jar";
String[] args = new String[] { "-d", classesDir.getCanonicalPath(), "-src",
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/XmlBeansFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/XmlBeansFiler.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/XmlBeansFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/XmlBeansFiler.java Fri Sep 2 20:46:46 2011
@@ -68,63 +68,5 @@ public class XmlBeansFiler /* implements
return new FileWriter(srcFile);
}
- // public void compileJavaFiles() {
- //
- // // int status = 0;
- // // Main main = new Main();
- // // System.out.println(System.getProperty("JAVA_HOME"));
- // // for ( int i=0; i<javaFilePaths.size() ; i++ ){
- // // String[] args = new String[]
- // // {"-classpath",System.getProperty("java.class.path",".") , "-d",
- // // this.path, (String) javaFilePaths.elementAt(i)};
- // // status = main.compile(args);
- // // }
- // // if (status != 0) {
- // // throw new XBayaRuntimeException(
- // // "Failed in compiling the xmlBeans generated source files");
- // // }
- // // Project p = new Project();
- // // Path srcPath = new Path(p, this.path);
- // // Javac javac = new Javac();
- // // javac.setTarget("compile");
- // // javac.setSrcdir(srcPath);
- // // javac.setDestdir(new File(this.path));
- // // javac.execute();
- // //
- // // p.executeTarget("compile");
- //
- // // CodeGenUtil.externalCompile((File[])this.javaFilePaths.toArray(), new
- // // File(this.path), false);
- //
- // }
- //
- // public boolean makeJarFile(String jarFile) throws IOException {
- // JarHelper jarHelperObj = new JarHelper();
- // File fileObj = new File(jarFile);
- // fileObj.createNewFile();
- //
- // jarHelperObj.jarDir(new File(this.path), fileObj);
- //
- // return true;
- //
- // }
- //
- // public static void main(String[] args) {
- // String path = "/nfs/mneme/home/users/cherath/generated/";
- // Project p = new Project();
- // Path srcPath = new Path(p, path);
- // Javac javac = new Javac();
- // javac.setSrcdir(srcPath);
- // javac.setDestdir(new File(path));
- // // javac.execute();
- // Target target = new Target();
- // target.setName("compile");
- // target.addTask(javac);
- // p.addTarget(target);
- // // p.executeTarget("compile");
- // Ant ant = new Ant();
- // ant.setProject(p);
- // p.executeTarget("compile");
- // }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java Fri Sep 2 20:46:46 2011
@@ -529,8 +529,6 @@ public class WSGraph extends GraphImpl {
throw new XBayaRuntimeException(
"Some edges were not labeled after labeling algorithm. Possibly partitioned graph");
}
- System.out.println(edge.getLabel());
- System.out.println(edge);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java Fri Sep 2 20:46:46 2011
@@ -54,8 +54,6 @@ public class TestWorkflowInterpreter {
Workflow workflow = new Workflow(workflowAsString);
WsdlDefinitions wsdl = workflow.getTridentWorkflowWSDL(XBayaConstants.DEFAULT_DSC_URL,
XBayaConstants.DEFAULT_ODE_URL.toString());
- System.out.println("llllllllllllllllllllllllll");
- System.out.println(wsdl.xmlStringPretty());
ODEClient client = new ODEClient();
Pair<String, String>[] in = new Pair[3];
@@ -109,99 +107,6 @@ public class TestWorkflowInterpreter {
invoker(userName, password, workflowAsString, in, workflow);
- //
- // workflowAsString = getWorkflow();
- //
- //
- // workflow = new Workflow(workflowAsString);
- // wsdl =
- // workflow.getTridentWorkflowWSDL(XBayaConstants.DEFAULT_DSC_URL,
- // XBayaConstants.DEFAULT_ODE_URL.toString());
- // System.out.println("llllllllllllllllllllllllll");
- // System.out.println(wsdl.xmlStringPretty());
-
- // List<InputNode> inputs = new ODEClient().getInputNodes(workflow);
- // for (Iterator iterator = inputs.iterator(); iterator.hasNext();) {
- // InputNode inputNode = (InputNode) iterator.next();
- // if ("input".equals(inputNode.getName())) {
- // inputNode.setDefaultValue("MyechoString");
- // } // other else ifs for other inputs
- //
- // }
- //
- // XBayaConfiguration configuration = getConfiguration();
- //
- //
- // WorkflowInterpreter interpreter = new WorkflowInterpreter(
- // configuration, "mytopic", workflow, "username", "password");
- // interpreter.scheduleDynamically();
-
- // String userName = "chathura";
- // String password = "changeme";
- // ODEClient client = new ODEClient();
- // GSSCredential credential = client.getGSSCredential(userName,
- // password,
- // XBayaConstants.DEFAULT_MYPROXY_SERVER);
- //
- // Workflow workflow1 = client.getWorkflowFromOGCE(new URI(
- // "https://ogceportal.iu.teragrid.org:19443/xregistry"),
- // credential, new
- // QName("Public_NAM_Initialized_WRF_Forecastc55d6223-7f79-4c07-824c-804c6b12782d"));
- //
- // try {
- // BufferedWriter out = new BufferedWriter(new
- // FileWriter("/nfs/mneme/home/users/cherath/projects/test/extremeWorkspace/xbaya-gui/workflows/t-new.xwf"));
- // out.write(workflow1.toXMLText());
- // out.close();
- // } catch (IOException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // }
- //
- //
- // List<InputNode> inputNodes = client.getInputNodes(workflow1);
- // for (InputNode port : inputNodes) {
- // if (port.getName().equals("CrossCuttingConfigurations")) {
- // // Object val = client.parseValue(port,
- //
- // String val1 =
- // "<CrossCuttingConfigurations n2:leadType='LeadCrosscutParameters' xmlns:n2='http://www.extreme.indiana.edu/namespaces/2004/01/gFac'>"
- // +"<lcp:nx xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>203</lcp:nx>"
- // +"<lcp:ny xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>203</lcp:ny>"
- // +"<lcp:dx xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>5000</lcp:dx>"
- // +"<lcp:dy xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>5000</lcp:dy>"
- // +"<lcp:ctrlat xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>44.85</lcp:ctrlat>"
- // +"<lcp:ctrlon xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>-86.25</lcp:ctrlon>"
- // +"<lcp:fcst_time xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>36</lcp:fcst_time>"
- // +"<lcp:start_date xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>7/30/2010</lcp:start_date>"
- // +"<lcp:start_hour xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>9</lcp:start_hour>"
- // +"<lcp:westbc xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>-90.74158</lcp:westbc>"
- // +"<lcp:eastbc xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>-81.75842</lcp:eastbc>"
- // +"<lcp:northbc xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>47.95601</lcp:northbc>"
- // +"<lcp:southbc xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>41.56573</lcp:southbc>"
- // +"</CrossCuttingConfigurations>";
- //
- // port.setDefaultValue(val1);
- // // port.setValue(val);
- //
- //
- //
- //
- // } else if (port.getName().equals("NAMInitialData")) {
- // // Object val = client.parseValue(port,
- // port.setDefaultValue("gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f03");
- // // port.setValue(val);
- // } else if (port.getName().equals("NAMLateralBoundaryData")) {
- // // Object val = client.parseValue(port,
- // port.setDefaultValue("gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f06 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f09 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f12 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f15 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f18 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f21 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f24 gsiftp://gridftp.bigred.i
u.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f27 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f30 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f33 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f36 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f39");
- // // port.setValue(val);
- // }
- //
- // }
- //
- // WorkflowInterpreter interpreter = new WorkflowInterpreter(
- // getConfiguration(), "mytopic333", workflow, "chathura", "changeme");
- // interpreter.scheduleDynamically();
}
@@ -257,7 +162,6 @@ public class TestWorkflowInterpreter {
wfClient = new GPELWorkflowClient(context, workflow);
wfClient.init();
try {
- System.out.println(workflow.getGPELTemplateID());
context.prepare(wfClient, workflow);
} catch (GSSException e) {
throw new RuntimeException(e);
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=1164705&r1=1164704&r2=1164705&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 Fri Sep 2 20:46:46 2011
@@ -62,268 +62,274 @@ import xsul5.MLogger;
import javax.xml.stream.XMLStreamException;
-public class WorkflowInterpretorEventListener implements NotificationHandler,ConsumerNotificationHandler {
+public class WorkflowInterpretorEventListener implements NotificationHandler,
+ ConsumerNotificationHandler {
- private Workflow workflow;
- private boolean pullMode;
- private WseMsgBrokerClient wseClient;
- private URI brokerURL;
- private String topic;
- private URI messageBoxURL;
- private String subscriptionID;
- private MessagePuller messagePuller;
-
- private static MLogger logger = MLogger.getLogger();
-
- public WorkflowInterpretorEventListener(Workflow workflow, XBayaConfiguration configuration) {
- this.workflow = workflow;
- this.brokerURL = configuration.getBrokerURL();
- this.topic = configuration.getTopic();
- this.pullMode = true;
- this.messageBoxURL = configuration.getMessageBoxURL();
- this.wseClient = new WseMsgBrokerClient();
- this.wseClient.init(this.brokerURL.toString());
- }
-
- public void start() throws MonitorException {
-
- subscribe();
- }
-
- public void stop() throws MonitorException {
- unsubscribe();
- }
-
- private synchronized void subscribe() throws MonitorException {
- if (this.subscriptionID != null) {
- throw new IllegalStateException();
- }
- try {
- if (this.pullMode) {
- EndpointReference messageBoxEPR = this.wseClient.createPullMsgBox(this.messageBoxURL.toString());
- this.subscriptionID = this.wseClient.subscribe(messageBoxEPR.getAddress(),
- this.topic,null);
- this.messagePuller = this.wseClient.startPullingEventsFromMsgBox(messageBoxEPR, this, 1000L,20000L);
- } else {
- String[] endpoints = this.wseClient.startConsumerService(2222,this);
- this.subscriptionID = this.wseClient.subscribe(endpoints[0], this.topic,null);
- }
- } catch (IOException e) {
- throw new MonitorException("Failed to subscribe.", e);
- } catch (RuntimeException e) {
- throw new MonitorException("Failed to subscribe.", e);
- }
- }
-
- /**
- * Unsubscribes from the notification.
- *
- * @throws MonitorException
- */
- private synchronized void unsubscribe() throws MonitorException {
- // This method needs to be synchronized along with subscribe() because
- // unsubscribe() might be called while subscribe() is being executed.
- if (this.subscriptionID == null) {
- throw new IllegalStateException();
- }
- try {
- if (this.pullMode) {
- this.messagePuller.stopPulling();
- } else {
- this.wseClient.unSubscribe(this.subscriptionID);
- }
- this.wseClient.unSubscribe(this.subscriptionID);
- } catch (MsgBrokerClientException e) {
- throw new MonitorException("Failed to unsubscribe.", e);
- }
-
- }
-
- /**
- * @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
- */
- public void handleNotification(String message) {
- try {
- String soapBody = WorkFlowUtils.getSoapBodyContent(message);
- XmlElement event = XMLUtil.stringToXmlElement(soapBody);
- handleEvent(new MonitorEvent(event), true, this.workflow.getGraph());
-
- } catch (XMLStreamException 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);
- }
- }
-
- private void handleEvent(MonitorEvent event, boolean forward, Graph graph) {
- EventType type = event.getType();
- String nodeID = event.getNodeID();
- Node node = graph.getNode(nodeID);
-
- System.out.println(nodeID);
-
- // logger.finest("type: " + type);
- if (type == MonitorUtil.EventType.WORKFLOW_INVOKED) {
- workflowStarted(graph, forward);
- } else if (type == MonitorUtil.EventType.WORKFLOW_TERMINATED) {
- workflowFinished(graph, forward);
- } else if (type == EventType.INVOKING_SERVICE
- // TODO this should be removed when GPEL sends all notification
- // correctly.
- || type == EventType.SERVICE_INVOKED) {
- if (node == null) {
- logger.warning("There is no node that has ID, " + nodeID);
- } else {
- nodeStarted(node, forward);
- }
- } else if (type == MonitorUtil.EventType.RECEIVED_RESULT
- // TODO this should be removed when GPEL sends all notification
- // correctly.
- || type == EventType.SENDING_RESULT) {
- if (node == null) {
- logger.warning("There is no node that has ID, " + nodeID);
- } else {
- nodeFinished(node, forward);
- }
- } else if (type == EventType.INVOKING_SERVICE_FAILED || type == EventType.RECEIVED_FAULT
- // TODO
- || type == EventType.SENDING_FAULT || type == EventType.SENDING_RESPONSE_FAILED) {
- if (node == null) {
- logger.warning("There is no node that has ID, " + nodeID);
- } else {
- nodeFailed(node, forward);
- }
- } else if (type == MonitorUtil.EventType.RESOURCE_MAPPING) {
- if (node == null) {
- logger.warning("There is no node that has ID, " + nodeID);
- } else {
- // nodeResourceMapped(node, event.getEvent(), forward);
- }
- } else {
- // Ignore the rest.
- }
- }
-
- private void workflowStarted(Graph graph, boolean forward) {
- for (InputNode node : GraphUtil.getInputNodes(graph)) {
- if (forward) {
- finishNode(node);
- } else {
- resetNode(node);
- }
- }
- }
-
- private void workflowFinished(Graph graph, boolean forward) {
- for (OutputNode node : GraphUtil.getOutputNodes(graph)) {
- if (forward) {
- finishNode(node);
- finishPredecessorNodes(node);
- } else {
- resetNode(node);
- }
- }
- }
-
- private LinkedList<InputNode> getInputNodes(WSGraph graph) {
- List<NodeImpl> nodes = graph.getNodes();
- LinkedList<InputNode> inputNodes = new LinkedList<InputNode>();
- for (NodeImpl nodeImpl : nodes) {
- if (nodeImpl instanceof InputNode) {
- inputNodes.add((InputNode) nodeImpl);
- }
- }
- return inputNodes;
- }
-
- private LinkedList<OutputNode> getOutputNodes(WSGraph graph) {
- List<NodeImpl> nodes = graph.getNodes();
- LinkedList<OutputNode> outputNodes = new LinkedList<OutputNode>();
- for (NodeImpl nodeImpl : nodes) {
- if (nodeImpl instanceof OutputNode) {
- outputNodes.add((OutputNode) nodeImpl);
- }
- }
- return outputNodes;
- }
-
- private void nodeStarted(Node node, boolean forward) {
- if (forward) {
- executeNode(node);
- finishPredecessorNodes(node);
- } else {
- resetNode(node);
- }
- }
-
- private void nodeFinished(Node node, boolean forward) {
- if (forward) {
- finishNode(node);
- finishPredecessorNodes(node);
- } else {
- executeNode(node);
- }
- }
-
- private void nodeFailed(Node node, boolean forward) {
- if (forward) {
- failNode(node);
- finishPredecessorNodes(node);
- } else {
- executeNode(node);
- }
- }
-
- private void executeNode(Node node) {
- node.getGUI().setBodyColor(NodeState.EXECUTING.color);
- }
-
- private void finishNode(Node node) {
- node.getGUI().setBodyColor(NodeState.FINISHED.color);
- }
-
- private void failNode(Node node) {
- node.getGUI().setBodyColor(NodeState.FAILED.color);
- }
-
- private void resetNode(Node node) {
- node.getGUI().setBodyColor(NodeGUI.DEFAULT_BODY_COLOR);
- node.getGUI().resetTokens();
- }
-
- /**
- * Make preceding nodes done. This helps the monitoring GUI when a user subscribes from the middle of the workflow
- * execution.
- *
- * @param node
- */
- private void finishPredecessorNodes(Node node) {
- for (Port inputPort : node.getInputPorts()) {
- for (Edge edge : inputPort.getEdges()) {
- Port fromPort = edge.getFromPort();
- if (!(fromPort instanceof EPRPort)) {
- Node fromNode = fromPort.getNode();
- finishNode(fromNode);
- finishPredecessorNodes(fromNode);
- }
- }
- }
- Port controlInPort = node.getControlInPort();
- if (controlInPort != null) {
- for (Node fromNode : controlInPort.getFromNodes()) {
- finishNode(fromNode);
- finishPredecessorNodes(fromNode);
- }
- }
- }
- /**
- * @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
- */
- public void handleNotification(SOAPEnvelope message) {
- String soapBody = message.getBody().toString();
- this.handleNotification(soapBody);
- }
+ private Workflow workflow;
+ private boolean pullMode;
+ private WseMsgBrokerClient wseClient;
+ private URI brokerURL;
+ private String topic;
+ private URI messageBoxURL;
+ private String subscriptionID;
+ private MessagePuller messagePuller;
+
+ private static MLogger logger = MLogger.getLogger();
+
+ public WorkflowInterpretorEventListener(Workflow workflow,
+ XBayaConfiguration configuration) {
+ this.workflow = workflow;
+ this.brokerURL = configuration.getBrokerURL();
+ this.topic = configuration.getTopic();
+ this.pullMode = true;
+ this.messageBoxURL = configuration.getMessageBoxURL();
+ this.wseClient = new WseMsgBrokerClient();
+ this.wseClient.init(this.brokerURL.toString());
+ }
+
+ public void start() throws MonitorException {
+
+ subscribe();
+ }
+
+ public void stop() throws MonitorException {
+ unsubscribe();
+ }
+
+ private synchronized void subscribe() throws MonitorException {
+ if (this.subscriptionID != null) {
+ throw new IllegalStateException();
+ }
+ try {
+ if (this.pullMode) {
+ EndpointReference messageBoxEPR = this.wseClient
+ .createPullMsgBox(this.messageBoxURL.toString());
+ this.subscriptionID = this.wseClient.subscribe(
+ messageBoxEPR.getAddress(), this.topic, null);
+ this.messagePuller = this.wseClient
+ .startPullingEventsFromMsgBox(messageBoxEPR, this,
+ 1000L, 20000L);
+ } else {
+ String[] endpoints = this.wseClient.startConsumerService(2222,
+ this);
+ this.subscriptionID = this.wseClient.subscribe(endpoints[0],
+ this.topic, null);
+ }
+ } catch (IOException e) {
+ throw new MonitorException("Failed to subscribe.", e);
+ } catch (RuntimeException e) {
+ throw new MonitorException("Failed to subscribe.", e);
+ }
+ }
+
+ /**
+ * Unsubscribes from the notification.
+ *
+ * @throws MonitorException
+ */
+ private synchronized void unsubscribe() throws MonitorException {
+ // This method needs to be synchronized along with subscribe() because
+ // unsubscribe() might be called while subscribe() is being executed.
+ if (this.subscriptionID == null) {
+ throw new IllegalStateException();
+ }
+ try {
+ if (this.pullMode) {
+ this.messagePuller.stopPulling();
+ } else {
+ this.wseClient.unSubscribe(this.subscriptionID);
+ }
+ this.wseClient.unSubscribe(this.subscriptionID);
+ } catch (MsgBrokerClientException e) {
+ throw new MonitorException("Failed to unsubscribe.", e);
+ }
+
+ }
+
+ /**
+ * @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
+ */
+ public void handleNotification(String message) {
+ try {
+ String soapBody = WorkFlowUtils.getSoapBodyContent(message);
+ XmlElement event = XMLUtil.stringToXmlElement(soapBody);
+ handleEvent(new MonitorEvent(event), true, this.workflow.getGraph());
+
+ } catch (XMLStreamException 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);
+ }
+ }
+
+ private void handleEvent(MonitorEvent event, boolean forward, Graph graph) {
+ EventType type = event.getType();
+ String nodeID = event.getNodeID();
+ Node node = graph.getNode(nodeID);
+
+ if (type == MonitorUtil.EventType.WORKFLOW_INVOKED) {
+ workflowStarted(graph, forward);
+ } else if (type == MonitorUtil.EventType.WORKFLOW_TERMINATED) {
+ workflowFinished(graph, forward);
+ } else if (type == EventType.INVOKING_SERVICE
+ || type == EventType.SERVICE_INVOKED) {
+ if (node == null) {
+ logger.warning("There is no node that has ID, " + nodeID);
+ } else {
+ nodeStarted(node, forward);
+ }
+ } else if (type == MonitorUtil.EventType.RECEIVED_RESULT
+ // TODO this should be removed when GPEL sends all notification
+ // correctly.
+ || type == EventType.SENDING_RESULT) {
+ if (node == null) {
+ logger.warning("There is no node that has ID, " + nodeID);
+ } else {
+ nodeFinished(node, forward);
+ }
+ } else if (type == EventType.INVOKING_SERVICE_FAILED
+ || type == EventType.RECEIVED_FAULT
+ // TODO
+ || type == EventType.SENDING_FAULT
+ || type == EventType.SENDING_RESPONSE_FAILED) {
+ if (node == null) {
+ logger.warning("There is no node that has ID, " + nodeID);
+ } else {
+ nodeFailed(node, forward);
+ }
+ } else if (type == MonitorUtil.EventType.RESOURCE_MAPPING) {
+ if (node == null) {
+ logger.warning("There is no node that has ID, " + nodeID);
+ } else {
+ // nodeResourceMapped(node, event.getEvent(), forward);
+ }
+ } else {
+ // Ignore the rest.
+ }
+ }
+
+ private void workflowStarted(Graph graph, boolean forward) {
+ for (InputNode node : GraphUtil.getInputNodes(graph)) {
+ if (forward) {
+ finishNode(node);
+ } else {
+ resetNode(node);
+ }
+ }
+ }
+
+ private void workflowFinished(Graph graph, boolean forward) {
+ for (OutputNode node : GraphUtil.getOutputNodes(graph)) {
+ if (forward) {
+ finishNode(node);
+ finishPredecessorNodes(node);
+ } else {
+ resetNode(node);
+ }
+ }
+ }
+
+ private LinkedList<InputNode> getInputNodes(WSGraph graph) {
+ List<NodeImpl> nodes = graph.getNodes();
+ LinkedList<InputNode> inputNodes = new LinkedList<InputNode>();
+ for (NodeImpl nodeImpl : nodes) {
+ if (nodeImpl instanceof InputNode) {
+ inputNodes.add((InputNode) nodeImpl);
+ }
+ }
+ return inputNodes;
+ }
+
+ private LinkedList<OutputNode> getOutputNodes(WSGraph graph) {
+ List<NodeImpl> nodes = graph.getNodes();
+ LinkedList<OutputNode> outputNodes = new LinkedList<OutputNode>();
+ for (NodeImpl nodeImpl : nodes) {
+ if (nodeImpl instanceof OutputNode) {
+ outputNodes.add((OutputNode) nodeImpl);
+ }
+ }
+ return outputNodes;
+ }
+
+ private void nodeStarted(Node node, boolean forward) {
+ if (forward) {
+ executeNode(node);
+ finishPredecessorNodes(node);
+ } else {
+ resetNode(node);
+ }
+ }
+
+ private void nodeFinished(Node node, boolean forward) {
+ if (forward) {
+ finishNode(node);
+ finishPredecessorNodes(node);
+ } else {
+ executeNode(node);
+ }
+ }
+
+ private void nodeFailed(Node node, boolean forward) {
+ if (forward) {
+ failNode(node);
+ finishPredecessorNodes(node);
+ } else {
+ executeNode(node);
+ }
+ }
+
+ private void executeNode(Node node) {
+ node.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ }
+
+ private void finishNode(Node node) {
+ node.getGUI().setBodyColor(NodeState.FINISHED.color);
+ }
+
+ private void failNode(Node node) {
+ node.getGUI().setBodyColor(NodeState.FAILED.color);
+ }
+
+ private void resetNode(Node node) {
+ node.getGUI().setBodyColor(NodeGUI.DEFAULT_BODY_COLOR);
+ node.getGUI().resetTokens();
+ }
+
+ /**
+ * Make preceding nodes done. This helps the monitoring GUI when a user
+ * subscribes from the middle of the workflow execution.
+ *
+ * @param node
+ */
+ private void finishPredecessorNodes(Node node) {
+ for (Port inputPort : node.getInputPorts()) {
+ for (Edge edge : inputPort.getEdges()) {
+ Port fromPort = edge.getFromPort();
+ if (!(fromPort instanceof EPRPort)) {
+ Node fromNode = fromPort.getNode();
+ finishNode(fromNode);
+ finishPredecessorNodes(fromNode);
+ }
+ }
+ }
+ Port controlInPort = node.getControlInPort();
+ if (controlInPort != null) {
+ for (Node fromNode : controlInPort.getFromNodes()) {
+ finishNode(fromNode);
+ finishPredecessorNodes(fromNode);
+ }
+ }
+ }
+
+ /**
+ * @see org.apache.airavata.wsmg.client.NotificationHandler#handleNotification(java.lang.String)
+ */
+ public void handleNotification(SOAPEnvelope message) {
+ String soapBody = message.getBody().toString();
+ this.handleNotification(soapBody);
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java Fri Sep 2 20:46:46 2011
@@ -279,140 +279,7 @@ public class ODEClient {
}
- // public static void main(String[] args) throws GSSException {
- // ODEClient client = new ODEClient();
- // GSSCredential credential = client.getGSSCredential("chathura",
- // "changeme", "montblanc.extreme.indiana.edu");
- // Workflow workflow = client.getWorkflow(
- // XBayaConstants.DEFAULT_XREGISTRY_URL, credential,
- // "NAM_Workflow101");
- // String instanceID = java.util.UUID.randomUUID().toString();
- // String userDN = credential.getName().toString();
- // new ODEClient().invoke(workflow, credential,
- // XBayaConstants.DEFAULT_DSC_URL, XBayaConstants.DEFAULT_ODE_URL,
- // new ODEClient().getDefaultLeadHeader(workflow, "topic", userDN,
- // URI.create(instanceID), null, null));
- // System.out.println("pppppppppppppppp");
- //
- // // new experiment
- //
- // String wsdlLoc = WSDLUtil
- // .appendWSDLQuary(XBayaConstants.DEFAULT_MYLEAD_AGENT_URL
- // .toString());
- // // OperationResponseDocument res = createExperiment(instanceID,
- // //
- // // "templateid",
- // //
- // // userDN,
- // // wsdlLoc, "Experiment name- preferably unique",
- // // "Experiment name- preferably unique");
- //
- // // System.out.println(res.getOperationResponse().getResourceIDArray(0));
- //
- // // "urn:uuid:f573e6df-6886-4198-8efd-7dde9277b73e"
- // }
-
- public static void main(String[] args) throws XRegistryClientException, URISyntaxException, GSSException {
- // ODEClient client = new ODEClient();
- // DocumentRegistryClient registryClient =
- // client.getXRegistryClient(client.getGSSCredential("chathura",
- // "changeme", "montblanc.extreme.indiana.edu"),
- // XBayaConstants.DEFAULT_XREGISTRY_URL);
- // // http://hunk.extreme.indiana.edu:8081/axis2/services/LdmStream?wsdl
- // // client.deployStreamSource(registryClient, "Ldm",
- // "http://hunk.extreme.indiana.edu:8081/axis2/services/LDMStream?wsdl");
- // // client.deployStreamSource(registryClient, "Mesonet",
- // "http://hunk.extreme.indiana.edu:8081/axis2/services/StreamSourceAPI?wsdl");
- // DocData[] streamResources =
- // client.getStreamResources(registryClient);
- // for (DocData docData : streamResources) {
- // String resource = registryClient.getResource(docData.name);
- // // registryClient.removeResource(docData.name);
- // System.out.println(resource);
- // }
-
- // XBayaSecurity.getTrustedCertificates();
- // WSIFProviderManager.getInstance().addProvider(
- // new xsul.wsif_xsul_soap_http.Provider());
-
- // GSSCredential proxy = new ODEClient().getGSSCredential("chathura", "changeme",
- // XBayaConstants.DEFAULT_MYPROXY_SERVER);
- // WsdlResolver instance = WsdlResolver.getInstance();
- // PuretlsInvoker secureInvoker = new GsiInvoker(proxy, XBayaSecurity
- // .getTrustedCertificates());
- //
- // instance.setSecureInvoker(secureInvoker );
- // xsul.wsdl.WsdlDefinitions definitions = instance.loadWsdl(new URI("https://tyr09.cs.indiana.edu:23443/?wsdl")
- // );
-
- String userName = "chathura";
- String password = "changeme";
- new ODEClient();
- SecurityUtil.getGSSCredential(userName, password, XBayaConstants.DEFAULT_MYPROXY_SERVER);
-
- // Workflow workflow1 = client.getWorkflowFromOGCE(new URI(
- // "https://ogceportal.iu.teragrid.org:19443/xregistry"),
- // credential, new QName("Public_NAM_Initialized_WRF_Forecastc55d6223-7f79-4c07-824c-804c6b12782d"));
-
- // try {
- // BufferedWriter out = new BufferedWriter(new
- // FileWriter("/nfs/mneme/home/users/cherath/projects/test/extremeWorkspace/xbaya-gui/workflows/t-new.xwf"));
- // out.write(workflow1.toXMLText());
- // out.close();
- // } catch (IOException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // }
-
- // List<WSComponentPort> inputNodes = client.getInputs(workflow1);
- // for (WSComponentPort port : inputNodes) {
- // if (port.getName().equals("CrossCuttingConfigurations")) {
- // // Object val = client.parseValue(port,
- //
- // port.setValue("<CrossCuttingConfigurations n2:leadType='LeadCrosscutParameters' xmlns:n2='http://www.extreme.indiana.edu/namespaces/2004/01/gFac'>"
- // +"<lcp:nx xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>203</lcp:nx>"
- // +"<lcp:ny xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>203</lcp:ny>"
- // +"<lcp:dx xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>5000</lcp:dx>"
- // +"<lcp:dy xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>5000</lcp:dy>"
- // +"<lcp:ctrlat xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>44.85</lcp:ctrlat>"
- // +"<lcp:ctrlon xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>-86.25</lcp:ctrlon>"
- // +"<lcp:fcst_time xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>36</lcp:fcst_time>"
- // +"<lcp:start_date xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>7/30/2010</lcp:start_date>"
- // +"<lcp:start_hour xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>9</lcp:start_hour>"
- // +"<lcp:westbc xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>-90.74158</lcp:westbc>"
- // +"<lcp:eastbc xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>-81.75842</lcp:eastbc>"
- // +"<lcp:northbc xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>47.95601</lcp:northbc>"
- // +"<lcp:southbc xmlns:lcp='http://lead.extreme.indiana.edu/namespaces/2006/lead-crosscut-parameters/'>41.56573</lcp:southbc>"
- // +"</CrossCuttingConfigurations>");
- // // port.setValue(val);
- //
- //
- //
- //
- // } else if (port.getName().equals("NAMInitialData")) {
- // // Object val = client.parseValue(port,
- // port.setValue("gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f03");
- // // port.setValue(val);
- // } else if (port.getName().equals("NAMLateralBoundaryData")) {
- // // Object val = client.parseValue(port,
- // port.setValue("gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f06 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f09 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f12 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f15 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f18 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f21 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f24 gsiftp://gridftp.bigred.iu.terag
rid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f27 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f30 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f33 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f36 gsiftp://gridftp.bigred.iu.teragrid.org:2812//N/dc/projects/lead/ldm/pub/native/grid/NCEP/LEADNAM/2010073006/nam40grb2.2010073006f39");
- // // port.setValue(val);
- // }
- //
- // }
- //
- // String instanceID = java.util.UUID.randomUUID().toString();
- //
- // String userDN = credential.getName().toString();
- // client.invoke(
- // workflow1, inputNodes,
- // credential,
- // XBayaConstants.DEFAULT_DSC_URL,
- // XBayaConstants.DEFAULT_ODE_URL,
- // client.getDefaultLeadHeader(workflow1, "topic", userDN,
- // URI.create(instanceID), null, null));
- }
public ResourceData[] getStreamResources(XRegistryClient client) throws XRegistryClientException {
ResourceData[] result = client.findResource(STREAM_SOURCE_NS);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java Fri Sep 2 20:46:46 2011
@@ -83,7 +83,8 @@ import xsul5.wsdl.WsdlResolver;
public class ODEInvokerWindow {
- private XBayaEngine engine;
+ private static final String REGISTER_QUERY = "registerQuery";
+ private XBayaEngine engine;
private ODEInvoker invoker;
private MyProxyChecker myProxyChecker;
private GridPanel parameterPanel;
@@ -196,7 +197,6 @@ public class ODEInvokerWindow {
});
JPanel buttonPanel = new JPanel();
- // buttonPanel.add(this.deployNewAndInvokeButton);
buttonPanel.add(this.invokeButton);
buttonPanel.add(cancelButton);
@@ -310,162 +310,13 @@ public class ODEInvokerWindow {
hide();
String workflowName = this.engine.getWorkflow().getName();
- // this is the control workflow
- if (-1 != (workflowName.indexOf("Control_"))) {
-
- String oldWorkflowName = workflowName.substring("Control_".length());
- String oldWorkflowID = null;
- List<GraphCanvas> graphCanvases = this.engine.getGUI().getGraphCanvases();
- for (GraphCanvas graphCanvas : graphCanvases) {
- if (oldWorkflowName.equals(graphCanvas.getWorkflow().getName())) {
- this.engine.getGUI().setFocus(graphCanvas);
- Workflow workflow2 = this.engine.getWorkflow();
- oldWorkflowID = workflow2.getGraph().getID();
- break;
- }
- }
-
- try {
- registerQuery(inputs, oldWorkflowID);
- } catch (URISyntaxException e1) {
- this.engine.getErrorWindow().error("Invalid service location", e1);
- hide();
- return;
- }
-
- try {
- this.engine.getWorkflow().setGPELInstanceID(new URI(this.topicTextField.getText()));
- } catch (URISyntaxException e) {
- this.engine.getErrorWindow().error("Invalid Topic", e);
- hide();
- return;
- }
-
- }
+
}
- public static void main(String[] args) throws WsdlException, URISyntaxException {
- WsdlDefinitions streamEngine = WsdlResolver.getInstance().loadWsdl(
- new URI("http://pagodatree.cs.indiana.edu:9999/axis2/services/StreamEngine?wsdl"));
- WSDLCleaner.cleanWSDL(streamEngine);
-
- WSIFService service = WSIFServiceFactory.newInstance().getService(
- WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(streamEngine));
- WSIFPort port = service.getPort();
- WSIFRuntime.getDefault().newClientFor(port);
-
- String operationName = "registerQuery";
- WSIFOperation operation = port.createOperation(operationName);
- WSIFMessage inputMessage = operation.createInputMessage();
- WSIFMessage outputMessage = operation.createOutputMessage();
- WSIFMessage faultMessage = operation.createFaultMessage();
-
- inputMessage.setObjectPart("endpoint", "http://pagodatree.cs.indiana.edu:17080/ode/processes/velocityhh?wsdl");
- inputMessage.setObjectPart("startTime", "D");
- inputMessage.setObjectPart("endTime", "d");
- inputMessage.setObjectPart("epl", "select * from java.lang.String.win:length_batch(2)");
- inputMessage.setObjectPart("topic", "skkkk");
-
- boolean res = operation.executeRequestResponseOperation(inputMessage, outputMessage, faultMessage);
- if (res) {
- System.out.println(outputMessage.getObjectPart("return"));
- } else {
- System.out.println(faultMessage.toString());
- }
-
- }
-
- /**
- * @param inputs
- * @param workflowname
- * @throws URISyntaxException
- */
- // private void registerQuery(List<WSComponentPort> inputs, String
- // workflowname)
- // throws URISyntaxException {
- // WsdlDefinitions streamEngine = WsdlResolver
- // .getInstance()
- // .loadWsdl(
- // new URI(
- // "http://pagodatree.cs.indiana.edu:9999/axis2/services/StreamEngine?wsdl"
- // ));
- // WSDLCleaner.cleanWSDL(streamEngine);
- //
- // WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
- //
- // WSIFService service = factory.getService(WSDLUtil
- // .wsdlDefinitions5ToWsdlDefintions3(streamEngine));
- // WSIFClient client = WSIFRuntime.getDefault()
- // .newClientFor(service, null);
- // WSIFPort port = client.getPort();
- // String operationName = "registerQuery";
- // WSIFOperation operation = port.createOperation(operationName);
- // WSIFMessage inputMessage = operation.createInputMessage();
- // WSIFMessage outputMessage = operation.createOutputMessage();
- // WSIFMessage faultMessage = operation.createFaultMessage();
- // for (WSComponentPort input : inputs) {
- //
- // // Somethign special for the control workflow
- // if ("epr".equals(input.getName())) {
- // String endpoint =
- // "http://pagodatree.cs.indiana.edu:17080/ode/processes/Control_"
- // + workflowname + "?wsdl";
- // System.out.println(endpoint);
- // inputMessage.setObjectPart("endpoint",
- // endpoint);
- // } else if ("startTime".equals(input.getName())) {
- // inputMessage.setObjectPart("startTime", input.getValue());
- // } else if ("endTime".equals(input.getName())) {
- // inputMessage.setObjectPart("endTime", input.getValue());
- // } else if ("eql".equals(input.getName())) {
- // inputMessage.setObjectPart("epl", input.getValue());
- // }
- // }
- // System.out.println(this.topicTextField.getText());
- // inputMessage.setObjectPart("topic", this.topicTextField.getText());
- // boolean res = operation.executeRequestResponseOperation(inputMessage,
- // outputMessage, faultMessage);
- // if (res) {
- // System.out.println(outputMessage.getObjectPart("return"));
- // }else{
- // System.out.println("Didnt receive the responce from CEPService yet");
- // }
- // }
- private void registerQuery(List<WSComponentPort> inputs, String workflowname) throws URISyntaxException {
- WsdlDefinitions streamEngine = WsdlResolver.getInstance().loadWsdl(
- new URI("http://pagodatree.cs.indiana.edu:9999/axis2/services/StreamEngine?wsdl"));
- WSDLCleaner.cleanWSDL(streamEngine);
-
- WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
-
- WSIFService service = factory.getService(WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(streamEngine));
- WSIFClient client = WSIFRuntime.getDefault().newClientFor(service, null);
- WSIFPort port = client.getPort();
- String operationName = "registerQuery";
- WSIFOperation operation = port.createOperation(operationName);
- WSIFMessage inputMessage = operation.createInputMessage();
- WSIFMessage outputMessage = operation.createOutputMessage();
- WSIFMessage faultMessage = operation.createFaultMessage();
-
- // Somethign special for the control workflow
- String endpoint = "http://pagodatree.cs.indiana.edu:17080/ode/processes/Control_" + workflowname + "?wsdl";
- System.out.println(endpoint);
- String t = "5";
- inputMessage.setObjectPart("endpoint", endpoint);
- inputMessage.setObjectPart("startTime", t);
- inputMessage.setObjectPart("endTime", t);
- inputMessage.setObjectPart("epl", "select * from java.lang.String.win:length_batch(1)");
- // inputMessage.setObjectPart("secs", t);
- inputMessage.setObjectPart("topic", this.topicTextField.getText());
- boolean res = operation.executeRequestResponseOperation(inputMessage, outputMessage, faultMessage);
- if (res) {
- System.out.println(outputMessage.getObjectPart("return"));
- } else {
- System.out.println("Didnt receive the responce from CEPService yet");
- }
- }
+
+
public void hide() {
this.dialog.hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java Fri Sep 2 20:46:46 2011
@@ -127,9 +127,6 @@ public class ODEDeploymentClient {
deploy(wfClient, engine.getWorkflow(), gssCredential, makePublic, System.currentTimeMillis());
- long end = System.currentTimeMillis();
- XBaya.time.add("" + (end - start));
- System.out.println("Time:" + (end - start));
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java Fri Sep 2 20:46:46 2011
@@ -148,7 +148,6 @@ public class PegasusInvokerWindow {
// request.setInputStrings(contents);
request.setInputStrings(new String[] { "lol", "lol2" });
SubmitRefResponse response = stub.submitById(request);
- System.out.println(response.getSubmitRefResponse());
} catch (AxisFault e) {
e.printStackTrace();
} catch (RemoteException e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamTransformer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamTransformer.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamTransformer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamTransformer.java Fri Sep 2 20:46:46 2011
@@ -222,7 +222,6 @@ public class StreamTransformer {
assignString = assignString.replace("parameters", "input");
assignString = assignString.replaceAll("return", "input");
- System.out.println(assignString);
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java Fri Sep 2 20:46:46 2011
@@ -272,48 +272,6 @@ public class TavernaRunnerWindow {
}
}.start();
- // new Thread() {
- // @Override
- // public synchronized void run() {
- //
- // MonitorStarter monitorStarter = new MonitorStarter(
- // TavernaRunnerWindow.this.engine);
- // monitorStarter.start(true);
- //
- // WsaEndpointReference eventSourceReference = null;
- // try {
- // eventSourceReference = new WsaEndpointReference(new
- // URI("http://localhost:9999"));
- // } catch (URISyntaxException e) {
- // TavernaRunnerWindow.this.engine.getErrorWindow().error(e);
- // }
- // try {
- // WsaInvoker invoker = new WsaInvoker();
- // invoker.setTargetEPR(eventSourceReference);
- // invoker.setSoapFragrance(Soap11Util.getInstance());
- // invoker.setIndent(" ");
- // // to improve interop do not use KA
- // invoker.setUseHttpKeepAlive(false);
- // XmlNamespace ns = builder.newNamespace("taverna",
- // "http://taverna.sourceforge.net/");
- // org.xmlpull.v1.builder.XmlElement message = builder.newFragment(ns,
- // "run");
- // message.addChild(builder.parseFragmentFromReader(new
- // StringReader(scriptString)));
- // // System.out.println(builder.serializeToString(inputs));
- // message.addChild(inputs);
- // invoker.setDefaultAction(URI.create("http://taverna.sourceforge.net/run"));
- // org.xmlpull.v1.builder.XmlElement responseMessage =
- // invoker.invokeMessage(message);
- // JOptionPane.showConfirmDialog(TavernaRunnerWindow.this.engine.getGUI().getFrame(),
- // builder.serializeToString(responseMessage), "Outputs",
- // JOptionPane.OK_OPTION);
- // } catch (RuntimeException e) {
- // TavernaRunnerWindow.this.engine.getErrorWindow().error(e);
- // }
- //
- // }
- // }.start();
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java Fri Sep 2 20:46:46 2011
@@ -581,7 +581,6 @@ public class WSDLUtil {
}
public static boolean attributeExist(XmlElement element, String name, String value) {
- System.out.println(xsul5.XmlConstants.BUILDER.serializeToStringPretty(element));
XmlAttribute attribute = element.attribute(name);
if (null != attribute && value.equals(attribute.getValue())) {
return true;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowClient.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowClient.java Fri Sep 2 20:46:46 2011
@@ -83,7 +83,6 @@ public class GPELWorkflowClient implemen
client.deploy(workflow, false);
this.instance = client.instantiate(workflow, XBayaConstants.DEFAULT_DSC_URL, context.getTopic());
this.wsdl = client.start(instance);
- // System.out.println(workflow.getGPELTemplateID());
} catch (WorkflowEngineException e) {
throw new RuntimeException(e);
} catch (ComponentException e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java Fri Sep 2 20:46:46 2011
@@ -203,7 +203,6 @@ public class WorkflowProxyClient extends
.getConfiguration().getDSCURL()));
WSIFMessage inputMessage = new WSIFMessageElement(inputMessageElement);
- System.out.println("Sending a message:\n" + XMLUtil.xmlElementToString((XmlElement) inputMessage));
boolean success = operation.executeRequestResponseOperation(inputMessage, outputMessage, faultMessage);
if (success) {
@@ -391,7 +390,6 @@ public class WorkflowProxyClient extends
WSIFMessage inputMessage = new WSIFMessageElement(inputMessageElement);
- System.out.println("Sending a message:\n" + XMLUtil.xmlElementToString((XmlElement) inputMessage));
boolean success = operation.executeRequestResponseOperation(inputMessage, outputMessage, faultMessage);
XmlElement result;
@@ -400,7 +398,6 @@ public class WorkflowProxyClient extends
} else {
result = (XmlElement) faultMessage;
}
- System.out.println("Received message:\n" + XMLUtil.xmlElementToString(result));
wsdlDefinitions = new WsdlDefinitions(XMLUtil.xmlElementToString(result));
@@ -477,7 +474,6 @@ public class WorkflowProxyClient extends
XRegistryAccesser xregistryAccesser = new XRegistryAccesser(this.xbayaEngine);
String templateAsString = xregistryAccesser.getWorkflow(workflowQName).toString();
- System.out.println("templateAsString = " + templateAsString);
workflow = new Workflow(XMLUtil.stringToXmlElement(templateAsString));
@@ -633,51 +629,5 @@ public class WorkflowProxyClient extends
}
}
- private String getProcessStr1(org.xmlpull.infoset.XmlElement process) {
-
- try {
- process = XmlConstants.BUILDER.parseFragmentFromInputStream(new FileInputStream(
- "/nfs/mneme/home/users/cherath/projects/test/extremeWorkspace/xbaya-workigncopy/t.bpel"));
-
- System.out.println("--------------------------------------------");
- System.out.println(XmlConstants.BUILDER.serializeToStringPretty(process));
- // org.xmlpull.infoset.XmlElement sequence = process
- // .element("sequence");
- // process.removeChild(sequence);
- // final org.xmlpull.infoset.XmlElement firstReceive =
- // sequence.element("receive");
- // final org.xmlpull.infoset.XmlElement newReceive =
- // firstReceive.clone();
- //
- // final XmlAttribute createInsAttr =
- // firstReceive.attribute("createInstance");
- // firstReceive.removeAttribute(createInsAttr);
- // firstReceive.setAttributeValue("createInstance", "no");
- //
- // final org.xmlpull.infoset.XmlElement topSeq =
- // process.addElement(process.getNamespace(), "sequence");
- // // final org.xmlpull.infoset.XmlElement receiveSeq =
- // topSeq.addElement(topSeq.getNamespace(), "sequence");
- // topSeq.addChild(newReceive);
- //
- // topSeq.addChild(sequence);
- // // org.xmlpull.infoset.XmlElement whileElemt = topSeq.addElement(
- // // sequence.getNamespace(), "while");
- // // org.xmlpull.infoset.XmlElement condition =
- // whileElemt.addElement(
- // // whileElemt.getNamespace(), "condition");
- // // condition.setText("(true())");
- // // whileElemt.addChild(sequence);
- // System.out.println("--------------------------------------------")
- // ;
- // System.out.println(XmlConstants.BUILDER
- // .serializeToStringPretty(process));
- //
- } catch (Exception e) {
- throw new XBayaRuntimeException(e);
- }
- // TODO Auto-generated method stub
- return XmlConstants.BUILDER.serializeToStringPretty(process);
- }
-
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java?rev=1164705&r1=1164704&r2=1164705&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java Fri Sep 2 20:46:46 2011
@@ -260,10 +260,8 @@ public class XRegistryAccesser {
if (this.xregistryClient == null) {
connectToXRegistry();
}
- System.out.println(workflowTemplateId);
String workflowString = this.xregistryClient.getOGCEResource(workflowTemplateId,
XRegClientConstants.ResourceType.WorkflowTemplate.toString(), null);
- System.out.println(workflowString);
XmlElement xwf = XMLUtil.stringToXmlElement(workflowString);
Workflow workflow = new Workflow(xwf);
@@ -420,8 +418,6 @@ public class XRegistryAccesser {
}
String resource = this.xregistryClient.getResource(qname);
XmlElement xwf = XMLUtil.stringToXmlElement(resource);
- // System.out.println(XmlConstants.BUILDER.serializeToStringPretty(xwf
- // ));
Workflow workflow = new Workflow(xwf);
return workflow;
} catch (Exception e) {
@@ -515,7 +511,6 @@ public class XRegistryAccesser {
String toFormatXML = HostUtils.simpleHostXMLRequest(hostBean);
String formattedXML = XmlFormatter.format(toFormatXML);
- System.out.println(formattedXML);
this.xregistryClient.registerHostDesc(formattedXML);
@@ -542,7 +537,6 @@ public class XRegistryAccesser {
String toFormatXML = ApplicationUtils.simpleAppXMLRequest(appBean);
String formattedXML = XmlFormatter.format(toFormatXML);
- // System.out.println(formattedXML);
this.xregistryClient.registerAppDesc(formattedXML);
@@ -566,7 +560,6 @@ public class XRegistryAccesser {
String formattedXML = XmlFormatter.format(toFormatXML);
String serviceWsdl = ServiceUtils.createAwsdl4ServiceMap(formattedXML);
- // System.out.println(formattedXML);
this.xregistryClient.registerServiceDesc(formattedXML, serviceWsdl);