airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [5/5] airavata git commit: making cosmetic changes to the data manager module
Date Tue, 15 Dec 2015 18:30:57 GMT
making cosmetic changes to the data manager module


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

Branch: refs/heads/master
Commit: 098c2306b2a62ae72e0d38b7d66fd2e15ab6808f
Parents: 0dc7e84
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Tue Dec 15 13:30:39 2015 -0500
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Tue Dec 15 13:30:39 2015 -0500

----------------------------------------------------------------------
 airavata-api/airavata-api-server/pom.xml        |  10 +
 .../server/handler/AiravataServerHandler.java   |  31 +-
 .../java/org/apache/airavata/api/Airavata.java  | 202 ++++++------
 .../main/resources/lib/airavata/Airavata.cpp    |  72 ++---
 .../src/main/resources/lib/airavata/Airavata.h  |  86 ++---
 .../lib/airavata/Airavata_server.skeleton.cpp   |   6 +-
 .../resources/lib/Airavata/API/Airavata.php     |  38 +--
 .../lib/apache/airavata/api/Airavata-remote     |   8 +-
 .../lib/apache/airavata/api/Airavata.py         |  44 +--
 .../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  |   2 +-
 .../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/data-manager-core/pom.xml  |  61 ++++
 .../catalog/core/DataManagerFactory.java        |  34 ++
 .../replica/catalog/core/DataManagerImpl.java   | 207 ++++++++++++
 .../catalog/core/DataManagerFactoryTest.java    |  41 +++
 .../catalog/core/DataManagerImplTest.java       | 209 ++++++++++++
 .../replica/catalog/core/utils/AppCatInit.java  | 320 +++++++++++++++++++
 .../replica/catalog/core/utils/DataCatInit.java | 315 ++++++++++++++++++
 modules/data-manager/data-manager-cpi/pom.xml   |  30 ++
 .../replica/catalog/cpi/DataManager.java        |  98 ++++++
 .../catalog/cpi/DataManagerConstants.java       |  28 ++
 .../catalog/cpi/DataManagerException.java       |  35 ++
 modules/data-manager/pom.xml                    |  39 +++
 .../catalog/impl/RegistryFactory.java           |  14 +-
 .../registry/core/impl/RegistryImpl.java        |   6 +-
 .../replica/catalog/impl/DataCatalogImpl.java   | 278 ----------------
 .../catalog/impl/ReplicaCatalogImpl.java        | 278 ++++++++++++++++
 .../replica/catalog/DataCatalogTest.java        | 221 -------------
 .../replica/catalog/ReplicaCatalogTest.java     | 221 +++++++++++++
 .../airavata/registry/cpi/DataCatalog.java      |  45 ---
 .../registry/cpi/DataCatalogException.java      |  36 ---
 .../apache/airavata/registry/cpi/Registry.java  |   2 +-
 .../airavata/registry/cpi/ReplicaCatalog.java   |  45 +++
 .../registry/cpi/ReplicaCatalogException.java   |  36 +++
 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-apis/airavata_api.thrift           |   4 +-
 124 files changed, 2343 insertions(+), 2285 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/098c2306/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 dd6c43c..367dff6 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -73,6 +73,16 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>data-manager-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>data-manager-cpi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
             <version>${thrift.version}</version>

http://git-wip-us.apache.org/repos/asf/airavata/blob/098c2306/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 14d474f..4019271 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -71,6 +71,9 @@ import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
 import org.apache.airavata.registry.cpi.*;
 import org.apache.airavata.registry.cpi.utils.Constants;
+import org.apache.airavata.replica.catalog.core.DataManagerFactory;
+import org.apache.airavata.replica.catalog.cpi.DataManager;
+import org.apache.airavata.replica.catalog.cpi.DataManagerException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -4060,7 +4063,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 	}
 
     /**
-     * * Replica Catalog Related API Methods
+     * * Data Manager Related API Methods
      * *
      */
 
