You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/12/14 17:05:49 UTC

[8/8] airavata git commit: adding gatewayId to the replica catalog

adding gatewayId to the replica catalog


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d3a5a5ea
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d3a5a5ea
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d3a5a5ea

Branch: refs/heads/master
Commit: d3a5a5ea608d5193aa9f8826de40c74804ad4242
Parents: 305bc04
Author: scnakandala <su...@gmail.com>
Authored: Mon Dec 14 11:05:06 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Dec 14 11:05:06 2015 -0500

----------------------------------------------------------------------
 airavata-api/airavata-api-server/pom.xml        |  15 +
 .../airavata/api/server/security/Main.java      | 179 +++++
 .../security/oauth/DefaultOAuthClient.java      |   5 +-
 .../java/org/apache/airavata/api/Airavata.java  |   2 +-
 .../src/main/resources/lib/airavata/Airavata.h  |  24 +-
 .../resources/lib/airavata/airavata_api_types.h |   2 +-
 .../lib/airavata/airavata_data_models_types.h   |   2 +-
 .../replica_catalog_models_constants.cpp        |  34 +
 .../airavata/replica_catalog_models_constants.h |  41 ++
 .../airavata/replica_catalog_models_types.cpp   | 729 +++++++++++++++++++
 .../lib/airavata/replica_catalog_models_types.h | 299 ++++++++
 .../lib/Airavata/Model/Data/Resource/Types.php  |  67 +-
 .../airavata/model/data/resource/ttypes.py      |  61 +-
 .../org/apache/airavata/model/Workflow.java     |   2 +-
 .../ApplicationDeploymentDescription.java       |   2 +-
 .../appdeployment/ApplicationModule.java        |   2 +-
 .../appcatalog/appdeployment/CommandObject.java |   2 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   |   2 +-
 .../ApplicationInterfaceDescription.java        |   2 +-
 .../appcatalog/computeresource/BatchQueue.java  |   2 +-
 .../computeresource/CloudJobSubmission.java     |   2 +-
 .../ComputeResourceDescription.java             |   2 +-
 .../computeresource/GlobusJobSubmission.java    |   2 +-
 .../computeresource/JobSubmissionInterface.java |   2 +-
 .../computeresource/LOCALSubmission.java        |   2 +-
 .../computeresource/ResourceJobManager.java     |   2 +-
 .../computeresource/SSHJobSubmission.java       |   2 +-
 .../computeresource/UnicoreJobSubmission.java   |   2 +-
 .../ComputeResourcePreference.java              |   2 +-
 .../gatewayprofile/GatewayResourceProfile.java  |   2 +-
 .../gatewayprofile/StoragePreference.java       |   2 +-
 .../StorageResourceDescription.java             |   2 +-
 .../application/io/InputDataObjectType.java     |   2 +-
 .../application/io/OutputDataObjectType.java    |   2 +-
 .../airavata/model/commons/ErrorModel.java      |   2 +-
 .../model/commons/ValidationResults.java        |   2 +-
 .../airavata/model/commons/ValidatorResult.java |   2 +-
 .../data/movement/DataMovementInterface.java    |   2 +-
 .../data/movement/GridFTPDataMovement.java      |   2 +-
 .../model/data/movement/LOCALDataMovement.java  |   2 +-
 .../model/data/movement/SCPDataMovement.java    |   2 +-
 .../data/movement/UnicoreDataMovement.java      |   2 +-
 .../data/resource/DataReplicaLocationModel.java |   2 +-
 .../model/data/resource/DataResourceModel.java  | 208 ++++--
 .../model/error/AiravataClientException.java    |   2 +-
 .../model/error/AiravataSystemException.java    |   2 +-
 .../model/error/AuthenticationException.java    |   2 +-
 .../model/error/AuthorizationException.java     |   2 +-
 .../error/ExperimentNotFoundException.java      |   2 +-
 .../model/error/InvalidRequestException.java    |   2 +-
 .../model/error/LaunchValidationException.java  |   2 +-
 .../model/error/ProjectNotFoundException.java   |   2 +-
 .../airavata/model/error/TimedOutException.java |   2 +-
 .../airavata/model/error/ValidationResults.java |   2 +-
 .../airavata/model/error/ValidatorResult.java   |   2 +-
 .../model/experiment/ExperimentModel.java       |   2 +-
 .../model/experiment/ExperimentStatistics.java  |   2 +-
 .../experiment/ExperimentSummaryModel.java      |   2 +-
 .../experiment/UserConfigurationDataModel.java  |   2 +-
 .../org/apache/airavata/model/job/JobModel.java |   2 +-
 .../event/ExperimentStatusChangeEvent.java      |   2 +-
 .../model/messaging/event/JobIdentifier.java    |   2 +-
 .../messaging/event/JobStatusChangeEvent.java   |   2 +-
 .../event/JobStatusChangeRequestEvent.java      |   2 +-
 .../airavata/model/messaging/event/Message.java |   2 +-
 .../messaging/event/ProcessIdentifier.java      |   2 +-
 .../event/ProcessStatusChangeEvent.java         |   2 +-
 .../event/ProcessStatusChangeRequestEvent.java  |   2 +-
 .../messaging/event/ProcessSubmitEvent.java     |   2 +-
 .../messaging/event/ProcessTerminateEvent.java  |   2 +-
 .../model/messaging/event/TaskIdentifier.java   |   2 +-
 .../messaging/event/TaskOutputChangeEvent.java  |   2 +-
 .../messaging/event/TaskStatusChangeEvent.java  |   2 +-
 .../event/TaskStatusChangeRequestEvent.java     |   2 +-
 .../airavata/model/process/ProcessModel.java    |   2 +-
 .../ComputationalResourceSchedulingModel.java   |   2 +-
 .../airavata/model/security/AuthzToken.java     |   2 +-
 .../airavata/model/status/ExperimentStatus.java |   2 +-
 .../apache/airavata/model/status/JobStatus.java |   2 +-
 .../airavata/model/status/ProcessStatus.java    |   2 +-
 .../airavata/model/status/TaskStatus.java       |   2 +-
 .../model/task/DataStagingTaskModel.java        |   2 +-
 .../model/task/EnvironmentSetupTaskModel.java   |   2 +-
 .../model/task/JobSubmissionTaskModel.java      |   2 +-
 .../airavata/model/task/MonitorTaskModel.java   |   2 +-
 .../apache/airavata/model/task/TaskModel.java   |   2 +-
 .../airavata/model/workspace/Gateway.java       |   2 +-
 .../apache/airavata/model/workspace/Group.java  |   2 +-
 .../airavata/model/workspace/Project.java       |   2 +-
 .../apache/airavata/model/workspace/User.java   |   2 +-
 modules/data-manager/pom.xml                    |  61 --
 .../airavata/data/manager/DataManager.java      |  99 ---
 .../data/manager/DataManagerConstants.java      |  28 -
 .../data/manager/DataManagerException.java      |  35 -
 .../data/manager/DataManagerFactory.java        |  32 -
 .../airavata/data/manager/DataManagerImpl.java  | 204 ------
 .../data/manager/DataManagerFactoryTest.java    |  40 -
 .../data/manager/DataManagerImplTest.java       | 207 ------
 .../airavata/data/manager/utils/AppCatInit.java | 320 --------
 .../data/manager/utils/DataCatInit.java         | 315 --------
 modules/data-manager/src/test/resources/id_rsa  |  30 -
 .../data-manager/src/test/resources/id_rsa.pub  |   1 -
 .../data-manager/src/test/resources/known_hosts |   0
 .../core/data/catalog/impl/DataCatalogImpl.java | 279 -------
 .../core/data/catalog/model/Configuration.java  |  55 --
 .../data/catalog/model/DataReplicaLocation.java | 147 ----
 .../data/catalog/model/DataReplicaMetaData.java |  77 --
 .../catalog/model/DataReplicaMetaData_PK.java   |  59 --
 .../core/data/catalog/model/DataResource.java   | 126 ----
 .../catalog/model/DataResourceMetaData.java     |  80 --
 .../catalog/model/DataResourceMetaData_PK.java  |  59 --
 .../catalog/utils/DataCatalogConstants.java     |  49 --
 .../data/catalog/utils/DataCatalogJPAUtils.java |  82 ---
 .../utils/DataCatalogQueryGenerator.java        | 111 ---
 .../utils/ThriftDataModelConversion.java        | 186 -----
 .../catalog/impl/RegistryFactory.java           |   2 +-
 .../registry/core/impl/RegistryImpl.java        |   2 +-
 .../replica/catalog/impl/DataCatalogImpl.java   | 278 +++++++
 .../replica/catalog/model/Configuration.java    |  55 ++
 .../catalog/model/DataReplicaLocation.java      | 147 ++++
 .../catalog/model/DataReplicaMetaData.java      |  77 ++
 .../catalog/model/DataReplicaMetaData_PK.java   |  59 ++
 .../replica/catalog/model/DataResource.java     | 136 ++++
 .../catalog/model/DataResourceMetaData.java     |  80 ++
 .../catalog/model/DataResourceMetaData_PK.java  |  59 ++
 .../catalog/utils/DataCatalogConstants.java     |  49 ++
 .../catalog/utils/DataCatalogJPAUtils.java      |  82 +++
 .../utils/DataCatalogQueryGenerator.java        | 111 +++
 .../utils/ThriftDataModelConversion.java        | 188 +++++
 .../src/main/resources/META-INF/persistence.xml |  10 +-
 .../src/main/resources/datacatalog-derby.sql    |  73 --
 .../src/main/resources/datacatalog-mysql.sql    |  72 --
 .../src/main/resources/replicacatalog-derby.sql |  74 ++
 .../src/main/resources/replicacatalog-mysql.sql |  73 ++
 .../airavata/data/catalog/DataCatalogTest.java  | 222 ------
 .../airavata/data/catalog/util/Initialize.java  | 315 --------
 .../replica/catalog/DataCatalogTest.java        | 221 ++++++
 .../replica/catalog/util/Initialize.java        | 315 ++++++++
 modules/replica-catalog/pom.xml                 |  61 ++
 .../replica/catalog/ReplicaCatalog.java         |  99 +++
 .../catalog/ReplicaCatalogConstants.java        |  28 +
 .../catalog/ReplicaCatalogException.java        |  35 +
 .../replica/catalog/ReplicaCatalogFactory.java  |  32 +
 .../replica/catalog/ReplicaCatalogImpl.java     | 204 ++++++
 .../catalog/ReplicaCatalogFactoryTest.java      |  40 +
 .../replica/catalog/ReplicaCatalogImplTest.java | 207 ++++++
 .../replica/catalog/utils/AppCatInit.java       | 320 ++++++++
 .../replica/catalog/utils/DataCatInit.java      | 315 ++++++++
 .../replica-catalog/src/test/resources/id_rsa   |  30 +
 .../src/test/resources/id_rsa.pub               |   1 +
 .../src/test/resources/known_hosts              |   0
 pom.xml                                         |   2 +-
 .../airavata-api/airavata_api.thrift            |   8 +-
 .../airavata-api/airavata_data_models.thrift    |   2 +-
 .../airavata-api/data_resource_models.thrift    |  61 --
 .../airavata-api/replica_catalog_models.thrift  |  62 ++
 156 files changed, 5079 insertions(+), 3630 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-api-server/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index e78ff9d..1f03b95 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -127,6 +127,21 @@
             <artifactId>aopalliance</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>super-admin-entitlement-stubs</artifactId>
