http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index 1e6f325..d0a09b7 100644
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -1440,7 +1440,7 @@ public class Airavata {
      * @param priorityOrder
      * @param localDataMovement
      */
-    public String 
addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public String 
addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) 
throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Update the given Local data movement details
@@ -1459,7 +1459,7 @@ public class Airavata {
      * @param dataMovementInterfaceId
      * @param localDataMovement
      */
-    public boolean 
updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public boolean 
updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) 
throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      *         * This method returns local datamovement object
@@ -1471,7 +1471,7 @@ public class Airavata {
      * @param authzToken
      * @param dataMovementId
      */
-    public 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
getLocalDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public org.apache.airavata.model.data.movement.LOCALDataMovement 
getLocalDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Add a SCP data movement details to a compute resource
@@ -1496,7 +1496,7 @@ public class Airavata {
      * @param priorityOrder
      * @param scpDataMovement
      */
-    public String 
addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public String 
addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Update the given scp data movement details
@@ -1516,7 +1516,7 @@ public class Airavata {
      * @param dataMovementInterfaceId
      * @param scpDataMovement
      */
-    public boolean 
updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public boolean 
updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      *   * This method returns SCP datamovement object
@@ -1528,13 +1528,13 @@ public class Airavata {
      * @param authzToken
      * @param dataMovementId
      */
-    public 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public org.apache.airavata.model.data.movement.SCPDataMovement 
getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
-    public String 
addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public String 
addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
-    public boolean 
updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public boolean 
updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
getUnicoreDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public org.apache.airavata.model.data.movement.UnicoreDataMovement 
getUnicoreDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Add a GridFTP data movement details to a compute resource
@@ -1559,7 +1559,7 @@ public class Airavata {
      * @param priorityOrder
      * @param gridFTPDataMovement
      */
-    public String 
addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public String 
addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Update the given GridFTP data movement details to a compute resource
@@ -1579,7 +1579,7 @@ public class Airavata {
      * @param dataMovementInterfaceId
      * @param gridFTPDataMovement
      */
-    public boolean 
updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public boolean 
updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      *   * This method returns GridFTP datamovement object
@@ -1591,7 +1591,7 @@ public class Airavata {
      * @param authzToken
      * @param dataMovementId
      */
-    public 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
getGridFTPDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public org.apache.airavata.model.data.movement.GridFTPDataMovement 
getGridFTPDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Change the priority of a given job submisison interface
@@ -1793,7 +1793,7 @@ public class Airavata {
      */
     public boolean 
addGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayID, String computeResourceId, 
org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference 
computeResourcePreference) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
-    public boolean 
addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public boolean 
addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Fetch a Compute Resource Preference of a registered gateway profile.
@@ -1814,7 +1814,7 @@ public class Airavata {
      */
     public 
org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference 
getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayID, String computeResourceId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
-    public 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Fetch all Compute Resource Preferences of a registered gateway profile.
@@ -2075,27 +2075,27 @@ public class Airavata {
 
     public void 
updateUnicoreJobSubmissionDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String jobSubmissionInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission 
unicoreJobSubmission, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void 
addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void 
getLocalDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void 
addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void 
getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void 
addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-    public void 
updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
     public void 
getUnicoreDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void 
addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-    public void 
updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
     public void 
getGridFTPDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
@@ -2131,11 +2131,11 @@ public class Airavata {
 
     public void 
addGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayID, String computeResourceId, 
org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference 
computeResourcePreference, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void 
addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
     public void 
getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayID, String computeResourceId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void 
getAllGatewayComputeResourcePreferences(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
@@ -5320,13 +5320,13 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateUnicoreJobSubmissionDetails failed: unknown result");
     }
 
-    public String 
addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public String 
addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) 
throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_addLocalDataMovementDetails(authzToken, resourceId, dataMoveType, 
priorityOrder, localDataMovement);
       return recv_addLocalDataMovementDetails();
     }
 
-    public void 
send_addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement) throws org.apache.thrift.TException
+    public void 
send_addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) 
throws org.apache.thrift.TException
     {
       addLocalDataMovementDetails_args args = new 
addLocalDataMovementDetails_args();
       args.setAuthzToken(authzToken);
@@ -5359,13 +5359,13 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addLocalDataMovementDetails failed: unknown result");
     }
 
-    public boolean 
updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public boolean 
updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) 
throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_updateLocalDataMovementDetails(authzToken, dataMovementInterfaceId, 
localDataMovement);
       return recv_updateLocalDataMovementDetails();
     }
 
-    public void 
send_updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement) throws org.apache.thrift.TException
+    public void 
send_updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) 
throws org.apache.thrift.TException
     {
       updateLocalDataMovementDetails_args args = new 
updateLocalDataMovementDetails_args();
       args.setAuthzToken(authzToken);
@@ -5396,7 +5396,7 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateLocalDataMovementDetails failed: unknown result");
     }
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
getLocalDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.data.movement.LOCALDataMovement 
getLocalDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_getLocalDataMovement(authzToken, dataMovementId);
       return recv_getLocalDataMovement();
@@ -5410,7 +5410,7 @@ public class Airavata {
       sendBase("getLocalDataMovement", args);
     }
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
recv_getLocalDataMovement() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.data.movement.LOCALDataMovement 
recv_getLocalDataMovement() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       getLocalDataMovement_result result = new getLocalDataMovement_result();
       receiveBase(result, "getLocalDataMovement");
@@ -5432,13 +5432,13 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getLocalDataMovement failed: unknown result");
     }
 
-    public String 
addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public String 
addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_addSCPDataMovementDetails(authzToken, resourceId, dataMoveType, 
priorityOrder, scpDataMovement);
       return recv_addSCPDataMovementDetails();
     }
 
