You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/05/17 18:40:14 UTC
svn commit: r1339699 [6/8] - in /incubator/airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/airavata/
xbaya-gui/src/main/java/org/apache/airavata/workflow/
xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ xbay...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfConfigurationDialog.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfConfigurationDialog.java Thu May 17 16:39:54 2012
@@ -29,9 +29,9 @@ import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.system.IfNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.system.IfNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -28,12 +28,12 @@ import java.awt.Polygon;
import java.awt.Rectangle;
import java.util.List;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.impl.PortImpl;
+import org.apache.airavata.workflow.model.graph.system.IfNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.Port;
import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.gui.PortGUI;
-import org.apache.airavata.xbaya.graph.impl.PortImpl;
-import org.apache.airavata.xbaya.graph.system.IfNode;
public class IfNodeGUI extends ConfigurableNodeGUI {
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -30,8 +30,8 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.graph.
import java.awt.Color;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
public class InputNodeGUI extends ConfigurableNodeGUI {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoConfigurationDialog.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/MemoConfigurationDialog.java Thu May 17 16:39:54 2012
@@ -27,8 +27,8 @@ import javax.swing.AbstractAction;
import javax.swing.JButton;
import javax.swing.JPanel;
+import org.apache.airavata.workflow.model.graph.system.MemoNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.system.MemoNode;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -31,9 +31,9 @@ import java.awt.event.MouseEvent;
import javax.swing.JTextArea;
import javax.swing.border.EmptyBorder;
+import org.apache.airavata.workflow.model.graph.system.MemoNode;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.MemoNode;
public class MemoNodeGUI extends NodeGUI {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/OutputConfigurationDialog.java Thu May 17 16:39:54 2012
@@ -29,8 +29,8 @@ import javax.swing.JPanel;
import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -27,9 +27,9 @@ import java.net.URL;
import org.apache.airavata.common.exception.UtilsException;
import org.apache.airavata.common.utils.BrowserLauncher;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
public class OutputNodeGUI extends ConfigurableNodeGUI {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveConfigurationDialog.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveConfigurationDialog.java Thu May 17 16:39:54 2012
@@ -29,9 +29,9 @@ import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.system.ReceiveNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -27,10 +27,10 @@ import java.awt.Point;
import java.awt.Polygon;
import java.awt.Rectangle;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.Port;
import org.apache.airavata.xbaya.graph.controller.NodeController;
-import org.apache.airavata.xbaya.graph.system.ReceiveNode;
public class ReceiveNodeGUI extends ConfigurableNodeGUI {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3FileChooser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3FileChooser.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3FileChooser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3FileChooser.java Thu May 17 16:39:54 2012
@@ -31,12 +31,12 @@ import javax.swing.event.TreeSelectionEv
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
+import org.apache.airavata.workflow.model.graph.system.S3InputNode;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.amazonEC2.gui.AmazonCredential;
import org.apache.airavata.xbaya.amazonEC2.gui.BucketsLoader;
import org.apache.airavata.xbaya.amazonEC2.gui.ChangeCredentialWindow;
import org.apache.airavata.xbaya.amazonEC2.gui.S3Tree;
-import org.apache.airavata.xbaya.graph.system.S3InputNode;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.jets3t.service.S3Service;
import org.jets3t.service.S3ServiceException;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3InputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3InputNodeGUI.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3InputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/S3InputNodeGUI.java Thu May 17 16:39:54 2012
@@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.graph.
import java.awt.Color;
+import org.apache.airavata.workflow.model.graph.system.S3InputNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.system.S3InputNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
public class S3InputNodeGUI extends ConfigurableNodeGUI {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java Thu May 17 16:39:54 2012
@@ -27,8 +27,8 @@ import javax.swing.AbstractAction;
import javax.swing.JButton;
import javax.swing.JPanel;
+import org.apache.airavata.workflow.model.graph.system.StreamSourceNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java Thu May 17 16:39:54 2012
@@ -29,10 +29,10 @@ import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.MouseEvent;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.apache.airavata.xbaya.graph.interaction.gui.ServiceInteractionWindow;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeWindow.java Thu May 17 16:39:54 2012
@@ -29,8 +29,8 @@ import javax.swing.JPanel;
import org.apache.airavata.common.utils.WSDLUtil;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WorkflowNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WorkflowNodeGUI.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WorkflowNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WorkflowNodeGUI.java Thu May 17 16:39:54 2012
@@ -23,13 +23,13 @@ package org.apache.airavata.xbaya.graph.
import java.awt.event.MouseEvent;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.ws.WorkflowNode;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.ws.WorkflowNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java Thu May 17 16:39:54 2012
@@ -39,15 +39,16 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
@@ -57,7 +58,6 @@ import org.apache.airavata.xbaya.jython.
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.gui.MonitorStarter;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.NameValuePair;
@@ -409,7 +409,7 @@ public class GridChemRunnerWindow {
// } catch (InterruptedException e) {
// logger.error(e.getMessage(), e);
// }
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
GridChemRunnerWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (RuntimeException e) {
GridChemRunnerWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/PortViewer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/PortViewer.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/PortViewer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/PortViewer.java Thu May 17 16:39:54 2012
@@ -34,8 +34,8 @@ import javax.swing.border.EtchedBorder;
import javax.swing.border.TitledBorder;
import org.apache.airavata.common.utils.SwingUtil;
-import org.apache.airavata.xbaya.graph.DataPort;
-import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.Port;
import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
import org.apache.airavata.xbaya.graph.gui.GraphCanvasEvent;
import org.apache.airavata.xbaya.graph.gui.GraphCanvasEvent.GraphCanvasEventType;
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -36,8 +36,8 @@ import javax.swing.JDialog;
import javax.swing.JLabel;
import org.apache.airavata.common.utils.SwingUtil;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
public class XBayaDialog {
@@ -243,7 +243,7 @@ public class XBayaDialog {
this.dialog = new JDialog((Dialog) this.owner);
} else {
// This should not happen.
- throw new XBayaRuntimeException("The owner component was neither Frame or Dialog.");
+ throw new WorkflowRuntimeException("The owner component was neither Frame or Dialog.");
}
this.dialog.setTitle(this.title);
this.dialog.setModal(true);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java Thu May 17 16:39:54 2012
@@ -49,20 +49,21 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.apache.airavata.common.utils.SwingUtil;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.Component;
import org.apache.airavata.xbaya.component.gui.ComponentSelector;
import org.apache.airavata.xbaya.component.gui.ComponentViewer;
import org.apache.airavata.xbaya.event.Event;
import org.apache.airavata.xbaya.event.Event.Type;
import org.apache.airavata.xbaya.event.EventListener;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.Port;
import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
import org.apache.airavata.xbaya.graph.gui.GraphCanvasEvent;
import org.apache.airavata.xbaya.graph.gui.GraphCanvasEvent.GraphCanvasEventType;
@@ -71,7 +72,6 @@ import org.apache.airavata.xbaya.menues.
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.monitor.gui.MonitorPanel;
import org.apache.airavata.xbaya.registrybrowser.JCRBrowserPanel;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -142,7 +142,7 @@ public class XBayaGUI implements EventLi
});
} catch (InterruptedException e) {
// Shouldn't happen.
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
} catch (InvocationTargetException e) {
// Shouldn't happen.
//It happened
@@ -159,7 +159,7 @@ public class XBayaGUI implements EventLi
at org.apache.airavata.xbaya.gui.XBayaGUI.<init>(XBayaGUI.java:138)
... 4 more
*/
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
// Following suppsed to jump in the middle to save unsaved workflows when exiting xbaya
@@ -692,7 +692,7 @@ public class XBayaGUI implements EventLi
XBayaGUI.this.frame.setVisible(false);
try {
XBayaGUI.this.engine.dispose();
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
// Ignore the error.
logger.error(e.getMessage(), e);
} catch (RuntimeException e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java Thu May 17 16:39:54 2012
@@ -41,10 +41,10 @@ import javax.swing.JToolBar;
import javax.swing.border.Border;
import org.apache.airavata.common.utils.SwingUtil;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.workflow.model.wf.WorkflowExecutionState;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.airavata.xbaya.wf.WorkflowExecutionState;
import com.amazonaws.transform.MapEntry;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java Thu May 17 16:39:54 2012
@@ -25,16 +25,16 @@ import java.net.URI;
import java.util.List;
import org.apache.airavata.common.utils.StringUtil;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.graph.controller.NodeController;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
import org.apache.airavata.xbaya.jython.lib.StandaloneServiceNotificationSender;
import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.axis2.addressing.EndpointReference;
import org.python.core.PyObject;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SystemComponentInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SystemComponentInvoker.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SystemComponentInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SystemComponentInvoker.java Thu May 17 16:39:54 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.interp
import java.util.Hashtable;
import java.util.Map;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.xbaya.invoker.Invoker;
import xsul.wsif.WSIFMessage;
@@ -103,12 +103,12 @@ public class SystemComponentInvoker impl
}
@Override
- public WSIFMessage getInputs() throws XBayaException {
+ public WSIFMessage getInputs() throws WorkflowException {
return null;
}
@Override
- public WSIFMessage getFault() throws XBayaException {
+ public WSIFMessage getFault() throws WorkflowException {
return null;
}
}
\ No newline at end of file
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -30,14 +30,14 @@ import java.net.URISyntaxException;
import java.util.List;
import java.util.UUID;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.ode.ODEClient;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.ode.ODEClient;
import org.apache.airavata.xbaya.security.SecurityUtil;
import org.apache.airavata.common.utils.Pair;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.proxy.WorkflowClient;
import org.apache.airavata.xbaya.workflow.proxy.WorkflowContext;
import org.ietf.jgss.GSSException;
@@ -46,7 +46,7 @@ import xsul5.wsdl.WsdlDefinitions;
public class TestWorkflowInterpreter {
- public static void main(String[] args) throws XBayaException, URISyntaxException, GSSException, IOException {
+ public static void main(String[] args) throws WorkflowException, URISyntaxException, GSSException, IOException {
String workflowAsString = getWorkflow();
Workflow workflow = new Workflow(workflowAsString);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Thu May 17 16:39:54 2012
@@ -44,52 +44,55 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.common.utils.WSDLUtil;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.registry.api.WorkflowExecutionStatus.ExecutionStatus;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.SubWorkflowComponent;
+import org.apache.airavata.workflow.model.component.amazon.InstanceComponent;
+import org.apache.airavata.workflow.model.component.amazon.TerminateInstanceComponent;
+import org.apache.airavata.workflow.model.component.dynamic.DynamicComponent;
+import org.apache.airavata.workflow.model.component.system.ConstantComponent;
+import org.apache.airavata.workflow.model.component.system.DifferedInputComponent;
+import org.apache.airavata.workflow.model.component.system.EndForEachComponent;
+import org.apache.airavata.workflow.model.component.system.EndifComponent;
+import org.apache.airavata.workflow.model.component.system.ForEachComponent;
+import org.apache.airavata.workflow.model.component.system.IfComponent;
+import org.apache.airavata.workflow.model.component.system.InputComponent;
+import org.apache.airavata.workflow.model.component.system.MemoComponent;
+import org.apache.airavata.workflow.model.component.system.OutputComponent;
+import org.apache.airavata.workflow.model.component.system.S3InputComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.ControlPort;
+import org.apache.airavata.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.amazon.InstanceNode;
+import org.apache.airavata.workflow.model.graph.dynamic.BasicTypeMapping;
+import org.apache.airavata.workflow.model.graph.dynamic.DynamicNode;
+import org.apache.airavata.workflow.model.graph.impl.EdgeImpl;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.subworkflow.SubWorkflowNode;
+import org.apache.airavata.workflow.model.graph.system.ConstantNode;
+import org.apache.airavata.workflow.model.graph.system.EndForEachNode;
+import org.apache.airavata.workflow.model.graph.system.EndifNode;
+import org.apache.airavata.workflow.model.graph.system.ForEachNode;
+import org.apache.airavata.workflow.model.graph.system.IfNode;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
+import org.apache.airavata.workflow.model.graph.ws.WSGraph;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
+import org.apache.airavata.workflow.model.graph.ws.WSPort;
+import org.apache.airavata.workflow.model.ode.ODEClient;
+import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.workflow.model.wf.WorkflowExecutionState;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.amazonEC2.gui.AmazonCredential;
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.SubWorkflowComponent;
-import org.apache.airavata.xbaya.component.amazon.InstanceComponent;
-import org.apache.airavata.xbaya.component.amazon.TerminateInstanceComponent;
-import org.apache.airavata.xbaya.component.dynamic.DynamicComponent;
-import org.apache.airavata.xbaya.component.system.ConstantComponent;
-import org.apache.airavata.xbaya.component.system.DifferedInputComponent;
-import org.apache.airavata.xbaya.component.system.EndForEachComponent;
-import org.apache.airavata.xbaya.component.system.EndifComponent;
-import org.apache.airavata.xbaya.component.system.ForEachComponent;
-import org.apache.airavata.xbaya.component.system.IfComponent;
-import org.apache.airavata.xbaya.component.system.InputComponent;
-import org.apache.airavata.xbaya.component.system.MemoComponent;
-import org.apache.airavata.xbaya.component.system.OutputComponent;
-import org.apache.airavata.xbaya.component.system.S3InputComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
import org.apache.airavata.xbaya.concurrent.PredicatedTaskRunner;
-import org.apache.airavata.xbaya.graph.ControlPort;
-import org.apache.airavata.xbaya.graph.DataPort;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.amazon.InstanceNode;
import org.apache.airavata.xbaya.graph.controller.NodeController;
-import org.apache.airavata.xbaya.graph.dynamic.BasicTypeMapping;
-import org.apache.airavata.xbaya.graph.dynamic.DynamicNode;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.impl.EdgeImpl;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
import org.apache.airavata.xbaya.graph.subworkflow.gui.SubWorkflowNodeGUI;
-import org.apache.airavata.xbaya.graph.system.ConstantNode;
-import org.apache.airavata.xbaya.graph.system.EndForEachNode;
-import org.apache.airavata.xbaya.graph.system.EndifNode;
-import org.apache.airavata.xbaya.graph.system.ForEachNode;
-import org.apache.airavata.xbaya.graph.system.IfNode;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
import org.apache.airavata.xbaya.graph.system.gui.DifferedInputHandler;
-import org.apache.airavata.xbaya.graph.ws.WSGraph;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
-import org.apache.airavata.xbaya.graph.ws.WSPort;
import org.apache.airavata.xbaya.gui.Cancelable;
import org.apache.airavata.xbaya.gui.WaitDialog;
import org.apache.airavata.xbaya.invoker.DynamicInvoker;
@@ -105,7 +108,6 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker;
-import org.apache.airavata.xbaya.ode.ODEClient;
import org.apache.airavata.xbaya.provenance.ProvenanceReader;
import org.apache.airavata.xbaya.provenance.ProvenanceWrite;
import org.apache.airavata.xbaya.security.SecurityUtil;
@@ -113,8 +115,6 @@ import org.apache.airavata.xbaya.securit
import org.apache.airavata.xbaya.util.AmazonUtil;
import org.apache.airavata.xbaya.util.InterpreterUtil;
import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.airavata.xbaya.wf.WorkflowExecutionState;
import org.apache.axis2.context.ConfigurationContext;
import org.ietf.jgss.GSSCredential;
import org.xmlpull.infoset.XmlElement;
@@ -273,9 +273,9 @@ public class WorkflowInterpreter {
}
/**
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void scheduleDynamically() throws XBayaException {
+ public void scheduleDynamically() throws WorkflowException {
try {
if (!this.isSubWorkflow
&& this.getWorkflow().getExecutionState() != WorkflowExecutionState.NONE) {
@@ -292,7 +292,7 @@ public class WorkflowInterpreter {
.saveWorkflowExecutionStatus(this.topic,
ExecutionStatus.STARTED);
} catch (RegistryException e) {
- throw new XBayaException(e);
+ throw new WorkflowException(e);
}
}
ArrayList<Node> inputNodes = this.getInputNodesDynamically();
@@ -388,10 +388,10 @@ public class WorkflowInterpreter {
.saveWorkflowExecutionStatus(this.topic,
ExecutionStatus.FINISHED);
} catch (Exception e) {
- throw new XBayaException(e);
+ throw new WorkflowException(e);
}
} catch (Exception e) {
- throw new XBayaException(e);
+ throw new WorkflowException(e);
}
// System.out.println(this.configuration.getJcrComponentRegistry().getRegistry().getWorkflowStatus(this.topic));
}
@@ -404,7 +404,7 @@ public class WorkflowInterpreter {
.saveWorkflowExecutionStatus(this.topic,
ExecutionStatus.FAILED);
} catch (RegistryException e) {
- throw new XBayaException(e);
+ throw new WorkflowException(e);
}
}
}
@@ -450,7 +450,7 @@ public class WorkflowInterpreter {
/**
* @param node
* @return
- * @throws XBayaException
+ * @throws WorkflowException
* @throws java.io.IOException
*/
private boolean readProvenance(Node node) {
@@ -496,7 +496,7 @@ public class WorkflowInterpreter {
return true;
}
} catch (Exception e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
return false;
@@ -504,9 +504,9 @@ public class WorkflowInterpreter {
/**
* @param node
- * @throws XBayaException
+ * @throws WorkflowException
*/
- private void writeProvenanceLater(Node node) throws XBayaException {
+ private void writeProvenanceLater(Node node) throws WorkflowException {
if (node instanceof ForEachNode) {
node = InterpreterUtil.findEndForEachFor((ForEachNode) node);
@@ -542,7 +542,7 @@ public class WorkflowInterpreter {
this.engine.getGUI().getToolbar().getPlayAction()
.actionPerformed(null);
} else {
- throw new XBayaRuntimeException("Cannot pause when not running");
+ throw new WorkflowRuntimeException("Cannot pause when not running");
}
}
}
@@ -562,7 +562,7 @@ public class WorkflowInterpreter {
}
}
- private void sendOutputsDynamically() throws XBayaException {
+ private void sendOutputsDynamically() throws WorkflowException {
ArrayList<Node> outputNodes = getReadyOutputNodesDynamically();
if (outputNodes.size() != 0) {
LinkedList<Object> outputValues = new LinkedList<Object>();
@@ -629,7 +629,7 @@ public class WorkflowInterpreter {
}
}
- private void finish() throws XBayaException {
+ private void finish() throws WorkflowException {
ArrayList<Node> outoutNodes = new ArrayList<Node>();
List<NodeImpl> nodes = this.graph.getNodes();
for (Node node : nodes) {
@@ -704,7 +704,7 @@ public class WorkflowInterpreter {
}
- private void executeDynamically(final Node node) throws XBayaException {
+ private void executeDynamically(final Node node) throws WorkflowException {
NodeController.getGUI(node).setBodyColor(NodeState.EXECUTING.color);
Component component = node.getComponent();
if (component instanceof SubWorkflowComponent) {
@@ -747,7 +747,7 @@ public class WorkflowInterpreter {
}
- private void handleSubWorkComponent(Node node) throws XBayaException {
+ private void handleSubWorkComponent(Node node) throws WorkflowException {
if ((this.mode == GUI_MODE) && (node instanceof SubWorkflowNodeGUI)) {
((SubWorkflowNodeGUI) NodeController.getGUI(node)).openWorkflowTab(this.engine);
}
@@ -795,7 +795,7 @@ public class WorkflowInterpreter {
}
}
- private void handleWSComponent(Node node) throws XBayaException {
+ private void handleWSComponent(Node node) throws WorkflowException {
WSComponent wsComponent = ((WSComponent) node.getComponent());
QName portTypeQName = wsComponent.getPortTypeQName();
Invoker invoker = this.invokerMap.get(node);
@@ -841,7 +841,7 @@ public class WorkflowInterpreter {
wsNode.getID(), null);
}
} catch (URISyntaxException e) {
- throw new XBayaException(e);
+ throw new WorkflowException(e);
}
leadCtxHeader.setServiceId(node.getID());
@@ -857,7 +857,7 @@ public class WorkflowInterpreter {
XBayaSecurity.init();
} catch (URISyntaxException e) {
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
}
/*
@@ -1001,7 +1001,7 @@ public class WorkflowInterpreter {
invoker.invoke();
}
- private void handleDynamicComponent(Node node) throws XBayaException {
+ private void handleDynamicComponent(Node node) throws WorkflowException {
DynamicComponent dynamicComponent = (DynamicComponent) node
.getComponent();
String className = dynamicComponent.getClassName();
@@ -1055,7 +1055,7 @@ public class WorkflowInterpreter {
NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
}
- private void handleForEach(Node node) throws XBayaException {
+ private void handleForEach(Node node) throws WorkflowException {
final ForEachNode forEachNode = (ForEachNode) node;
EndForEachNode endForEachNode = null;
Collection<Node> repeatNodes = node.getOutputPort(0).getToNodes();
@@ -1153,7 +1153,7 @@ public class WorkflowInterpreter {
runInThread(listOfValues, forEachNode,
node1, finalEndForEachNodes,
finalMap, counter, inputNumbers);
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
WorkflowInterpreter.this.engine
.getErrorWindow().error(e);
@@ -1254,7 +1254,7 @@ public class WorkflowInterpreter {
runInThread(listOfValues, forEachNode,
foreachWSNode, finalEndForEachNodes,
finalInvokerMap, counter, inputNumbers);
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
WorkflowInterpreter.this.engine
.getErrorWindow().error(e);
}
@@ -1285,7 +1285,7 @@ public class WorkflowInterpreter {
}
}
- private void handleIf(Node node) throws XBayaException {
+ private void handleIf(Node node) throws WorkflowException {
IfNode ifNode = (IfNode) node;
/*
@@ -1341,7 +1341,7 @@ public class WorkflowInterpreter {
}
}
- private void handleEndIf(Node node) throws XBayaException {
+ private void handleEndIf(Node node) throws WorkflowException {
EndifNode endIfNode = (EndifNode) node;
SystemComponentInvoker invoker = new SystemComponentInvoker();
@@ -1377,7 +1377,7 @@ public class WorkflowInterpreter {
private Invoker createInvokerForEachSingleWSNode(Node foreachWSNode,
String gfacURLString, WSComponent wsComponent)
- throws XBayaException {
+ throws WorkflowException {
Invoker invoker;
String wsdlLocation = InterpreterUtil.getEPR((WSNode) foreachWSNode);
QName portTypeQName = wsComponent.getPortTypeQName();
@@ -1414,7 +1414,7 @@ public class WorkflowInterpreter {
foreachWSNode.getID(), null);
}
} catch (URISyntaxException e) {
- throw new XBayaException(e);
+ throw new WorkflowException(e);
}
invoker = new WorkflowInvokerWrapperForGFacInvoker(
portTypeQName, gfacURLString, this.configuration
@@ -1449,7 +1449,7 @@ public class WorkflowInterpreter {
ForEachNode forEachNode, final Node middleNode,
List<Node> endForEachNodes, Map<Node, Invoker> tempInvoker,
AtomicInteger counter, final Integer[] inputNumber)
- throws XBayaException {
+ throws WorkflowException {
final LinkedList<Invoker> invokerList = new LinkedList<Invoker>();
@@ -1475,7 +1475,7 @@ public class WorkflowInterpreter {
invokeGFacService(listOfValues, middleNode,
inputNumber, input, invoker2);
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
WorkflowInterpreter.this.engine.getErrorWindow()
.error(e);
}
@@ -1581,7 +1581,7 @@ public class WorkflowInterpreter {
private void invokeGFacService(LinkedList<String> listOfValues,
Node middleNode, Integer[] inputNumber, String input,
- Invoker invoker) throws XBayaException {
+ Invoker invoker) throws WorkflowException {
// find inputs
List<DataPort> inputPorts = middleNode.getInputPorts();
@@ -1615,7 +1615,7 @@ public class WorkflowInterpreter {
}
private Invoker getInvoker(Node middleNode, Invoker invoker)
- throws XBayaException {
+ throws WorkflowException {
if (middleNode instanceof WSNode) {
WSComponent wsComponent = (WSComponent) middleNode.getComponent();
invoker.setup();
@@ -1626,7 +1626,7 @@ public class WorkflowInterpreter {
// TODO : Need to create a invoker!
// new WorkflowInterpreter()
} else {
- throw new XBayaRuntimeException(
+ throw new WorkflowRuntimeException(
"Only Web services and subworkflows are supported for For-Each : Found : "
+ middleNode);
}
@@ -1636,7 +1636,7 @@ public class WorkflowInterpreter {
private List<String> createInputValues(LinkedList<String> listOfValues,
- Integer[] inputNumbers) throws XBayaException {
+ Integer[] inputNumbers) throws WorkflowException {
List<String> inputValues = null;
try {
inputValues = new ArrayList<String>();
@@ -1690,7 +1690,7 @@ public class WorkflowInterpreter {
}
} catch (ArrayIndexOutOfBoundsException e) {
- throw new XBayaException("Wrong number of Inputs to For EachNode");
+ throw new WorkflowException("Wrong number of Inputs to For EachNode");
}
return inputValues;
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -27,30 +27,30 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.graph.EPRPort;
+import org.apache.airavata.workflow.model.graph.Edge;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSGraph;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.NotificationHandler;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.airavata.wsmg.client.msgbox.MessagePuller;
import org.apache.airavata.xbaya.XBayaConfiguration;
-import org.apache.airavata.xbaya.graph.EPRPort;
-import org.apache.airavata.xbaya.graph.Edge;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.Port;
import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSGraph;
import org.apache.airavata.xbaya.monitor.MonitorEvent;
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.monitor.MonitorUtil;
import org.apache.airavata.xbaya.monitor.MonitorUtil.EventType;
import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.addressing.EndpointReference;
import org.slf4j.Logger;
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -34,18 +34,18 @@ import org.apache.airavata.commons.gfac.
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.airavata.schemas.gfac.HostDescriptionType;
import org.apache.airavata.schemas.wec.ContextHeaderDocument;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.ode.ODEClient;
+import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
import org.apache.airavata.xbaya.concurrent.PredicatedTaskRunner;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.monitor.MonitorException;
-import org.apache.airavata.xbaya.ode.ODEClient;
-import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.proxy.WorkflowContext;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
@@ -238,7 +238,7 @@ public class WorkflowInterpretorSkeleton
}
}
if (inputNode.getDefaultValue() == null) {
- throw new XBayaRuntimeException("Could not find a input value for component with name :" + inputNode.getName());
+ throw new WorkflowRuntimeException("Could not find a input value for component with name :" + inputNode.getName());
}
}
@@ -250,7 +250,7 @@ public class WorkflowInterpretorSkeleton
conf.setTopic(topic);
conf.setRunWithCrossProduct(true);
} catch (URISyntaxException e1) {
- throw new XBayaRuntimeException(e1);
+ throw new WorkflowRuntimeException(e1);
}
WorkflowInterpretorEventListener listener = null;
WorkflowInterpreter interpreter = null;
@@ -303,8 +303,8 @@ public class WorkflowInterpretorSkeleton
try {
interpreter.scheduleDynamically();
System.err.println("Called the interpreter");
- } catch (XBayaException e) {
- throw new XBayaRuntimeException(e);
+ } catch (WorkflowException e) {
+ throw new WorkflowRuntimeException(e);
} finally {
/*
* stop listener no matter what happens
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.xbaya.invoker;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +61,7 @@ public class AsynchronousInvoker extends
* @see org.apache.airavata.xbaya.invoker.SimpleInvoker#setup()
*/
@Override
- public void setup() throws XBayaException {
+ public void setup() throws WorkflowException {
super.setup();
/* Set the output message to null to set teh output from async Listener */
WSIFAsyncResponsesCorrelator correlator;
@@ -76,7 +76,7 @@ public class AsynchronousInvoker extends
this.client.useAsyncMessaging(correlator);
}
- public boolean invoke() throws XBayaException {
+ public boolean invoke() throws WorkflowException {
final WSIFOperation operation = this.getOperation();
final WSIFMessage inputMessage = this.getInputMessage();
this.setOutputMessage(null);
@@ -98,7 +98,7 @@ public class AsynchronousInvoker extends
return true;
} catch (RuntimeException e) {
String message = "Error in invoking a service.";
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java Thu May 17 16:39:54 2012
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import xsul.wsif.WSIFMessage;
import xsul.xwsif_runtime.WSIFClient;
@@ -59,7 +59,7 @@ public class DynamicInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#getOutput(java.lang.String)
*/
- public Object getOutput(String name) throws XBayaException {
+ public Object getOutput(String name) throws WorkflowException {
waitToFinish();
return result;
}
@@ -67,7 +67,7 @@ public class DynamicInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#invoke()
*/
- public boolean invoke() throws XBayaException {
+ public boolean invoke() throws WorkflowException {
try {
Class<?> targetClass = Class.forName(this.className);
Object obj = targetClass.newInstance();
@@ -81,14 +81,14 @@ public class DynamicInvoker implements I
}
}
if (targetMethod == null) {
- throw new XBayaException("Could not find the method using reflection: " + this.operationName);
+ throw new WorkflowException("Could not find the method using reflection: " + this.operationName);
}
targetMethod.setAccessible(true);
this.result = targetMethod.invoke(obj, inputs);
} catch (Exception e) {
- throw new XBayaException(e);
+ throw new WorkflowException(e);
}
return true;
}
@@ -96,21 +96,21 @@ public class DynamicInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setInput(java.lang.String, java.lang.Object)
*/
- public void setInput(String name, Object value) throws XBayaException {
+ public void setInput(String name, Object value) throws WorkflowException {
}
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setOperation(java.lang.String)
*/
- public void setOperation(String operationName) throws XBayaException {
+ public void setOperation(String operationName) throws WorkflowException {
this.operationName = operationName;
}
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#setup()
*/
- public void setup() throws XBayaException {
+ public void setup() throws WorkflowException {
Class[] parameters = new Class[] { URL.class };
URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
Class sysclass = URLClassLoader.class;
@@ -121,14 +121,14 @@ public class DynamicInvoker implements I
method.invoke(sysloader, new Object[] { this.jarUrl });
} catch (Throwable t) {
t.printStackTrace();
- throw new XBayaException("Error, could not add URL to system classloader");
+ throw new WorkflowException("Error, could not add URL to system classloader");
}
}
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#waitToFinish()
*/
- public void waitToFinish() throws XBayaException {
+ public void waitToFinish() throws WorkflowException {
while (this.result == null) {
try {
Thread.sleep(200);
@@ -143,7 +143,7 @@ public class DynamicInvoker implements I
/**
* @see org.apache.airavata.xbaya.invoker.WorkflowInvoker#getOutputs()
*/
- public WSIFMessage getOutputs() throws XBayaException {
+ public WSIFMessage getOutputs() throws WorkflowException {
waitToFinish();
return (WSIFMessage) this.result;
@@ -155,12 +155,12 @@ public class DynamicInvoker implements I
}
@Override
- public WSIFMessage getInputs() throws XBayaException {
+ public WSIFMessage getInputs() throws WorkflowException {
return null;
}
@Override
- public WSIFMessage getFault() throws XBayaException {
+ public WSIFMessage getFault() throws WorkflowException {
return null;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java Thu May 17 16:39:54 2012
@@ -26,7 +26,7 @@ import java.net.URI;
import javax.xml.namespace.QName;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.xbaya.invoker.factory.InvokerFactory;
import xsul.wsdl.WsdlDefinitions;
@@ -53,7 +53,7 @@ public class DynamicServiceCreator {
this.dynamicFactoryWSDLLocation = dynamicFactoryWSDLLocation;
}
- public void createService(String code) throws XBayaException {
+ public void createService(String code) throws WorkflowException {
try {
WsdlDefinitions definitions = null;
if (this.dynamicFactoryWSDLLocation != null && !this.dynamicFactoryWSDLLocation.equals("")) {
@@ -73,12 +73,12 @@ public class DynamicServiceCreator {
invoker.invoke();
invoker.getOutput("return");
} catch (Exception e) {
- throw new XBayaException(e);
+ throw new WorkflowException(e);
}
}
- public static void main(String[] args) throws XBayaException {
+ public static void main(String[] args) throws WorkflowException {
DynamicServiceCreator c = new DynamicServiceCreator("http://127.0.0.1:8080/axis2/services/ServiceCreator?wsdl");
c.createService(classStr);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Thu May 17 16:39:54 2012
@@ -34,9 +34,9 @@ import org.apache.airavata.core.gfac.uti
import org.apache.airavata.registry.api.AiravataRegistry;
import org.apache.airavata.schemas.gfac.Parameter;
import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.XBayaConfiguration;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
import org.apache.axiom.om.OMAbstractFactory;
@@ -199,22 +199,22 @@ public class EmbeddedGFacInvoker impleme
/**
*
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setup() throws XBayaException {
+ public void setup() throws WorkflowException {
this.notifier.setServiceID(this.nodeID);
}
- private void setup(WsdlDefinitions definitions) throws XBayaException {
+ private void setup(WsdlDefinitions definitions) throws WorkflowException {
}
/**
*
* @param operationName
* The name of the operation
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setOperation(String operationName) throws XBayaException {
+ public void setOperation(String operationName) throws WorkflowException {
}
/**
@@ -223,9 +223,9 @@ public class EmbeddedGFacInvoker impleme
* The name of the input parameter
* @param value
* The value of the input parameter
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public void setInput(String name, Object value) throws XBayaException {
+ public void setInput(String name, Object value) throws WorkflowException {
try {
if (value instanceof XmlElement) {
logger.info("value: " + XMLUtil.xmlElementToString((XmlElement) value));
@@ -245,12 +245,12 @@ public class EmbeddedGFacInvoker impleme
logger.error(e.getMessage(), e);
String message = "Error in setting an input. name: " + name + " value: " + value;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (RegistryException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
} catch (Exception e) {
@@ -261,9 +261,9 @@ public class EmbeddedGFacInvoker impleme
/**
*
* @return
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public synchronized boolean invoke() throws XBayaException {
+ public synchronized boolean invoke() throws WorkflowException {
try {
ExecutorService executor = Executors.newSingleThreadExecutor();
this.result = executor.submit(new Callable<Boolean>() {
@@ -308,12 +308,12 @@ public class EmbeddedGFacInvoker impleme
EmbeddedGFacInvoker.this.failerSent = true;
}
return true;
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
EmbeddedGFacInvoker.this.notifier.invocationFailed(e.getMessage(), e);
EmbeddedGFacInvoker.this.failerSent = true;
- throw new XBayaRuntimeException(e);
+ throw new WorkflowRuntimeException(e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + EmbeddedGFacInvoker.this.serviceInformation;
@@ -349,18 +349,18 @@ public class EmbeddedGFacInvoker impleme
// already.
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Exception e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
@@ -369,10 +369,10 @@ public class EmbeddedGFacInvoker impleme
/**
*
- * @throws XBayaException
+ * @throws WorkflowException
*/
@SuppressWarnings("boxing")
- public synchronized void waitToFinish() throws XBayaException {
+ public synchronized void waitToFinish() throws WorkflowException {
try {
while (this.result == null) {
// The job is not submitted yet.
@@ -391,7 +391,7 @@ public class EmbeddedGFacInvoker impleme
// WSIFMessageElement, implements toString(), which
// serialize the message XML.
message += faultMessage.toString();
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
} catch (InterruptedException e) {
logger.error(e.getMessage(), e);
@@ -399,17 +399,17 @@ public class EmbeddedGFacInvoker impleme
// The service-failed notification should have been sent already.
logger.error(e.getMessage(), e);
String message = "Error in invoking a service: " + this.serviceInformation;
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (RuntimeException e) {
logger.error(e.getMessage(), e);
String message = "Error while waiting for a service to finish: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
@@ -418,13 +418,13 @@ public class EmbeddedGFacInvoker impleme
* @param name
* The name of the output parameter
* @return
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public Object getOutput(String name) throws XBayaException {
+ public Object getOutput(String name) throws WorkflowException {
try {
waitToFinish();
return outPut;
- } catch (XBayaException e) {
+ } catch (WorkflowException e) {
logger.error(e.getMessage(), e);
// An appropriate message has been set in the exception.
if (!this.failerSent) {
@@ -435,21 +435,21 @@ public class EmbeddedGFacInvoker impleme
logger.error(e.getMessage(), e);
String message = "Error while waiting for a output: " + name;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
} catch (Error e) {
logger.error(e.getMessage(), e);
String message = "Unexpected error: " + this.serviceInformation;
this.notifier.invocationFailed(message, e);
- throw new XBayaException(message, e);
+ throw new WorkflowException(message, e);
}
}
/**
*
* @return
- * @throws XBayaException
+ * @throws WorkflowException
*/
- public WSIFMessage getOutputs() throws XBayaException {
+ public WSIFMessage getOutputs() throws WorkflowException {
return this.invoker.getOutputs();
}
@@ -459,12 +459,12 @@ public class EmbeddedGFacInvoker impleme
}
@Override
- public WSIFMessage getInputs() throws XBayaException {
+ public WSIFMessage getInputs() throws WorkflowException {
return null;
}
@Override
- public WSIFMessage getFault() throws XBayaException {
+ public WSIFMessage getFault() throws WorkflowException {
return null;
}
}
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=1339699&r1=1339698&r2=1339699&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 Thu May 17 16:39:54 2012
@@ -27,7 +27,7 @@ import java.util.UUID;
import javax.xml.namespace.QName;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.xbaya.invoker.factory.InvokerFactory;
import org.apache.airavata.xbaya.lead.NotificationHandler;
import org.slf4j.Logger;
@@ -81,16 +81,16 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#setup()
*/
- public void setup() throws XBayaException {
+ public void setup() throws WorkflowException {
if (this.gfacURL == null) {
String message = "The location of the Generic Factory is not specified.";
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
if (this.portTypeQName == null) {
String message = "Error in finding the service name";
- throw new XBayaException(message);
+ throw new WorkflowException(message);
}
try {
@@ -114,10 +114,10 @@ public class GFacInvoker implements Invo
this.invoker = InvokerFactory.createInvoker(this.portTypeQName, concreteWSDL, null, this.messageBoxURL,
null, true);
this.invoker.setup();
- } catch (XBayaException xe) {
+ } catch (WorkflowException xe) {
throw xe;
} catch (Exception e) {
- throw new XBayaException(e.getMessage(), e);
+ throw new WorkflowException(e.getMessage(), e);
}
}
@@ -130,33 +130,33 @@ public class GFacInvoker implements Invo
}
/**
- * @throws XBayaException
+ * @throws WorkflowException
* @see org.apache.airavata.xbaya.invoker.Invoker#setOperation(java.lang.String)
*/
- public void setOperation(String operationName) throws XBayaException {
+ public void setOperation(String operationName) throws WorkflowException {
this.invoker.setOperation(operationName);
}
/**
- * @throws XBayaException
+ * @throws WorkflowException
* @see org.apache.airavata.xbaya.invoker.Invoker#setInput(java.lang.String, java.lang.Object)
*/
- public void setInput(String name, Object value) throws XBayaException {
+ public void setInput(String name, Object value) throws WorkflowException {
this.invoker.setInput(name, value);
}
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getInputs()
*/
- public WSIFMessage getInputs() throws XBayaException {
+ public WSIFMessage getInputs() throws WorkflowException {
return this.invoker.getInputs();
}
/**
- * @throws XBayaException
+ * @throws WorkflowException
* @see org.apache.airavata.xbaya.invoker.Invoker#invoke()
*/
- public boolean invoke() throws XBayaException {
+ public boolean invoke() throws WorkflowException {
WSIFClient client = invoker.getClient();
// FIXME: Temporary fix
@@ -176,23 +176,23 @@ public class GFacInvoker implements Invo
/**
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutputs()
*/
- public WSIFMessage getOutputs() throws XBayaException {
+ public WSIFMessage getOutputs() throws WorkflowException {
return this.invoker.getOutputs();
}
/**
- * @throws XBayaException
+ * @throws WorkflowException
* @see org.apache.airavata.xbaya.invoker.Invoker#getOutput(java.lang.String)
*/
- public Object getOutput(String name) throws XBayaException {
+ public Object getOutput(String name) throws WorkflowException {
return this.invoker.getOutput(name);
}
/**
- * @throws XBayaException
+ * @throws WorkflowException
* @see org.apache.airavata.xbaya.invoker.Invoker#getFault()
*/
- public WSIFMessage getFault() throws XBayaException {
+ public WSIFMessage getFault() throws WorkflowException {
return this.invoker.getFault();
}