airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1339699 [4/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...
Date Thu, 17 May 2012 16:40:14 GMT
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/S3InputNode.java Thu May 17 16:39:54 2012
@@ -19,25 +19,25 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.system;
+package org.apache.airavata.workflow.model.graph.system;
 
 import java.util.List;
 
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.WSConstants;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.system.S3InputComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.graph.DataEdge;
-import org.apache.airavata.xbaya.graph.DataPort;
-import org.apache.airavata.xbaya.graph.Edge;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.ws.WSPort;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.system.S3InputComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.DataEdge;
+import org.apache.airavata.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.Edge;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.ws.WSPort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
@@ -70,7 +70,7 @@ public class S3InputNode extends InputNo
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#getComponent()
      */
     @Override
     public Component getComponent() {
@@ -160,7 +160,7 @@ public class S3InputNode extends InputNo
      * 
      * @throws GraphException
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#edgeWasAdded(org.apache.airavata.xbaya.graph.impl.EdgeImpl)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#edgeWasAdded(org.apache.airavata.workflow.model.graph.impl.EdgeImpl)
      */
     @Override
     protected void edgeWasAdded(Edge edge) throws GraphException {
@@ -190,7 +190,7 @@ public class S3InputNode extends InputNo
 
             } else {
                 // Should not happen.
-                throw new XBayaRuntimeException("edges.size(): " + edges.size());
+                throw new WorkflowRuntimeException("edges.size(): " + edges.size());
             }
         }
     }
