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 23:26:07 UTC
svn commit: r1164715 [2/2] - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
./ appwrapper/ component/ component/dynamic/ component/gui/
component/registry/ component/system/ component/ws/ experiment/gui/
file/gu...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java Fri Sep 2 21:26:03 2011
@@ -40,8 +40,6 @@ import org.xmlpull.infoset.XmlElement;
public abstract class SystemNode extends NodeImpl {
- // private final static MLogger logger = MLogger.getLogger();
-
/**
* Constructs a SystemNode.
*
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -34,8 +34,6 @@ public class BlockNodeGUI extends NodeGU
private static final int HEIGHT = 100;
- // private static final MLogger logger = MLogger.getLogger();
-
private BlockNode node;
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ConstantNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -27,8 +27,6 @@ import org.apache.airavata.xbaya.gui.Err
public class ConstantNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private static final String CONFIG_AREA_STRING = "Value";
private ConstantNode node;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -35,8 +35,6 @@ import org.apache.airavata.xbaya.graph.s
public class EndBlockNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private EndBlockConfigurationDialog configurationWindow;
private EndBlockNode node;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -33,8 +33,6 @@ import org.apache.airavata.xbaya.graph.s
public class EndForEachNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private EndForEachNode node;
private Polygon polygon;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -35,8 +35,6 @@ import org.apache.airavata.xbaya.graph.s
public class EndifNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private EndifConfigurationDialog configurationWindow;
private EndifNode node;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -34,8 +34,6 @@ import org.apache.airavata.xbaya.graph.s
public class ForEachNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private static final String CONFIG_AREA_STRING = "Config";
private ForEachNode node;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -36,8 +36,6 @@ import org.apache.airavata.xbaya.graph.s
public class IfNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private static final String CONFIG_AREA_STRING = "Config";
private IfNode node;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java Fri Sep 2 21:26:03 2011
@@ -99,10 +99,6 @@ public class InputConfigurationDialog {
this.gridPanel.layout(new double[] { 0, 1.0 / 3, 1.0 / 3, 1.0 / 3 }, new double[] { 0, 1 });
}
- // String name = this.node.getConfiguredName();
- // if (name == null) {
- // name = this.node.getName();
- // }
String name = this.node.getID(); // Show ID.
this.nameTextField.setText(name);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -29,8 +29,6 @@ import org.apache.airavata.xbaya.gui.Err
public class InputNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private static final String CONFIG_AREA_STRING = "Config";
private static final Color HEAD_COLOR = new Color(153, 204, 255);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -37,8 +37,6 @@ import org.apache.airavata.xbaya.graph.s
public class MemoNodeGUI extends NodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private static final int BORDER_SIZE = 5;
private MemoNode node;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -32,8 +32,6 @@ import org.apache.airavata.xbaya.util.Br
public class OutputNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private static final String CONFIG_AREA_STRING = "View";
private static final Color HEAD_COLOR = new Color(35, 107, 142);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -33,8 +33,6 @@ import org.apache.airavata.xbaya.graph.s
public class ReceiveNodeGUI extends ConfigurableNodeGUI {
- // private static final MLogger logger = MLogger.getLogger();
-
private ReceiveNode node;
private Polygon polygon;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java Fri Sep 2 21:26:03 2011
@@ -65,7 +65,6 @@ import org.apache.airavata.xbaya.wf.Work
public class GraphUtil {
- // private static final MLogger logger = MLogger.getLogger();
/**
* Returns the WSNodes included in a specified graph.
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridftp/GridFtpClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridftp/GridFtpClient.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridftp/GridFtpClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridftp/GridFtpClient.java Fri Sep 2 21:26:03 2011
@@ -26,6 +26,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.globus.ftp.DataSink;
import org.globus.ftp.DataSinkStream;
import org.globus.ftp.DataSource;
@@ -49,14 +50,11 @@ public class GridFtpClient implements Ma
}
gridFTPClient.extendedPut(remoteFile, source, this);
} catch (ServerException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new XBayaRuntimeException(e);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new XBayaRuntimeException(e);
} catch (ClientException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new XBayaRuntimeException(e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java Fri Sep 2 21:26:03 2011
@@ -76,9 +76,6 @@ public class WaitDialog {
synchronized (this) {
// We cannot check if this.done is false because show() might be
// called more than once at the same time.
- // if (this.done == false) {
- // throw new IllegalStateException();
- // }
this.done = false;
// We cannot make the whole method synchronized because
// this.dialog.show() blocks.
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java Fri Sep 2 21:26:03 2011
@@ -229,7 +229,6 @@ public class XBayaDialog {
Container contentPane = this.dialog.getContentPane();
int numRow = 0;
if (this.description != null && this.description.length() > 0) {
- // TODO not working!!
JLabel descriptionLabel = new JLabel("<html>" + this.description + "</html>");
contentPane.add(descriptionLabel);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Fri Sep 2 21:26:03 2011
@@ -70,11 +70,9 @@ public class WorkflowInterpretorSkeleton
System.err.println("Workflow Object created");
} catch (GraphException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ throw new XBayaRuntimeException(e1);
} catch (ComponentException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ throw new XBayaRuntimeException(e1);
}
System.err.println("Setting Input values");
List<InputNode> inputNodes = new ODEClient().getInputNodes(workflow);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java Fri Sep 2 21:26:03 2011
@@ -62,7 +62,6 @@ public class AsynchronousInvoker extends
public void setup() throws XBayaException {
super.setup();
- // TODO put header to invoke asynchronously
WSIFAsyncResponsesCorrelator correlator;
if (this.messageBoxURL == null || this.messageBoxURL.length() == 0) {
correlator = new XsulSoapHttpWsaResponsesCorrelator();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java Fri Sep 2 21:26:03 2011
@@ -96,7 +96,6 @@ public class GFacInvoker implements Invo
WsdlDefinitions definitions = WsdlResolver.getInstance().loadWsdl(uri);
- // FIXME: Should pass the last argument of leadcontextheader
this.invoker = InvokerFactory
.createInvoker(this.portTypeQName, definitions, null, this.messageBoxURL, null);
this.invoker.setup();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java Fri Sep 2 21:26:03 2011
@@ -131,11 +131,9 @@ public class JythonClassLoader extends S
Class klass = null;
try {
klass = findClass(name);
- // logger.finest("found from jython, klass: " + klass);
} catch (ClassNotFoundException e) {
try {
klass = super.loadClass(name, false);
- // logger.finest("found from super, klass: " + klass);
} catch (ClassNotFoundException e2) {
klass = this.parent.loadClass(name);
logger.finest("found from parent, klass: " + klass);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/script/JythonScript.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/script/JythonScript.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/script/JythonScript.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/script/JythonScript.java Fri Sep 2 21:26:03 2011
@@ -115,8 +115,6 @@ public class JythonScript {
*/
private static final String WSDL_SUFFIX = "_wsdl";
- // private static final MLogger logger = MLogger.getLogger();
-
private XBayaConfiguration configuration;
private Workflow workflow;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java Fri Sep 2 21:26:03 2011
@@ -176,7 +176,6 @@ public class LEADWorkflowInvoker {
if (LEADTypes.isArrayType(type)) {
// split string into items using " " as separator
Pattern pattern = Pattern.compile("[,\\s]+");
- // String[] result = p.split("one,two, three four , five");
String[] result = pattern.split((String) value);
XmlElement arrayEl = XmlConstants.BUILDER.newFragment(name);
for (int i = 0; i < result.length; i++) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEvent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEvent.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEvent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEvent.java Fri Sep 2 21:26:03 2011
@@ -148,7 +148,6 @@ public class MonitorEvent {
this.message = MonitorUtil.getMessage(this.event);
if (this.type == MonitorUtil.EventType.PUBLISH_URL) {
String location = MonitorUtil.getLocation(this.event);
- // TODO: Pre-SC Fix comenting IDV url by suresh but going forward some eligant way of dealing with url's
// should be looked into
// String url = PREFIX + location + SUFFIX;
String url = location;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java Fri Sep 2 21:26:03 2011
@@ -56,8 +56,6 @@ public class MonitorPanel implements XBa
*/
public static final String TITLE = "Monitoring";
- // private static final MLogger logger = MLogger.getLogger();
-
private XBayaEngine engine;
private MonitorEventData tableSliderModel;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorWindow.java Fri Sep 2 21:26:03 2011
@@ -79,7 +79,6 @@ public class MonitorWindow {
}
this.idTextField.setText(MonitorUtil.getNodeID(event));
this.statusTextField.setText(MonitorUtil.getStatus(event));
- // this.messageEditorPane.setText(MonitorUtil.getMessage(event));
// Show the raw XML for now.
this.messageTextArea.setText(XMLUtil.BUILDER.serializeToStringPretty(event));
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyChecker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyChecker.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyChecker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyChecker.java Fri Sep 2 21:26:03 2011
@@ -26,8 +26,6 @@ import org.apache.airavata.xbaya.myproxy
public class MyProxyChecker {
- // private static final MLogger logger = MLogger.getLogger();
-
private XBayaEngine engine;
private MyProxyDialog dialog;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyMenu.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyMenu.java Fri Sep 2 21:26:03 2011
@@ -32,8 +32,6 @@ import org.apache.airavata.xbaya.XBayaEn
public class MyProxyMenu {
- // private static final MLogger logger = MLogger.getLogger();
-
private XBayaEngine engine;
private JMenu myProxyMenu;
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=1164715&r1=1164714&r2=1164715&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 21:26:03 2011
@@ -91,7 +91,6 @@ public class ODEInvokerWindow {
private XBayaTextField topicTextField;
private XBayaTextField xRegistryTextField;
private XBayaTextField gfacTextField;
- // private JButton deployNewAndInvokeButton;
private JButton invokeButton;
private XBayaDialog dialog;
private Workflow workflow;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java Fri Sep 2 21:26:03 2011
@@ -145,10 +145,6 @@ public class ODEWSDLTransformer {
public void trasnformToODEWsdls(String workflowName, URI dscUrl, WsdlDefinitions workflowWsdl,
Map<String, WsdlDefinitions> wsdls) {
- // WSDLUtil.replaceAttributeValue(workflowWsdl.getTypes(),
- // "schemaLocation",
- // "http://www.extreme.indiana.edu/gfac/gfac-simple-types.xsd",
- // "gfac-simple-types.xsd");
addCrosscutImportsIfNecessary(workflowWsdl);
makeWorkflowWSDLConcrete(workflowWsdl, workflowName, dscUrl);
changePartnerLinkNS(workflowWsdl);
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=1164715&r1=1164714&r2=1164715&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 21:26:03 2011
@@ -144,8 +144,6 @@ public class PegasusInvokerWindow {
request.setTopic(this.topicTextField.getText());
request.setGFacLocation(this.gfacTextField.getText());
request.setXRegistryLocation(this.xRegistryTextField.getText());
- // String [] contents = fileToStrings(this.intpuFilePath.getText());
- // request.setInputStrings(contents);
request.setInputStrings(new String[] { "lol", "lol2" });
SubmitRefResponse response = stub.submitById(request);
} catch (AxisFault e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusMenu.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusMenu.java Fri Sep 2 21:26:03 2011
@@ -57,7 +57,6 @@ public class PegasusMenu {
*/
public PegasusMenu(XBayaEngine engine) {
this.engine = engine;
- // this.odeDeploymentDescription = new ODEDeploymentDescriptor();
this.xregistry = new XRegistryAccesser(engine);
createExperimentMenu();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamReceiveNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamReceiveNodeGUI.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamReceiveNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamReceiveNodeGUI.java Fri Sep 2 21:26:03 2011
@@ -29,8 +29,6 @@ public class StreamReceiveNodeGUI extend
public static Color HEAD_COLOR = new Color(51, 255, 204);
- // public static Color SELECTED_HEAD_COLOR = new Color(100, 255, 255);
-
public StreamReceiveNodeGUI(StreamReceiveNode node) {
super(node);
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=1164715&r1=1164714&r2=1164715&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 21:26:03 2011
@@ -151,9 +151,6 @@ public class StreamTransformer {
int end = assignString.indexOf("\"", start);
String oldVar = assignString.substring(start, end);
assignString = assignString.replace(oldVar, "newReceiveVar");
- // TODO generalize
- // TODO
- // FIXME
assignString = assignString.replace("parameters", "input");
assignString = assignString.replaceAll("return", "input");
assign = BUILDER.parseFragmentFromString(assignString);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java Fri Sep 2 21:26:03 2011
@@ -85,8 +85,6 @@ public class LEADWorkflowInvokerTestCase
WSIFService service = factory.getService(WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(definitions));
WSIFClient client = WSIFRuntime.getDefault().newClientFor(service, null);
- // WSIFClient client =
- // WSIFRuntime.newClient("http://129.79.240.86:7007/AdderService?wsdl");
// null selects the first port in the first service.
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java Fri Sep 2 21:26:03 2011
@@ -97,15 +97,6 @@ public class MetadataTestCase extends Te
// Get the metadata for input.
XmlElement inputAppinfo = workflow.getInputMetadata();
- if (inputAppinfo != null) {
- // Parse the simple case.
- // for (XmlElement element : inputAppinfo.requiredElementContent())
- // {
- // String tag = element.getName();
- // String value = element.requiredText();
- // logger.info(tag + " = " + value);
- // }
- }
// Get the input information
List<WSComponentPort> inputs = workflow.getInputs();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java Fri Sep 2 21:26:03 2011
@@ -54,8 +54,6 @@ public class WebComponentRegistryClientT
*/
private static final String MATH_MULTIPLIER_WSDL = "multiplier-wsdl.xml";
- // private static final MLogger logger = MLogger.getLogger();
-
private Component inputComponent;
private Component outputComponent;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XMLUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XMLUtil.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XMLUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XMLUtil.java Fri Sep 2 21:26:03 2011
@@ -162,11 +162,9 @@ public class XMLUtil {
for (org.xmlpull.infoset.XmlNamespace namespace : xppElement.namespaces()) {
logger.finest("namespace: " + namespace);
- // TODO
}
for (org.xmlpull.infoset.XmlAttribute attribute : xppElement.attributes()) {
- // TODO namespace
domElement.setAttribute(attribute.getName(), attribute.getValue());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java Fri Sep 2 21:26:03 2011
@@ -63,8 +63,6 @@ public class WorkflowMenu {
private JMenuItem runJythonWorkflowItem;
- // private JMenuItem launchInTavernaItem;
-
private JMenuItem exitItem;
private JMenuItem launchDynamicWorkflowItem;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowEngineManager.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowEngineManager.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowEngineManager.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowEngineManager.java Fri Sep 2 21:26:03 2011
@@ -32,11 +32,6 @@ public class WorkflowEngineManager {
public static final String WORKFLOW_CLIENT_PROXY = "WorkflowProxy";
public static final String WORKFLOW_CLIENT_GPEL = "GPELClient";
- // private static WorkflowEngineManager ourInstance = new WorkflowEngineManager();
- //
- // public static WorkflowEngineManager getInstance() {
- // return ourInstance;
- // }
private WorkflowEngineManager() {
}
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=1164715&r1=1164714&r2=1164715&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 21:26:03 2011
@@ -71,7 +71,6 @@ public class GPELWorkflowClient implemen
UserX509Credential credential = new UserX509Credential(context.getCredentials(),
XBayaSecurity.getTrustedCertificates());
- // new ODEClient().getInputs(workflow);
BPELScript bpel = new BPELScript(workflow);
bpel.create(BPELScriptType.GPEL);
workflow.getGpelProcess();
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=1164715&r1=1164714&r2=1164715&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 21:26:03 2011
@@ -88,546 +88,600 @@ import edu.indiana.extreme.weps.XMLFile;
public class WorkflowProxyClient extends WorkflowClient {
- private GSSCredential gssCredential;
+ private GSSCredential gssCredential;
- XRegistryClient xregistryCient;
- String xregistryURL;
- private WsdlDefinitions wsdlDefinitions;
- private XBayaEngine xbayaEngine;
-
- // private static int count = 0;
-
- /**
- * Constructs a WorkflowProxyClient.
- */
- public WorkflowProxyClient() {
- // Nothing
- sendSafeEvent(new Event(Event.Type.GPEL_ENGINE_CONNECTED));
- }
-
- /**
- * Constructs a WorkflowProxyClient.
- *
- * @param engineURL
- * @param xregistryURL
- * @param credential
- * @throws WorkflowProxyException
- */
- public WorkflowProxyClient(URI engineURL, String xregistryURL, UserX509Credential credential)
- throws WorkflowEngineException {
- // TODO : Xregistry URL can be null. Make sure we check that and set a
- // default location to that.
- this();
- this.engineURL = engineURL;
- this.xregistryURL = xregistryURL;
- this.gssCredential = credential.getGssCredential();
- }
-
- public void setXRegistryUrl(URI xRegistryURL) {
- if (xRegistryURL != null) {
- this.xregistryURL = xRegistryURL.toString();
- }
- }
-
- /**
- * @param engineURL
- * @throws WorkflowProxyException
- */
- public void setEngineURL(URI engineURL) throws WorkflowEngineException {
- super.setEngineURL(engineURL);
- sendSafeEvent(new Event(Event.Type.GPEL_ENGINE_CONNECTED));
- // connect();
- }
-
- /**
- * @param gssCredential
- * @throws WorkflowProxyException
- */
- public void setSecurityInformation(GSSCredential gssCredential) throws WorkflowProxyException {
- this.gssCredential = gssCredential;
- // connect();
- }
-
- /**
- * @param workflow
- * @param redeploy
- * @return The workflow template ID.
- * @throws WorkflowProxyException
- */
- public synchronized URI deploy(Workflow workflow, boolean redeploy) throws WorkflowProxyException {
-
- try {
- // count++;
-
- // adding workflow in to Xregistry
-
- WSIFAsyncResponsesCorrelator correlator;
- correlator = null;
-
- // pass some headers
- LeadContextHeader leadContext = getLeadContextHeader();
- // URI uri = new File("/u/cherath/Desktop/WEPSService.xml").toURI();
- // WSIFClient wclient = WSIFRuntime.newClient(uri.toString())
- // .addHandler(
- // new StickySoapHeaderHandler("use-lead-header",
- // leadContext)).useAsyncMessaging(correlator)
- // .setAsyncResponseTimeoutInMs(33000L); // to simplify testing
-
- xsul5.wsdl.WsdlResolver.getInstance().loadWsdl(engineURL);
-
- // WsdlService proxyService = WSDLUtil.getfirst(proxyWSDL.services());
- // WsdlPort proxyPort = WSDLUtil.getfirst(proxyService.ports());
- // org.xmlpull.infoset.XmlElement address = proxyPort.xml().element("address");
- // XmlAttribute location = address.attribute("location");
- // address.removeAttribute(location);
- // address.setAttributeValue("location", engineURL.toString().substring(0,
- // engineURL.toString().indexOf("?wsdl")));
-
- // WSIFService service = WSIFServiceFactory.newInstance().getService(
- // WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(proxyWSDL) );
- // WSIFPort port = service.getPort();
- // WSIFClient wclient = WSIFRuntime.getDefault().newClientFor(port);
-
- WSIFClient wclient = WSIFRuntime.newClient(engineURL.toString())
- .addHandler(new StickySoapHeaderHandler("use-lead-header", leadContext))
- .useAsyncMessaging(correlator).setAsyncResponseTimeoutInMs(33000L); // to simplify testing
- // set to just few
- // seconds
-
- WSIFPort port = wclient.getPort();
- WSIFOperation operation = port.createOperation("deploy");
-
- WSIFMessage outputMessage = operation.createOutputMessage();
- WSIFMessage faultMessage = operation.createFaultMessage();
- XmlElement inputMessageElement = xmlObjectToEl(getDeploymentPayload(workflow, this.xbayaEngine
- .getConfiguration().getDSCURL()));
- WSIFMessage inputMessage = new WSIFMessageElement(inputMessageElement);
-
- boolean success = operation.executeRequestResponseOperation(inputMessage, outputMessage, faultMessage);
-
- if (success) {
- } else {
- throw new XsulException(faultMessage.toString());
-
- }
-
- } catch (IOException e) {
- throw new WorkflowProxyException(e);
-
- } catch (XmlBuilderException e) {
- throw new WorkflowProxyException(e);
- } catch (GraphException e) {
- throw new WorkflowProxyException(e);
- } catch (ComponentException e) {
- throw new WorkflowProxyException(e);
- }
- XBayaConfiguration configuration = this.xbayaEngine.getConfiguration();
- WsdlDefinitions workflowWSDL;
- try {
- workflowWSDL = workflow.getOdeWorkflowWSDL(configuration.getDSCURL(), configuration.getODEURL());
- } catch (Exception e) {
- // shouldnt happen cos we have already called this once
- throw new XBayaRuntimeException(e);
- }
- org.xmlpull.infoset.XmlElement service = workflowWSDL.xml().element(null, "service");
- org.xmlpull.infoset.XmlElement port = service.element(null, "port");
- org.xmlpull.infoset.XmlElement address = port.element(null, "address");
- String location = address.attributeValue("location");
-
- URI ret = null;
- try {
- ret = new URI(location + "?wsdl");
- } catch (URISyntaxException e) {
- throw new XBayaRuntimeException(e);
- }
- return ret;
-
- }
-
- private XmlElement xmlObjectToEl(XmlObject outgoingXmlObj) throws IOException {
- String outgoingXmlAsString = outgoingXmlObj.xmlText();
- return XmlInfosetBuilder.newInstance().parseFragmentFromReader(new StringReader(outgoingXmlAsString));
- }
-
- private DeploymentInformationDocument getDeploymentPayload(Workflow workflow, URI dscURI)
- throws WorkflowProxyException, XmlBuilderException, GraphException, ComponentException {
- try {
- String workflowName = workflow.getName();
- URI templateId = workflow.getUniqueWorkflowName();
- XBayaConfiguration configuration = this.xbayaEngine.getConfiguration();
- GpelProcess gpelProcess = null;
- String processString = null;
-
- gpelProcess = workflow.getOdeProcess(dscURI, configuration.getODEURL());
- processString = gpelProcess.xmlStringPretty();
-
- workflow.getImage();
- WsdlDefinitions workflowWSDL = workflow.getOdeWorkflowWSDL(dscURI, configuration.getODEURL());
-
- // do some error checking here
- if (workflowName == null || "".equals(workflowName)) {
- throw new IllegalStateException("No workflow name given");
- }
-
- DeploymentInformationDocument document = DeploymentInformationDocument.Factory.newInstance();
- DeploymentInformationDocument.DeploymentInformation deploymentInformation = DeploymentInformationDocument.DeploymentInformation.Factory
- .newInstance();
- DeploymentDocumentsType documentsType = DeploymentDocumentsType.Factory.newInstance();
-
- // setting the process name
- deploymentInformation.setProcessName(StringUtil.convertToJavaIdentifier(workflowName));
-
- // setting workflow template id
- if (templateId != null) {
- deploymentInformation.setTemplateId(templateId.toString());
- }
-
- // setting process GPEL
-
- XmlObject gpelProcessXmlObject = XBeansUtil.xmlElementToXmlObject(processString);
- documentsType.setBPEL(gpelProcessXmlObject);
-
- // setting deployment descriptors
- documentsType.setDeploymentDescriptor(XmlObject.Factory.parse(XmlConstants.BUILDER
- .serializeToStringPretty(workflow.getODEDeploymentDescriptor(dscURI, configuration.getODEURL()))));
-
- XMLFile processWSDL = XMLFile.Factory.newInstance();
- processWSDL.setFileName(workflowWSDL.xml().attributeValue("name") + ".wsdl");
- processWSDL.setContent(XBeansUtil.xmlElementToXmlObject(workflowWSDL.xmlStringPretty()));
- documentsType.setProcessWSDL(processWSDL);
-
- XMLFile serviceWSDL;
- Map<String, WsdlDefinitions> wsdlMap = workflow.getOdeServiceWSDLs(dscURI, configuration.getODEURL());
- XMLFile[] serviceWSDLs = new XMLFile[wsdlMap.size() + 3];
- int index = 0;
- for (String id : wsdlMap.keySet()) {
- WsdlDefinitions wsdl = wsdlMap.get(id);
- serviceWSDL = XMLFile.Factory.newInstance();
- serviceWSDL.setFileName(wsdl.xml().attributeValue("name") + ".wsdl");
- serviceWSDL.setContent(XBeansUtil.xmlElementToXmlObject(wsdl.xmlStringPretty()));
- serviceWSDLs[index++] = serviceWSDL;
- }
-
- // add the xsds
- // crosscutt
- XMLFile crossCutXsd = XMLFile.Factory.newInstance();
- crossCutXsd.setFileName("lead-crosscut-parameters.xsd");
- crossCutXsd.setContent(XBeansUtil.xmlElementToXmlObject(LeadCrosscutXSD.getXml()));
- serviceWSDLs[index++] = crossCutXsd;
-
- // gfac-simple-types.xsd
-
- XMLFile gfacXsd = XMLFile.Factory.newInstance();
- gfacXsd.setFileName("gfac-simple-types.xsd");
- gfacXsd.setContent(XBeansUtil.xmlElementToXmlObject(GFacSimpleTypesXSD.getXml()));
- serviceWSDLs[index++] = gfacXsd;
-
- // fileidtype
- XMLFile lch = XMLFile.Factory.newInstance();
- lch.setFileName("lead-context.xsd");
- lch.setContent(XBeansUtil.xmlElementToXmlObject(LeadContextHeaderXSD.getXml()));
- serviceWSDLs[index++] = lch;
-
- documentsType.setServiceWSDLsArray(serviceWSDLs);
-
- workflow.getGraph();
-
- deploymentInformation.setDeploymentDocuments(documentsType);
- document.setDeploymentInformation(deploymentInformation);
-
- return document;
- } catch (XmlException e) {
- throw new WorkflowProxyException(e);
- }
-
- }
-
- /**
- * @param workflow
- * The workflow to instantiate.
- * @param dscURL
- * The URL of the DSC.
- * @param name
- * The name that becomes a part of the workflow instance name.
- * @return The wsdl of the workflow
- * @throws WorkflowProxyException
- * @throws ComponentException
- * @throws GraphException
- */
- public synchronized GcInstance instantiate(Workflow workflow, URI dscURL, String name)
- throws WorkflowEngineException, ComponentException, GraphException {
-
- URI templateID = workflow.getGPELTemplateID();
- if (templateID == null) {
- throw new IllegalStateException("The workflow has not been deployed.");
- }
-
- try {
-
- WSIFAsyncResponsesCorrelator correlator;
- correlator = null;
-
- // pass some headers
- LeadContextHeader leadContext = getLeadContextHeader();
-
- WSIFClient wclient = WSIFRuntime.newClient(engineURL.toString())
- .addHandler(new StickySoapHeaderHandler("use-lead-header", leadContext))
- .useAsyncMessaging(correlator).setAsyncResponseTimeoutInMs(33000L); // to simplify testing
- // set to just few
- // seconds
-
- WSIFPort port = wclient.getPort();
- WSIFOperation operation = port.createOperation("createInstance");
-
- WSIFMessage outputMessage = operation.createOutputMessage();
- WSIFMessage faultMessage = operation.createFaultMessage();
-
- ProcessNameDocument processNameDocument = ProcessNameDocument.Factory.newInstance();
- // TODO : do we use template id or process name here?
- processNameDocument.setProcessName(workflow.getName());
-
- XmlElement inputMessageElement = xmlObjectToEl(processNameDocument);
-
- WSIFMessage inputMessage = new WSIFMessageElement(inputMessageElement);
-
- boolean success = operation.executeRequestResponseOperation(inputMessage, outputMessage, faultMessage);
-
- XmlElement result;
- if (success) {
- result = (XmlElement) outputMessage;
- } else {
- result = (XmlElement) faultMessage;
- }
-
- wsdlDefinitions = new WsdlDefinitions(XMLUtil.xmlElementToString(result));
-
- // this is tricky here. This method requires us to return a
- // GcInstance and will call
- // start method with GcInstance as the argument to get
- // wsdlDefinitions.
- // With workflow proxy client, we do get wsdldefinitions from the
- // first invocation itself and we do not need
- // to have a GcInstance. So let's create our own GcInstance extended
- // from GcInstance, store the wsdldefinitions
- // inside that. When we get "start" call next time, let's retrieve
- // these wsdldefinitions from that GcInstance
- // object and return it to the client
- return new ProxyGcInstance(wsdlDefinitions);
- } catch (IOException e) {
- e.printStackTrace();
-
- }
-
- return null;
- }
-
- @Deprecated
- public GcInstance instantiate(Workflow workflow, Map<String, WsdlDefinitions> wsdlMap)
- throws WorkflowEngineException {
- return null; // To change body of implemented methods use File |
- // Settings | File Templates.
- }
-
- private LeadContextHeader getLeadContextHeader() {
- LeadContextHeaderHelper helper = new LeadContextHeaderHelper();
- helper.setXBayaConfiguration(new XBayaConfiguration());
- LeadContextHeader leadContext = helper.getLeadContextHeader();
- leadContext.setWorkflowId(URI.create("http://host/2005/11/09/workflowinstace"));
- leadContext.setNodeId("decoder1");
- leadContext.setTimeStep("5");
- leadContext.setServiceId("decoder-instance-10");
- return leadContext;
- }
-
- /**
- * Loads a workflow with s specified workflow template ID.
- *
- * @param templateID
- * The workflow template ID.
- * @return The workflow loaded
- * @throws GraphException
- * @throws WorkflowProxyException
- * @throws org.apache.airavata.xbaya.component.ComponentException
- *
- */
- public Workflow load(URI templateID, WorkflowType workflowType) throws GraphException, WorkflowProxyException,
- ComponentException {
-
- Workflow workflow = null;
- String templateIDString = templateID.toString();
-
- // workflow template id is of the format
- // urn:uuid:<workflow_name>:date_as_long. Trying to extract
- // the workflow name from the template id now
-
- QName workflowQName;
- if (templateIDString.indexOf("urn:uuid") > -1) {
- int secondColonLocation = templateIDString.indexOf(":", templateIDString.indexOf(":") + 1);
- int thirdColonLocation = templateIDString.indexOf(":", secondColonLocation + 1);
-
- workflowQName = new QName(templateIDString, templateIDString.substring(secondColonLocation + 1,
- thirdColonLocation));
- } else {
- workflowQName = new QName(templateIDString);
- }
-
- XRegistryAccesser xregistryAccesser = new XRegistryAccesser(this.xbayaEngine);
- String templateAsString = xregistryAccesser.getWorkflow(workflowQName).toString();
-
-
- workflow = new Workflow(XMLUtil.stringToXmlElement(templateAsString));
-
- return workflow;
- }
-
- public void setUserX509Credential(UserX509Credential userX509Credential) throws WorkflowEngineException {
- this.gssCredential = userX509Credential.getGssCredential();
- }
-
- /**
- * Returns the List of GcSearchResult.
- *
- * @param maxNum
- * The maximum number of results
- * @return The List of GcSearchResult.
- * @throws WorkflowProxyException
- */
- @SuppressWarnings("boxing")
- public synchronized GcSearchList list(int maxNum, WorkflowType type) throws WorkflowProxyException {
- logger.entering(new Object[] { maxNum });
-
- try {
- // TODO return the ones only related to the user.
- GcSearchListImpl results = new GcSearchListImpl(maxNum);
- // retrieve the workflow from xregistry
- checkAndLoadCredentials();
-
- URI xregistryURL = this.xbayaEngine.getConfiguration().getXRegistryURL();
- if (xregistryURL == null) {
- xregistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
- }
- XRegistryClient xregistryClient = new XRegistryClient(gssCredential,
- XBayaSecurity.getTrustedCertificates(), xregistryURL.toString());
- ResourceData[] datas = xregistryClient.findResource("");
-
- int index = 0;
- while (maxNum > 0 && datas.length > index) {
- ResourceData data = datas[index];
- QName qName = data.getName();
- results.addResult(new SearchResult(new URI(qName.getNamespaceURI()), qName.getLocalPart(), index));
- index++;
- maxNum--;
- }
-
- return results;
- } catch (RuntimeException e) {
- throw new WorkflowProxyException(e);
- } catch (XRegistryClientException e) {
- throw new WorkflowProxyException(e);
- } catch (URISyntaxException e) {
- throw new WorkflowProxyException(e);
- }
- }
-
- public WsdlDefinitions start(GcInstance instance) {
- if (instance instanceof ProxyGcInstance) {
- ((ProxyGcInstance) instance).getWsdlDefinitions();
- }
-
- return null;
- }
-
- public void connect() throws WorkflowEngineException {
- // we don't have to explicitly connect to our workflow engine. So
- // discarding that
- }
-
- public void setXBayaEngine(XBayaEngine xBayaEngine) {
- this.xbayaEngine = xBayaEngine;
- }
-
- class ProxyGcInstance extends GcInstance {
- private WsdlDefinitions wsdlDefinitions;
-
- public ProxyGcInstance(WsdlDefinitions wsdlDefinitions) {
- super(null);
- this.wsdlDefinitions = wsdlDefinitions;
- }
-
- public WsdlDefinitions getWsdlDefinitions() {
- return wsdlDefinitions;
- }
-
- public void setWsdlDefinitions(WsdlDefinitions wsdlDefinitions) {
- this.wsdlDefinitions = wsdlDefinitions;
- }
- }
-
- class SearchResult implements GcSearchResult {
-
- private URI id;
- private String title;
- private int lastModfied;
-
- public SearchResult(URI id, String title, int lastModfied) {
- this.title = title;
- this.id = id;
- this.lastModfied = lastModfied;
- }
-
- public String getTitle() {
- return title;
- }
-
- public URI getId() {
- return id;
- }
-
- public long getLastModfied() {
- return lastModfied;
- }
- }
-
- class GcSearchListImpl implements GcSearchList {
-
- private List<GcSearchResult> list;
-
- GcSearchListImpl(int size) {
- list = new ArrayList<GcSearchResult>(size);
- }
-
- public void addResult(org.gpel.client.GcSearchResult gcSearchResult) {
- this.list.add(gcSearchResult);
- }
-
- public Iterable<GcSearchResult> results() {
- return list;
- }
-
- public int size() {
- return list.size();
- }
- }
-
- private void checkAndLoadCredentials() {
- if (isSecure()) {
- // Check if the proxy is loaded.
- boolean loaded = new MyProxyChecker(this.xbayaEngine).loadIfNecessary();
- if (!loaded) {
- return;
- }
- // Creates a secure channel in gpel.
- MyProxyClient myProxyClient = this.xbayaEngine.getMyProxyClient();
- GSSCredential proxy = myProxyClient.getProxy();
- UserX509Credential credential = new UserX509Credential(proxy, XBayaSecurity.getTrustedCertificates());
- try {
- this.setUserX509Credential(credential);
- } catch (WorkflowEngineException e) {
- this.xbayaEngine.getErrorWindow().error(ErrorMessages.GPEL_ERROR, e);
- return;
- }
- }
- }
+ private XRegistryClient xregistryCient;
+ private String xregistryURL;
+ private WsdlDefinitions wsdlDefinitions;
+ private XBayaEngine xbayaEngine;
+
+ /**
+ * Constructs a WorkflowProxyClient.
+ */
+ public WorkflowProxyClient() {
+ // Nothing
+ sendSafeEvent(new Event(Event.Type.GPEL_ENGINE_CONNECTED));
+ }
+
+ /**
+ * Constructs a WorkflowProxyClient.
+ *
+ * @param engineURL
+ * @param xregistryURL
+ * @param credential
+ * @throws WorkflowProxyException
+ */
+ public WorkflowProxyClient(URI engineURL, String xregistryURL,
+ UserX509Credential credential) throws WorkflowEngineException {
+ // TODO : Xregistry URL can be null. Make sure we check that and set a
+ // default location to that.
+ this();
+ this.engineURL = engineURL;
+ this.xregistryURL = xregistryURL;
+ this.gssCredential = credential.getGssCredential();
+ }
+
+ public void setXRegistryUrl(URI xRegistryURL) {
+ if (xRegistryURL != null) {
+ this.xregistryURL = xRegistryURL.toString();
+ }
+ }
+
+ /**
+ * @param engineURL
+ * @throws WorkflowProxyException
+ */
+ public void setEngineURL(URI engineURL) throws WorkflowEngineException {
+ super.setEngineURL(engineURL);
+ sendSafeEvent(new Event(Event.Type.GPEL_ENGINE_CONNECTED));
+ // connect();
+ }
+
+ /**
+ * @param gssCredential
+ * @throws WorkflowProxyException
+ */
+ public void setSecurityInformation(GSSCredential gssCredential)
+ throws WorkflowProxyException {
+ this.gssCredential = gssCredential;
+ // connect();
+ }
+
+ /**
+ * @param workflow
+ * @param redeploy
+ * @return The workflow template ID.
+ * @throws WorkflowProxyException
+ */
+ public synchronized URI deploy(Workflow workflow, boolean redeploy)
+ throws WorkflowProxyException {
+
+ try {
+ // count++;
+
+ // adding workflow in to Xregistry
+
+ WSIFAsyncResponsesCorrelator correlator;
+ correlator = null;
+
+ // pass some headers
+ LeadContextHeader leadContext = getLeadContextHeader();
+ // URI uri = new File("/u/cherath/Desktop/WEPSService.xml").toURI();
+ // WSIFClient wclient = WSIFRuntime.newClient(uri.toString())
+ // .addHandler(
+ // new StickySoapHeaderHandler("use-lead-header",
+ // leadContext)).useAsyncMessaging(correlator)
+ // .setAsyncResponseTimeoutInMs(33000L); // to simplify testing
+
+ xsul5.wsdl.WsdlResolver.getInstance().loadWsdl(engineURL);
+
+ // WsdlService proxyService =
+ // WSDLUtil.getfirst(proxyWSDL.services());
+ // WsdlPort proxyPort = WSDLUtil.getfirst(proxyService.ports());
+ // org.xmlpull.infoset.XmlElement address =
+ // proxyPort.xml().element("address");
+ // XmlAttribute location = address.attribute("location");
+ // address.removeAttribute(location);
+ // address.setAttributeValue("location",
+ // engineURL.toString().substring(0,
+ // engineURL.toString().indexOf("?wsdl")));
+
+ // WSIFService service =
+ // WSIFServiceFactory.newInstance().getService(
+ // WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(proxyWSDL) );
+ // WSIFPort port = service.getPort();
+ // WSIFClient wclient = WSIFRuntime.getDefault().newClientFor(port);
+
+ WSIFClient wclient = WSIFRuntime
+ .newClient(engineURL.toString())
+ .addHandler(
+ new StickySoapHeaderHandler("use-lead-header",
+ leadContext)).useAsyncMessaging(correlator)
+ .setAsyncResponseTimeoutInMs(33000L); // to simplify testing
+ // set to just few
+ // seconds
+
+ WSIFPort port = wclient.getPort();
+ WSIFOperation operation = port.createOperation("deploy");
+
+ WSIFMessage outputMessage = operation.createOutputMessage();
+ WSIFMessage faultMessage = operation.createFaultMessage();
+ XmlElement inputMessageElement = xmlObjectToEl(getDeploymentPayload(
+ workflow, this.xbayaEngine.getConfiguration().getDSCURL()));
+ WSIFMessage inputMessage = new WSIFMessageElement(
+ inputMessageElement);
+
+ boolean success = operation.executeRequestResponseOperation(
+ inputMessage, outputMessage, faultMessage);
+
+ if (success) {
+ } else {
+ throw new XsulException(faultMessage.toString());
+
+ }
+
+ } catch (IOException e) {
+ throw new WorkflowProxyException(e);
+
+ } catch (XmlBuilderException e) {
+ throw new WorkflowProxyException(e);
+ } catch (GraphException e) {
+ throw new WorkflowProxyException(e);
+ } catch (ComponentException e) {
+ throw new WorkflowProxyException(e);
+ }
+ XBayaConfiguration configuration = this.xbayaEngine.getConfiguration();
+ WsdlDefinitions workflowWSDL;
+ try {
+ workflowWSDL = workflow.getOdeWorkflowWSDL(
+ configuration.getDSCURL(), configuration.getODEURL());
+ } catch (Exception e) {
+ // shouldnt happen cos we have already called this once
+ throw new XBayaRuntimeException(e);
+ }
+ org.xmlpull.infoset.XmlElement service = workflowWSDL.xml().element(
+ null, "service");
+ org.xmlpull.infoset.XmlElement port = service.element(null, "port");
+ org.xmlpull.infoset.XmlElement address = port.element(null, "address");
+ String location = address.attributeValue("location");
+
+ URI ret = null;
+ try {
+ ret = new URI(location + "?wsdl");
+ } catch (URISyntaxException e) {
+ throw new XBayaRuntimeException(e);
+ }
+ return ret;
+
+ }
+
+ private XmlElement xmlObjectToEl(XmlObject outgoingXmlObj)
+ throws IOException {
+ String outgoingXmlAsString = outgoingXmlObj.xmlText();
+ return XmlInfosetBuilder.newInstance().parseFragmentFromReader(
+ new StringReader(outgoingXmlAsString));
+ }
+
+ private DeploymentInformationDocument getDeploymentPayload(
+ Workflow workflow, URI dscURI) throws WorkflowProxyException,
+ XmlBuilderException, GraphException, ComponentException {
+ try {
+ String workflowName = workflow.getName();
+ URI templateId = workflow.getUniqueWorkflowName();
+ XBayaConfiguration configuration = this.xbayaEngine
+ .getConfiguration();
+ GpelProcess gpelProcess = null;
+ String processString = null;
+
+ gpelProcess = workflow.getOdeProcess(dscURI,
+ configuration.getODEURL());
+ processString = gpelProcess.xmlStringPretty();
+
+ workflow.getImage();
+ WsdlDefinitions workflowWSDL = workflow.getOdeWorkflowWSDL(dscURI,
+ configuration.getODEURL());
+
+ // do some error checking here
+ if (workflowName == null || "".equals(workflowName)) {
+ throw new IllegalStateException("No workflow name given");
+ }
+
+ DeploymentInformationDocument document = DeploymentInformationDocument.Factory
+ .newInstance();
+ DeploymentInformationDocument.DeploymentInformation deploymentInformation = DeploymentInformationDocument.DeploymentInformation.Factory
+ .newInstance();
+ DeploymentDocumentsType documentsType = DeploymentDocumentsType.Factory
+ .newInstance();
+
+ // setting the process name
+ deploymentInformation.setProcessName(StringUtil
+ .convertToJavaIdentifier(workflowName));
+
+ // setting workflow template id
+ if (templateId != null) {
+ deploymentInformation.setTemplateId(templateId.toString());
+ }
+
+ // setting process GPEL
+
+ XmlObject gpelProcessXmlObject = XBeansUtil
+ .xmlElementToXmlObject(processString);
+ documentsType.setBPEL(gpelProcessXmlObject);
+
+ // setting deployment descriptors
+ documentsType.setDeploymentDescriptor(XmlObject.Factory
+ .parse(XmlConstants.BUILDER
+ .serializeToStringPretty(workflow
+ .getODEDeploymentDescriptor(dscURI,
+ configuration.getODEURL()))));
+
+ XMLFile processWSDL = XMLFile.Factory.newInstance();
+ processWSDL.setFileName(workflowWSDL.xml().attributeValue("name")
+ + ".wsdl");
+ processWSDL.setContent(XBeansUtil
+ .xmlElementToXmlObject(workflowWSDL.xmlStringPretty()));
+ documentsType.setProcessWSDL(processWSDL);
+
+ XMLFile serviceWSDL;
+ Map<String, WsdlDefinitions> wsdlMap = workflow.getOdeServiceWSDLs(
+ dscURI, configuration.getODEURL());
+ XMLFile[] serviceWSDLs = new XMLFile[wsdlMap.size() + 3];
+ int index = 0;
+ for (String id : wsdlMap.keySet()) {
+ WsdlDefinitions wsdl = wsdlMap.get(id);
+ serviceWSDL = XMLFile.Factory.newInstance();
+ serviceWSDL.setFileName(wsdl.xml().attributeValue("name")
+ + ".wsdl");
+ serviceWSDL.setContent(XBeansUtil.xmlElementToXmlObject(wsdl
+ .xmlStringPretty()));
+ serviceWSDLs[index++] = serviceWSDL;
+ }
+
+ // add the xsds
+ // crosscutt
+ XMLFile crossCutXsd = XMLFile.Factory.newInstance();
+ crossCutXsd.setFileName("lead-crosscut-parameters.xsd");
+ crossCutXsd.setContent(XBeansUtil
+ .xmlElementToXmlObject(LeadCrosscutXSD.getXml()));
+ serviceWSDLs[index++] = crossCutXsd;
+
+ // gfac-simple-types.xsd
+
+ XMLFile gfacXsd = XMLFile.Factory.newInstance();
+ gfacXsd.setFileName("gfac-simple-types.xsd");
+ gfacXsd.setContent(XBeansUtil
+ .xmlElementToXmlObject(GFacSimpleTypesXSD.getXml()));
+ serviceWSDLs[index++] = gfacXsd;
+
+ // fileidtype
+ XMLFile lch = XMLFile.Factory.newInstance();
+ lch.setFileName("lead-context.xsd");
+ lch.setContent(XBeansUtil
+ .xmlElementToXmlObject(LeadContextHeaderXSD.getXml()));
+ serviceWSDLs[index++] = lch;
+
+ documentsType.setServiceWSDLsArray(serviceWSDLs);
+
+ workflow.getGraph();
+
+ deploymentInformation.setDeploymentDocuments(documentsType);
+ document.setDeploymentInformation(deploymentInformation);
+
+ return document;
+ } catch (XmlException e) {
+ throw new WorkflowProxyException(e);
+ }
+
+ }
+
+ /**
+ * @param workflow
+ * The workflow to instantiate.
+ * @param dscURL
+ * The URL of the DSC.
+ * @param name
+ * The name that becomes a part of the workflow instance name.
+ * @return The wsdl of the workflow
+ * @throws WorkflowProxyException
+ * @throws ComponentException
+ * @throws GraphException
+ */
+ public synchronized GcInstance instantiate(Workflow workflow, URI dscURL,
+ String name) throws WorkflowEngineException, ComponentException,
+ GraphException {
+
+ URI templateID = workflow.getGPELTemplateID();
+ if (templateID == null) {
+ throw new IllegalStateException(
+ "The workflow has not been deployed.");
+ }
+
+ try {
+
+ WSIFAsyncResponsesCorrelator correlator;
+ correlator = null;
+
+ // pass some headers
+ LeadContextHeader leadContext = getLeadContextHeader();
+
+ WSIFClient wclient = WSIFRuntime
+ .newClient(engineURL.toString())
+ .addHandler(
+ new StickySoapHeaderHandler("use-lead-header",
+ leadContext)).useAsyncMessaging(correlator)
+ .setAsyncResponseTimeoutInMs(33000L); // to simplify testing
+ // set to just few
+ // seconds
+
+ WSIFPort port = wclient.getPort();
+ WSIFOperation operation = port.createOperation("createInstance");
+
+ WSIFMessage outputMessage = operation.createOutputMessage();
+ WSIFMessage faultMessage = operation.createFaultMessage();
+
+ ProcessNameDocument processNameDocument = ProcessNameDocument.Factory
+ .newInstance();
+ // TODO : do we use template id or process name here?
+ processNameDocument.setProcessName(workflow.getName());
+
+ XmlElement inputMessageElement = xmlObjectToEl(processNameDocument);
+
+ WSIFMessage inputMessage = new WSIFMessageElement(
+ inputMessageElement);
+
+ boolean success = operation.executeRequestResponseOperation(
+ inputMessage, outputMessage, faultMessage);
+
+ XmlElement result;
+ if (success) {
+ result = (XmlElement) outputMessage;
+ } else {
+ result = (XmlElement) faultMessage;
+ }
+
+ wsdlDefinitions = new WsdlDefinitions(
+ XMLUtil.xmlElementToString(result));
+
+ // this is tricky here. This method requires us to return a
+ // GcInstance and will call
+ // start method with GcInstance as the argument to get
+ // wsdlDefinitions.
+ // With workflow proxy client, we do get wsdldefinitions from the
+ // first invocation itself and we do not need
+ // to have a GcInstance. So let's create our own GcInstance extended
+ // from GcInstance, store the wsdldefinitions
+ // inside that. When we get "start" call next time, let's retrieve
+ // these wsdldefinitions from that GcInstance
+ // object and return it to the client
+ return new ProxyGcInstance(wsdlDefinitions);
+ } catch (IOException e) {
+ e.printStackTrace();
+
+ }
+
+ return null;
+ }
+
+ @Deprecated
+ public GcInstance instantiate(Workflow workflow,
+ Map<String, WsdlDefinitions> wsdlMap)
+ throws WorkflowEngineException {
+ return null; // To change body of implemented methods use File |
+ // Settings | File Templates.
+ }
+
+ private LeadContextHeader getLeadContextHeader() {
+ LeadContextHeaderHelper helper = new LeadContextHeaderHelper();
+ helper.setXBayaConfiguration(new XBayaConfiguration());
+ LeadContextHeader leadContext = helper.getLeadContextHeader();
+ leadContext.setWorkflowId(URI
+ .create("http://host/2005/11/09/workflowinstace"));
+ leadContext.setNodeId("decoder1");
+ leadContext.setTimeStep("5");
+ leadContext.setServiceId("decoder-instance-10");
+ return leadContext;
+ }
+
+ /**
+ * Loads a workflow with s specified workflow template ID.
+ *
+ * @param templateID
+ * The workflow template ID.
+ * @return The workflow loaded
+ * @throws GraphException
+ * @throws WorkflowProxyException
+ * @throws org.apache.airavata.xbaya.component.ComponentException
+ *
+ */
+ public Workflow load(URI templateID, WorkflowType workflowType)
+ throws GraphException, WorkflowProxyException, ComponentException {
+
+ Workflow workflow = null;
+ String templateIDString = templateID.toString();
+
+ // workflow template id is of the format
+ // urn:uuid:<workflow_name>:date_as_long. Trying to extract
+ // the workflow name from the template id now
+
+ QName workflowQName;
+ if (templateIDString.indexOf("urn:uuid") > -1) {
+ int secondColonLocation = templateIDString.indexOf(":",
+ templateIDString.indexOf(":") + 1);
+ int thirdColonLocation = templateIDString.indexOf(":",
+ secondColonLocation + 1);
+
+ workflowQName = new QName(templateIDString,
+ templateIDString.substring(secondColonLocation + 1,
+ thirdColonLocation));
+ } else {
+ workflowQName = new QName(templateIDString);
+ }
+
+ XRegistryAccesser xregistryAccesser = new XRegistryAccesser(
+ this.xbayaEngine);
+ String templateAsString = xregistryAccesser.getWorkflow(workflowQName)
+ .toString();
+
+ workflow = new Workflow(XMLUtil.stringToXmlElement(templateAsString));
+
+ return workflow;
+ }
+
+ public void setUserX509Credential(UserX509Credential userX509Credential)
+ throws WorkflowEngineException {
+ this.gssCredential = userX509Credential.getGssCredential();
+ }
+
+ /**
+ * Returns the List of GcSearchResult.
+ *
+ * @param maxNum
+ * The maximum number of results
+ * @return The List of GcSearchResult.
+ * @throws WorkflowProxyException
+ */
+ @SuppressWarnings("boxing")
+ public synchronized GcSearchList list(int maxNum, WorkflowType type)
+ throws WorkflowProxyException {
+ logger.entering(new Object[] { maxNum });
+
+ try {
+ // TODO return the ones only related to the user.
+ GcSearchListImpl results = new GcSearchListImpl(maxNum);
+ // retrieve the workflow from xregistry
+ checkAndLoadCredentials();
+
+ URI xregistryURL = this.xbayaEngine.getConfiguration()
+ .getXRegistryURL();
+ if (xregistryURL == null) {
+ xregistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
+ }
+ XRegistryClient xregistryClient = new XRegistryClient(
+ gssCredential, XBayaSecurity.getTrustedCertificates(),
+ xregistryURL.toString());
+ ResourceData[] datas = xregistryClient.findResource("");
+
+ int index = 0;
+ while (maxNum > 0 && datas.length > index) {
+ ResourceData data = datas[index];
+ QName qName = data.getName();
+ results.addResult(new SearchResult(new URI(qName
+ .getNamespaceURI()), qName.getLocalPart(), index));
+ index++;
+ maxNum--;
+ }
+
+ return results;
+ } catch (RuntimeException e) {
+ throw new WorkflowProxyException(e);
+ } catch (XRegistryClientException e) {
+ throw new WorkflowProxyException(e);
+ } catch (URISyntaxException e) {
+ throw new WorkflowProxyException(e);
+ }
+ }
+
+ public WsdlDefinitions start(GcInstance instance) {
+ if (instance instanceof ProxyGcInstance) {
+ ((ProxyGcInstance) instance).getWsdlDefinitions();
+ }
+
+ return null;
+ }
+
+ public void connect() throws WorkflowEngineException {
+ // we don't have to explicitly connect to our workflow engine. So
+ // discarding that
+ }
+
+ public void setXBayaEngine(XBayaEngine xBayaEngine) {
+ this.xbayaEngine = xBayaEngine;
+ }
+
+ class ProxyGcInstance extends GcInstance {
+ private WsdlDefinitions wsdlDefinitions;
+
+ public ProxyGcInstance(WsdlDefinitions wsdlDefinitions) {
+ super(null);
+ this.wsdlDefinitions = wsdlDefinitions;
+ }
+
+ public WsdlDefinitions getWsdlDefinitions() {
+ return wsdlDefinitions;
+ }
+
+ public void setWsdlDefinitions(WsdlDefinitions wsdlDefinitions) {
+ this.wsdlDefinitions = wsdlDefinitions;
+ }
+ }
+
+ class SearchResult implements GcSearchResult {
+
+ private URI id;
+ private String title;
+ private int lastModfied;
+
+ public SearchResult(URI id, String title, int lastModfied) {
+ this.title = title;
+ this.id = id;
+ this.lastModfied = lastModfied;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public URI getId() {
+ return id;
+ }
+
+ public long getLastModfied() {
+ return lastModfied;
+ }
+ }
+
+ class GcSearchListImpl implements GcSearchList {
+
+ private List<GcSearchResult> list;
+
+ GcSearchListImpl(int size) {
+ list = new ArrayList<GcSearchResult>(size);
+ }
+
+ public void addResult(org.gpel.client.GcSearchResult gcSearchResult) {
+ this.list.add(gcSearchResult);
+ }
+
+ public Iterable<GcSearchResult> results() {
+ return list;
+ }
+
+ public int size() {
+ return list.size();
+ }
+ }
+
+ private void checkAndLoadCredentials() {
+ if (isSecure()) {
+ // Check if the proxy is loaded.
+ boolean loaded = new MyProxyChecker(this.xbayaEngine)
+ .loadIfNecessary();
+ if (!loaded) {
+ return;
+ }
+ // Creates a secure channel in gpel.
+ MyProxyClient myProxyClient = this.xbayaEngine.getMyProxyClient();
+ GSSCredential proxy = myProxyClient.getProxy();
+ UserX509Credential credential = new UserX509Credential(proxy,
+ XBayaSecurity.getTrustedCertificates());
+ try {
+ this.setUserX509Credential(credential);
+ } catch (WorkflowEngineException e) {
+ this.xbayaEngine.getErrorWindow().error(
+ ErrorMessages.GPEL_ERROR, e);
+ return;
+ }
+ }
+ }
-
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryLoaderWindow.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryLoaderWindow.java Fri Sep 2 21:26:03 2011
@@ -45,8 +45,6 @@ import org.apache.airavata.xbaya.wf.Work
public class XRegistryLoaderWindow {
- // private static final MLogger logger = MLogger.getLogger();
-
private XBayaEngine engine;
private XBayaDialog dialog;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xsd/LeadContextHeaderXSD.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xsd/LeadContextHeaderXSD.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xsd/LeadContextHeaderXSD.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xsd/LeadContextHeaderXSD.java Fri Sep 2 21:26:03 2011
@@ -181,7 +181,6 @@ public class LeadContextHeaderXSD {
* @return
*/
public static String getXml() {
- // TODO Auto-generated method stub
return XSD;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xsd/LeadCrosscutXSD.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xsd/LeadCrosscutXSD.java?rev=1164715&r1=1164714&r2=1164715&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xsd/LeadCrosscutXSD.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xsd/LeadCrosscutXSD.java Fri Sep 2 21:26:03 2011
@@ -147,7 +147,6 @@ public class LeadCrosscutXSD {
* @return
*/
public static String getXml() {
- // TODO Auto-generated method stub
return XSD;
}