-    public void 
send_addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement) throws org.apache.thrift.TException
+    public void 
send_addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws 
org.apache.thrift.TException
     {
       addSCPDataMovementDetails_args args = new 
addSCPDataMovementDetails_args();
       args.setAuthzToken(authzToken);
@@ -5471,13 +5471,13 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addSCPDataMovementDetails failed: unknown result");
     }
 
-    public boolean 
updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public boolean 
updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_updateSCPDataMovementDetails(authzToken, dataMovementInterfaceId, 
scpDataMovement);
       return recv_updateSCPDataMovementDetails();
     }
 
-    public void 
send_updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement) throws org.apache.thrift.TException
+    public void 
send_updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) throws 
org.apache.thrift.TException
     {
       updateSCPDataMovementDetails_args args = new 
updateSCPDataMovementDetails_args();
       args.setAuthzToken(authzToken);
@@ -5508,7 +5508,7 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateSCPDataMovementDetails failed: unknown result");
     }
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.data.movement.SCPDataMovement 
getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, 
String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_getSCPDataMovement(authzToken, dataMovementId);
       return recv_getSCPDataMovement();
@@ -5522,7 +5522,7 @@ public class Airavata {
       sendBase("getSCPDataMovement", args);
     }
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
recv_getSCPDataMovement() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.data.movement.SCPDataMovement 
recv_getSCPDataMovement() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       getSCPDataMovement_result result = new getSCPDataMovement_result();
       receiveBase(result, "getSCPDataMovement");
@@ -5544,13 +5544,13 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getSCPDataMovement failed: unknown result");
     }
 
-    public String 
addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public String 
addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_addUnicoreDataMovementDetails(authzToken, resourceId, dataMoveType, 
priorityOrder, unicoreDataMovement);
       return recv_addUnicoreDataMovementDetails();
     }
 
-    public void 
send_addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement) throws org.apache.thrift.TException
+    public void 
send_addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement) throws org.apache.thrift.TException
     {
       addUnicoreDataMovementDetails_args args = new 
addUnicoreDataMovementDetails_args();
       args.setAuthzToken(authzToken);
@@ -5583,13 +5583,13 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addUnicoreDataMovementDetails failed: unknown result");
     }
 
-    public boolean 
updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public boolean 
updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_updateUnicoreDataMovementDetails(authzToken, 
dataMovementInterfaceId, unicoreDataMovement);
       return recv_updateUnicoreDataMovementDetails();
     }
 
-    public void 
send_updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement) throws org.apache.thrift.TException
+    public void 
send_updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement) throws org.apache.thrift.TException
     {
       updateUnicoreDataMovementDetails_args args = new 
updateUnicoreDataMovementDetails_args();
       args.setAuthzToken(authzToken);
@@ -5620,7 +5620,7 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateUnicoreDataMovementDetails failed: unknown result");
     }
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
getUnicoreDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.data.movement.UnicoreDataMovement 
getUnicoreDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_getUnicoreDataMovement(authzToken, dataMovementId);
       return recv_getUnicoreDataMovement();