+            <version>0.16-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/Main.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/Main.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/Main.java
new file mode 100644
index 0000000..cfd59c7
--- /dev/null
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/Main.java
@@ -0,0 +1,179 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.airavata.api.server.security;
+
+import org.apache.airavata.api.server.security.oauth.DefaultOAuthClient;
+import org.apache.airavata.api.server.security.xacml.DefaultXACMLPEP;
+import org.apache.airavata.common.utils.Constants;
+import org.apache.airavata.model.error.AuthenticationException;
+import org.apache.airavata.model.security.AuthzToken;
+import org.apache.airavata.security.AiravataSecurityException;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.oltu.oauth2.client.URLConnectionClient;
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.response.OAuthResourceResponse;
+import org.apache.oltu.oauth2.common.OAuth;
+import org.apache.oltu.oauth2.common.message.types.GrantType;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationResponseDTO;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Main {
+    private final static Logger logger = LoggerFactory.getLogger(Main.class);
+
+    private static String username = "scigap_admin";
+    private static String password = "sci9067@min";
+    private static String hostName = "https://idp.scigap.org:7443";
+//    private static String clientId = "KUu0a74dFbrwvSxD3C_GhwKeNrQa";
+    private static String clientId = "O3iUdkkVYyHgzWPiVTQpY_tb96Ma";
+//    private static String clientSecret = "UTKb9nDOPsuWB4lEX39TwhkW8qIa";
+    private static String clientSecret = "6Ck1jZoa2oRtrzodSqkUZ2iINkUa";
+
+    public static void main(String[] args) throws AuthenticationException, AiravataSecurityException, AxisFault {
+        String accessToken = authenticate("master@master.airavata", "master").getAccess_token();
+        ConfigurationContext configContext =
+                ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
+        DefaultOAuthClient defaultOAuthClient = new DefaultOAuthClient(hostName+"/services/",username,password, configContext);
+        OAuth2TokenValidationResponseDTO tokenValidationRequestDTO = defaultOAuthClient.validateAccessToken(accessToken);
+        String authorizedUser = tokenValidationRequestDTO.getAuthorizedUser();
+        AuthzToken authzToken = new AuthzToken();
+        authzToken.setAccessToken(accessToken);
+        Map<String, String> claimsMap = new HashMap<>();
+        claimsMap.put(Constants.USER_NAME, "scigap_admin");
+        claimsMap.put(Constants.API_METHOD_NAME, "/airavata/getAPIVersion");
+        authzToken.setClaimsMap(claimsMap);
+
+        DefaultXACMLPEP defaultXACMLPEP = new DefaultXACMLPEP(hostName+"/services/",username,password,configContext);
+        HashMap<String, String> metaDataMap = new HashMap();
+        boolean result = defaultXACMLPEP.getAuthorizationDecision(authzToken, metaDataMap);
+        System.out.println(result);
+    }
+
+    public static AuthResponse authenticate(String username,String password) throws AuthenticationException {
+        try {
+            OAuthClientRequest request = OAuthClientRequest.tokenLocation(hostName+"/oauth2/token").
+                    setClientId(clientId).setClientSecret(clientSecret).
+                    setGrantType(GrantType.PASSWORD).
+                    setRedirectURI("").
+                    setUsername(username).
+                    setPassword(password).
+                    setScope("openid").
+                    buildBodyMessage();
+
+
+            URLConnectionClient ucc = new URLConnectionClient();
+
+            org.apache.oltu.oauth2.client.OAuthClient oAuthClient = new org.apache.oltu.oauth2.client.OAuthClient(ucc);
+            OAuthResourceResponse resp = oAuthClient.resource(request, OAuth.HttpMethod.POST, OAuthResourceResponse.class);
+
+            //converting JSON to object
+            ObjectMapper mapper = new ObjectMapper();
+            AuthResponse authResponse;
+            try{
+                authResponse = mapper.readValue(resp.getBody(), AuthResponse.class);
+            }catch (Exception e){
+                return null;
+            }
+
+            String accessToken = authResponse.getAccess_token();
+            if(accessToken != null && !accessToken.isEmpty()){
+                request = new OAuthBearerClientRequest(hostName + "/oauth2/userinfo?schema=openid").
+                        buildQueryMessage();
+                ucc = new URLConnectionClient();
+                request.setHeader("Authorization","Bearer "+accessToken);
+                oAuthClient = new org.apache.oltu.oauth2.client.OAuthClient(ucc);
+                resp = oAuthClient.resource(request, OAuth.HttpMethod.GET,
+                        OAuthResourceResponse.class);
+                Map<String,String> profile = mapper.readValue(resp.getBody(), Map.class);
+                return authResponse;
+            }
+        }catch (Exception ex){
+            throw new AuthenticationException(ex.getMessage());
+        }
+        return null;
+    }
+}
+
+class AuthResponse{
+
+    private String token_type;
+    private int expires_in;
+    private String refresh_token;
+    private String access_token;
+    public String id_token;
+    private String scope;
+
+
+    public String getToken_type() {
+        return token_type;
+    }
+
+    public void setToken_type(String token_type) {
+        this.token_type = token_type;
+    }
+
+    public int getExpires_in() {
+        return expires_in;
+    }
+
+    public void setExpires_in(int expires_in) {
+        this.expires_in = expires_in;
+    }
+
+    public String getRefresh_token() {
+        return refresh_token;
+    }
+
+    public void setRefresh_token(String refresh_token) {
+        this.refresh_token = refresh_token;
+    }
+
+    public String getAccess_token() {
+        return access_token;
+    }
+
+    public void setAccess_token(String access_token) {
+        this.access_token = access_token;
+    }
+
+    public String getId_token() {
+        return id_token;
+    }
+
+    public void setId_token(String id_token) {
+        this.id_token = id_token;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/oauth/DefaultOAuthClient.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/oauth/DefaultOAuthClient.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/oauth/DefaultOAuthClient.java
index 74b36cf..0c8d0e3 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/oauth/DefaultOAuthClient.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/oauth/DefaultOAuthClient.java
@@ -85,10 +85,7 @@ public class DefaultOAuthClient {
         } catch (RemoteException e) {
             logger.error(e.getMessage(), e);
             throw new AiravataSecurityException("Error in validating the OAuth access token.");
-        } /*catch (ApplicationSettingsException e) {
-            logger.error(e.getMessage(), e);
-            throw new AiravataSecurityException("Error in reading OAuth configuration.");
-        }*/
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/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 e1ececb..df4960f 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
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-14")
 public class Airavata {
 
   public interface Iface {

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
index 746357f..c66bae3 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
@@ -23050,8 +23050,8 @@ class Airavata_isWorkflowExistWithName_presult {
 class Airavata_publishDataResource_args {
  public:
 
-  static const char* ascii_fingerprint; // = "B0364BC8BD5AD6E34421711F776ED6BE";
-  static const uint8_t binary_fingerprint[16]; // = {0xB0,0x36,0x4B,0xC8,0xBD,0x5A,0xD6,0xE3,0x44,0x21,0x71,0x1F,0x77,0x6E,0xD6,0xBE};
+  static const char* ascii_fingerprint; // = "0F825F188186641A1AE3E1C23F0A8DAF";
+  static const uint8_t binary_fingerprint[16]; // = {0x0F,0x82,0x5F,0x18,0x81,0x86,0x64,0x1A,0x1A,0xE3,0xE1,0xC2,0x3F,0x0A,0x8D,0xAF};
 
   Airavata_publishDataResource_args(const Airavata_publishDataResource_args&);
   Airavata_publishDataResource_args& operator=(const Airavata_publishDataResource_args&);
@@ -23090,8 +23090,8 @@ class Airavata_publishDataResource_args {
 class Airavata_publishDataResource_pargs {
  public:
 
-  static const char* ascii_fingerprint; // = "B0364BC8BD5AD6E34421711F776ED6BE";
-  static const uint8_t binary_fingerprint[16]; // = {0xB0,0x36,0x4B,0xC8,0xBD,0x5A,0xD6,0xE3,0x44,0x21,0x71,0x1F,0x77,0x6E,0xD6,0xBE};
+  static const char* ascii_fingerprint; // = "0F825F188186641A1AE3E1C23F0A8DAF";
+  static const uint8_t binary_fingerprint[16]; // = {0x0F,0x82,0x5F,0x18,0x81,0x86,0x64,0x1A,0x1A,0xE3,0xE1,0xC2,0x3F,0x0A,0x8D,0xAF};
 
 
   virtual ~Airavata_publishDataResource_pargs() throw();
@@ -23202,8 +23202,8 @@ class Airavata_publishDataResource_presult {
 class Airavata_updateDataResource_args {
  public:
 
-  static const char* ascii_fingerprint; // = "B0364BC8BD5AD6E34421711F776ED6BE";
-  static const uint8_t binary_fingerprint[16]; // = {0xB0,0x36,0x4B,0xC8,0xBD,0x5A,0xD6,0xE3,0x44,0x21,0x71,0x1F,0x77,0x6E,0xD6,0xBE};
+  static const char* ascii_fingerprint; // = "0F825F188186641A1AE3E1C23F0A8DAF";
+  static const uint8_t binary_fingerprint[16]; // = {0x0F,0x82,0x5F,0x18,0x81,0x86,0x64,0x1A,0x1A,0xE3,0xE1,0xC2,0x3F,0x0A,0x8D,0xAF};
 
   Airavata_updateDataResource_args(const Airavata_updateDataResource_args&);
   Airavata_updateDataResource_args& operator=(const Airavata_updateDataResource_args&);
@@ -23242,8 +23242,8 @@ class Airavata_updateDataResource_args {
 class Airavata_updateDataResource_pargs {
  public:
 
-  static const char* ascii_fingerprint; // = "B0364BC8BD5AD6E34421711F776ED6BE";
-  static const uint8_t binary_fingerprint[16]; // = {0xB0,0x36,0x4B,0xC8,0xBD,0x5A,0xD6,0xE3,0x44,0x21,0x71,0x1F,0x77,0x6E,0xD6,0xBE};
+  static const char* ascii_fingerprint; // = "0F825F188186641A1AE3E1C23F0A8DAF";
+  static const uint8_t binary_fingerprint[16]; // = {0x0F,0x82,0x5F,0x18,0x81,0x86,0x64,0x1A,0x1A,0xE3,0xE1,0xC2,0x3F,0x0A,0x8D,0xAF};
 
 
   virtual ~Airavata_updateDataResource_pargs() throw();
@@ -23555,8 +23555,8 @@ typedef struct _Airavata_getDataResource_result__isset {
 class Airavata_getDataResource_result {
  public:
 
-  static const char* ascii_fingerprint; // = "746873CC749B9F1B734513F4A1F1F109";
-  static const uint8_t binary_fingerprint[16]; // = {0x74,0x68,0x73,0xCC,0x74,0x9B,0x9F,0x1B,0x73,0x45,0x13,0xF4,0xA1,0xF1,0xF1,0x09};
+  static const char* ascii_fingerprint; // = "C4440F37E5C789D7863582F8FCA2BE19";
+  static const uint8_t binary_fingerprint[16]; // = {0xC4,0x44,0x0F,0x37,0xE5,0xC7,0x89,0xD7,0x86,0x35,0x82,0xF8,0xFC,0xA2,0xBE,0x19};
 
   Airavata_getDataResource_result(const Airavata_getDataResource_result&);
   Airavata_getDataResource_result& operator=(const Airavata_getDataResource_result&);
@@ -23620,8 +23620,8 @@ typedef struct _Airavata_getDataResource_presult__isset {
 class Airavata_getDataResource_presult {
  public:
 
-  static const char* ascii_fingerprint; // = "746873CC749B9F1B734513F4A1F1F109";
-  static const uint8_t binary_fingerprint[16]; // = {0x74,0x68,0x73,0xCC,0x74,0x9B,0x9F,0x1B,0x73,0x45,0x13,0xF4,0xA1,0xF1,0xF1,0x09};
+  static const char* ascii_fingerprint; // = "C4440F37E5C789D7863582F8FCA2BE19";
+  static const uint8_t binary_fingerprint[16]; // = {0xC4,0x44,0x0F,0x37,0xE5,0xC7,0x89,0xD7,0x86,0x35,0x82,0xF8,0xFC,0xA2,0xBE,0x19};
 
 
   virtual ~Airavata_getDataResource_presult() throw();

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
index 4a61fd5..90006ea 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
@@ -48,7 +48,7 @@
 #include "workflow_data_model_types.h"
 #include "security_model_types.h"
 #include "data_movement_models_types.h"
-#include "data_resource_models_types.h"
+#include "replica_catalog_models_types.h"
 
 
 namespace apache { namespace airavata { namespace api {

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
index 2a7a069..40c53e0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
@@ -44,7 +44,7 @@
 #include "scheduling_model_types.h"
 #include "status_models_types.h"
 #include "data_movement_models_types.h"
-#include "data_resource_models_types.h"
+#include "replica_catalog_models_types.h"
 
 
 namespace apache { namespace airavata { namespace model {

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_constants.cpp
new file mode 100644
index 0000000..4ae7ddc
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_constants.cpp
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#include "replica_catalog_models_constants.h"
+
+namespace apache { namespace airavata { namespace model { namespace data { namespace resource {
+
+const replica_catalog_modelsConstants g_replica_catalog_models_constants;
+
+replica_catalog_modelsConstants::replica_catalog_modelsConstants() {
+}
+
+}}}}} // namespace
+

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_constants.h
new file mode 100644
index 0000000..14d8efa
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_constants.h
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#ifndef replica_catalog_models_CONSTANTS_H
+#define replica_catalog_models_CONSTANTS_H
+
+#include "replica_catalog_models_types.h"
+
+namespace apache { namespace airavata { namespace model { namespace data { namespace resource {
+
+class replica_catalog_modelsConstants {
+ public:
+  replica_catalog_modelsConstants();
+
+};
+
+extern const replica_catalog_modelsConstants g_replica_catalog_models_constants;
+
+}}}}} // namespace
+
+#endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp
new file mode 100644
index 0000000..4823df3
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp
@@ -0,0 +1,729 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#include "replica_catalog_models_types.h"
+
+#include <algorithm>
+#include <ostream>
+
+#include <thrift/TToString.h>
+
+namespace apache { namespace airavata { namespace model { namespace data { namespace resource {
+
+int _kReplicaLocationCategoryValues[] = {
+  ReplicaLocationCategory::GATEWAY_DATA_STORE,
+  ReplicaLocationCategory::COMPUTE_RESOURCE,
+  ReplicaLocationCategory::LONG_TERM_STORAGE_RESOURCE,
+  ReplicaLocationCategory::OTHER
+};
+const char* _kReplicaLocationCategoryNames[] = {
+  "GATEWAY_DATA_STORE",
+  "COMPUTE_RESOURCE",
+  "LONG_TERM_STORAGE_RESOURCE",
+  "OTHER"
+};
+const std::map<int, const char*> _ReplicaLocationCategory_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kReplicaLocationCategoryValues, _kReplicaLocationCategoryNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kReplicaPersistentTypeValues[] = {
+  ReplicaPersistentType::TRANSIENT,
+  ReplicaPersistentType::PERSISTENT
+};
+const char* _kReplicaPersistentTypeNames[] = {
+  "TRANSIENT",
+  "PERSISTENT"
+};
+const std::map<int, const char*> _ReplicaPersistentType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kReplicaPersistentTypeValues, _kReplicaPersistentTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+
+DataResourceModel::~DataResourceModel() throw() {
+}
+
+
+void DataResourceModel::__set_resourceId(const std::string& val) {
+  this->resourceId = val;
+__isset.resourceId = true;
+}
+
+void DataResourceModel::__set_gatewayId(const std::string& val) {
+  this->gatewayId = val;
+__isset.gatewayId = true;
+}
+
+void DataResourceModel::__set_resourceName(const std::string& val) {
+  this->resourceName = val;
+__isset.resourceName = true;
+}
+
+void DataResourceModel::__set_resourceDescription(const std::string& val) {
+  this->resourceDescription = val;
+__isset.resourceDescription = true;
+}
+
+void DataResourceModel::__set_ownerName(const std::string& val) {
+  this->ownerName = val;
+__isset.ownerName = true;
+}
+
+void DataResourceModel::__set_resourceSize(const int32_t val) {
+  this->resourceSize = val;
+__isset.resourceSize = true;
+}
+
+void DataResourceModel::__set_creationTime(const int64_t val) {
+  this->creationTime = val;
+__isset.creationTime = true;
+}
+
+void DataResourceModel::__set_lastModifiedTime(const int64_t val) {
+  this->lastModifiedTime = val;
+__isset.lastModifiedTime = true;
+}
+
+void DataResourceModel::__set_resourceMetadata(const std::map<std::string, std::string> & val) {
+  this->resourceMetadata = val;
+__isset.resourceMetadata = true;
+}
+
+void DataResourceModel::__set_dataReplicaLocations(const std::vector<DataReplicaLocationModel> & val) {
+  this->dataReplicaLocations = val;
+__isset.dataReplicaLocations = true;
+}
+
+const char* DataResourceModel::ascii_fingerprint = "B62C7AC0978F39C377296FFA824B5766";
+const uint8_t DataResourceModel::binary_fingerprint[16] = {0xB6,0x2C,0x7A,0xC0,0x97,0x8F,0x39,0xC3,0x77,0x29,0x6F,0xFA,0x82,0x4B,0x57,0x66};
+
+uint32_t DataResourceModel::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->resourceId);
+          this->__isset.resourceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->gatewayId);
+          this->__isset.gatewayId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->resourceName);
+          this->__isset.resourceName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->resourceDescription);
+          this->__isset.resourceDescription = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->ownerName);
+          this->__isset.ownerName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->resourceSize);
+          this->__isset.resourceSize = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->creationTime);
+          this->__isset.creationTime = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->lastModifiedTime);
+          this->__isset.lastModifiedTime = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 9:
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            this->resourceMetadata.clear();
+            uint32_t _size0;
+            ::apache::thrift::protocol::TType _ktype1;
+            ::apache::thrift::protocol::TType _vtype2;
+            xfer += iprot->readMapBegin(_ktype1, _vtype2, _size0);
+            uint32_t _i4;
+            for (_i4 = 0; _i4 < _size0; ++_i4)
+            {
+              std::string _key5;
+              xfer += iprot->readString(_key5);
+              std::string& _val6 = this->resourceMetadata[_key5];
+              xfer += iprot->readString(_val6);
+            }
+            xfer += iprot->readMapEnd();
+          }
+          this->__isset.resourceMetadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 10:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->dataReplicaLocations.clear();
+            uint32_t _size7;
+            ::apache::thrift::protocol::TType _etype10;
+            xfer += iprot->readListBegin(_etype10, _size7);
+            this->dataReplicaLocations.resize(_size7);
+            uint32_t _i11;
+            for (_i11 = 0; _i11 < _size7; ++_i11)
+            {
+              xfer += this->dataReplicaLocations[_i11].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.dataReplicaLocations = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t DataResourceModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  oprot->incrementRecursionDepth();
+  xfer += oprot->writeStructBegin("DataResourceModel");
+
+  if (this->__isset.resourceId) {
+    xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 1);
+    xfer += oprot->writeString(this->resourceId);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.gatewayId) {
+    xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeString(this->gatewayId);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.resourceName) {
+    xfer += oprot->writeFieldBegin("resourceName", ::apache::thrift::protocol::T_STRING, 3);
+    xfer += oprot->writeString(this->resourceName);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.resourceDescription) {
+    xfer += oprot->writeFieldBegin("resourceDescription", ::apache::thrift::protocol::T_STRING, 4);
+    xfer += oprot->writeString(this->resourceDescription);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.ownerName) {
+    xfer += oprot->writeFieldBegin("ownerName", ::apache::thrift::protocol::T_STRING, 5);
+    xfer += oprot->writeString(this->ownerName);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.resourceSize) {
+    xfer += oprot->writeFieldBegin("resourceSize", ::apache::thrift::protocol::T_I32, 6);
+    xfer += oprot->writeI32(this->resourceSize);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.creationTime) {
+    xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 7);
+    xfer += oprot->writeI64(this->creationTime);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.lastModifiedTime) {
+    xfer += oprot->writeFieldBegin("lastModifiedTime", ::apache::thrift::protocol::T_I64, 8);
+    xfer += oprot->writeI64(this->lastModifiedTime);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.resourceMetadata) {
+    xfer += oprot->writeFieldBegin("resourceMetadata", ::apache::thrift::protocol::T_MAP, 9);
+    {
+      xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->resourceMetadata.size()));
+      std::map<std::string, std::string> ::const_iterator _iter12;
+      for (_iter12 = this->resourceMetadata.begin(); _iter12 != this->resourceMetadata.end(); ++_iter12)
+      {
+        xfer += oprot->writeString(_iter12->first);
+        xfer += oprot->writeString(_iter12->second);
+      }
+      xfer += oprot->writeMapEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.dataReplicaLocations) {
+    xfer += oprot->writeFieldBegin("dataReplicaLocations", ::apache::thrift::protocol::T_LIST, 10);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataReplicaLocations.size()));
+      std::vector<DataReplicaLocationModel> ::const_iterator _iter13;
+      for (_iter13 = this->dataReplicaLocations.begin(); _iter13 != this->dataReplicaLocations.end(); ++_iter13)
+      {
+        xfer += (*_iter13).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  oprot->decrementRecursionDepth();
+  return xfer;
+}
+
+void swap(DataResourceModel &a, DataResourceModel &b) {
+  using ::std::swap;
+  swap(a.resourceId, b.resourceId);
+  swap(a.gatewayId, b.gatewayId);
+  swap(a.resourceName, b.resourceName);
+  swap(a.resourceDescription, b.resourceDescription);
+  swap(a.ownerName, b.ownerName);
+  swap(a.resourceSize, b.resourceSize);
+  swap(a.creationTime, b.creationTime);
+  swap(a.lastModifiedTime, b.lastModifiedTime);
+  swap(a.resourceMetadata, b.resourceMetadata);
+  swap(a.dataReplicaLocations, b.dataReplicaLocations);
+  swap(a.__isset, b.__isset);
+}
+
+DataResourceModel::DataResourceModel(const DataResourceModel& other14) {
+  resourceId = other14.resourceId;
+  gatewayId = other14.gatewayId;
+  resourceName = other14.resourceName;
+  resourceDescription = other14.resourceDescription;
+  ownerName = other14.ownerName;
+  resourceSize = other14.resourceSize;
+  creationTime = other14.creationTime;
+  lastModifiedTime = other14.lastModifiedTime;
+  resourceMetadata = other14.resourceMetadata;
+  dataReplicaLocations = other14.dataReplicaLocations;
+  __isset = other14.__isset;
+}
+DataResourceModel& DataResourceModel::operator=(const DataResourceModel& other15) {
+  resourceId = other15.resourceId;
+  gatewayId = other15.gatewayId;
+  resourceName = other15.resourceName;
+  resourceDescription = other15.resourceDescription;
+  ownerName = other15.ownerName;
+  resourceSize = other15.resourceSize;
+  creationTime = other15.creationTime;
+  lastModifiedTime = other15.lastModifiedTime;
+  resourceMetadata = other15.resourceMetadata;
+  dataReplicaLocations = other15.dataReplicaLocations;
+  __isset = other15.__isset;
+  return *this;
+}
+std::ostream& operator<<(std::ostream& out, const DataResourceModel& obj) {
+  using apache::thrift::to_string;
+  out << "DataResourceModel(";
+  out << "resourceId="; (obj.__isset.resourceId ? (out << to_string(obj.resourceId)) : (out << "<null>"));
+  out << ", " << "gatewayId="; (obj.__isset.gatewayId ? (out << to_string(obj.gatewayId)) : (out << "<null>"));
+  out << ", " << "resourceName="; (obj.__isset.resourceName ? (out << to_string(obj.resourceName)) : (out << "<null>"));
+  out << ", " << "resourceDescription="; (obj.__isset.resourceDescription ? (out << to_string(obj.resourceDescription)) : (out << "<null>"));
+  out << ", " << "ownerName="; (obj.__isset.ownerName ? (out << to_string(obj.ownerName)) : (out << "<null>"));
+  out << ", " << "resourceSize="; (obj.__isset.resourceSize ? (out << to_string(obj.resourceSize)) : (out << "<null>"));
+  out << ", " << "creationTime="; (obj.__isset.creationTime ? (out << to_string(obj.creationTime)) : (out << "<null>"));
+  out << ", " << "lastModifiedTime="; (obj.__isset.lastModifiedTime ? (out << to_string(obj.lastModifiedTime)) : (out << "<null>"));
+  out << ", " << "resourceMetadata="; (obj.__isset.resourceMetadata ? (out << to_string(obj.resourceMetadata)) : (out << "<null>"));
+  out << ", " << "dataReplicaLocations="; (obj.__isset.dataReplicaLocations ? (out << to_string(obj.dataReplicaLocations)) : (out << "<null>"));
+  out << ")";
+  return out;
+}
+
+
+DataReplicaLocationModel::~DataReplicaLocationModel() throw() {
+}
+
+
+void DataReplicaLocationModel::__set_replicaId(const std::string& val) {
+  this->replicaId = val;
+__isset.replicaId = true;
+}
+
+void DataReplicaLocationModel::__set_resourceId(const std::string& val) {
+  this->resourceId = val;
+__isset.resourceId = true;
+}
+
+void DataReplicaLocationModel::__set_replicaName(const std::string& val) {
+  this->replicaName = val;
+__isset.replicaName = true;
+}
+
+void DataReplicaLocationModel::__set_replicaDescription(const std::string& val) {
+  this->replicaDescription = val;
+__isset.replicaDescription = true;
+}
+
+void DataReplicaLocationModel::__set_creationTime(const int64_t val) {
+  this->creationTime = val;
+__isset.creationTime = true;
+}
+
+void DataReplicaLocationModel::__set_lastModifiedTime(const int64_t val) {
+  this->lastModifiedTime = val;
+__isset.lastModifiedTime = true;
+}
+
+void DataReplicaLocationModel::__set_replicaLocationCategory(const ReplicaLocationCategory::type val) {
+  this->replicaLocationCategory = val;
+__isset.replicaLocationCategory = true;
+}
+
+void DataReplicaLocationModel::__set_replicaPersistentType(const ReplicaPersistentType::type val) {
+  this->replicaPersistentType = val;
+__isset.replicaPersistentType = true;
+}
+
+void DataReplicaLocationModel::__set_dataLocations(const std::vector<std::string> & val) {
+  this->dataLocations = val;
+__isset.dataLocations = true;
+}
+
+void DataReplicaLocationModel::__set_replicaMetadata(const std::map<std::string, std::string> & val) {
+  this->replicaMetadata = val;
+__isset.replicaMetadata = true;
+}
+
+const char* DataReplicaLocationModel::ascii_fingerprint = "781A1748A91BB45A79F33F79DC9474F1";
+const uint8_t DataReplicaLocationModel::binary_fingerprint[16] = {0x78,0x1A,0x17,0x48,0xA9,0x1B,0xB4,0x5A,0x79,0xF3,0x3F,0x79,0xDC,0x94,0x74,0xF1};
+
+uint32_t DataReplicaLocationModel::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->replicaId);
+          this->__isset.replicaId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->resourceId);
+          this->__isset.resourceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->replicaName);
+          this->__isset.replicaName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->replicaDescription);
+          this->__isset.replicaDescription = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->creationTime);
+          this->__isset.creationTime = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->lastModifiedTime);
+          this->__isset.lastModifiedTime = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast16;
+          xfer += iprot->readI32(ecast16);
+          this->replicaLocationCategory = (ReplicaLocationCategory::type)ecast16;
+          this->__isset.replicaLocationCategory = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast17;
+          xfer += iprot->readI32(ecast17);
+          this->replicaPersistentType = (ReplicaPersistentType::type)ecast17;
+          this->__isset.replicaPersistentType = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 9:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->dataLocations.clear();
+            uint32_t _size18;
+            ::apache::thrift::protocol::TType _etype21;
+            xfer += iprot->readListBegin(_etype21, _size18);
+            this->dataLocations.resize(_size18);
+            uint32_t _i22;
+            for (_i22 = 0; _i22 < _size18; ++_i22)
+            {
+              xfer += iprot->readString(this->dataLocations[_i22]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.dataLocations = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 10:
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            this->replicaMetadata.clear();
+            uint32_t _size23;
+            ::apache::thrift::protocol::TType _ktype24;
+            ::apache::thrift::protocol::TType _vtype25;
+            xfer += iprot->readMapBegin(_ktype24, _vtype25, _size23);
+            uint32_t _i27;
+            for (_i27 = 0; _i27 < _size23; ++_i27)
+            {
+              std::string _key28;
+              xfer += iprot->readString(_key28);
+              std::string& _val29 = this->replicaMetadata[_key28];
+              xfer += iprot->readString(_val29);
+            }
+            xfer += iprot->readMapEnd();
+          }
+          this->__isset.replicaMetadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t DataReplicaLocationModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  oprot->incrementRecursionDepth();
+  xfer += oprot->writeStructBegin("DataReplicaLocationModel");
+
+  if (this->__isset.replicaId) {
+    xfer += oprot->writeFieldBegin("replicaId", ::apache::thrift::protocol::T_STRING, 1);
+    xfer += oprot->writeString(this->replicaId);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.resourceId) {
+    xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeString(this->resourceId);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.replicaName) {
+    xfer += oprot->writeFieldBegin("replicaName", ::apache::thrift::protocol::T_STRING, 3);
+    xfer += oprot->writeString(this->replicaName);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.replicaDescription) {
+    xfer += oprot->writeFieldBegin("replicaDescription", ::apache::thrift::protocol::T_STRING, 4);
+    xfer += oprot->writeString(this->replicaDescription);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.creationTime) {
+    xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 5);
+    xfer += oprot->writeI64(this->creationTime);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.lastModifiedTime) {
+    xfer += oprot->writeFieldBegin("lastModifiedTime", ::apache::thrift::protocol::T_I64, 6);
+    xfer += oprot->writeI64(this->lastModifiedTime);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.replicaLocationCategory) {
+    xfer += oprot->writeFieldBegin("replicaLocationCategory", ::apache::thrift::protocol::T_I32, 7);
+    xfer += oprot->writeI32((int32_t)this->replicaLocationCategory);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.replicaPersistentType) {
+    xfer += oprot->writeFieldBegin("replicaPersistentType", ::apache::thrift::protocol::T_I32, 8);
+    xfer += oprot->writeI32((int32_t)this->replicaPersistentType);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.dataLocations) {
+    xfer += oprot->writeFieldBegin("dataLocations", ::apache::thrift::protocol::T_LIST, 9);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->dataLocations.size()));
+      std::vector<std::string> ::const_iterator _iter30;
+      for (_iter30 = this->dataLocations.begin(); _iter30 != this->dataLocations.end(); ++_iter30)
+      {
+        xfer += oprot->writeString((*_iter30));
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.replicaMetadata) {
+    xfer += oprot->writeFieldBegin("replicaMetadata", ::apache::thrift::protocol::T_MAP, 10);
+    {
+      xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->replicaMetadata.size()));
+      std::map<std::string, std::string> ::const_iterator _iter31;
+      for (_iter31 = this->replicaMetadata.begin(); _iter31 != this->replicaMetadata.end(); ++_iter31)
+      {
+        xfer += oprot->writeString(_iter31->first);
+        xfer += oprot->writeString(_iter31->second);
+      }
+      xfer += oprot->writeMapEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  oprot->decrementRecursionDepth();
+  return xfer;
+}
+
+void swap(DataReplicaLocationModel &a, DataReplicaLocationModel &b) {
+  using ::std::swap;
+  swap(a.replicaId, b.replicaId);
+  swap(a.resourceId, b.resourceId);
+  swap(a.replicaName, b.replicaName);
+  swap(a.replicaDescription, b.replicaDescription);
+  swap(a.creationTime, b.creationTime);
+  swap(a.lastModifiedTime, b.lastModifiedTime);
+  swap(a.replicaLocationCategory, b.replicaLocationCategory);
+  swap(a.replicaPersistentType, b.replicaPersistentType);
+  swap(a.dataLocations, b.dataLocations);
+  swap(a.replicaMetadata, b.replicaMetadata);
+  swap(a.__isset, b.__isset);
+}
+
+DataReplicaLocationModel::DataReplicaLocationModel(const DataReplicaLocationModel& other32) {
+  replicaId = other32.replicaId;
+  resourceId = other32.resourceId;
+  replicaName = other32.replicaName;
+  replicaDescription = other32.replicaDescription;
+  creationTime = other32.creationTime;
+  lastModifiedTime = other32.lastModifiedTime;
+  replicaLocationCategory = other32.replicaLocationCategory;
+  replicaPersistentType = other32.replicaPersistentType;
+  dataLocations = other32.dataLocations;
+  replicaMetadata = other32.replicaMetadata;
+  __isset = other32.__isset;
+}
+DataReplicaLocationModel& DataReplicaLocationModel::operator=(const DataReplicaLocationModel& other33) {
+  replicaId = other33.replicaId;
+  resourceId = other33.resourceId;
+  replicaName = other33.replicaName;
+  replicaDescription = other33.replicaDescription;
+  creationTime = other33.creationTime;
+  lastModifiedTime = other33.lastModifiedTime;
+  replicaLocationCategory = other33.replicaLocationCategory;
+  replicaPersistentType = other33.replicaPersistentType;
+  dataLocations = other33.dataLocations;
+  replicaMetadata = other33.replicaMetadata;
+  __isset = other33.__isset;
+  return *this;
+}
+std::ostream& operator<<(std::ostream& out, const DataReplicaLocationModel& obj) {
+  using apache::thrift::to_string;
+  out << "DataReplicaLocationModel(";
+  out << "replicaId="; (obj.__isset.replicaId ? (out << to_string(obj.replicaId)) : (out << "<null>"));
+  out << ", " << "resourceId="; (obj.__isset.resourceId ? (out << to_string(obj.resourceId)) : (out << "<null>"));
+  out << ", " << "replicaName="; (obj.__isset.replicaName ? (out << to_string(obj.replicaName)) : (out << "<null>"));
+  out << ", " << "replicaDescription="; (obj.__isset.replicaDescription ? (out << to_string(obj.replicaDescription)) : (out << "<null>"));
+  out << ", " << "creationTime="; (obj.__isset.creationTime ? (out << to_string(obj.creationTime)) : (out << "<null>"));
+  out << ", " << "lastModifiedTime="; (obj.__isset.lastModifiedTime ? (out << to_string(obj.lastModifiedTime)) : (out << "<null>"));
+  out << ", " << "replicaLocationCategory="; (obj.__isset.replicaLocationCategory ? (out << to_string(obj.replicaLocationCategory)) : (out << "<null>"));
+  out << ", " << "replicaPersistentType="; (obj.__isset.replicaPersistentType ? (out << to_string(obj.replicaPersistentType)) : (out << "<null>"));
+  out << ", " << "dataLocations="; (obj.__isset.dataLocations ? (out << to_string(obj.dataLocations)) : (out << "<null>"));
+  out << ", " << "replicaMetadata="; (obj.__isset.replicaMetadata ? (out << to_string(obj.replicaMetadata)) : (out << "<null>"));
+  out << ")";
+  return out;
+}
+
+}}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h
new file mode 100644
index 0000000..c88386e
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h
@@ -0,0 +1,299 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#ifndef replica_catalog_models_TYPES_H
+#define replica_catalog_models_TYPES_H
+
+#include <iosfwd>
+
+#include <thrift/Thrift.h>
+#include <thrift/TApplicationException.h>
+#include <thrift/protocol/TProtocol.h>
+#include <thrift/transport/TTransport.h>
+
+#include <thrift/cxxfunctional.h>
+
+
+namespace apache { namespace airavata { namespace model { namespace data { namespace resource {
+
+struct ReplicaLocationCategory {
+  enum type {
+    GATEWAY_DATA_STORE = 0,
+    COMPUTE_RESOURCE = 1,
+    LONG_TERM_STORAGE_RESOURCE = 2,
+    OTHER = 3
+  };
+};
+
+extern const std::map<int, const char*> _ReplicaLocationCategory_VALUES_TO_NAMES;
+
+struct ReplicaPersistentType {
+  enum type {
+    TRANSIENT = 0,
+    PERSISTENT = 1
+  };
+};
+
+extern const std::map<int, const char*> _ReplicaPersistentType_VALUES_TO_NAMES;
+
+class DataResourceModel;
+
+class DataReplicaLocationModel;
+
+typedef struct _DataResourceModel__isset {
+  _DataResourceModel__isset() : resourceId(false), gatewayId(false), resourceName(false), resourceDescription(false), ownerName(false), resourceSize(false), creationTime(false), lastModifiedTime(false), resourceMetadata(false), dataReplicaLocations(false) {}
+  bool resourceId :1;
+  bool gatewayId :1;
+  bool resourceName :1;
+  bool resourceDescription :1;
+  bool ownerName :1;
+  bool resourceSize :1;
+  bool creationTime :1;
+  bool lastModifiedTime :1;
+  bool resourceMetadata :1;
+  bool dataReplicaLocations :1;
+} _DataResourceModel__isset;
+
+class DataResourceModel {
+ public:
+
+  static const char* ascii_fingerprint; // = "B62C7AC0978F39C377296FFA824B5766";
+  static const uint8_t binary_fingerprint[16]; // = {0xB6,0x2C,0x7A,0xC0,0x97,0x8F,0x39,0xC3,0x77,0x29,0x6F,0xFA,0x82,0x4B,0x57,0x66};
+
+  DataResourceModel(const DataResourceModel&);
+  DataResourceModel& operator=(const DataResourceModel&);
+  DataResourceModel() : resourceId(), gatewayId(), resourceName(), resourceDescription(), ownerName(), resourceSize(0), creationTime(0), lastModifiedTime(0) {
+  }
+
+  virtual ~DataResourceModel() throw();
+  std::string resourceId;
+  std::string gatewayId;
+  std::string resourceName;
+  std::string resourceDescription;
+  std::string ownerName;
+  int32_t resourceSize;
+  int64_t creationTime;
+  int64_t lastModifiedTime;
+  std::map<std::string, std::string>  resourceMetadata;
+  std::vector<DataReplicaLocationModel>  dataReplicaLocations;
+
+  _DataResourceModel__isset __isset;
+
+  void __set_resourceId(const std::string& val);
+
+  void __set_gatewayId(const std::string& val);
+
+  void __set_resourceName(const std::string& val);
+
+  void __set_resourceDescription(const std::string& val);
+
+  void __set_ownerName(const std::string& val);
+
+  void __set_resourceSize(const int32_t val);
+
+  void __set_creationTime(const int64_t val);
+
+  void __set_lastModifiedTime(const int64_t val);
+
+  void __set_resourceMetadata(const std::map<std::string, std::string> & val);
+
+  void __set_dataReplicaLocations(const std::vector<DataReplicaLocationModel> & val);
+
+  bool operator == (const DataResourceModel & rhs) const
+  {
+    if (__isset.resourceId != rhs.__isset.resourceId)
+      return false;
+    else if (__isset.resourceId && !(resourceId == rhs.resourceId))
+      return false;
+    if (__isset.gatewayId != rhs.__isset.gatewayId)
+      return false;
+    else if (__isset.gatewayId && !(gatewayId == rhs.gatewayId))
+      return false;
+    if (__isset.resourceName != rhs.__isset.resourceName)
+      return false;
+    else if (__isset.resourceName && !(resourceName == rhs.resourceName))
+      return false;
+    if (__isset.resourceDescription != rhs.__isset.resourceDescription)
+      return false;
+    else if (__isset.resourceDescription && !(resourceDescription == rhs.resourceDescription))
+      return false;
+    if (__isset.ownerName != rhs.__isset.ownerName)
+      return false;
+    else if (__isset.ownerName && !(ownerName == rhs.ownerName))
+      return false;
+    if (__isset.resourceSize != rhs.__isset.resourceSize)
+      return false;
+    else if (__isset.resourceSize && !(resourceSize == rhs.resourceSize))
+      return false;
+    if (__isset.creationTime != rhs.__isset.creationTime)
+      return false;
+    else if (__isset.creationTime && !(creationTime == rhs.creationTime))
+      return false;
+    if (__isset.lastModifiedTime != rhs.__isset.lastModifiedTime)
+      return false;
+    else if (__isset.lastModifiedTime && !(lastModifiedTime == rhs.lastModifiedTime))
+      return false;
+    if (__isset.resourceMetadata != rhs.__isset.resourceMetadata)
+      return false;
+    else if (__isset.resourceMetadata && !(resourceMetadata == rhs.resourceMetadata))
+      return false;
+    if (__isset.dataReplicaLocations != rhs.__isset.dataReplicaLocations)
+      return false;
+    else if (__isset.dataReplicaLocations && !(dataReplicaLocations == rhs.dataReplicaLocations))
+      return false;
+    return true;
+  }
+  bool operator != (const DataResourceModel &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const DataResourceModel & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+  friend std::ostream& operator<<(std::ostream& out, const DataResourceModel& obj);
+};
+
+void swap(DataResourceModel &a, DataResourceModel &b);
+
+typedef struct _DataReplicaLocationModel__isset {
+  _DataReplicaLocationModel__isset() : replicaId(false), resourceId(false), replicaName(false), replicaDescription(false), creationTime(false), lastModifiedTime(false), replicaLocationCategory(false), replicaPersistentType(false), dataLocations(false), replicaMetadata(false) {}
+  bool replicaId :1;
+  bool resourceId :1;
+  bool replicaName :1;
+  bool replicaDescription :1;
+  bool creationTime :1;
+  bool lastModifiedTime :1;
+  bool replicaLocationCategory :1;
+  bool replicaPersistentType :1;
+  bool dataLocations :1;
+  bool replicaMetadata :1;
+} _DataReplicaLocationModel__isset;
+
+class DataReplicaLocationModel {
+ public:
+
+  static const char* ascii_fingerprint; // = "781A1748A91BB45A79F33F79DC9474F1";
+  static const uint8_t binary_fingerprint[16]; // = {0x78,0x1A,0x17,0x48,0xA9,0x1B,0xB4,0x5A,0x79,0xF3,0x3F,0x79,0xDC,0x94,0x74,0xF1};
+
+  DataReplicaLocationModel(const DataReplicaLocationModel&);
+  DataReplicaLocationModel& operator=(const DataReplicaLocationModel&);
+  DataReplicaLocationModel() : replicaId(), resourceId(), replicaName(), replicaDescription(), creationTime(0), lastModifiedTime(0), replicaLocationCategory((ReplicaLocationCategory::type)0), replicaPersistentType((ReplicaPersistentType::type)0) {
+  }
+
+  virtual ~DataReplicaLocationModel() throw();
+  std::string replicaId;
+  std::string resourceId;
+  std::string replicaName;
+  std::string replicaDescription;
+  int64_t creationTime;
+  int64_t lastModifiedTime;
+  ReplicaLocationCategory::type replicaLocationCategory;
+  ReplicaPersistentType::type replicaPersistentType;
+  std::vector<std::string>  dataLocations;
+  std::map<std::string, std::string>  replicaMetadata;
+
+  _DataReplicaLocationModel__isset __isset;
+
+  void __set_replicaId(const std::string& val);
+
+  void __set_resourceId(const std::string& val);
+
+  void __set_replicaName(const std::string& val);
+
+  void __set_replicaDescription(const std::string& val);
+
+  void __set_creationTime(const int64_t val);
+
+  void __set_lastModifiedTime(const int64_t val);
+
+  void __set_replicaLocationCategory(const ReplicaLocationCategory::type val);
+
+  void __set_replicaPersistentType(const ReplicaPersistentType::type val);
+
+  void __set_dataLocations(const std::vector<std::string> & val);
+
+  void __set_replicaMetadata(const std::map<std::string, std::string> & val);
+
+  bool operator == (const DataReplicaLocationModel & rhs) const
+  {
+    if (__isset.replicaId != rhs.__isset.replicaId)
+      return false;
+    else if (__isset.replicaId && !(replicaId == rhs.replicaId))
+      return false;
+    if (__isset.resourceId != rhs.__isset.resourceId)
+      return false;
+    else if (__isset.resourceId && !(resourceId == rhs.resourceId))
+      return false;
+    if (__isset.replicaName != rhs.__isset.replicaName)
+      return false;
+    else if (__isset.replicaName && !(replicaName == rhs.replicaName))
+      return false;
+    if (__isset.replicaDescription != rhs.__isset.replicaDescription)
+      return false;
+    else if (__isset.replicaDescription && !(replicaDescription == rhs.replicaDescription))
+      return false;
+    if (__isset.creationTime != rhs.__isset.creationTime)
+      return false;
+    else if (__isset.creationTime && !(creationTime == rhs.creationTime))
+      return false;
+    if (__isset.lastModifiedTime != rhs.__isset.lastModifiedTime)
+      return false;
+    else if (__isset.lastModifiedTime && !(lastModifiedTime == rhs.lastModifiedTime))
+      return false;
+    if (__isset.replicaLocationCategory != rhs.__isset.replicaLocationCategory)
+      return false;
+    else if (__isset.replicaLocationCategory && !(replicaLocationCategory == rhs.replicaLocationCategory))
+      return false;
+    if (__isset.replicaPersistentType != rhs.__isset.replicaPersistentType)
+      return false;
+    else if (__isset.replicaPersistentType && !(replicaPersistentType == rhs.replicaPersistentType))
+      return false;
+    if (__isset.dataLocations != rhs.__isset.dataLocations)
+      return false;
+    else if (__isset.dataLocations && !(dataLocations == rhs.dataLocations))
+      return false;
+    if (__isset.replicaMetadata != rhs.__isset.replicaMetadata)
+      return false;
+    else if (__isset.replicaMetadata && !(replicaMetadata == rhs.replicaMetadata))
+      return false;
+    return true;
+  }
+  bool operator != (const DataReplicaLocationModel &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const DataReplicaLocationModel & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+  friend std::ostream& operator<<(std::ostream& out, const DataReplicaLocationModel& obj);
+};
+
+void swap(DataReplicaLocationModel &a, DataReplicaLocationModel &b);
+
+}}}}} // namespace
+
+#endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php
index b558b2c..84e6c9c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php
@@ -49,6 +49,10 @@ class DataResourceModel {
   /**
    * @var string
    */
+  public $gatewayId = null;
+  /**
+   * @var string
+   */
   public $resourceName = null;
   /**
    * @var string
@@ -87,30 +91,34 @@ class DataResourceModel {
           'type' => TType::STRING,
           ),
         2 => array(
-          'var' => 'resourceName',
+          'var' => 'gatewayId',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'resourceDescription',
+          'var' => 'resourceName',
           'type' => TType::STRING,
           ),
         4 => array(
-          'var' => 'ownerName',
+          'var' => 'resourceDescription',
           'type' => TType::STRING,
           ),
         5 => array(
+          'var' => 'ownerName',
+          'type' => TType::STRING,
+          ),
+        6 => array(
           'var' => 'resourceSize',
           'type' => TType::I32,
           ),
-        6 => array(
+        7 => array(
           'var' => 'creationTime',
           'type' => TType::I64,
           ),
-        7 => array(
+        8 => array(
           'var' => 'lastModifiedTime',
           'type' => TType::I64,
           ),
-        8 => array(
+        9 => array(
           'var' => 'resourceMetadata',
           'type' => TType::MAP,
           'ktype' => TType::STRING,
@@ -122,7 +130,7 @@ class DataResourceModel {
             'type' => TType::STRING,
             ),
           ),
-        9 => array(
+        10 => array(
           'var' => 'dataReplicaLocations',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
@@ -137,6 +145,9 @@ class DataResourceModel {
       if (isset($vals['resourceId'])) {
         $this->resourceId = $vals['resourceId'];
       }
+      if (isset($vals['gatewayId'])) {
+        $this->gatewayId = $vals['gatewayId'];
+      }
       if (isset($vals['resourceName'])) {
         $this->resourceName = $vals['resourceName'];
       }
@@ -192,47 +203,54 @@ class DataResourceModel {
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->resourceName);
+            $xfer += $input->readString($this->gatewayId);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->resourceDescription);
+            $xfer += $input->readString($this->resourceName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->ownerName);
+            $xfer += $input->readString($this->resourceDescription);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 5:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->ownerName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 6:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->resourceSize);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 6:
+        case 7:
           if ($ftype == TType::I64) {
             $xfer += $input->readI64($this->creationTime);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 7:
+        case 8:
           if ($ftype == TType::I64) {
             $xfer += $input->readI64($this->lastModifiedTime);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 8:
+        case 9:
           if ($ftype == TType::MAP) {
             $this->resourceMetadata = array();
             $_size0 = 0;
@@ -252,7 +270,7 @@ class DataResourceModel {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 9:
+        case 10:
           if ($ftype == TType::LST) {
             $this->dataReplicaLocations = array();
             $_size7 = 0;
@@ -288,33 +306,38 @@ class DataResourceModel {
       $xfer += $output->writeString($this->resourceId);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->gatewayId !== null) {
+      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+      $xfer += $output->writeString($this->gatewayId);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->resourceName !== null) {
-      $xfer += $output->writeFieldBegin('resourceName', TType::STRING, 2);
+      $xfer += $output->writeFieldBegin('resourceName', TType::STRING, 3);
       $xfer += $output->writeString($this->resourceName);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->resourceDescription !== null) {
-      $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 3);
+      $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 4);
       $xfer += $output->writeString($this->resourceDescription);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->ownerName !== null) {
-      $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 4);
+      $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 5);
       $xfer += $output->writeString($this->ownerName);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->resourceSize !== null) {
-      $xfer += $output->writeFieldBegin('resourceSize', TType::I32, 5);
+      $xfer += $output->writeFieldBegin('resourceSize', TType::I32, 6);
       $xfer += $output->writeI32($this->resourceSize);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->creationTime !== null) {
-      $xfer += $output->writeFieldBegin('creationTime', TType::I64, 6);
+      $xfer += $output->writeFieldBegin('creationTime', TType::I64, 7);
       $xfer += $output->writeI64($this->creationTime);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->lastModifiedTime !== null) {
-      $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 7);
+      $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 8);
       $xfer += $output->writeI64($this->lastModifiedTime);
       $xfer += $output->writeFieldEnd();
     }
@@ -322,7 +345,7 @@ class DataResourceModel {
       if (!is_array($this->resourceMetadata)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('resourceMetadata', TType::MAP, 8);
+      $xfer += $output->writeFieldBegin('resourceMetadata', TType::MAP, 9);
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, count($this->resourceMetadata));
         {
@@ -340,7 +363,7 @@ class DataResourceModel {
       if (!is_array($this->dataReplicaLocations)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('dataReplicaLocations', TType::LST, 9);
+      $xfer += $output->writeFieldBegin('dataReplicaLocations', TType::LST, 10);
       {
         $output->writeListBegin(TType::STRUCT, count($this->dataReplicaLocations));
         {

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py
index d261956..3a0d602 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/resource/ttypes.py
@@ -55,6 +55,7 @@ class DataResourceModel:
   """
   Attributes:
    - resourceId
+   - gatewayId
    - resourceName
    - resourceDescription
    - ownerName
@@ -68,18 +69,20 @@ class DataResourceModel:
   thrift_spec = (
     None, # 0
     (1, TType.STRING, 'resourceId', None, None, ), # 1
-    (2, TType.STRING, 'resourceName', None, None, ), # 2
-    (3, TType.STRING, 'resourceDescription', None, None, ), # 3
-    (4, TType.STRING, 'ownerName', None, None, ), # 4
-    (5, TType.I32, 'resourceSize', None, None, ), # 5
-    (6, TType.I64, 'creationTime', None, None, ), # 6
-    (7, TType.I64, 'lastModifiedTime', None, None, ), # 7
-    (8, TType.MAP, 'resourceMetadata', (TType.STRING,None,TType.STRING,None), None, ), # 8
-    (9, TType.LIST, 'dataReplicaLocations', (TType.STRUCT,(DataReplicaLocationModel, DataReplicaLocationModel.thrift_spec)), None, ), # 9
+    (2, TType.STRING, 'gatewayId', None, None, ), # 2
+    (3, TType.STRING, 'resourceName', None, None, ), # 3
+    (4, TType.STRING, 'resourceDescription', None, None, ), # 4
+    (5, TType.STRING, 'ownerName', None, None, ), # 5
+    (6, TType.I32, 'resourceSize', None, None, ), # 6
+    (7, TType.I64, 'creationTime', None, None, ), # 7
+    (8, TType.I64, 'lastModifiedTime', None, None, ), # 8
+    (9, TType.MAP, 'resourceMetadata', (TType.STRING,None,TType.STRING,None), None, ), # 9
+    (10, TType.LIST, 'dataReplicaLocations', (TType.STRUCT,(DataReplicaLocationModel, DataReplicaLocationModel.thrift_spec)), None, ), # 10
   )
 
-  def __init__(self, resourceId=None, resourceName=None, resourceDescription=None, ownerName=None, resourceSize=None, creationTime=None, lastModifiedTime=None, resourceMetadata=None, dataReplicaLocations=None,):
+  def __init__(self, resourceId=None, gatewayId=None, resourceName=None, resourceDescription=None, ownerName=None, resourceSize=None, creationTime=None, lastModifiedTime=None, resourceMetadata=None, dataReplicaLocations=None,):
     self.resourceId = resourceId
+    self.gatewayId = gatewayId
     self.resourceName = resourceName
     self.resourceDescription = resourceDescription
     self.ownerName = ownerName
@@ -105,35 +108,40 @@ class DataResourceModel:
           iprot.skip(ftype)
       elif fid == 2:
         if ftype == TType.STRING:
-          self.resourceName = iprot.readString();
+          self.gatewayId = iprot.readString();
         else:
           iprot.skip(ftype)
       elif fid == 3:
         if ftype == TType.STRING:
-          self.resourceDescription = iprot.readString();
+          self.resourceName = iprot.readString();
         else:
           iprot.skip(ftype)
       elif fid == 4:
         if ftype == TType.STRING:
-          self.ownerName = iprot.readString();
+          self.resourceDescription = iprot.readString();
         else:
           iprot.skip(ftype)
       elif fid == 5:
+        if ftype == TType.STRING:
+          self.ownerName = iprot.readString();
+        else:
+          iprot.skip(ftype)
+      elif fid == 6:
         if ftype == TType.I32:
           self.resourceSize = iprot.readI32();
         else:
           iprot.skip(ftype)
-      elif fid == 6:
+      elif fid == 7:
         if ftype == TType.I64:
           self.creationTime = iprot.readI64();
         else:
           iprot.skip(ftype)
-      elif fid == 7:
+      elif fid == 8:
         if ftype == TType.I64:
           self.lastModifiedTime = iprot.readI64();
         else:
           iprot.skip(ftype)
-      elif fid == 8:
+      elif fid == 9:
         if ftype == TType.MAP:
           self.resourceMetadata = {}
           (_ktype1, _vtype2, _size0 ) = iprot.readMapBegin()
@@ -144,7 +152,7 @@ class DataResourceModel:
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
-      elif fid == 9:
+      elif fid == 10:
         if ftype == TType.LIST:
           self.dataReplicaLocations = []
           (_etype10, _size7) = iprot.readListBegin()
@@ -169,32 +177,36 @@ class DataResourceModel:
       oprot.writeFieldBegin('resourceId', TType.STRING, 1)
       oprot.writeString(self.resourceId)
       oprot.writeFieldEnd()
+    if self.gatewayId is not None:
+      oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
+      oprot.writeString(self.gatewayId)
+      oprot.writeFieldEnd()
     if self.resourceName is not None:
-      oprot.writeFieldBegin('resourceName', TType.STRING, 2)
+      oprot.writeFieldBegin('resourceName', TType.STRING, 3)
       oprot.writeString(self.resourceName)
       oprot.writeFieldEnd()
     if self.resourceDescription is not None:
-      oprot.writeFieldBegin('resourceDescription', TType.STRING, 3)
+      oprot.writeFieldBegin('resourceDescription', TType.STRING, 4)
       oprot.writeString(self.resourceDescription)
       oprot.writeFieldEnd()
     if self.ownerName is not None:
-      oprot.writeFieldBegin('ownerName', TType.STRING, 4)
+      oprot.writeFieldBegin('ownerName', TType.STRING, 5)
       oprot.writeString(self.ownerName)
       oprot.writeFieldEnd()
     if self.resourceSize is not None:
-      oprot.writeFieldBegin('resourceSize', TType.I32, 5)
+      oprot.writeFieldBegin('resourceSize', TType.I32, 6)
       oprot.writeI32(self.resourceSize)
       oprot.writeFieldEnd()
     if self.creationTime is not None:
-      oprot.writeFieldBegin('creationTime', TType.I64, 6)
+      oprot.writeFieldBegin('creationTime', TType.I64, 7)
       oprot.writeI64(self.creationTime)
       oprot.writeFieldEnd()
     if self.lastModifiedTime is not None:
-      oprot.writeFieldBegin('lastModifiedTime', TType.I64, 7)
+      oprot.writeFieldBegin('lastModifiedTime', TType.I64, 8)
       oprot.writeI64(self.lastModifiedTime)
       oprot.writeFieldEnd()
     if self.resourceMetadata is not None:
-      oprot.writeFieldBegin('resourceMetadata', TType.MAP, 8)
+      oprot.writeFieldBegin('resourceMetadata', TType.MAP, 9)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.resourceMetadata))
       for kiter13,viter14 in self.resourceMetadata.items():
         oprot.writeString(kiter13)
@@ -202,7 +214,7 @@ class DataResourceModel:
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     if self.dataReplicaLocations is not None:
-      oprot.writeFieldBegin('dataReplicaLocations', TType.LIST, 9)
+      oprot.writeFieldBegin('dataReplicaLocations', TType.LIST, 10)
       oprot.writeListBegin(TType.STRUCT, len(self.dataReplicaLocations))
       for iter15 in self.dataReplicaLocations:
         iter15.write(oprot)
@@ -218,6 +230,7 @@ class DataResourceModel:
   def __hash__(self):
     value = 17
     value = (value * 31) ^ hash(self.resourceId)
+    value = (value * 31) ^ hash(self.gatewayId)
     value = (value * 31) ^ hash(self.resourceName)
     value = (value * 31) ^ hash(self.resourceDescription)
     value = (value * 31) ^ hash(self.ownerName)

http://git-wip-us.apache.org/repos/asf/airavata/blob/d3a5a5ea/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
index 572d4ab..ca29188 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-14")
 public class Workflow implements org.apache.thrift.TBase<Workflow, Workflow._Fields>, java.io.Serializable, Cloneable, Comparable<Workflow> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Workflow");