@@ -198,7 +198,7 @@ public class S3InputNode extends InputNo
     /**
      * Called whan an Edge was removed from the parameter port. Change the name of the node.
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#edgeWasRemoved(org.apache.airavata.xbaya.graph.impl.EdgeImpl)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#edgeWasRemoved(org.apache.airavata.workflow.model.graph.impl.EdgeImpl)
      */
     @Override
     protected void edgeWasRemoved(Edge removedEdge) {
@@ -231,7 +231,7 @@ public class S3InputNode extends InputNo
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.system.SystemNode#portTypeChanged(org.apache.airavata.xbaya.graph.system.SystemDataPort)
+     * @see org.apache.airavata.workflow.model.graph.system.SystemNode#portTypeChanged(org.apache.airavata.workflow.model.graph.system.SystemDataPort)
      */
     @Override
     protected void portTypeChanged(SystemDataPort port) throws GraphException {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/StreamSourceNode.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/StreamSourceNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/StreamSourceNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/StreamSourceNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/StreamSourceNode.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/StreamSourceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/StreamSourceNode.java Thu May 17 16:39:54 2012
@@ -19,17 +19,17 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.system;
+package org.apache.airavata.workflow.model.graph.system;
 
 import java.awt.Point;
 import java.util.ArrayList;
 
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.StreamSourceComponent;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.StreamSourceComponent;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
+import org.apache.airavata.workflow.model.graph.Port;
 import org.apache.axiom.om.util.UUIDGenerator;
 import org.xmlpull.infoset.XmlElement;
 
@@ -63,7 +63,7 @@ public class StreamSourceNode extends Pa
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#getComponent()
      */
     @Override
     public Component getComponent() {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemDataPort.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemDataPort.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemDataPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemDataPort.java Thu May 17 16:39:54 2012
@@ -19,18 +19,18 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.system;
+package org.apache.airavata.workflow.model.graph.system;
 
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.WSConstants;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.graph.DataEdge;
-import org.apache.airavata.xbaya.graph.DataPort;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.ws.WSPort;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.DataEdge;
+import org.apache.airavata.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
+import org.apache.airavata.workflow.model.graph.ws.WSPort;
 import org.xmlpull.infoset.XmlElement;
 
 public class SystemDataPort extends DataPort {
@@ -60,7 +60,7 @@ public class SystemDataPort extends Data
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.PortImpl#getNode()
+     * @see org.apache.airavata.workflow.model.graph.impl.PortImpl#getNode()
      */
     @Override
     public SystemNode getNode() {
@@ -104,7 +104,7 @@ public class SystemDataPort extends Data
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.DataPort#copyType(org.apache.airavata.xbaya.graph.DataPort)
+     * @see org.apache.airavata.workflow.model.graph.DataPort#copyType(org.apache.airavata.workflow.model.graph.DataPort)
      */
     @Override
     public void copyType(DataPort port) throws GraphException {
@@ -143,7 +143,7 @@ public class SystemDataPort extends Data
                     DataPort toPort = edge.getToPort();
                     toPort.copyType(this);
                 } else {
-                    throw new XBayaRuntimeException();
+                    throw new WorkflowRuntimeException();
                 }
             }
         }
@@ -159,7 +159,7 @@ public class SystemDataPort extends Data
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.PortImpl#toXML()
+     * @see org.apache.airavata.workflow.model.graph.impl.PortImpl#toXML()
      */
     @Override
     protected XmlElement toXML() {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemNode.java (from r1339684, 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/workflow/model/graph/system/SystemNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/system/SystemNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemNode.java&r1=1339684&r2=1339699&rev=1339699&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/workflow/model/graph/system/SystemNode.java Thu May 17 16:39:54 2012
@@ -19,22 +19,22 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.system;
+package org.apache.airavata.workflow.model.graph.system;
 
 import java.util.List;
 
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.graph.DataEdge;
-import org.apache.airavata.xbaya.graph.DataPort;
-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.GraphException;
-import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.DataEdge;
+import org.apache.airavata.workflow.model.graph.DataPort;
+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.GraphException;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
 import org.apache.airavata.common.utils.WSConstants;
 import org.xmlpull.infoset.XmlElement;
 
@@ -61,7 +61,7 @@ public abstract class SystemNode extends
 
     /**
      * @throws GraphException
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#edgeWasAdded(org.apache.airavata.xbaya.graph.Edge)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#edgeWasAdded(org.apache.airavata.workflow.model.graph.Edge)
      */
     @Override
     protected void edgeWasAdded(Edge edge) throws GraphException {
@@ -92,13 +92,13 @@ public abstract class SystemNode extends
                     toDataPort.copyType(fromDataPort);
                 }
             } else {
-                throw new XBayaRuntimeException();
+                throw new WorkflowRuntimeException();
             }
         }
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#edgeWasRemoved(org.apache.airavata.xbaya.graph.Edge)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#edgeWasRemoved(org.apache.airavata.workflow.model.graph.Edge)
      */
     @Override
     protected void edgeWasRemoved(Edge removedEdge) {
@@ -117,7 +117,7 @@ public abstract class SystemNode extends
                 GraphUtil.propagateTypes(getGraph());
             } catch (GraphException e) {
                 // this should not happen.
-                throw new XBayaRuntimeException(e);
+                throw new WorkflowRuntimeException(e);
             }
         }
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/util/GraphUtil.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.util;
+package org.apache.airavata.workflow.model.graph.util;
 
 import java.awt.Point;
 import java.util.ArrayList;
@@ -36,30 +36,30 @@ import java.util.Set;
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.WSConstants;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.SubWorkflowComponent;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.ControlEdge;
+import org.apache.airavata.workflow.model.graph.ControlPort;
+import org.apache.airavata.workflow.model.graph.DataEdge;
+import org.apache.airavata.workflow.model.graph.DataPort;
+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.GraphException;
+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.subworkflow.SubWorkflowNode;
+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.system.StreamSourceNode;
+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.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.SubWorkflowComponent;
-import org.apache.airavata.xbaya.graph.ControlEdge;
-import org.apache.airavata.xbaya.graph.ControlPort;
-import org.apache.airavata.xbaya.graph.DataEdge;
-import org.apache.airavata.xbaya.graph.DataPort;
-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.GraphException;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
-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.ErrorMessages;
-import org.apache.airavata.xbaya.wf.Workflow;
 
 public class GraphUtil {
 	// private static final MLogger logger = MLogger.getLogger();
@@ -334,7 +334,7 @@ public class GraphUtil {
 				} else if (toPort == wsPort) {
 					fromPort.copyType(wsPort);
 				} else {
-					throw new XBayaRuntimeException();
+					throw new WorkflowRuntimeException();
 				}
 			}
 		}
@@ -365,10 +365,10 @@ public class GraphUtil {
 	 */
 	public static String isSameLabeledInput(Node node) {
 		if (!isAllInputsConnected(node)) {
-			throw new XBayaRuntimeException("Node inputs not connected" + node);
+			throw new WorkflowRuntimeException("Node inputs not connected" + node);
 		}
 		if (!isAllInputsLabeled(node)) {
-			throw new XBayaRuntimeException(
+			throw new WorkflowRuntimeException(
 					"Some or all of the node inputs not labeled" + node);
 		}
 		List<DataPort> inputPorts = node.getInputPorts();
@@ -433,10 +433,10 @@ public class GraphUtil {
      */
 	public static String getEncodedInputLabels(Node node) {
 		if (!isAllInputsConnected(node)) {
-			throw new XBayaRuntimeException("Node inputs not connected" + node);
+			throw new WorkflowRuntimeException("Node inputs not connected" + node);
 		}
 		if (!isAllInputsLabeled(node)) {
-			throw new XBayaRuntimeException(
+			throw new WorkflowRuntimeException(
 					"Some or all of the node inputs not labeled" + node);
 		}
 		List<DataPort> inputPorts = node.getInputPorts();

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraph.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraph.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraph.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraph.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraph.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.ws;
+package org.apache.airavata.workflow.model.graph.ws;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,16 +28,16 @@ import java.util.List;
 
 import org.apache.airavata.common.exception.UtilsException;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.graph.DataEdge;
-import org.apache.airavata.xbaya.graph.DataPort;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphFactory;
-import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.impl.EdgeImpl;
-import org.apache.airavata.xbaya.graph.impl.GraphImpl;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.DataEdge;
+import org.apache.airavata.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphFactory;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.impl.EdgeImpl;
+import org.apache.airavata.workflow.model.graph.impl.GraphImpl;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
 import org.xmlpull.infoset.XmlElement;
 
 public class WSGraph extends GraphImpl {
@@ -116,7 +116,7 @@ public class WSGraph extends GraphImpl {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.GraphImpl#toXML(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.impl.GraphImpl#toXML(org.xmlpull.infoset.XmlElement)
      */
     @Override
     protected void toXML(XmlElement graphElement) {
@@ -153,7 +153,7 @@ public class WSGraph extends GraphImpl {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.GraphImpl#parse(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.impl.GraphImpl#parse(org.xmlpull.infoset.XmlElement)
      */
     @Override
     protected void parse(XmlElement graphElement) throws GraphException {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSGraphFactory.java Thu May 17 16:39:54 2012
@@ -19,42 +19,42 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.ws;
+package org.apache.airavata.workflow.model.graph.ws;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.airavata.common.utils.IOUtil;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.graph.ControlEdge;
-import org.apache.airavata.xbaya.graph.ControlPort;
-import org.apache.airavata.xbaya.graph.DataEdge;
-import org.apache.airavata.xbaya.graph.EPRPort;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphFactory;
-import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.Port.Kind;
-import org.apache.airavata.xbaya.graph.amazon.InstanceDataPort;
-import org.apache.airavata.xbaya.graph.amazon.InstanceNode;
-import org.apache.airavata.xbaya.graph.amazon.TerminateInstanceNode;
-import org.apache.airavata.xbaya.graph.impl.EdgeImpl;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.impl.PortImpl;
-import org.apache.airavata.xbaya.graph.system.BlockNode;
-import org.apache.airavata.xbaya.graph.system.ConstantNode;
-import org.apache.airavata.xbaya.graph.system.EndBlockNode;
-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.MemoNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.system.ReceiveNode;
-import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
-import org.apache.airavata.xbaya.graph.system.SystemDataPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.ControlEdge;
+import org.apache.airavata.workflow.model.graph.ControlPort;
+import org.apache.airavata.workflow.model.graph.DataEdge;
+import org.apache.airavata.workflow.model.graph.EPRPort;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphFactory;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.Port.Kind;
+import org.apache.airavata.workflow.model.graph.amazon.InstanceDataPort;
+import org.apache.airavata.workflow.model.graph.amazon.InstanceNode;
+import org.apache.airavata.workflow.model.graph.amazon.TerminateInstanceNode;
+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.impl.PortImpl;
+import org.apache.airavata.workflow.model.graph.system.BlockNode;
+import org.apache.airavata.workflow.model.graph.system.ConstantNode;
+import org.apache.airavata.workflow.model.graph.system.EndBlockNode;
+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.MemoNode;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
+import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
+import org.apache.airavata.workflow.model.graph.system.StreamSourceNode;
+import org.apache.airavata.workflow.model.graph.system.SystemDataPort;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.xmlpull.infoset.XmlElement;
 
@@ -117,7 +117,7 @@ public class WSGraphFactory implements G
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.GraphFactory#createNode(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.GraphFactory#createNode(org.xmlpull.infoset.XmlElement)
      */
     public NodeImpl createNode(XmlElement nodeElement) throws GraphException {
         String type = nodeElement.attributeValue(GraphSchema.NS, GraphSchema.NODE_TYPE_ATTRIBUTE);
@@ -167,7 +167,7 @@ public class WSGraphFactory implements G
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.GraphFactory#createPort(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.GraphFactory#createPort(org.xmlpull.infoset.XmlElement)
      */
     public PortImpl createPort(XmlElement portElement) {
         String type = portElement.attributeValue(GraphSchema.NS, GraphSchema.PORT_TYPE_ATTRIBUTE);
@@ -194,15 +194,15 @@ public class WSGraphFactory implements G
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.GraphFactory#createEdge(org.apache.airavata.xbaya.graph.Port,
-     *      org.apache.airavata.xbaya.graph.Port)
+     * @see org.apache.airavata.workflow.model.graph.GraphFactory#createEdge(org.apache.airavata.workflow.model.graph.Port,
+     *      org.apache.airavata.workflow.model.graph.Port)
      */
     public EdgeImpl createEdge(Port fromPort, Port toPort) {
         Kind fromKind = fromPort.getKind();
         Kind toKind = toPort.getKind();
         if (!((fromKind == Kind.DATA_OUT && toKind == Kind.DATA_IN)
                 || (fromKind == Kind.CONTROL_OUT && toKind == Kind.CONTROL_IN) || (fromKind == Kind.EPR && toKind == Kind.DATA_IN))) {
-            throw new XBayaRuntimeException();
+            throw new WorkflowRuntimeException();
         }
         EdgeImpl edge;
         if (toKind == Kind.DATA_IN) {
@@ -211,13 +211,13 @@ public class WSGraphFactory implements G
             edge = new ControlEdge();
         } else {
             // Should not happen.
-            throw new XBayaRuntimeException();
+            throw new WorkflowRuntimeException();
         }
         return edge;
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.GraphFactory#createEdge(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.GraphFactory#createEdge(org.xmlpull.infoset.XmlElement)
      */
     public EdgeImpl createEdge(XmlElement edgeElement) {
         String type = edgeElement.attributeValue(GraphSchema.NS, GraphSchema.EDGE_TYPE_ATTRIBUTE);

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSNode.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSNode.java Thu May 17 16:39:54 2012
@@ -19,20 +19,20 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.ws;
+package org.apache.airavata.workflow.model.graph.ws;
 
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponentFactory;
-import org.apache.airavata.xbaya.graph.Edge;
-import org.apache.airavata.xbaya.graph.ForEachExecutableNode;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponentFactory;
+import org.apache.airavata.workflow.model.graph.Edge;
+import org.apache.airavata.workflow.model.graph.ForEachExecutableNode;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.xmlpull.infoset.XmlElement;
 
@@ -64,7 +64,7 @@ public class WSNode extends NodeImpl imp
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getComponent()
+     * @see org.apache.airavata.workflow.model.graph.Node#getComponent()
      */
     @Override
     public WSComponent getComponent() {
@@ -119,7 +119,7 @@ public class WSNode extends NodeImpl imp
 
     /**
      * @throws GraphException
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#edgeWasAdded(org.apache.airavata.xbaya.graph.Edge)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#edgeWasAdded(org.apache.airavata.workflow.model.graph.Edge)
      */
     @Override
     protected void edgeWasAdded(Edge edge) throws GraphException {
@@ -148,7 +148,7 @@ public class WSNode extends NodeImpl imp
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#parse(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#parse(org.xmlpull.infoset.XmlElement)
      */
     @Override
     protected void parse(XmlElement nodeElement) throws GraphException {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSPort.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSPort.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WSPort.java Thu May 17 16:39:54 2012
@@ -19,20 +19,20 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.ws;
+package org.apache.airavata.workflow.model.graph.ws;
 
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.WSConstants;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.component.system.SystemComponentDataPort;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.graph.DataPort;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.system.EndForEachNode;
-import org.apache.airavata.xbaya.graph.system.ForEachNode;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+import org.apache.airavata.workflow.model.component.system.SystemComponentDataPort;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.system.EndForEachNode;
+import org.apache.airavata.workflow.model.graph.system.ForEachNode;
 import org.xmlpull.infoset.XmlElement;
 
 public class WSPort extends DataPort {
@@ -66,7 +66,7 @@ public class WSPort extends DataPort {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.DataPort#copyType(org.apache.airavata.xbaya.graph.DataPort)
+     * @see org.apache.airavata.workflow.model.graph.DataPort#copyType(org.apache.airavata.workflow.model.graph.DataPort)
      */
     @Override
     public void copyType(DataPort port) throws GraphException {
@@ -98,7 +98,7 @@ public class WSPort extends DataPort {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.PortImpl#getComponentPort()
+     * @see org.apache.airavata.workflow.model.graph.impl.PortImpl#getComponentPort()
      */
     @Override
     public WSComponentPort getComponentPort() {
@@ -117,7 +117,7 @@ public class WSPort extends DataPort {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.PortImpl#toXML()
+     * @see org.apache.airavata.workflow.model.graph.impl.PortImpl#toXML()
      */
     @Override
     protected XmlElement toXML() {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WorkflowNode.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WorkflowNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WorkflowNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WorkflowNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WorkflowNode.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WorkflowNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ws/WorkflowNode.java Thu May 17 16:39:54 2012
@@ -19,12 +19,12 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.ws;
+package org.apache.airavata.workflow.model.graph.ws;
 
-import org.apache.airavata.xbaya.component.ws.WorkflowComponent;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphSchema;
+import org.apache.airavata.workflow.model.component.ws.WorkflowComponent;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
 import org.xmlpull.infoset.XmlElement;
 
 public class WorkflowNode extends WSNode {
@@ -49,7 +49,7 @@ public class WorkflowNode extends WSNode
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.ws.WSNode#getComponent()
+     * @see org.apache.airavata.workflow.model.graph.ws.WSNode#getComponent()
      */
     @Override
     public WorkflowComponent getComponent() {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEBPELTransformer.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEBPELTransformer.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEBPELTransformer.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEBPELTransformer.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEBPELTransformer.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEBPELTransformer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEBPELTransformer.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.workflow.model.ode;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -27,7 +27,7 @@ import java.util.Map;
 
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
 import org.apache.airavata.common.utils.StringUtil;
 import org.gpel.model.GpelActivity;
 import org.gpel.model.GpelAssign;
@@ -201,7 +201,7 @@ public class ODEBPELTransformer {
             }
         }
 
-        throw new XBayaRuntimeException("Cannot locate the Namespace  for Qname:" + messageQname + " in the BPEL");
+        throw new WorkflowRuntimeException("Cannot locate the Namespace  for Qname:" + messageQname + " in the BPEL");
     }
 
     /**
@@ -239,7 +239,7 @@ public class ODEBPELTransformer {
 
             }
         }
-        throw new XBayaRuntimeException("Unable to find the Message for the PortType " + portType + " operation:"
+        throw new WorkflowRuntimeException("Unable to find the Message for the PortType " + portType + " operation:"
                 + opName);
     }
 
@@ -252,7 +252,7 @@ public class ODEBPELTransformer {
                 return gpelVariable;
             }
         }
-        throw new XBayaRuntimeException("Unable to fine the variable :" + variable + "  in the BPEL variables "
+        throw new WorkflowRuntimeException("Unable to fine the variable :" + variable + "  in the BPEL variables "
                 + variables);
     }
 
@@ -418,7 +418,7 @@ public class ODEBPELTransformer {
                 evaluateFlowAndSequenceForAddingInits(wsdls, workflowWSDL, next, list);
             } else if (isInvoke(next) || isReply(next)) {
                 if (last == null || !isAssign(last)) {
-                    throw new XBayaRuntimeException("Assign activity not found for the Invoke "
+                    throw new WorkflowRuntimeException("Assign activity not found for the Invoke "
                             + next.xmlStringPretty());
                 }
 
@@ -430,7 +430,7 @@ public class ODEBPELTransformer {
                 String portTypeattr = next.xml().attributeValue(PORT_TYPE_STR);
                 String operation = next.xml().attributeValue(OPERATION_STR);
                 if (null == portTypeattr || "".equals(portTypeattr)) {
-                    throw new XBayaRuntimeException("No Porttype found for Invoke:" + next);
+                    throw new WorkflowRuntimeException("No Porttype found for Invoke:" + next);
                 }
                 String portTypeName = portTypeattr.substring(portTypeattr.indexOf(':') + 1);
                 String messagePartName = null;
@@ -533,7 +533,7 @@ public class ODEBPELTransformer {
                 addVariableManipulationBeforeInvoke(next);
             } else if (isInvoke(next)) {
                 if (last == null || !isAssign(last)) {
-                    throw new XBayaRuntimeException("Assign activity not found for the Invoke" + next.xmlStringPretty());
+                    throw new WorkflowRuntimeException("Assign activity not found for the Invoke" + next.xmlStringPretty());
                 }
 
                 // we are good and should add the header copy.
@@ -587,11 +587,11 @@ public class ODEBPELTransformer {
     private String extractDataType(String query) {
         int index = query.indexOf(':');
         if (index == -1) {
-            throw new XBayaRuntimeException("Invalid query no : delimeter found " + query);
+            throw new WorkflowRuntimeException("Invalid query no : delimeter found " + query);
         }
         String[] split = query.substring(index + 1).trim().split("/");
         if (split.length == 0) {
-            throw new XBayaRuntimeException("Unknown Xpath " + query.substring(index));
+            throw new WorkflowRuntimeException("Unknown Xpath " + query.substring(index));
         }
         return split[split.length - 1];
     }

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java Thu May 17 16:39:54 2012
@@ -19,21 +19,21 @@
  *
  */
 
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.workflow.model.ode;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.gpel.script.BPELScript;
-import org.apache.airavata.xbaya.gpel.script.BPELScriptType;
-import org.apache.airavata.xbaya.graph.GraphException;
-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.wf.Workflow;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.gpel.script.BPELScript;
+import org.apache.airavata.workflow.model.gpel.script.BPELScriptType;
+import org.apache.airavata.workflow.model.graph.GraphException;
+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.wf.Workflow;
 
 public class ODEClient {
 
@@ -74,9 +74,9 @@ public class ODEClient {
             inputs = workflow.getInputs();
             return inputs;
         } catch (GraphException e) {
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         } catch (ComponentException e) {
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         }
 
     }

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEDeploymentDescriptor.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEDeploymentDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEDeploymentDescriptor.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEDeploymentDescriptor.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEDeploymentDescriptor.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEDeploymentDescriptor.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEDeploymentDescriptor.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.workflow.model.ode;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -28,7 +28,7 @@ import java.util.Set;
 
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.xbaya.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphException;
 import org.gpel.model.GpelPartnerLink;
 import org.gpel.model.GpelPartnerLinksContainer;
 import org.gpel.model.GpelProcess;

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEWSDLTransformer.java (from r1339684, 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/workflow/model/ode/ODEWSDLTransformer.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/ODEWSDLTransformer.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java&r1=1339684&r2=1339699&rev=1339699&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/workflow/model/ode/ODEWSDLTransformer.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.workflow.model.ode;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -32,9 +32,9 @@ import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.WSDLUtil;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.gpel.DSCUtil;
 import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.gpel.DSCUtil;
 import org.xmlpull.infoset.XmlBuilderException;
 import org.xmlpull.infoset.XmlInfosetBuilder;
 import org.xmlpull.infoset.XmlNamespace;
@@ -321,7 +321,7 @@ public class ODEWSDLTransformer {
                     }
 
                     if (null == inputPartName) {
-                        throw new XBayaRuntimeException("Could not find a partname in message :" + inputMessage
+                        throw new WorkflowRuntimeException("Could not find a partname in message :" + inputMessage
                                 + " for binding :" + wsdlBindingOperation);
                     }
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/WSDLCleaner.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/WSDLCleaner.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/WSDLCleaner.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/WSDLCleaner.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/WSDLCleaner.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/WSDLCleaner.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/ode/WSDLCleaner.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.workflow.model.ode;
 
 import java.util.ArrayList;
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/TridentTransformer.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/TridentTransformer.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/TridentTransformer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/TridentTransformer.java Thu May 17 16:39:54 2012
@@ -19,14 +19,14 @@
  *
  */
 
-package org.apache.airavata.xbaya.wf;
+package org.apache.airavata.workflow.model.wf;
 
 import java.util.LinkedList;
 
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.xsd.GFacSimpleTypesXSD;
-import org.apache.airavata.xbaya.xsd.LeadContextHeaderXSD;
-import org.apache.airavata.xbaya.xsd.LeadCrosscutXSD;
+import org.apache.airavata.workflow.model.xsd.GFacSimpleTypesXSD;
+import org.apache.airavata.workflow.model.xsd.LeadContextHeaderXSD;
+import org.apache.airavata.workflow.model.xsd.LeadCrosscutXSD;
 import org.xmlpull.infoset.XmlElement;
 
 import xsul5.wsdl.WsdlDefinitions;

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.wf;
+package org.apache.airavata.workflow.model.wf;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
@@ -40,30 +40,30 @@ import org.apache.airavata.common.except
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponentFactory;
+import org.apache.airavata.workflow.model.component.ws.WSComponentKey;
+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.gpel.script.BPELScript;
+import org.apache.airavata.workflow.model.gpel.script.BPELScriptType;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSGraph;
+import org.apache.airavata.workflow.model.graph.ws.WSGraphFactory;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
+import org.apache.airavata.workflow.model.ode.ODEBPELTransformer;
+import org.apache.airavata.workflow.model.ode.ODEDeploymentDescriptor;
+import org.apache.airavata.workflow.model.ode.ODEWSDLTransformer;
+import org.apache.airavata.workflow.model.ode.WSDLCleaner;
 import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
 import org.apache.airavata.xbaya.XBayaVersion;
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponentFactory;
-import org.apache.airavata.xbaya.component.ws.WSComponentKey;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.gpel.script.BPELScript;
-import org.apache.airavata.xbaya.gpel.script.BPELScriptType;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSGraph;
-import org.apache.airavata.xbaya.graph.ws.WSGraphFactory;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
-import org.apache.airavata.xbaya.ode.ODEBPELTransformer;
-import org.apache.airavata.xbaya.ode.ODEDeploymentDescriptor;
-import org.apache.airavata.xbaya.ode.ODEWSDLTransformer;
-import org.apache.airavata.xbaya.ode.WSDLCleaner;
 import org.apache.commons.codec.binary.Base64;
 import org.gpel.GpelConstants;
 import org.gpel.model.GpelProcess;
@@ -201,7 +201,7 @@ public class Workflow implements Cloneab
         try {
             return new URI(XBayaConstants.LEAD_NS + "/" + this.getName());
         } catch (URISyntaxException e) {
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         }
     }
 
@@ -209,7 +209,7 @@ public class Workflow implements Cloneab
         try {
             return new URI(XBayaConstants.LEAD_NS);
         } catch (URISyntaxException e) {
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         }
     }
 
@@ -629,13 +629,13 @@ public class Workflow implements Cloneab
             return newWorkflow;
         } catch (GraphException e) {
             // This should not happen.
-            throw new XBayaRuntimeException(e);
-        } catch (XBayaException e) {
+            throw new WorkflowRuntimeException(e);
+        } catch (WorkflowException e) {
             // This should not happen.
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         } catch (UtilsException e) {
             // This should not happen.
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         }
     }
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowExecutionState.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/WorkflowExecutionState.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowExecutionState.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowExecutionState.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/WorkflowExecutionState.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/WorkflowExecutionState.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/wf/WorkflowExecutionState.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.wf;
+package org.apache.airavata.workflow.model.wf;
 
 public enum WorkflowExecutionState {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/GFacSimpleTypesXSD.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/GFacSimpleTypesXSD.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/GFacSimpleTypesXSD.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/GFacSimpleTypesXSD.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.xsd;
+package org.apache.airavata.workflow.model.xsd;
 
 public class GFacSimpleTypesXSD {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/LeadContextHeaderXSD.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/LeadContextHeaderXSD.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/LeadContextHeaderXSD.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/LeadContextHeaderXSD.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.xsd;
+package org.apache.airavata.workflow.model.xsd;
 
 public class LeadContextHeaderXSD {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/LeadCrosscutXSD.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/LeadCrosscutXSD.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/LeadCrosscutXSD.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/xsd/LeadCrosscutXSD.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.xsd;
+package org.apache.airavata.workflow.model.xsd;
 
 public class LeadCrosscutXSD {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java Thu May 17 16:39:54 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.xbaya;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
 import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
@@ -114,7 +115,7 @@ public class XBaya {
                     } catch (RuntimeException e) {
                         String message = "Error while reading config file, " + configPath;
                         logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
+                        this.config.addError(new WorkflowException(message, e));
                     }
                 } else if ("-title".equalsIgnoreCase(arg)) {
                     index++;
@@ -130,7 +131,7 @@ public class XBaya {
                     } catch (URISyntaxException e) {
                         String message = "The GFac URL is in wrong format: " + url;
                         logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
+                        this.config.addError(new WorkflowException(message, e));
                     }
                 } else if ("-dscURL".equalsIgnoreCase(arg)) {
                     index++;
@@ -140,7 +141,7 @@ public class XBaya {
                     } catch (URISyntaxException e) {
                         String message = "The DSC URL is in wrong format: " + url;
                         logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
+                        this.config.addError(new WorkflowException(message, e));
                     }
                 } else if ("-startMonitor".equalsIgnoreCase(arg)) {
                     this.config.setStartMonitor(true);
@@ -152,7 +153,7 @@ public class XBaya {
                     } catch (URISyntaxException e) {
                         String message = "The broker URL is in wrong format: " + brokerURL;
                         logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
+                        this.config.addError(new WorkflowException(message, e));
                     }
                 } else if ("-odeEngine".equalsIgnoreCase(arg)) {
                     index++;
@@ -180,7 +181,7 @@ public class XBaya {
                         } else {
                             String message = "-pullMode has to be either true or false, not " + nextArg;
                             logger.warn(message);
-                            this.config.addError(new XBayaException(message));
+                            this.config.addError(new WorkflowException(message));
                         }
                     } else {
                         // This is the last arg
@@ -194,7 +195,7 @@ public class XBaya {
                     } catch (URISyntaxException e) {
                         String message = "The message box URL is in wrong format: " + messageBoxURL;
                         logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
+                        this.config.addError(new WorkflowException(message, e));
                     }
                 } else if ("-registryURL".equalsIgnoreCase(arg)) {
                     index++;
@@ -204,7 +205,7 @@ public class XBaya {
                     } catch (URISyntaxException e) {
                         String message = "The message box URL is in wrong format: " + registryURL;
                         logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
+                        this.config.addError(new WorkflowException(message, e));
                     }
                     } else if ("-registryUserName".equalsIgnoreCase(arg)) {
 
@@ -222,7 +223,7 @@ public class XBaya {
                     } catch (NumberFormatException e) {
                         String message = "The width must be an integer: " + width;
                         logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
+                        this.config.addError(new WorkflowException(message, e));
                     }
                 } else if ("-height".equalsIgnoreCase(arg)) {
                     index++;
@@ -232,7 +233,7 @@ public class XBaya {
                     } catch (NumberFormatException e) {
                         String message = "The height must be an integer: " + height;
                         logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
+                        this.config.addError(new WorkflowException(message, e));
                     }
                 } else if ("-exitOnClose".equalsIgnoreCase(arg)) {
                     index++;
@@ -265,7 +266,7 @@ public class XBaya {
                 }  else {
                     String message = "Unknown option: " + arg;
                     logger.error(message);
-                    this.config.addError(new XBayaException(message));
+                    this.config.addError(new WorkflowException(message));
                 }
                 this.config.setJcrComponentRegistry(new
                         JCRComponentRegistry(this.config.getRegistryURL(),this.config.getRegistryUserName(),this.config.getRegistryPassphrase()));
@@ -274,11 +275,11 @@ public class XBaya {
         } catch (ArrayIndexOutOfBoundsException e) {
             String message = "Argument is missing after " + args[args.length - 1];
             logger.error(message, e);
-            this.config.addError(new XBayaException(message));
+            this.config.addError(new WorkflowException(message));
         } catch (Throwable e) {
             logger.error(e.getMessage(), e);
             String message = "Unknown error while parsing the arguments";
-            this.config.addError(new XBayaException(message, e));
+            this.config.addError(new WorkflowException(message, e));
         }
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Thu May 17 16:39:54 2012
@@ -27,12 +27,15 @@ import java.util.List;
 
 import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.SubWorkflowComponent;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.SubWorkflowComponent;
+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.wf.Workflow;
 import org.apache.airavata.xbaya.component.gui.ComponentSelector;
 import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
 import org.apache.airavata.xbaya.component.registry.*;
-import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.apache.airavata.xbaya.gui.ErrorWindow;
 import org.apache.airavata.xbaya.gui.XBayaGUI;
@@ -42,7 +45,6 @@ import org.apache.airavata.xbaya.monitor
 import org.apache.airavata.xbaya.monitor.gui.MonitorStarter;
 import org.apache.airavata.xbaya.myproxy.MyProxyClient;
 import org.apache.airavata.xbaya.security.XBayaSecurity;
-import org.apache.airavata.xbaya.wf.Workflow;
 import org.apache.airavata.xbaya.wf.gui.WorkflowPropertyWindow;
 import org.apache.airavata.xbaya.workflow.WorkflowClient;
 import org.slf4j.Logger;
@@ -190,9 +192,9 @@ public class XBayaEngine {
     /**
      * Disposes on exit.
      *
-     * @throws XBayaException
+     * @throws WorkflowException
      */
-    public void dispose() throws XBayaException {
+    public void dispose() throws WorkflowException {
         this.monitor.stop();
     }
 
@@ -392,7 +394,7 @@ public class XBayaEngine {
 
 	public void registerWorkflowInterpreter(WorkflowInterpreter workflowInterpreter) {
 		if (getWorkflowInterpreter()!=null){
-			throw new XBayaRuntimeException("Critical Error!!! Workflow interpretter already running. Cleanup first");
+			throw new WorkflowRuntimeException("Critical Error!!! Workflow interpretter already running. Cleanup first");
 		}
 		this.workflowInterpreter = workflowInterpreter;
 	}

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/amazonEC2/gui/AmazonEC2InvokerWindow.java Thu May 17 16:39:54 2012
@@ -29,8 +29,8 @@ import javax.swing.JButton;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
 import org.apache.airavata.xbaya.gui.GridPanel;
 import org.apache.airavata.xbaya.gui.XBayaDialog;
 import org.apache.airavata.xbaya.gui.XBayaLabel;
@@ -222,7 +222,7 @@ public class AmazonEC2InvokerWindow {
 
         @Override
         public void receiveErrorjobStatus(java.lang.Exception e) {
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         }
 
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java Thu May 17 16:39:54 2012
@@ -30,9 +30,10 @@ import javax.swing.JFileChooser;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.SubWorkflowComponent;
+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.component.SubWorkflowComponent;
 import org.apache.airavata.xbaya.component.registry.ComponentRegistryException;
 import org.apache.airavata.xbaya.component.registry.ComponentRegistryLoader;
 import org.apache.airavata.xbaya.component.registry.LocalComponentRegistry;
@@ -40,7 +41,6 @@ import org.apache.airavata.xbaya.file.XB
 import org.apache.airavata.xbaya.file.gui.WorkflowFiler;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.apache.airavata.xbaya.util.RegistryConstants;
-import org.apache.airavata.xbaya.wf.Workflow;
 
 public class ComponentMenu {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java Thu May 17 16:39:54 2012
@@ -51,16 +51,16 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import org.apache.airavata.common.utils.SwingUtil;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
 import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.ComponentException;
 import org.apache.airavata.xbaya.component.gui.ComponentSelectorEvent.ComponentSelectorEventType;
 import org.apache.airavata.xbaya.component.registry.ComponentOperationReference;
 import org.apache.airavata.xbaya.component.registry.ComponentReference;
 import org.apache.airavata.xbaya.component.registry.ComponentRegistry;
 import org.apache.airavata.xbaya.component.registry.ComponentRegistryException;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.apache.airavata.xbaya.gui.XBayaComponent;
 import org.slf4j.Logger;
@@ -184,10 +184,10 @@ public class ComponentSelector implement
             });
         } catch (InterruptedException e) {
             // Should not happen.
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         } catch (InvocationTargetException e) {
             // Should not happen.
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         }
 
         TreePath selectionPath = selectionPathHolder[0];
@@ -230,10 +230,10 @@ public class ComponentSelector implement
                 });
             } catch (InterruptedException e) {
                 // Should not happen.
-                throw new XBayaRuntimeException(e);
+                throw new WorkflowRuntimeException(e);
             } catch (InvocationTargetException e) {
                 // Should not happen.
-                throw new XBayaRuntimeException(e);
+                throw new WorkflowRuntimeException(e);
             }
         }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelectorEvent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelectorEvent.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelectorEvent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelectorEvent.java Thu May 17 16:39:54 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.xbaya.component.gui;
 
-import org.apache.airavata.xbaya.component.Component;
+import org.apache.airavata.workflow.model.component.Component;
 
 public class ComponentSelectorEvent {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentViewer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentViewer.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentViewer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentViewer.java Thu May 17 16:39:54 2012
@@ -26,9 +26,9 @@ import java.awt.Color;
 import javax.swing.JEditorPane;
 import javax.swing.SwingUtilities;
 
-import org.apache.airavata.xbaya.component.Component;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.graph.Node;
 import org.apache.airavata.xbaya.component.gui.ComponentSelectorEvent.ComponentSelectorEventType;
-import org.apache.airavata.xbaya.graph.Node;
 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/component/gui/StreamSourceNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java Thu May 17 16:39:54 2012
@@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.compon
 
 import java.awt.Color;
 
+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.graph.system.gui.ConfigurableNodeGUI;
 import org.apache.airavata.xbaya.graph.system.gui.StreamSourceConfigurationDialog;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/AmazonComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/AmazonComponentRegistry.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/AmazonComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/AmazonComponentRegistry.java Thu May 17 16:39:54 2012
@@ -24,9 +24,9 @@ package org.apache.airavata.xbaya.compon
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.amazon.InstanceComponent;
-import org.apache.airavata.xbaya.component.amazon.TerminateInstanceComponent;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.amazon.InstanceComponent;
+import org.apache.airavata.workflow.model.component.amazon.TerminateInstanceComponent;
 import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
 
 public class AmazonComponentRegistry extends ComponentRegistry {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentOperationReference.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentOperationReference.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentOperationReference.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentOperationReference.java Thu May 17 16:39:54 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.compon
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.airavata.xbaya.component.Component;
+import org.apache.airavata.workflow.model.component.Component;
 
 public class ComponentOperationReference extends ComponentReference {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentReference.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentReference.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentReference.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentReference.java Thu May 17 16:39:54 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.xbaya.compon
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.ComponentException;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentException;
 
 public abstract class ComponentReference {
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryException.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryException.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryException.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryException.java Thu May 17 16:39:54 2012
@@ -21,9 +21,9 @@
 
 package org.apache.airavata.xbaya.component.registry;
 
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 
-public class ComponentRegistryException extends XBayaException {
+public class ComponentRegistryException extends WorkflowException {
 
     /**
      * Constructs a ComponentRegistryException.

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentReference.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentReference.java?rev=1339699&r1=1339698&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentReference.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentReference.java Thu May 17 16:39:54 2012
@@ -23,10 +23,10 @@ package org.apache.airavata.xbaya.compon
 
 import java.util.List;
 
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponentFactory;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponentFactory;
 
 public class JCRComponentReference extends ComponentReference {
 



Mime
View raw message