@@ -5634,7 +5634,7 @@ public class Airavata {
       sendBase("getUnicoreDataMovement", args);
     }
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
recv_getUnicoreDataMovement() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.data.movement.UnicoreDataMovement 
recv_getUnicoreDataMovement() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       getUnicoreDataMovement_result result = new 
getUnicoreDataMovement_result();
       receiveBase(result, "getUnicoreDataMovement");
@@ -5656,13 +5656,13 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getUnicoreDataMovement failed: unknown result");
     }
 
-    public String 
addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public String 
addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_addGridFTPDataMovementDetails(authzToken, resourceId, dataMoveType, 
priorityOrder, gridFTPDataMovement);
       return recv_addGridFTPDataMovementDetails();
     }
 
-    public void 
send_addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement) throws org.apache.thrift.TException
+    public void 
send_addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement) throws org.apache.thrift.TException
     {
       addGridFTPDataMovementDetails_args args = new 
addGridFTPDataMovementDetails_args();
       args.setAuthzToken(authzToken);
@@ -5695,13 +5695,13 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addGridFTPDataMovementDetails failed: unknown result");
     }
 
-    public boolean 
updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public boolean 
updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_updateGridFTPDataMovementDetails(authzToken, 
dataMovementInterfaceId, gridFTPDataMovement);
       return recv_updateGridFTPDataMovementDetails();
     }
 
-    public void 
send_updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement) throws org.apache.thrift.TException
+    public void 
send_updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement) throws org.apache.thrift.TException
     {
       updateGridFTPDataMovementDetails_args args = new 
updateGridFTPDataMovementDetails_args();
       args.setAuthzToken(authzToken);
@@ -5732,7 +5732,7 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateGridFTPDataMovementDetails failed: unknown result");
     }
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
getGridFTPDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.data.movement.GridFTPDataMovement 
getGridFTPDataMovement(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       send_getGridFTPDataMovement(authzToken, dataMovementId);
       return recv_getGridFTPDataMovement();
@@ -5746,7 +5746,7 @@ public class Airavata {
       sendBase("getGridFTPDataMovement", args);
     }
 
-    public 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
recv_getGridFTPDataMovement() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.data.movement.GridFTPDataMovement 
recv_getGridFTPDataMovement() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
       getGridFTPDataMovement_result result = new 
getGridFTPDataMovement_result();
       receiveBase(result, "getGridFTPDataMovement");
@@ -6353,18 +6353,18 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addGatewayComputeResourcePreference failed: unknown result");
     }
 
-    public boolean 
addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public boolean 
addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
-      send_addGatewayStoragePreference(authzToken, gatewayID, dataMoveId, 
storagePreference);
+      send_addGatewayStoragePreference(authzToken, gatewayID, 
storageResourceId, storagePreference);
       return recv_addGatewayStoragePreference();
     }
 
-    public void 
send_addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference) throws org.apache.thrift.TException
+    public void 
send_addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference) throws org.apache.thrift.TException
     {
       addGatewayStoragePreference_args args = new 
addGatewayStoragePreference_args();
       args.setAuthzToken(authzToken);
       args.setGatewayID(gatewayID);
-      args.setDataMoveId(dataMoveId);
+      args.setStorageResourceId(storageResourceId);
       args.setStoragePreference(storagePreference);
       sendBase("addGatewayStoragePreference", args);
     }
@@ -6428,18 +6428,18 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getGatewayComputeResourcePreference failed: unknown result");
     }
 
-    public 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
-      send_getGatewayStoragePreference(authzToken, gatewayID, dataMoveId);
+      send_getGatewayStoragePreference(authzToken, gatewayID, 
storageResourceId);
       return recv_getGatewayStoragePreference();
     }
 
-    public void 
send_getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId) throws 
org.apache.thrift.TException
+    public void 
send_getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId) throws 
org.apache.thrift.TException
     {
       getGatewayStoragePreference_args args = new 
getGatewayStoragePreference_args();
       args.setAuthzToken(authzToken);
       args.setGatewayID(gatewayID);
-      args.setDataMoveId(dataMoveId);
+      args.setStorageResourceId(storageResourceId);
       sendBase("getGatewayStoragePreference", args);
     }
 
@@ -10182,7 +10182,7 @@ public class Airavata {
       }
     }
 
-    public void 
addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       addLocalDataMovementDetails_call method_call = new 
addLocalDataMovementDetails_call(authzToken, resourceId, dataMoveType, 
priorityOrder, localDataMovement, resultHandler, this, ___protocolFactory, 
___transport);
       this.___currentMethod = method_call;