@@ -4077,11 +4080,11 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public String publishDataResource(AuthzToken authzToken, DataResourceModel dataResourceModel) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+    public String registerDataResource(AuthzToken authzToken, DataResourceModel dataResourceModel) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         try {
-            DataCatalog dataCatalog = RegistryFactory.getDataCatalog();
-            return dataCatalog.publishResource(dataResourceModel);
-        } catch (DataCatalogException e) {
+            DataManager dataManager = DataManagerFactory.getDataManager();
+            return dataManager.registerResource(dataResourceModel);
+        } catch (DataManagerException e) {
             String msg = "Error in publishing the data resource"+dataResourceModel.getResourceName()+".";
             logger.error(msg, e);
             AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
@@ -4104,9 +4107,9 @@ public class AiravataServerHandler implements Airavata.Iface {
     @SecurityCheck
     public void updateDataResource(AuthzToken authzToken, DataResourceModel dataResourceModel) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         try {
-            DataCatalog dataCatalog = RegistryFactory.getDataCatalog();
-            dataCatalog.updateResource(dataResourceModel);
-        } catch (DataCatalogException e) {
+            DataManager dataManager = DataManagerFactory.getDataManager();
+            dataManager.updateResource(dataResourceModel);
+        } catch (DataManagerException e) {
             String msg = "Error in updating the data resource"+dataResourceModel.getResourceName()+".";
             logger.error(msg, e);
             AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
@@ -4129,9 +4132,9 @@ public class AiravataServerHandler implements Airavata.Iface {
     @SecurityCheck
     public void removeDataResource(AuthzToken authzToken, String resourceId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         try {
-            DataCatalog dataCatalog = RegistryFactory.getDataCatalog();
-            dataCatalog.removeResource(resourceId);
-        } catch (DataCatalogException e) {
+            DataManager dataManager = DataManagerFactory.getDataManager();
+            dataManager.removeResource(resourceId);
+        } catch (DataManagerException e) {
             String msg = "Error in removing the data resource "+resourceId+".";
             logger.error(msg, e);
             AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
@@ -4156,9 +4159,9 @@ public class AiravataServerHandler implements Airavata.Iface {
     public DataResourceModel getDataResource(AuthzToken authzToken, String resourceId) throws InvalidRequestException,
             AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         try {
-            DataCatalog dataCatalog = RegistryFactory.getDataCatalog();
-            return  dataCatalog.getResource(resourceId);
-        } catch (DataCatalogException e) {
+            DataManager dataManager = DataManagerFactory.getDataManager();
+            return dataManager.getResource(resourceId);
+        } catch (DataManagerException e) {
             String msg = "Error in retreiving the data resource "+resourceId+".";
             logger.error(msg, e);
             AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);

http://git-wip-us.apache.org/repos/asf/airavata/blob/098c2306/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 df4960f..f5f7876 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-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-15")
 public class Airavata {
 
   public interface Iface {
@@ -1906,13 +1906,13 @@ public class Airavata {
     public boolean isWorkflowExistWithName(org.apache.airavata.model.security.AuthzToken authzToken, String workflowName) 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;
 
     /**
-     *  * Replica Catalog Related API Methods
+     *  * Data Manager Related API Methods
      * *
      * 
      * @param authzToken
      * @param dataResourceModel
      */
-    public String publishDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) 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 registerDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) 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 void updateDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) 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;
 
@@ -2188,7 +2188,7 @@ public class Airavata {
 
     public void isWorkflowExistWithName(org.apache.airavata.model.security.AuthzToken authzToken, String workflowName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void publishDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void registerDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void updateDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
@@ -7068,24 +7068,24 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isWorkflowExistWithName failed: unknown result");
     }
 
-    public String publishDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) 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 registerDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) 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_publishDataResource(authzToken, dataResourceModel);
-      return recv_publishDataResource();
+      send_registerDataResource(authzToken, dataResourceModel);
+      return recv_registerDataResource();
     }
 
-    public void send_publishDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) throws org.apache.thrift.TException
+    public void send_registerDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) throws org.apache.thrift.TException
     {
-      publishDataResource_args args = new publishDataResource_args();
+      registerDataResource_args args = new registerDataResource_args();
       args.setAuthzToken(authzToken);
       args.setDataResourceModel(dataResourceModel);
-      sendBase("publishDataResource", args);
+      sendBase("registerDataResource", args);
     }
 
-    public String recv_publishDataResource() 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 recv_registerDataResource() 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
     {
-      publishDataResource_result result = new publishDataResource_result();
-      receiveBase(result, "publishDataResource");
+      registerDataResource_result result = new registerDataResource_result();
+      receiveBase(result, "registerDataResource");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -7101,7 +7101,7 @@ public class Airavata {
       if (result.ae != null) {
         throw result.ae;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "publishDataResource failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "registerDataResource failed: unknown result");
     }
 
     public void updateDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) 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
@@ -12174,25 +12174,25 @@ public class Airavata {
       }
     }
 
-    public void publishDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void registerDataResource(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      publishDataResource_call method_call = new publishDataResource_call(authzToken, dataResourceModel, resultHandler, this, ___protocolFactory, ___transport);
+      registerDataResource_call method_call = new registerDataResource_call(authzToken, dataResourceModel, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class publishDataResource_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class registerDataResource_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel;
-      public publishDataResource_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel, 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 registerDataResource_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel, 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.dataResourceModel = dataResourceModel;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("publishDataResource", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        publishDataResource_args args = new publishDataResource_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("registerDataResource", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        registerDataResource_args args = new registerDataResource_args();
         args.setAuthzToken(authzToken);
         args.setDataResourceModel(dataResourceModel);
         args.write(prot);
@@ -12205,7 +12205,7 @@ public class Airavata {
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_publishDataResource();
+        return (new Client(prot)).recv_registerDataResource();
       }
     }
 
@@ -12459,7 +12459,7 @@ public class Airavata {
       processMap.put("updateWorkflow", new updateWorkflow());
       processMap.put("getWorkflowTemplateId", new getWorkflowTemplateId());
       processMap.put("isWorkflowExistWithName", new isWorkflowExistWithName());
-      processMap.put("publishDataResource", new publishDataResource());
+      processMap.put("registerDataResource", new registerDataResource());
       processMap.put("updateDataResource", new updateDataResource());
       processMap.put("removeDataResource", new removeDataResource());
       processMap.put("getDataResource", new getDataResource());
@@ -16478,23 +16478,23 @@ public class Airavata {
       }
     }
 
-    public static class publishDataResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, publishDataResource_args> {
-      public publishDataResource() {
-        super("publishDataResource");
+    public static class registerDataResource<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerDataResource_args> {
+      public registerDataResource() {
+        super("registerDataResource");
       }
 
-      public publishDataResource_args getEmptyArgsInstance() {
-        return new publishDataResource_args();
+      public registerDataResource_args getEmptyArgsInstance() {
+        return new registerDataResource_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public publishDataResource_result getResult(I iface, publishDataResource_args args) throws org.apache.thrift.TException {
-        publishDataResource_result result = new publishDataResource_result();
+      public registerDataResource_result getResult(I iface, registerDataResource_args args) throws org.apache.thrift.TException {
+        registerDataResource_result result = new registerDataResource_result();
         try {
-          result.success = iface.publishDataResource(args.authzToken, args.dataResourceModel);
+          result.success = iface.registerDataResource(args.authzToken, args.dataResourceModel);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -16743,7 +16743,7 @@ public class Airavata {
       processMap.put("updateWorkflow", new updateWorkflow());
       processMap.put("getWorkflowTemplateId", new getWorkflowTemplateId());
       processMap.put("isWorkflowExistWithName", new isWorkflowExistWithName());
-      processMap.put("publishDataResource", new publishDataResource());
+      processMap.put("registerDataResource", new registerDataResource());
       processMap.put("updateDataResource", new updateDataResource());
       processMap.put("removeDataResource", new removeDataResource());
       processMap.put("getDataResource", new getDataResource());
@@ -26312,20 +26312,20 @@ public class Airavata {
       }
     }
 
-    public static class publishDataResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, publishDataResource_args, String> {
-      public publishDataResource() {
-        super("publishDataResource");
+    public static class registerDataResource<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerDataResource_args, String> {
+      public registerDataResource() {
+        super("registerDataResource");
       }
 
-      public publishDataResource_args getEmptyArgsInstance() {
-        return new publishDataResource_args();
+      public registerDataResource_args getEmptyArgsInstance() {
+        return new registerDataResource_args();
       }
 
       public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new AsyncMethodCallback<String>() { 
           public void onComplete(String o) {
-            publishDataResource_result result = new publishDataResource_result();
+            registerDataResource_result result = new registerDataResource_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -26338,7 +26338,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            publishDataResource_result result = new publishDataResource_result();
+            registerDataResource_result result = new registerDataResource_result();
             if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -26379,8 +26379,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, publishDataResource_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
-        iface.publishDataResource(args.authzToken, args.dataResourceModel,resultHandler);
+      public void start(I iface, registerDataResource_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+        iface.registerDataResource(args.authzToken, args.dataResourceModel,resultHandler);
       }
     }
 
@@ -204413,16 +204413,16 @@ public class Airavata {
 
   }
 
-  public static class publishDataResource_args implements org.apache.thrift.TBase<publishDataResource_args, publishDataResource_args._Fields>, java.io.Serializable, Cloneable, Comparable<publishDataResource_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("publishDataResource_args");
+  public static class registerDataResource_args implements org.apache.thrift.TBase<registerDataResource_args, registerDataResource_args._Fields>, java.io.Serializable, Cloneable, Comparable<registerDataResource_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerDataResource_args");
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField DATA_RESOURCE_MODEL_FIELD_DESC = new org.apache.thrift.protocol.TField("dataResourceModel", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new publishDataResource_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new publishDataResource_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new registerDataResource_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new registerDataResource_argsTupleSchemeFactory());
     }
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
@@ -204498,13 +204498,13 @@ public class Airavata {
       tmpMap.put(_Fields.DATA_RESOURCE_MODEL, new org.apache.thrift.meta_data.FieldMetaData("dataResourceModel", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.resource.DataResourceModel.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(publishDataResource_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerDataResource_args.class, metaDataMap);
     }
 
-    public publishDataResource_args() {
+    public registerDataResource_args() {
     }
 
-    public publishDataResource_args(
+    public registerDataResource_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel)
     {
@@ -204516,7 +204516,7 @@ public class Airavata {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public publishDataResource_args(publishDataResource_args other) {
+    public registerDataResource_args(registerDataResource_args other) {
       if (other.isSetAuthzToken()) {
         this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
@@ -204525,8 +204525,8 @@ public class Airavata {
       }
     }
 
-    public publishDataResource_args deepCopy() {
-      return new publishDataResource_args(this);
+    public registerDataResource_args deepCopy() {
+      return new registerDataResource_args(this);
     }
 
     @Override
@@ -204539,7 +204539,7 @@ public class Airavata {
       return this.authzToken;
     }
 
-    public publishDataResource_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+    public registerDataResource_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
       this.authzToken = authzToken;
       return this;
     }
@@ -204563,7 +204563,7 @@ public class Airavata {
       return this.dataResourceModel;
     }
 
-    public publishDataResource_args setDataResourceModel(org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) {
+    public registerDataResource_args setDataResourceModel(org.apache.airavata.model.data.resource.DataResourceModel dataResourceModel) {
       this.dataResourceModel = dataResourceModel;
       return this;
     }
@@ -204635,12 +204635,12 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof publishDataResource_args)
-        return this.equals((publishDataResource_args)that);
+      if (that instanceof registerDataResource_args)
+        return this.equals((registerDataResource_args)that);
       return false;
     }
 
-    public boolean equals(publishDataResource_args that) {
+    public boolean equals(registerDataResource_args that) {
       if (that == null)
         return false;
 
@@ -204683,7 +204683,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(publishDataResource_args other) {
+    public int compareTo(registerDataResource_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -204727,7 +204727,7 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("publishDataResource_args(");
+      StringBuilder sb = new StringBuilder("registerDataResource_args(");
       boolean first = true;
 
       sb.append("authzToken:");
@@ -204782,15 +204782,15 @@ public class Airavata {
       }
     }
 
-    private static class publishDataResource_argsStandardSchemeFactory implements SchemeFactory {
-      public publishDataResource_argsStandardScheme getScheme() {
-        return new publishDataResource_argsStandardScheme();
+    private static class registerDataResource_argsStandardSchemeFactory implements SchemeFactory {
+      public registerDataResource_argsStandardScheme getScheme() {
+        return new registerDataResource_argsStandardScheme();
       }
     }
 
-    private static class publishDataResource_argsStandardScheme extends StandardScheme<publishDataResource_args> {
+    private static class registerDataResource_argsStandardScheme extends StandardScheme<registerDataResource_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, publishDataResource_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, registerDataResource_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -204829,7 +204829,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, publishDataResource_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, registerDataResource_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -204849,23 +204849,23 @@ public class Airavata {
 
     }
 
-    private static class publishDataResource_argsTupleSchemeFactory implements SchemeFactory {
-      public publishDataResource_argsTupleScheme getScheme() {
-        return new publishDataResource_argsTupleScheme();
+    private static class registerDataResource_argsTupleSchemeFactory implements SchemeFactory {
+      public registerDataResource_argsTupleScheme getScheme() {
+        return new registerDataResource_argsTupleScheme();
       }
     }
 
-    private static class publishDataResource_argsTupleScheme extends TupleScheme<publishDataResource_args> {
+    private static class registerDataResource_argsTupleScheme extends TupleScheme<registerDataResource_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, publishDataResource_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, registerDataResource_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         struct.dataResourceModel.write(oprot);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, publishDataResource_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, registerDataResource_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
         struct.authzToken.read(iprot);
@@ -204878,8 +204878,8 @@ public class Airavata {
 
   }
 
-  public static class publishDataResource_result implements org.apache.thrift.TBase<publishDataResource_result, publishDataResource_result._Fields>, java.io.Serializable, Cloneable, Comparable<publishDataResource_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("publishDataResource_result");
+  public static class registerDataResource_result implements org.apache.thrift.TBase<registerDataResource_result, registerDataResource_result._Fields>, java.io.Serializable, Cloneable, Comparable<registerDataResource_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerDataResource_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
     private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -204889,8 +204889,8 @@ public class Airavata {
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new publishDataResource_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new publishDataResource_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new registerDataResource_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new registerDataResource_resultTupleSchemeFactory());
     }
 
     public String success; // required
@@ -204984,13 +204984,13 @@ public class Airavata {
       tmpMap.put(_Fields.AE, new org.apache.thrift.meta_data.FieldMetaData("ae", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(publishDataResource_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerDataResource_result.class, metaDataMap);
     }
 
-    public publishDataResource_result() {
+    public registerDataResource_result() {
     }
 
-    public publishDataResource_result(
+    public registerDataResource_result(
       String success,
       org.apache.airavata.model.error.InvalidRequestException ire,
       org.apache.airavata.model.error.AiravataClientException ace,
@@ -205008,7 +205008,7 @@ public class Airavata {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public publishDataResource_result(publishDataResource_result other) {
+    public registerDataResource_result(registerDataResource_result other) {
       if (other.isSetSuccess()) {
         this.success = other.success;
       }
@@ -205026,8 +205026,8 @@ public class Airavata {
       }
     }
 
-    public publishDataResource_result deepCopy() {
-      return new publishDataResource_result(this);
+    public registerDataResource_result deepCopy() {
+      return new registerDataResource_result(this);
     }
 
     @Override
@@ -205043,7 +205043,7 @@ public class Airavata {
       return this.success;
     }
 
-    public publishDataResource_result setSuccess(String success) {
+    public registerDataResource_result setSuccess(String success) {
       this.success = success;
       return this;
     }
@@ -205067,7 +205067,7 @@ public class Airavata {
       return this.ire;
     }
 
-    public publishDataResource_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+    public registerDataResource_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -205091,7 +205091,7 @@ public class Airavata {
       return this.ace;
     }
 
-    public publishDataResource_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+    public registerDataResource_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
       this.ace = ace;
       return this;
     }
@@ -205115,7 +205115,7 @@ public class Airavata {
       return this.ase;
     }
 
-    public publishDataResource_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+    public registerDataResource_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
       this.ase = ase;
       return this;
     }
@@ -205139,7 +205139,7 @@ public class Airavata {
       return this.ae;
     }
 
-    public publishDataResource_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
+    public registerDataResource_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
       this.ae = ae;
       return this;
     }
@@ -205250,12 +205250,12 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof publishDataResource_result)
-        return this.equals((publishDataResource_result)that);
+      if (that instanceof registerDataResource_result)
+        return this.equals((registerDataResource_result)that);
       return false;
     }
 
-    public boolean equals(publishDataResource_result that) {
+    public boolean equals(registerDataResource_result that) {
       if (that == null)
         return false;
 
@@ -205340,7 +205340,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(publishDataResource_result other) {
+    public int compareTo(registerDataResource_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -205414,7 +205414,7 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("publishDataResource_result(");
+      StringBuilder sb = new StringBuilder("registerDataResource_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -205481,15 +205481,15 @@ public class Airavata {
       }
     }
 
-    private static class publishDataResource_resultStandardSchemeFactory implements SchemeFactory {
-      public publishDataResource_resultStandardScheme getScheme() {
-        return new publishDataResource_resultStandardScheme();
+    private static class registerDataResource_resultStandardSchemeFactory implements SchemeFactory {
+      public registerDataResource_resultStandardScheme getScheme() {
+        return new registerDataResource_resultStandardScheme();
       }
     }
 
-    private static class publishDataResource_resultStandardScheme extends StandardScheme<publishDataResource_result> {
+    private static class registerDataResource_resultStandardScheme extends StandardScheme<registerDataResource_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, publishDataResource_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, registerDataResource_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -205554,7 +205554,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, publishDataResource_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, registerDataResource_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -205589,16 +205589,16 @@ public class Airavata {
 
     }
 
-    private static class publishDataResource_resultTupleSchemeFactory implements SchemeFactory {
-      public publishDataResource_resultTupleScheme getScheme() {
-        return new publishDataResource_resultTupleScheme();
+    private static class registerDataResource_resultTupleSchemeFactory implements SchemeFactory {
+      public registerDataResource_resultTupleScheme getScheme() {
+        return new registerDataResource_resultTupleScheme();
       }
     }
 
-    private static class publishDataResource_resultTupleScheme extends TupleScheme<publishDataResource_result> {
+    private static class registerDataResource_resultTupleScheme extends TupleScheme<registerDataResource_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, publishDataResource_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, registerDataResource_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -205635,7 +205635,7 @@ public class Airavata {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, publishDataResource_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, registerDataResource_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/098c2306/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index 1c1b4da..2314d09 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -41221,11 +41221,11 @@ uint32_t Airavata_isWorkflowExistWithName_presult::read(::apache::thrift::protoc
 }
 
 
-Airavata_publishDataResource_args::~Airavata_publishDataResource_args() throw() {
+Airavata_registerDataResource_args::~Airavata_registerDataResource_args() throw() {
 }
 
 
-uint32_t Airavata_publishDataResource_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_registerDataResource_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -41279,10 +41279,10 @@ uint32_t Airavata_publishDataResource_args::read(::apache::thrift::protocol::TPr
   return xfer;
 }
 
-uint32_t Airavata_publishDataResource_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_registerDataResource_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   oprot->incrementRecursionDepth();
-  xfer += oprot->writeStructBegin("Airavata_publishDataResource_args");
+  xfer += oprot->writeStructBegin("Airavata_registerDataResource_args");
 
   xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
@@ -41299,14 +41299,14 @@ uint32_t Airavata_publishDataResource_args::write(::apache::thrift::protocol::TP
 }
 
 
-Airavata_publishDataResource_pargs::~Airavata_publishDataResource_pargs() throw() {
+Airavata_registerDataResource_pargs::~Airavata_registerDataResource_pargs() throw() {
 }
 
 
-uint32_t Airavata_publishDataResource_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_registerDataResource_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   oprot->incrementRecursionDepth();
-  xfer += oprot->writeStructBegin("Airavata_publishDataResource_pargs");
+  xfer += oprot->writeStructBegin("Airavata_registerDataResource_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
@@ -41323,11 +41323,11 @@ uint32_t Airavata_publishDataResource_pargs::write(::apache::thrift::protocol::T
 }
 
 
-Airavata_publishDataResource_result::~Airavata_publishDataResource_result() throw() {
+Airavata_registerDataResource_result::~Airavata_registerDataResource_result() throw() {
 }
 
 
-uint32_t Airavata_publishDataResource_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_registerDataResource_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -41399,11 +41399,11 @@ uint32_t Airavata_publishDataResource_result::read(::apache::thrift::protocol::T
   return xfer;
 }
 
-uint32_t Airavata_publishDataResource_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_registerDataResource_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_publishDataResource_result");
+  xfer += oprot->writeStructBegin("Airavata_registerDataResource_result");
 
   if (this->__isset.success) {
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
@@ -41432,11 +41432,11 @@ uint32_t Airavata_publishDataResource_result::write(::apache::thrift::protocol::
 }
 
 
-Airavata_publishDataResource_presult::~Airavata_publishDataResource_presult() throw() {
+Airavata_registerDataResource_presult::~Airavata_registerDataResource_presult() throw() {
 }
 
 
-uint32_t Airavata_publishDataResource_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_registerDataResource_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -51784,18 +51784,18 @@ bool AiravataClient::recv_isWorkflowExistWithName()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "isWorkflowExistWithName failed: unknown result");
 }
 
-void AiravataClient::publishDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel)
+void AiravataClient::registerDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel)
 {
-  send_publishDataResource(authzToken, dataResourceModel);
-  recv_publishDataResource(_return);
+  send_registerDataResource(authzToken, dataResourceModel);
+  recv_registerDataResource(_return);
 }
 
-void AiravataClient::send_publishDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel)
+void AiravataClient::send_registerDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("publishDataResource", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("registerDataResource", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  Airavata_publishDataResource_pargs args;
+  Airavata_registerDataResource_pargs args;
   args.authzToken = &authzToken;
   args.dataResourceModel = &dataResourceModel;
   args.write(oprot_);
@@ -51805,7 +51805,7 @@ void AiravataClient::send_publishDataResource(const  ::apache::airavata::model::
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_publishDataResource(std::string& _return)
+void AiravataClient::recv_registerDataResource(std::string& _return)
 {
 
   int32_t rseqid = 0;
@@ -51825,12 +51825,12 @@ void AiravataClient::recv_publishDataResource(std::string& _return)
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("publishDataResource") != 0) {
+  if (fname.compare("registerDataResource") != 0) {
     iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  Airavata_publishDataResource_presult result;
+  Airavata_registerDataResource_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -51852,7 +51852,7 @@ void AiravataClient::recv_publishDataResource(std::string& _return)
   if (result.__isset.ae) {
     throw result.ae;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "publishDataResource failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "registerDataResource failed: unknown result");
 }
 
 void AiravataClient::updateDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel)
@@ -60795,30 +60795,30 @@ void AiravataProcessor::process_isWorkflowExistWithName(int32_t seqid, ::apache:
   }
 }
 
-void AiravataProcessor::process_publishDataResource(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+void AiravataProcessor::process_registerDataResource(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
 {
   void* ctx = NULL;
   if (this->eventHandler_.get() != NULL) {
-    ctx = this->eventHandler_->getContext("Airavata.publishDataResource", callContext);
+    ctx = this->eventHandler_->getContext("Airavata.registerDataResource", callContext);
   }
-  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.publishDataResource");
+  ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.registerDataResource");
 
   if (this->eventHandler_.get() != NULL) {
-    this->eventHandler_->preRead(ctx, "Airavata.publishDataResource");
+    this->eventHandler_->preRead(ctx, "Airavata.registerDataResource");
   }
 
-  Airavata_publishDataResource_args args;
+  Airavata_registerDataResource_args args;
   args.read(iprot);
   iprot->readMessageEnd();
   uint32_t bytes = iprot->getTransport()->readEnd();
 
   if (this->eventHandler_.get() != NULL) {
-    this->eventHandler_->postRead(ctx, "Airavata.publishDataResource", bytes);
+    this->eventHandler_->postRead(ctx, "Airavata.registerDataResource", bytes);
   }
 
-  Airavata_publishDataResource_result result;
+  Airavata_registerDataResource_result result;
   try {
-    iface_->publishDataResource(result.success, args.authzToken, args.dataResourceModel);
+    iface_->registerDataResource(result.success, args.authzToken, args.dataResourceModel);
     result.__isset.success = true;
   } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
@@ -60834,11 +60834,11 @@ void AiravataProcessor::process_publishDataResource(int32_t seqid, ::apache::thr
     result.__isset.ae = true;
   } catch (const std::exception& e) {
     if (this->eventHandler_.get() != NULL) {
-      this->eventHandler_->handlerError(ctx, "Airavata.publishDataResource");
+      this->eventHandler_->handlerError(ctx, "Airavata.registerDataResource");
     }
 
     ::apache::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("publishDataResource", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+    oprot->writeMessageBegin("registerDataResource", ::apache::thrift::protocol::T_EXCEPTION, seqid);
     x.write(oprot);
     oprot->writeMessageEnd();
     oprot->getTransport()->writeEnd();
@@ -60847,17 +60847,17 @@ void AiravataProcessor::process_publishDataResource(int32_t seqid, ::apache::thr
   }
 
   if (this->eventHandler_.get() != NULL) {
-    this->eventHandler_->preWrite(ctx, "Airavata.publishDataResource");
+    this->eventHandler_->preWrite(ctx, "Airavata.registerDataResource");
   }
 
-  oprot->writeMessageBegin("publishDataResource", ::apache::thrift::protocol::T_REPLY, seqid);
+  oprot->writeMessageBegin("registerDataResource", ::apache::thrift::protocol::T_REPLY, seqid);
   result.write(oprot);
   oprot->writeMessageEnd();
   bytes = oprot->getTransport()->writeEnd();
   oprot->getTransport()->flush();
 
   if (this->eventHandler_.get() != NULL) {
-    this->eventHandler_->postWrite(ctx, "Airavata.publishDataResource", bytes);
+    this->eventHandler_->postWrite(ctx, "Airavata.registerDataResource", bytes);
   }
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/098c2306/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 c66bae3..0165131 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
@@ -1843,13 +1843,13 @@ class AiravataIf {
   virtual bool isWorkflowExistWithName(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName) = 0;
 
   /**
-   *  * Replica Catalog Related API Methods
+   *  * Data Manager Related API Methods
    * *
    * 
    * @param authzToken
    * @param dataResourceModel
    */
-  virtual void publishDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel) = 0;
+  virtual void registerDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel) = 0;
   virtual void updateDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel) = 0;
   virtual void removeDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId) = 0;
   virtual void getDataResource( ::apache::airavata::model::data::resource::DataResourceModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId) = 0;
@@ -2320,7 +2320,7 @@ class AiravataNull : virtual public AiravataIf {
     bool _return = false;
     return _return;
   }
-  void publishDataResource(std::string& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const  ::apache::airavata::model::data::resource::DataResourceModel& /* dataResourceModel */) {
+  void registerDataResource(std::string& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const  ::apache::airavata::model::data::resource::DataResourceModel& /* dataResourceModel */) {
     return;
   }
   void updateDataResource(const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const  ::apache::airavata::model::data::resource::DataResourceModel& /* dataResourceModel */) {
@@ -23047,18 +23047,18 @@ class Airavata_isWorkflowExistWithName_presult {
 };
 
 
-class Airavata_publishDataResource_args {
+class Airavata_registerDataResource_args {
  public:
 
   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&);
-  Airavata_publishDataResource_args() {
+  Airavata_registerDataResource_args(const Airavata_registerDataResource_args&);
+  Airavata_registerDataResource_args& operator=(const Airavata_registerDataResource_args&);
+  Airavata_registerDataResource_args() {
   }
 
-  virtual ~Airavata_publishDataResource_args() throw();
+  virtual ~Airavata_registerDataResource_args() throw();
    ::apache::airavata::model::security::AuthzToken authzToken;
    ::apache::airavata::model::data::resource::DataResourceModel dataResourceModel;
 
@@ -23066,7 +23066,7 @@ class Airavata_publishDataResource_args {
 
   void __set_dataResourceModel(const  ::apache::airavata::model::data::resource::DataResourceModel& val);
 
-  bool operator == (const Airavata_publishDataResource_args & rhs) const
+  bool operator == (const Airavata_registerDataResource_args & rhs) const
   {
     if (!(authzToken == rhs.authzToken))
       return false;
@@ -23074,63 +23074,63 @@ class Airavata_publishDataResource_args {
       return false;
     return true;
   }
-  bool operator != (const Airavata_publishDataResource_args &rhs) const {
+  bool operator != (const Airavata_registerDataResource_args &rhs) const {
     return !(*this == rhs);
   }
 
-  bool operator < (const Airavata_publishDataResource_args & ) const;
+  bool operator < (const Airavata_registerDataResource_args & ) 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 Airavata_publishDataResource_args& obj);
+  friend std::ostream& operator<<(std::ostream& out, const Airavata_registerDataResource_args& obj);
 };
 
 
-class Airavata_publishDataResource_pargs {
+class Airavata_registerDataResource_pargs {
  public:
 
   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();
+  virtual ~Airavata_registerDataResource_pargs() throw();
   const  ::apache::airavata::model::security::AuthzToken* authzToken;
   const  ::apache::airavata::model::data::resource::DataResourceModel* dataResourceModel;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  friend std::ostream& operator<<(std::ostream& out, const Airavata_publishDataResource_pargs& obj);
+  friend std::ostream& operator<<(std::ostream& out, const Airavata_registerDataResource_pargs& obj);
 };
 
-typedef struct _Airavata_publishDataResource_result__isset {
-  _Airavata_publishDataResource_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_registerDataResource_result__isset {
+  _Airavata_registerDataResource_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
   bool success :1;
   bool ire :1;
   bool ace :1;
   bool ase :1;
   bool ae :1;
-} _Airavata_publishDataResource_result__isset;
+} _Airavata_registerDataResource_result__isset;
 
-class Airavata_publishDataResource_result {
+class Airavata_registerDataResource_result {
  public:
 
   static const char* ascii_fingerprint; // = "21BF57A9FE5AAA661540804D4FB9F023";
   static const uint8_t binary_fingerprint[16]; // = {0x21,0xBF,0x57,0xA9,0xFE,0x5A,0xAA,0x66,0x15,0x40,0x80,0x4D,0x4F,0xB9,0xF0,0x23};
 
-  Airavata_publishDataResource_result(const Airavata_publishDataResource_result&);
-  Airavata_publishDataResource_result& operator=(const Airavata_publishDataResource_result&);
-  Airavata_publishDataResource_result() : success() {
+  Airavata_registerDataResource_result(const Airavata_registerDataResource_result&);
+  Airavata_registerDataResource_result& operator=(const Airavata_registerDataResource_result&);
+  Airavata_registerDataResource_result() : success() {
   }
 
-  virtual ~Airavata_publishDataResource_result() throw();
+  virtual ~Airavata_registerDataResource_result() throw();
   std::string success;
    ::apache::airavata::api::error::InvalidRequestException ire;
    ::apache::airavata::api::error::AiravataClientException ace;
    ::apache::airavata::api::error::AiravataSystemException ase;
    ::apache::airavata::api::error::AuthorizationException ae;
 
-  _Airavata_publishDataResource_result__isset __isset;
+  _Airavata_registerDataResource_result__isset __isset;
 
   void __set_success(const std::string& val);
 
@@ -23142,7 +23142,7 @@ class Airavata_publishDataResource_result {
 
   void __set_ae(const  ::apache::airavata::api::error::AuthorizationException& val);
 
-  bool operator == (const Airavata_publishDataResource_result & rhs) const
+  bool operator == (const Airavata_registerDataResource_result & rhs) const
   {
     if (!(success == rhs.success))
       return false;
@@ -23156,46 +23156,46 @@ class Airavata_publishDataResource_result {
       return false;
     return true;
   }
-  bool operator != (const Airavata_publishDataResource_result &rhs) const {
+  bool operator != (const Airavata_registerDataResource_result &rhs) const {
     return !(*this == rhs);
   }
 
-  bool operator < (const Airavata_publishDataResource_result & ) const;
+  bool operator < (const Airavata_registerDataResource_result & ) 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 Airavata_publishDataResource_result& obj);
+  friend std::ostream& operator<<(std::ostream& out, const Airavata_registerDataResource_result& obj);
 };
 
-typedef struct _Airavata_publishDataResource_presult__isset {
-  _Airavata_publishDataResource_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_registerDataResource_presult__isset {
+  _Airavata_registerDataResource_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
   bool success :1;
   bool ire :1;
   bool ace :1;
   bool ase :1;
   bool ae :1;
-} _Airavata_publishDataResource_presult__isset;
+} _Airavata_registerDataResource_presult__isset;
 
-class Airavata_publishDataResource_presult {
+class Airavata_registerDataResource_presult {
  public:
 
   static const char* ascii_fingerprint; // = "21BF57A9FE5AAA661540804D4FB9F023";
   static const uint8_t binary_fingerprint[16]; // = {0x21,0xBF,0x57,0xA9,0xFE,0x5A,0xAA,0x66,0x15,0x40,0x80,0x4D,0x4F,0xB9,0xF0,0x23};
 
 
-  virtual ~Airavata_publishDataResource_presult() throw();
+  virtual ~Airavata_registerDataResource_presult() throw();
   std::string* success;
    ::apache::airavata::api::error::InvalidRequestException ire;
    ::apache::airavata::api::error::AiravataClientException ace;
    ::apache::airavata::api::error::AiravataSystemException ase;
    ::apache::airavata::api::error::AuthorizationException ae;
 
-  _Airavata_publishDataResource_presult__isset __isset;
+  _Airavata_registerDataResource_presult__isset __isset;
 
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
 
-  friend std::ostream& operator<<(std::ostream& out, const Airavata_publishDataResource_presult& obj);
+  friend std::ostream& operator<<(std::ostream& out, const Airavata_registerDataResource_presult& obj);
 };
 
 
@@ -24059,9 +24059,9 @@ class AiravataClient : virtual public AiravataIf {
   bool isWorkflowExistWithName(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName);
   void send_isWorkflowExistWithName(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName);
   bool recv_isWorkflowExistWithName();
-  void publishDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel);
-  void send_publishDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel);
-  void recv_publishDataResource(std::string& _return);
+  void registerDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel);
+  void send_registerDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel);
+  void recv_registerDataResource(std::string& _return);
   void updateDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel);
   void send_updateDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel);
   void recv_updateDataResource();
@@ -24218,7 +24218,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
   void process_updateWorkflow(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
   void process_getWorkflowTemplateId(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
   void process_isWorkflowExistWithName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
-  void process_publishDataResource(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+  void process_registerDataResource(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
   void process_updateDataResource(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
   void process_removeDataResource(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
   void process_getDataResource(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -24357,7 +24357,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
     processMap_["updateWorkflow"] = &AiravataProcessor::process_updateWorkflow;
     processMap_["getWorkflowTemplateId"] = &AiravataProcessor::process_getWorkflowTemplateId;
     processMap_["isWorkflowExistWithName"] = &AiravataProcessor::process_isWorkflowExistWithName;
-    processMap_["publishDataResource"] = &AiravataProcessor::process_publishDataResource;
+    processMap_["registerDataResource"] = &AiravataProcessor::process_registerDataResource;
     processMap_["updateDataResource"] = &AiravataProcessor::process_updateDataResource;
     processMap_["removeDataResource"] = &AiravataProcessor::process_removeDataResource;
     processMap_["getDataResource"] = &AiravataProcessor::process_getDataResource;
@@ -25658,13 +25658,13 @@ class AiravataMultiface : virtual public AiravataIf {
     return ifaces_[i]->isWorkflowExistWithName(authzToken, workflowName);
   }
 
-  void publishDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel) {
+  void registerDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
-      ifaces_[i]->publishDataResource(_return, authzToken, dataResourceModel);
+      ifaces_[i]->registerDataResource(_return, authzToken, dataResourceModel);
     }
-    ifaces_[i]->publishDataResource(_return, authzToken, dataResourceModel);
+    ifaces_[i]->registerDataResource(_return, authzToken, dataResourceModel);
     return;
   }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/098c2306/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
index ce92e43..f56760b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
@@ -2285,15 +2285,15 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   *  * Replica Catalog Related API Methods
+   *  * Data Manager Related API Methods
    * *
    * 
    * @param authzToken
    * @param dataResourceModel
    */
-  void publishDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel) {
+  void registerDataResource(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel) {
     // Your implementation goes here
-    printf("publishDataResource\n");
+    printf("registerDataResource\n");
   }
 
   void updateDataResource(const  ::apache::airavata::model::security::AuthzToken& authzToken, const  ::apache::airavata::model::data::resource::DataResourceModel& dataResourceModel) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/098c2306/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index 7171104..bf2a78b 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -2812,7 +2812,7 @@ interface AiravataIf {
    */
   public function isWorkflowExistWithName(\Airavata\Model\Security\AuthzToken $authzToken, $workflowName);
   /**
-   *  * Replica Catalog Related API Methods
+   *  * Data Manager Related API Methods
    * *
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -2823,7 +2823,7 @@ interface AiravataIf {
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel);
+  public function registerDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel
@@ -11411,35 +11411,35 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("isWorkflowExistWithName failed: unknown result");
   }
 
-  public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
+  public function registerDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
   {
-    $this->send_publishDataResource($authzToken, $dataResourceModel);
-    return $this->recv_publishDataResource();
+    $this->send_registerDataResource($authzToken, $dataResourceModel);
+    return $this->recv_registerDataResource();
   }
 
-  public function send_publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
+  public function send_registerDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
   {
-    $args = new \Airavata\API\Airavata_publishDataResource_args();
+    $args = new \Airavata\API\Airavata_registerDataResource_args();
     $args->authzToken = $authzToken;
     $args->dataResourceModel = $dataResourceModel;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
-      thrift_protocol_write_binary($this->output_, 'publishDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+      thrift_protocol_write_binary($this->output_, 'registerDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
     }
     else
     {
-      $this->output_->writeMessageBegin('publishDataResource', TMessageType::CALL, $this->seqid_);
+      $this->output_->writeMessageBegin('registerDataResource', TMessageType::CALL, $this->seqid_);
       $args->write($this->output_);
       $this->output_->writeMessageEnd();
       $this->output_->getTransport()->flush();
     }
   }
 
-  public function recv_publishDataResource()
+  public function recv_registerDataResource()
   {
     $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
-    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_publishDataResource_result', $this->input_->isStrictRead());
+    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_registerDataResource_result', $this->input_->isStrictRead());
     else
     {
       $rseqid = 0;
@@ -11453,7 +11453,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
         $this->input_->readMessageEnd();
         throw $x;
       }
-      $result = new \Airavata\API\Airavata_publishDataResource_result();
+      $result = new \Airavata\API\Airavata_registerDataResource_result();
       $result->read($this->input_);
       $this->input_->readMessageEnd();
     }
@@ -11472,7 +11472,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     if ($result->ae !== null) {
       throw $result->ae;
     }
-    throw new \Exception("publishDataResource failed: unknown result");
+    throw new \Exception("registerDataResource failed: unknown result");
   }
 
   public function updateDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
@@ -52192,7 +52192,7 @@ class Airavata_isWorkflowExistWithName_result {
 
 }
 
-class Airavata_publishDataResource_args {
+class Airavata_registerDataResource_args {
   static $_TSPEC;
 
   /**
@@ -52230,7 +52230,7 @@ class Airavata_publishDataResource_args {
   }
 
   public function getName() {
-    return 'Airavata_publishDataResource_args';
+    return 'Airavata_registerDataResource_args';
   }
 
   public function read($input)
@@ -52276,7 +52276,7 @@ class Airavata_publishDataResource_args {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_publishDataResource_args');
+    $xfer += $output->writeStructBegin('Airavata_registerDataResource_args');
     if ($this->authzToken !== null) {
       if (!is_object($this->authzToken)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -52300,7 +52300,7 @@ class Airavata_publishDataResource_args {
 
 }
 
-class Airavata_publishDataResource_result {
+class Airavata_registerDataResource_result {
   static $_TSPEC;
 
   /**
@@ -52373,7 +52373,7 @@ class Airavata_publishDataResource_result {
   }
 
   public function getName() {
-    return 'Airavata_publishDataResource_result';
+    return 'Airavata_registerDataResource_result';
   }
 
   public function read($input)
@@ -52442,7 +52442,7 @@ class Airavata_publishDataResource_result {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_publishDataResource_result');
+    $xfer += $output->writeStructBegin('Airavata_registerDataResource_result');
     if ($this->success !== null) {
       $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
       $xfer += $output->writeString($this->success);

http://git-wip-us.apache.org/repos/asf/airavata/blob/098c2306/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index f562bf8..63d3892 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -156,7 +156,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print('  void updateWorkflow(AuthzToken authzToken, string workflowTemplateId, Workflow workflow)')
   print('  string getWorkflowTemplateId(AuthzToken authzToken, string workflowName)')
   print('  bool isWorkflowExistWithName(AuthzToken authzToken, string workflowName)')
-  print('  string publishDataResource(AuthzToken authzToken, DataResourceModel dataResourceModel)')
+  print('  string registerDataResource(AuthzToken authzToken, DataResourceModel dataResourceModel)')
   print('  void updateDataResource(AuthzToken authzToken, DataResourceModel dataResourceModel)')
   print('  void removeDataResource(AuthzToken authzToken, string resourceId)')
   print('  DataResourceModel getDataResource(AuthzToken authzToken, string resourceId)')
@@ -1008,11 +1008,11 @@ elif cmd == 'isWorkflowExistWithName':
     sys.exit(1)
   pp.pprint(client.isWorkflowExistWithName(eval(args[0]),args[1],))
 
-elif cmd == 'publishDataResource':
+elif cmd == 'registerDataResource':
   if len(args) != 2:
-    print('publishDataResource requires 2 args')
+    print('registerDataResource requires 2 args')
     sys.exit(1)
-  pp.pprint(client.publishDataResource(eval(args[0]),eval(args[1]),))
+  pp.pprint(client.registerDataResource(eval(args[0]),eval(args[1]),))
 
 elif cmd == 'updateDataResource':
   if len(args) != 2:


Mime
View raw message