svn commit: r1339699 [2/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...

[sa...@apache.org]

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/BlockComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/BlockComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/BlockComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/BlockComponent.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.BlockNode;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.BlockNode;
 
 public class BlockComponent extends SystemComponent {
 
@@ -72,7 +72,7 @@ public class BlockComponent extends Syst
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getInputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getInputPort(int)
      */
     @Override
     public ComponentPort getInputPort(int index) {
@@ -83,7 +83,7 @@ public class BlockComponent extends Syst
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ConstantComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ConstantComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ConstantComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ConstantComponent.java Thu May 17 16:39:54 2012
@@ -19,12 +19,12 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.ConstantNode;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.ConstantNode;
 
 public class ConstantComponent extends SystemComponent {
 
@@ -53,7 +53,7 @@ public class ConstantComponent extends S
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/DifferedInputComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/DifferedInputComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/DifferedInputComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/DifferedInputComponent.java Thu May 17 16:39:54 2012
@@ -5,10 +5,10 @@
  *
  * $Id: $
  */
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.system.DifferedInputNode;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.system.DifferedInputNode;
 
 /**
  * @author Chathura Herath

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndBlockComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndBlockComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndBlockComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndBlockComponent.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.EndBlockNode;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.EndBlockNode;
 
 public class EndBlockComponent extends SystemComponent {
 
@@ -81,7 +81,7 @@ public class EndBlockComponent extends S
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getInputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getInputPort(int)
      */
     @Override
     public ComponentPort getInputPort(int index) {
@@ -103,7 +103,7 @@ public class EndBlockComponent extends S
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getOutputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getOutputPort(int)
      */
     @Override
     public ComponentPort getOutputPort(int index) {
@@ -114,7 +114,7 @@ public class EndBlockComponent extends S
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndForEachComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndForEachComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndForEachComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndForEachComponent.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.EndForEachNode;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.EndForEachNode;
 
 public class EndForEachComponent extends SystemComponent {
 
@@ -81,7 +81,7 @@ public class EndForEachComponent extends
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getInputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getInputPort(int)
      */
     @Override
     public ComponentPort getInputPort(int index) {
@@ -103,7 +103,7 @@ public class EndForEachComponent extends
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getOutputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getOutputPort(int)
      */
     @Override
     public ComponentPort getOutputPort(int index) {
@@ -114,7 +114,7 @@ public class EndForEachComponent extends
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndifComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndifComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndifComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/EndifComponent.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.EndifNode;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.EndifNode;
 
 public class EndifComponent extends SystemComponent {
 
@@ -81,7 +81,7 @@ public class EndifComponent extends Syst
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getInputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getInputPort(int)
      */
     @Override
     public ComponentPort getInputPort(int index) {
@@ -103,7 +103,7 @@ public class EndifComponent extends Syst
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getOutputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getOutputPort(int)
      */
     @Override
     public ComponentPort getOutputPort(int index) {
@@ -114,7 +114,7 @@ public class EndifComponent extends Syst
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ForEachComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ForEachComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ForEachComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ForEachComponent.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.ForEachNode;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.ForEachNode;
 
 public class ForEachComponent extends SystemComponent {
 
@@ -82,7 +82,7 @@ public class ForEachComponent extends Sy
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getInputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getInputPort(int)
      */
     @Override
     public ComponentPort getInputPort(int index) {
@@ -104,7 +104,7 @@ public class ForEachComponent extends Sy
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getOutputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getOutputPort(int)
      */
     @Override
     public ComponentPort getOutputPort(int index) {
@@ -115,7 +115,7 @@ public class ForEachComponent extends Sy
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/IfComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/IfComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/IfComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/IfComponent.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.IfNode;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.IfNode;
 
 public class IfComponent extends SystemComponent {
 
@@ -90,7 +90,7 @@ public class IfComponent extends SystemC
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getInputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getInputPort(int)
      */
     @Override
     public ComponentPort getInputPort(int index) {
@@ -101,7 +101,7 @@ public class IfComponent extends SystemC
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/InputComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/InputComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/InputComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/InputComponent.java Thu May 17 16:39:54 2012
@@ -19,10 +19,10 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
 
 public class InputComponent extends SystemComponent {
 
@@ -54,7 +54,7 @@ public class InputComponent extends Syst
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public InputNode createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/MemoComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/MemoComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/MemoComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/MemoComponent.java Thu May 17 16:39:54 2012
@@ -19,11 +19,11 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.MemoNode;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.MemoNode;
 
 public class MemoComponent extends SystemComponent {
 
@@ -43,7 +43,7 @@ public class MemoComponent extends Syste
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/OutputComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/OutputComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/OutputComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/OutputComponent.java Thu May 17 16:39:54 2012
@@ -19,11 +19,11 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
 
 public class OutputComponent extends SystemComponent {
 
@@ -51,7 +51,7 @@ public class OutputComponent extends Sys
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ReceiveComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ReceiveComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ReceiveComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/ReceiveComponent.java Thu May 17 16:39:54 2012
@@ -19,14 +19,14 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentEPRPort;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.system.ReceiveNode;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.component.ComponentEPRPort;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
 
 public class ReceiveComponent extends SystemComponent {
 
@@ -72,7 +72,7 @@ public class ReceiveComponent extends Sy
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#getOutputPort(int)
+     * @see org.apache.airavata.workflow.model.component.Component#getOutputPort(int)
      */
     @Override
     public ComponentPort getOutputPort(int index) {
@@ -83,7 +83,7 @@ public class ReceiveComponent extends Sy
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/S3InputComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/S3InputComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/S3InputComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/S3InputComponent.java Thu May 17 16:39:54 2012
@@ -19,10 +19,10 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.system.S3InputNode;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.system.S3InputNode;
 
 public class S3InputComponent extends SystemComponent {
 
@@ -54,7 +54,7 @@ public class S3InputComponent extends Sy
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public S3InputNode createNode(Graph graph) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/SystemComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/SystemComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/SystemComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/SystemComponent.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.ComponentDataPort;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentDataPort;
 
 public abstract class SystemComponent extends Component {
 
@@ -64,7 +64,7 @@ public abstract class SystemComponent ex
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#toHTML()
+     * @see org.apache.airavata.workflow.model.component.Component#toHTML()
      */
     @Override
     public String toHTML() {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/SystemComponentDataPort.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/SystemComponentDataPort.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/SystemComponentDataPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/system/SystemComponentDataPort.java Thu May 17 16:39:54 2012
@@ -19,10 +19,10 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.system;
+package org.apache.airavata.workflow.model.component.system;
 
-import org.apache.airavata.xbaya.component.ComponentDataPort;
-import org.apache.airavata.xbaya.graph.system.SystemDataPort;
+import org.apache.airavata.workflow.model.component.ComponentDataPort;
+import org.apache.airavata.workflow.model.graph.system.SystemDataPort;
 
 public class SystemComponentDataPort extends ComponentDataPort {
 
@@ -49,7 +49,7 @@ public class SystemComponentDataPort ext
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.ComponentPort#createPort()
+     * @see org.apache.airavata.workflow.model.component.ComponentPort#createPort()
      */
     @Override
     public SystemDataPort createPort() {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.ws;
+package org.apache.airavata.workflow.model.component.ws;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -31,13 +31,13 @@ import org.apache.airavata.common.except
 import org.apache.airavata.common.utils.WSConstants;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.gpel.DSCUtil;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentControlPort;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.gpel.DSCUtil;
+import org.apache.airavata.workflow.model.graph.Graph;
+import org.apache.airavata.workflow.model.graph.Node;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlCharacters;
@@ -235,7 +235,7 @@ public class WSComponent extends Compone
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.Component#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public Node createNode(Graph graph) {
@@ -260,7 +260,7 @@ public class WSComponent extends Compone
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.Component#toHTML()
+     * @see org.apache.airavata.workflow.model.component.Component#toHTML()
      */
     @Override
     public String toHTML() {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentFactory.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentFactory.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.ws;
+package org.apache.airavata.workflow.model.component.ws;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,7 +29,7 @@ import javax.xml.namespace.QName;
 import org.apache.airavata.common.exception.UtilsException;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ComponentException;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.xmlpull.infoset.XmlElement;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentKey.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentKey.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentKey.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentKey.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.ws;
+package org.apache.airavata.workflow.model.component.ws;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java Thu May 17 16:39:54 2012
@@ -19,15 +19,15 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.ws;
+package org.apache.airavata.workflow.model.component.ws;
 
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.WSConstants;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.component.ComponentDataPort;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.graph.ws.WSPort;
+import org.apache.airavata.workflow.model.component.ComponentDataPort;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.graph.ws.WSPort;
 import org.xmlpull.infoset.XmlElement;
 import org.xmlpull.infoset.XmlNamespace;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WorkflowComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WorkflowComponent.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WorkflowComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/component/ws/WorkflowComponent.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.component.ws;
+package org.apache.airavata.workflow.model.component.ws;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -28,11 +28,11 @@ import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.exception.UtilsException;
 import org.apache.airavata.common.utils.WSDLUtil;
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.ws.WorkflowNode;
-import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.graph.Graph;
+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.gpel.GpelConstants;
 import org.xmlpull.infoset.XmlElement;
 import org.xmlpull.infoset.XmlNamespace;
@@ -120,7 +120,7 @@ public class WorkflowComponent extends W
     }
 
     /**
-     * @see org.apache.airavata.xbaya.component.ws.WSComponent#createNode(org.apache.airavata.xbaya.graph.Graph)
+     * @see org.apache.airavata.workflow.model.component.ws.WSComponent#createNode(org.apache.airavata.workflow.model.graph.Graph)
      */
     @Override
     public WorkflowNode createNode(Graph graph) {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/exceptions/WorkflowException.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaException.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/exceptions/WorkflowException.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/exceptions/WorkflowException.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaException.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaException.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/exceptions/WorkflowException.java Thu May 17 16:39:54 2012
@@ -19,15 +19,15 @@
  *
  */
 
-package org.apache.airavata.xbaya;
+package org.apache.airavata.workflow.model.exceptions;
 
-public class XBayaException extends Exception {
+public class WorkflowException extends Exception {
 
     /**
      * Constructs a XBayaException.
      * 
      */
-    public XBayaException() {
+    public WorkflowException() {
         super();
     }
 
@@ -36,7 +36,7 @@ public class XBayaException extends Exce
      * 
      * @param message
      */
-    public XBayaException(String message) {
+    public WorkflowException(String message) {
         super(message);
     }
 
@@ -45,7 +45,7 @@ public class XBayaException extends Exce
      * 
      * @param cause
      */
-    public XBayaException(Throwable cause) {
+    public WorkflowException(Throwable cause) {
         super(cause);
     }
 
@@ -55,7 +55,7 @@ public class XBayaException extends Exce
      * @param message
      * @param cause
      */
-    public XBayaException(String message, Throwable cause) {
+    public WorkflowException(String message, Throwable cause) {
         super(message, cause);
     }
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/exceptions/WorkflowRuntimeException.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaRuntimeException.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/exceptions/WorkflowRuntimeException.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/exceptions/WorkflowRuntimeException.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaRuntimeException.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaRuntimeException.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/exceptions/WorkflowRuntimeException.java Thu May 17 16:39:54 2012
@@ -19,30 +19,30 @@
  *
  */
 
-package org.apache.airavata.xbaya;
+package org.apache.airavata.workflow.model.exceptions;
 
-public class XBayaRuntimeException extends RuntimeException {
+public class WorkflowRuntimeException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
 
     /**
      *  
      */
-    public XBayaRuntimeException() {
+    public WorkflowRuntimeException() {
         super();
     }
 
     /**
      * @param arg0
      */
-    public XBayaRuntimeException(String arg0) {
+    public WorkflowRuntimeException(String arg0) {
         super(arg0);
     }
 
     /**
      * @param arg0
      */
-    public XBayaRuntimeException(Throwable arg0) {
+    public WorkflowRuntimeException(Throwable arg0) {
         super(arg0);
     }
 
@@ -50,7 +50,7 @@ public class XBayaRuntimeException exten
      * @param arg0
      * @param arg1
      */
-    public XBayaRuntimeException(String arg0, Throwable arg1) {
+    public WorkflowRuntimeException(String arg0, Throwable arg1) {
         super(arg0, arg1);
     }
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/DSCUtil.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/DSCUtil.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/DSCUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/DSCUtil.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.gpel;
+package org.apache.airavata.workflow.model.gpel;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
@@ -34,12 +34,12 @@ import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.exception.UtilsException;
 import org.apache.airavata.common.utils.WSDLUtil;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.gpel.script.BPELScript;
-import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
-import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.gpel.script.BPELScript;
+import org.apache.airavata.workflow.model.graph.Graph;
+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 xsul5.wsdl.WsdlDefinitions;
 import xsul5.wsdl.WsdlPortType;
@@ -124,7 +124,7 @@ public class DSCUtil {
             return epr;
         } catch (UnsupportedEncodingException e) {
             // Should not happen
-            throw new XBayaRuntimeException(e);
+            throw new WorkflowRuntimeException(e);
         }
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.gpel.script;
+package org.apache.airavata.workflow.model.gpel.script;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,36 +33,36 @@ import javax.xml.namespace.QName;
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.WSConstants;
 import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.component.ComponentPort;
+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.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.EPRPort;
+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.amazon.InstanceNode;
+import org.apache.airavata.workflow.model.graph.amazon.ResourceNode;
+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.ExitNode;
+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.util.GraphUtil;
+import org.apache.airavata.workflow.model.graph.ws.WSNode;
+import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
 import org.apache.airavata.xbaya.XBayaVersion;
-import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.component.ws.WSComponent;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.graph.DataPort;
-import org.apache.airavata.xbaya.graph.EPRPort;
-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.amazon.InstanceNode;
-import org.apache.airavata.xbaya.graph.amazon.ResourceNode;
-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.ExitNode;
-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.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSNode;
-import org.apache.airavata.xbaya.wf.Workflow;
 import org.gpel.GpelConstants;
 import org.gpel.model.GpelAssign;
 import org.gpel.model.GpelAssignCopy;
@@ -461,7 +461,7 @@ public class BPELScript {
                 addFlow(nextNodes, block, sequence);
             } else {
                 // Should not happen.
-                throw new XBayaRuntimeException("nextNodes.size(): " + nextNodes.size());
+                throw new WorkflowRuntimeException("nextNodes.size(): " + nextNodes.size());
             }
             nextNodes = getNextExecutableNodes(block);
         }

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

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java?rev=1339699&r1=1339684&r2=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.gpel.script;
+package org.apache.airavata.workflow.model.gpel.script;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,21 +31,21 @@ import org.apache.airavata.common.except
 import org.apache.airavata.common.utils.WSConstants;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
+import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
+import org.apache.airavata.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.Node;
+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.ParameterNode;
+import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
+import org.apache.airavata.workflow.model.graph.system.SystemDataPort;
+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.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.XBayaRuntimeException;
 import org.apache.airavata.xbaya.XBayaVersion;
-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.Node;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.system.ParameterNode;
-import org.apache.airavata.xbaya.graph.system.ReceiveNode;
-import org.apache.airavata.xbaya.graph.system.SystemDataPort;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.WSGraph;
-import org.apache.airavata.xbaya.wf.Workflow;
 import org.xmlpull.infoset.XmlComment;
 import org.xmlpull.infoset.XmlElement;
 import org.xmlpull.infoset.XmlNamespace;
@@ -426,7 +426,7 @@ public class WorkflowWSDL {
             type = new QName(this.typesNamespace.getName(), typeName);
         } else if (arrayDimension > 1) {
             // TODO
-            throw new XBayaRuntimeException("multi-dimentional arrays are not supported yet.");
+            throw new WorkflowRuntimeException("multi-dimentional arrays are not supported yet.");
         }
 
         if (WSConstants.XSD_ANY_TYPE.equals(type) && componentPort != null) {
@@ -507,7 +507,7 @@ public class WorkflowWSDL {
                 XmlElement newSchema = WSDLUtil.getSchema(serviceWSDL, paramType);
                 if (newSchema == null) {
                     // This should have been caught in WSComponent
-                    throw new XBayaRuntimeException("could not find definition for type " + paramType + " in "
+                    throw new WorkflowRuntimeException("could not find definition for type " + paramType + " in "
                             + WSDLUtil.getWSDLQName(serviceWSDL));
                 }
                 this.definitions.getTypes().addChild(XMLUtil.deepClone(newSchema));

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ControlEdge.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ControlEdge.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ControlEdge.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ControlEdge.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ControlEdge.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ControlEdge.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ControlEdge.java Thu May 17 16:39:54 2012
@@ -19,9 +19,9 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
-import org.apache.airavata.xbaya.graph.impl.EdgeImpl;
+import org.apache.airavata.workflow.model.graph.impl.EdgeImpl;
 import org.xmlpull.infoset.XmlElement;
 
 public class ControlEdge extends EdgeImpl {
@@ -44,7 +44,7 @@ public class ControlEdge extends EdgeImp
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.EdgeImpl#toXML()
+     * @see org.apache.airavata.workflow.model.graph.impl.EdgeImpl#toXML()
      */
     @Override
     protected XmlElement toXML() {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ControlPort.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ControlPort.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ControlPort.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ControlPort.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ControlPort.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ControlPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ControlPort.java Thu May 17 16:39:54 2012
@@ -19,9 +19,9 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
-import org.apache.airavata.xbaya.graph.impl.PortImpl;
+import org.apache.airavata.workflow.model.graph.impl.PortImpl;
 import org.xmlpull.infoset.XmlElement;
 
 public class ControlPort extends PortImpl {
@@ -46,7 +46,7 @@ public class ControlPort extends PortImp
     }
 
     /**
-     * @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/DataEdge.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/DataEdge.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/DataEdge.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/DataEdge.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/DataEdge.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/DataEdge.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/DataEdge.java Thu May 17 16:39:54 2012
@@ -19,9 +19,9 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
-import org.apache.airavata.xbaya.graph.impl.EdgeImpl;
+import org.apache.airavata.workflow.model.graph.impl.EdgeImpl;
 import org.xmlpull.infoset.XmlElement;
 
 public class DataEdge extends EdgeImpl {
@@ -44,7 +44,7 @@ public class DataEdge extends EdgeImpl {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.EdgeImpl#getFromPort()
+     * @see org.apache.airavata.workflow.model.graph.impl.EdgeImpl#getFromPort()
      */
     @Override
     public DataPort getFromPort() {
@@ -52,7 +52,7 @@ public class DataEdge extends EdgeImpl {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.EdgeImpl#getToPort()
+     * @see org.apache.airavata.workflow.model.graph.impl.EdgeImpl#getToPort()
      */
     @Override
     public DataPort getToPort() {
@@ -60,7 +60,7 @@ public class DataEdge extends EdgeImpl {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.EdgeImpl#toXML()
+     * @see org.apache.airavata.workflow.model.graph.impl.EdgeImpl#toXML()
      */
     @Override
     protected XmlElement toXML() {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/DataPort.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/DataPort.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/DataPort.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/DataPort.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/DataPort.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/DataPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/DataPort.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
 import java.util.List;
 
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.xbaya.graph.impl.PortImpl;
+import org.apache.airavata.workflow.model.graph.impl.PortImpl;
 import org.xmlpull.infoset.XmlElement;
 
 public abstract class DataPort extends PortImpl {
@@ -48,7 +48,7 @@ public abstract class DataPort extends P
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.impl.PortImpl#getEdges()
+     * @see org.apache.airavata.workflow.model.graph.impl.PortImpl#getEdges()
      */
     @SuppressWarnings("unchecked")
     @Override

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/EPRPort.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/EPRPort.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/EPRPort.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/EPRPort.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/EPRPort.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/EPRPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/EPRPort.java Thu May 17 16:39:54 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
 import javax.xml.namespace.QName;
 
@@ -46,7 +46,7 @@ public class EPRPort 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() {
@@ -56,7 +56,7 @@ public class EPRPort extends DataPort {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.DataPort#getType()
+     * @see org.apache.airavata.workflow.model.graph.DataPort#getType()
      */
     @Override
     public QName getType() {
@@ -64,7 +64,7 @@ public class EPRPort 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) {

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

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ForEachExecutableNode.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ForEachExecutableNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ForEachExecutableNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ForEachExecutableNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ForEachExecutableNode.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ForEachExecutableNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/ForEachExecutableNode.java Thu May 17 16:39:54 2012
@@ -18,7 +18,7 @@
  * under the License.
  *
 */
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
 public interface ForEachExecutableNode extends Node {
 }

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

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/GraphException.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphException.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/GraphException.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/GraphException.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphException.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphException.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/GraphException.java Thu May 17 16:39:54 2012
@@ -19,15 +19,15 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
-import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 
 /**
  * The GraphException class represents an Exception related to a Graph. Mostly, it is thrown when parsing a graph XML.
  * 
  */
-public class GraphException extends XBayaException {
+public class GraphException extends WorkflowException {
 
     private static final long serialVersionUID = 1L;
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/GraphFactory.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphFactory.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/GraphFactory.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/GraphFactory.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphFactory.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/GraphFactory.java Thu May 17 16:39:54 2012
@@ -19,11 +19,11 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
-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.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.xmlpull.infoset.XmlElement;
 
 public interface GraphFactory {

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

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

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/Node.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/Node.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/Node.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/Node.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
 import java.awt.Point;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.airavata.xbaya.component.Component;
+import org.apache.airavata.workflow.model.component.Component;
 
 public interface Node extends GraphPiece {
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/Port.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/Port.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/Port.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/Port.java Thu May 17 16:39:54 2012
@@ -19,11 +19,11 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph;
+package org.apache.airavata.workflow.model.graph;
 
 import java.util.Collection;
 
-import org.apache.airavata.xbaya.component.ComponentPort;
+import org.apache.airavata.workflow.model.component.ComponentPort;
 
 public interface Port extends GraphPiece {
 

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/InstanceDataPort.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceDataPort.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/InstanceDataPort.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/InstanceDataPort.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceDataPort.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceDataPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/InstanceDataPort.java Thu May 17 16:39:54 2012
@@ -19,14 +19,14 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.amazon;
+package org.apache.airavata.workflow.model.graph.amazon;
 
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.common.utils.WSConstants;
-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.workflow.model.graph.DataPort;
+import org.apache.airavata.workflow.model.graph.GraphException;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
 import org.xmlpull.infoset.XmlElement;
 
 public class InstanceDataPort extends DataPort {
@@ -56,7 +56,7 @@ public class InstanceDataPort extends Da
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.DataPort#getType()
+     * @see org.apache.airavata.workflow.model.graph.DataPort#getType()
      */
     @Override
     public QName getType() {
@@ -65,7 +65,7 @@ public class InstanceDataPort extends Da
 
     /**
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.PortImpl#toXML()
+     * @see org.apache.airavata.workflow.model.graph.impl.PortImpl#toXML()
      */
     @Override
     protected XmlElement toXML() {
@@ -75,7 +75,7 @@ public class InstanceDataPort extends Da
     }
 
     /**
-     * @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 {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/InstanceNode.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/InstanceNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/InstanceNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceNode.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/InstanceNode.java Thu May 17 16:39:54 2012
@@ -19,17 +19,17 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.amazon;
+package org.apache.airavata.workflow.model.graph.amazon;
 
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.amazon.InstanceComponent;
-import org.apache.airavata.xbaya.graph.ControlEdge;
-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.Node;
-import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.amazon.InstanceComponent;
+import org.apache.airavata.workflow.model.graph.ControlEdge;
+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.Node;
+import org.apache.airavata.workflow.model.graph.Port;
 import org.xmlpull.infoset.XmlElement;
 
 public class InstanceNode extends ResourceNode {
@@ -158,7 +158,7 @@ public class InstanceNode extends Resour
 
     /**
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#getComponent()
      */
     @Override
     public Component getComponent() {
@@ -173,7 +173,7 @@ public class InstanceNode extends Resour
 
     /**
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#parseConfiguration(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#parseConfiguration(org.xmlpull.infoset.XmlElement)
      */
     @Override
     protected void parseConfiguration(XmlElement configElement) {
@@ -225,7 +225,7 @@ public class InstanceNode extends Resour
 
     /**
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#toXML()
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#toXML()
      */
     @Override
     protected XmlElement toXML() {
@@ -236,7 +236,7 @@ public class InstanceNode extends Resour
 
     /**
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#addConfigurationElement(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#addConfigurationElement(org.xmlpull.infoset.XmlElement)
      */
     @Override
     protected XmlElement addConfigurationElement(XmlElement nodeElement) {
@@ -276,7 +276,7 @@ public class InstanceNode extends Resour
     }
 
     /**
-     * @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 {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/ResourceNode.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/ResourceNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/ResourceNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/ResourceNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/ResourceNode.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/ResourceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/ResourceNode.java Thu May 17 16:39:54 2012
@@ -19,16 +19,16 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.amazon;
+package org.apache.airavata.workflow.model.graph.amazon;
 
-import org.apache.airavata.xbaya.graph.DataEdge;
-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.Node;
-import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.DataEdge;
+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.Node;
+import org.apache.airavata.workflow.model.graph.Port;
+import org.apache.airavata.workflow.model.graph.impl.NodeImpl;
 import org.xmlpull.infoset.XmlElement;
 
 /**
@@ -59,7 +59,7 @@ public abstract class ResourceNode exten
 
     /**
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#addConfigurationElement(org.xmlpull.infoset.XmlElement)
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#addConfigurationElement(org.xmlpull.infoset.XmlElement)
      */
     @Override
     protected XmlElement addConfigurationElement(XmlElement nodeElement) {
@@ -68,7 +68,7 @@ public abstract class ResourceNode exten
     }
 
     /**
-     * @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 {

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/TerminateInstanceNode.java (from r1339684, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/TerminateInstanceNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/TerminateInstanceNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/TerminateInstanceNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/TerminateInstanceNode.java&r1=1339684&r2=1339699&rev=1339699&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/TerminateInstanceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/workflow/model/graph/amazon/TerminateInstanceNode.java Thu May 17 16:39:54 2012
@@ -19,13 +19,13 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.amazon;
+package org.apache.airavata.workflow.model.graph.amazon;
 
-import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.component.amazon.TerminateInstanceComponent;
-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.Component;
+import org.apache.airavata.workflow.model.component.amazon.TerminateInstanceComponent;
+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 TerminateInstanceNode extends ResourceNode {
@@ -55,7 +55,7 @@ public class TerminateInstanceNode exten
 
     /**
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#getComponent()
      */
     @Override
     public Component getComponent() {
@@ -70,7 +70,7 @@ public class TerminateInstanceNode exten
 
     /**
      * 
-     * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#toXML()
+     * @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#toXML()
      */
     @Override
     protected XmlElement toXML() {