@@ -10192,10 +10192,10 @@ public class Airavata {
     public static class addLocalDataMovementDetails_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String resourceId;
-      private org.apache.airavata.model.appcatalog.computeresource.DMType 
dataMoveType;
+      private org.apache.airavata.model.data.movement.DMType dataMoveType;
       private int priorityOrder;
-      private 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement;
-      public 
addLocalDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.model.data.movement.LOCALDataMovement 
localDataMovement;
+      public 
addLocalDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.resourceId = resourceId;
@@ -10226,7 +10226,7 @@ public class Airavata {
       }
     }
 
-    public void 
updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       updateLocalDataMovementDetails_call method_call = new 
updateLocalDataMovementDetails_call(authzToken, dataMovementInterfaceId, 
localDataMovement, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -10236,8 +10236,8 @@ public class Airavata {
     public static class updateLocalDataMovementDetails_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String dataMovementInterfaceId;
-      private 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement;
-      public 
updateLocalDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.model.data.movement.LOCALDataMovement 
localDataMovement;
+      public 
updateLocalDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.dataMovementInterfaceId = dataMovementInterfaceId;
@@ -10289,7 +10289,7 @@ public class Airavata {
         prot.writeMessageEnd();
       }
 
-      public 
org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException {
+      public org.apache.airavata.model.data.movement.LOCALDataMovement 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -10299,7 +10299,7 @@ public class Airavata {
       }
     }
 
-    public void 
addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       addSCPDataMovementDetails_call method_call = new 
addSCPDataMovementDetails_call(authzToken, resourceId, dataMoveType, 
priorityOrder, scpDataMovement, resultHandler, this, ___protocolFactory, 
___transport);
       this.___currentMethod = method_call;
@@ -10309,10 +10309,10 @@ public class Airavata {
     public static class addSCPDataMovementDetails_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String resourceId;
-      private org.apache.airavata.model.appcatalog.computeresource.DMType 
dataMoveType;
+      private org.apache.airavata.model.data.movement.DMType dataMoveType;
       private int priorityOrder;
-      private 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement;
-      public 
addSCPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.model.data.movement.SCPDataMovement 
scpDataMovement;
+      public 
addSCPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.resourceId = resourceId;
@@ -10343,7 +10343,7 @@ public class Airavata {
       }
     }
 
-    public void 
updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
updateSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       updateSCPDataMovementDetails_call method_call = new 
updateSCPDataMovementDetails_call(authzToken, dataMovementInterfaceId, 
scpDataMovement, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -10353,8 +10353,8 @@ public class Airavata {
     public static class updateSCPDataMovementDetails_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String dataMovementInterfaceId;
-      private 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement;
-      public 
updateSCPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
scpDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.model.data.movement.SCPDataMovement 
scpDataMovement;
+      public 
updateSCPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.dataMovementInterfaceId = dataMovementInterfaceId;
@@ -10406,7 +10406,7 @@ public class Airavata {
         prot.writeMessageEnd();
       }
 
-      public 
org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException {
+      public org.apache.airavata.model.data.movement.SCPDataMovement 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -10416,7 +10416,7 @@ public class Airavata {
       }
     }
 
-    public void 
addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
       addUnicoreDataMovementDetails_call method_call = new 
addUnicoreDataMovementDetails_call(authzToken, resourceId, dataMoveType, 
priorityOrder, unicoreDataMovement, resultHandler, this, ___protocolFactory, 
___transport);
       this.___currentMethod = method_call;
@@ -10426,10 +10426,10 @@ public class Airavata {
     public static class addUnicoreDataMovementDetails_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String resourceId;
-      private org.apache.airavata.model.appcatalog.computeresource.DMType 
dataMoveType;
+      private org.apache.airavata.model.data.movement.DMType dataMoveType;
       private int priorityOrder;
-      private 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement;
-      public 
addUnicoreDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement;
+      public 
addUnicoreDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.resourceId = resourceId;
@@ -10460,7 +10460,7 @@ public class Airavata {
       }
     }
 
-    public void 
updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
       updateUnicoreDataMovementDetails_call method_call = new 
updateUnicoreDataMovementDetails_call(authzToken, dataMovementInterfaceId, 
unicoreDataMovement, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -10470,8 +10470,8 @@ public class Airavata {
     public static class updateUnicoreDataMovementDetails_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String dataMovementInterfaceId;
-      private 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement;
-      public 
updateUnicoreDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement;
+      public 
updateUnicoreDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.UnicoreDataMovement 
unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.dataMovementInterfaceId = dataMovementInterfaceId;
@@ -10523,7 +10523,7 @@ public class Airavata {
         prot.writeMessageEnd();
       }
 
-      public 
org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException {
+      public org.apache.airavata.model.data.movement.UnicoreDataMovement 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -10533,7 +10533,7 @@ public class Airavata {
       }
     }
 
-    public void 
addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
addGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
       addGridFTPDataMovementDetails_call method_call = new 
addGridFTPDataMovementDetails_call(authzToken, resourceId, dataMoveType, 
priorityOrder, gridFTPDataMovement, resultHandler, this, ___protocolFactory, 
___transport);
       this.___currentMethod = method_call;
@@ -10543,10 +10543,10 @@ public class Airavata {
     public static class addGridFTPDataMovementDetails_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String resourceId;
-      private org.apache.airavata.model.appcatalog.computeresource.DMType 
dataMoveType;
+      private org.apache.airavata.model.data.movement.DMType dataMoveType;
       private int priorityOrder;
-      private 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement;
-      public 
addGridFTPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String resourceId, 
org.apache.airavata.model.appcatalog.computeresource.DMType dataMoveType, int 
priorityOrder, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement;
+      public 
addGridFTPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType 
dataMoveType, int priorityOrder, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.resourceId = resourceId;
@@ -10577,7 +10577,7 @@ public class Airavata {
       }
     }
 
-    public void 
updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
updateGridFTPDataMovementDetails(org.apache.airavata.model.security.AuthzToken 
authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
       updateGridFTPDataMovementDetails_call method_call = new 
updateGridFTPDataMovementDetails_call(authzToken, dataMovementInterfaceId, 
gridFTPDataMovement, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -10587,8 +10587,8 @@ public class Airavata {
     public static class updateGridFTPDataMovementDetails_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String dataMovementInterfaceId;
-      private 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement;
-      public 
updateGridFTPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement;
+      public 
updateGridFTPDataMovementDetails_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String dataMovementInterfaceId, 
org.apache.airavata.model.data.movement.GridFTPDataMovement 
gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.dataMovementInterfaceId = dataMovementInterfaceId;
@@ -10640,7 +10640,7 @@ public class Airavata {
         prot.writeMessageEnd();
       }
 
-      public 
org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException {
+      public org.apache.airavata.model.data.movement.GridFTPDataMovement 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -11237,9 +11237,9 @@ public class Airavata {
       }
     }
 
-    public void 
addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
-      addGatewayStoragePreference_call method_call = new 
addGatewayStoragePreference_call(authzToken, gatewayID, dataMoveId, 
storagePreference, resultHandler, this, ___protocolFactory, ___transport);
+      addGatewayStoragePreference_call method_call = new 
addGatewayStoragePreference_call(authzToken, gatewayID, storageResourceId, 
storagePreference, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -11247,13 +11247,13 @@ public class Airavata {
     public static class addGatewayStoragePreference_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String gatewayID;
-      private String dataMoveId;
+      private String storageResourceId;
       private 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference;
-      public 
addGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public 
addGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference 
storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.gatewayID = gatewayID;
-        this.dataMoveId = dataMoveId;
+        this.storageResourceId = storageResourceId;
         this.storagePreference = storagePreference;
       }
 
@@ -11262,7 +11262,7 @@ public class Airavata {
         addGatewayStoragePreference_args args = new 
addGatewayStoragePreference_args();
         args.setAuthzToken(authzToken);
         args.setGatewayID(gatewayID);
-        args.setDataMoveId(dataMoveId);
+        args.setStorageResourceId(storageResourceId);
         args.setStoragePreference(storagePreference);
         args.write(prot);
         prot.writeMessageEnd();
@@ -11316,9 +11316,9 @@ public class Airavata {
       }
     }
 
-    public void 
getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void 
getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getGatewayStoragePreference_call method_call = new 
getGatewayStoragePreference_call(authzToken, gatewayID, dataMoveId, 
resultHandler, this, ___protocolFactory, ___transport);
+      getGatewayStoragePreference_call method_call = new 
getGatewayStoragePreference_call(authzToken, gatewayID, storageResourceId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -11326,12 +11326,12 @@ public class Airavata {
     public static class getGatewayStoragePreference_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String gatewayID;
-      private String dataMoveId;
-      public 
getGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String dataMoveId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private String storageResourceId;
+      public 
getGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageResourceId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblocking

<TRUNCATED>

Reply via email to