You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/03/25 22:22:54 UTC
[31/55] [abbrv] airavata git commit: renaming data-catalog to replica
catalog
renaming data-catalog to replica catalog
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/04f6f593
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/04f6f593
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/04f6f593
Branch: refs/heads/master
Commit: 04f6f5934607cd2a0925f478fc4121c4adf0b306
Parents: a2ff432
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 24 11:25:13 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 24 11:25:15 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 14 +-
.../api/server/handler/utils/DataCatInit.java | 4 +-
.../java/org/apache/airavata/api/Airavata.java | 102 +-
.../main/resources/lib/airavata/Airavata.cpp | 24 +-
.../src/main/resources/lib/airavata/Airavata.h | 60 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 6 +-
.../resources/lib/airavata/airavata_api_types.h | 2 +-
.../lib/airavata/airavata_data_models_types.h | 2 +-
.../replica_catalog_models_constants.cpp | 2 +-
.../airavata/replica_catalog_models_constants.h | 2 +-
.../airavata/replica_catalog_models_types.cpp | 342 +--
.../lib/airavata/replica_catalog_models_types.h | 154 +-
.../resources/lib/Airavata/API/Airavata.php | 36 +-
.../lib/apache/airavata/api/Airavata.py | 12 +-
.../resources/lib/apache/airavata/api/ttypes.py | 2 +-
.../lib/apache/airavata/model/ttypes.py | 2 +-
.../client/samples/DataCatalogSample.java | 73 -
.../client/samples/ReplicaCatalogSample.java | 73 +
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.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 +-
.../model/data/product/DataProductModel.java | 1943 ------------------
.../model/data/product/DataProductType.java | 65 -
.../data/product/DataReplicaLocationModel.java | 1635 ---------------
.../data/product/ReplicaLocationCategory.java | 68 -
.../data/product/ReplicaPersistentType.java | 62 -
.../model/data/replica/DataProductModel.java | 1943 ++++++++++++++++++
.../model/data/replica/DataProductType.java | 65 +
.../data/replica/DataReplicaLocationModel.java | 1635 +++++++++++++++
.../data/replica/ReplicaLocationCategory.java | 68 +
.../data/replica/ReplicaPersistentType.java | 62 +
.../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 +-
.../test/resources/airavata-server.properties | 4 +-
.../server/OrchestratorServerHandler.java | 10 +-
.../core/data/catalog/impl/DataCatalogImpl.java | 356 ----
.../core/data/catalog/model/Configuration.java | 55 -
.../core/data/catalog/model/DataProduct.java | 187 --
.../data/catalog/model/DataProductMetaData.java | 77 -
.../catalog/model/DataProductMetaData_PK.java | 59 -
.../data/catalog/model/DataReplicaLocation.java | 169 --
.../data/catalog/model/DataReplicaMetaData.java | 77 -
.../catalog/model/DataReplicaMetaData_PK.java | 59 -
.../catalog/utils/DataCatalogConstants.java | 49 -
.../data/catalog/utils/DataCatalogJPAUtils.java | 82 -
.../utils/DataCatalogQueryGenerator.java | 111 -
.../utils/ThriftDataModelConversion.java | 215 --
.../catalog/impl/RegistryFactory.java | 10 +-
.../registry/core/impl/RegistryImpl.java | 6 +-
.../catalog/impl/ReplicaCatalogImpl.java | 356 ++++
.../replica/catalog/model/Configuration.java | 55 +
.../core/replica/catalog/model/DataProduct.java | 187 ++
.../catalog/model/DataProductMetaData.java | 77 +
.../catalog/model/DataProductMetaData_PK.java | 59 +
.../catalog/model/DataReplicaLocation.java | 169 ++
.../catalog/model/DataReplicaMetaData.java | 77 +
.../catalog/model/DataReplicaMetaData_PK.java | 59 +
.../catalog/utils/ReplicaCatalogConstants.java | 49 +
.../catalog/utils/ReplicaCatalogJPAUtils.java | 82 +
.../utils/ReplicaCatalogQueryGenerator.java | 111 +
.../utils/ThriftDataModelConversion.java | 215 ++
.../src/main/resources/META-INF/persistence.xml | 10 +-
.../airavata/data/catalog/DataCatalogTest.java | 100 -
.../airavata/data/catalog/util/Initialize.java | 315 ---
.../replica/catalog/ReplicaCatalogTest.java | 100 +
.../replica/catalog/util/Initialize.java | 315 +++
.../airavata/registry/cpi/DataCatalog.java | 50 -
.../registry/cpi/DataCatalogException.java | 35 -
.../apache/airavata/registry/cpi/Registry.java | 2 +-
.../airavata/registry/cpi/ReplicaCatalog.java | 50 +
.../registry/cpi/ReplicaCatalogException.java | 35 +
.../airavata-apis/airavata_api.thrift | 10 +-
.../data-models/airavata_data_models.thrift | 2 +-
.../data_catalog_models.thrift | 73 -
.../replica_catalog_models.thrift | 73 +
150 files changed, 6421 insertions(+), 6389 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/04f6f593/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 40877de..f1564e5 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
@@ -49,8 +49,8 @@ import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.model.commons.airavata_commonsConstants;
import org.apache.airavata.model.data.movement.DMType;
import org.apache.airavata.model.data.movement.*;
-import org.apache.airavata.model.data.product.DataProductModel;
-import org.apache.airavata.model.data.product.DataReplicaLocationModel;
+import org.apache.airavata.model.data.replica.DataProductModel;
+import org.apache.airavata.model.data.replica.DataReplicaLocationModel;
import org.apache.airavata.model.error.*;
import org.apache.airavata.model.experiment.*;
import org.apache.airavata.model.job.JobModel;
@@ -88,7 +88,7 @@ public class AiravataServerHandler implements Airavata.Iface {
private ExperimentCatalog experimentCatalog;
private AppCatalog appCatalog;
private Publisher publisher;
- private DataCatalog dataCatalog;
+ private ReplicaCatalog dataCatalog;
private WorkflowCatalog workflowCatalog;
private CredentialStoreService.Client csClient;
@@ -4295,7 +4295,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * DataCatalog Related Methods
+ * ReplicaCatalog Related Methods
* @return
* @throws TException
* @throws ApplicationSettingsException
@@ -4305,7 +4305,7 @@ public class AiravataServerHandler implements Airavata.Iface {
public String registerDataProduct(AuthzToken authzToken, DataProductModel dataProductModel) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- dataCatalog = RegistryFactory.getDataCatalog();
+ dataCatalog = RegistryFactory.getReplicaCatalog();
String productUrl = dataCatalog.registerDataProduct(dataProductModel);
return productUrl;
} catch (Exception e) {
@@ -4322,7 +4322,7 @@ public class AiravataServerHandler implements Airavata.Iface {
public DataProductModel getDataProduct(AuthzToken authzToken, String productUri) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- dataCatalog = RegistryFactory.getDataCatalog();
+ dataCatalog = RegistryFactory.getReplicaCatalog();
DataProductModel dataProductModel = dataCatalog.getDataProduct(productUri);
return dataProductModel;
} catch (Exception e) {
@@ -4339,7 +4339,7 @@ public class AiravataServerHandler implements Airavata.Iface {
public String registerReplicaLocation(AuthzToken authzToken, DataReplicaLocationModel replicaLocationModel) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- dataCatalog = RegistryFactory.getDataCatalog();
+ dataCatalog = RegistryFactory.getReplicaCatalog();
String replicaId = dataCatalog.registerReplicaLocation(replicaLocationModel);
return replicaId;
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/04f6f593/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java
index 2b55692..f99228a 100644
--- a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java
+++ b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java
@@ -23,7 +23,7 @@ package org.apache.airavata.api.server.handler.utils;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.registry.core.data.catalog.utils.DataCatalogConstants;
+import org.apache.airavata.registry.core.replica.catalog.utils.ReplicaCatalogConstants;
import org.apache.derby.drda.NetworkServerControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -111,7 +111,7 @@ public class DataCatInit {
try {
Class.forName(jdbcDriver).newInstance();
conn = DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPassword);
- if (!isDatabaseStructureCreated(DataCatalogConstants.CONFIGURATION, conn)) {
+ if (!isDatabaseStructureCreated(ReplicaCatalogConstants.CONFIGURATION, conn)) {
executeSQLScript(conn);
logger.info("New Database created for Data Catalog !!!");
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/04f6f593/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 430333f..29f1056 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.3)", date = "2016-03-22")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-24")
public class Airavata {
public interface Iface {
@@ -2644,11 +2644,11 @@ public class Airavata {
* @param authzToken
* @param dataProductModel
*/
- public String registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataProductModel dataProductModel) 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 registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataProductModel dataProductModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public org.apache.airavata.model.data.product.DataProductModel getDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, String dataProductUri) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public org.apache.airavata.model.data.replica.DataProductModel getDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, String dataProductUri) 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 registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel) 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 registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel) 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;
}
@@ -2922,11 +2922,11 @@ 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 registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataProductModel dataProductModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataProductModel dataProductModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, String dataProductUri, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -7876,13 +7876,13 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isWorkflowExistWithName failed: unknown result");
}
- public String registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataProductModel dataProductModel) 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 registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataProductModel dataProductModel) 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_registerDataProduct(authzToken, dataProductModel);
return recv_registerDataProduct();
}
- public void send_registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataProductModel dataProductModel) throws org.apache.thrift.TException
+ public void send_registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataProductModel dataProductModel) throws org.apache.thrift.TException
{
registerDataProduct_args args = new registerDataProduct_args();
args.setAuthzToken(authzToken);
@@ -7912,7 +7912,7 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "registerDataProduct failed: unknown result");
}
- public org.apache.airavata.model.data.product.DataProductModel getDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, String dataProductUri) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public org.apache.airavata.model.data.replica.DataProductModel getDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, String dataProductUri) 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_getDataProduct(authzToken, dataProductUri);
return recv_getDataProduct();
@@ -7926,7 +7926,7 @@ public class Airavata {
sendBase("getDataProduct", args);
}
- public org.apache.airavata.model.data.product.DataProductModel recv_getDataProduct() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public org.apache.airavata.model.data.replica.DataProductModel recv_getDataProduct() 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
{
getDataProduct_result result = new getDataProduct_result();
receiveBase(result, "getDataProduct");
@@ -7948,13 +7948,13 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getDataProduct failed: unknown result");
}
- public String registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel) 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 registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel) 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_registerReplicaLocation(authzToken, replicaLocationModel);
return recv_registerReplicaLocation();
}
- public void send_registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel) throws org.apache.thrift.TException
+ public void send_registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel) throws org.apache.thrift.TException
{
registerReplicaLocation_args args = new registerReplicaLocation_args();
args.setAuthzToken(authzToken);
@@ -13034,7 +13034,7 @@ public class Airavata {
}
}
- public void registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataProductModel dataProductModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void registerDataProduct(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataProductModel dataProductModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
registerDataProduct_call method_call = new registerDataProduct_call(authzToken, dataProductModel, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -13043,8 +13043,8 @@ public class Airavata {
public static class registerDataProduct_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
- private org.apache.airavata.model.data.product.DataProductModel dataProductModel;
- public registerDataProduct_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataProductModel dataProductModel, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ private org.apache.airavata.model.data.replica.DataProductModel dataProductModel;
+ public registerDataProduct_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataProductModel dataProductModel, 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.dataProductModel = dataProductModel;
@@ -13094,7 +13094,7 @@ public class Airavata {
prot.writeMessageEnd();
}
- public org.apache.airavata.model.data.product.DataProductModel getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+ public org.apache.airavata.model.data.replica.DataProductModel getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
@@ -13104,7 +13104,7 @@ public class Airavata {
}
}
- public void registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void registerReplicaLocation(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
registerReplicaLocation_call method_call = new registerReplicaLocation_call(authzToken, replicaLocationModel, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -13113,8 +13113,8 @@ public class Airavata {
public static class registerReplicaLocation_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
- private org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel;
- public registerReplicaLocation_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ private org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel;
+ public registerReplicaLocation_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel, 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.replicaLocationModel = replicaLocationModel;
@@ -27387,7 +27387,7 @@ public class Airavata {
}
}
- public static class getDataProduct<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getDataProduct_args, org.apache.airavata.model.data.product.DataProductModel> {
+ public static class getDataProduct<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getDataProduct_args, org.apache.airavata.model.data.replica.DataProductModel> {
public getDataProduct() {
super("getDataProduct");
}
@@ -27396,10 +27396,10 @@ public class Airavata {
return new getDataProduct_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.data.product.DataProductModel> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.data.replica.DataProductModel> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.data.product.DataProductModel>() {
- public void onComplete(org.apache.airavata.model.data.product.DataProductModel o) {
+ return new AsyncMethodCallback<org.apache.airavata.model.data.replica.DataProductModel>() {
+ public void onComplete(org.apache.airavata.model.data.replica.DataProductModel o) {
getDataProduct_result result = new getDataProduct_result();
result.success = o;
try {
@@ -27454,7 +27454,7 @@ public class Airavata {
return false;
}
- public void start(I iface, getDataProduct_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.data.product.DataProductModel> resultHandler) throws TException {
+ public void start(I iface, getDataProduct_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.data.replica.DataProductModel> resultHandler) throws TException {
iface.getDataProduct(args.authzToken, args.dataProductUri,resultHandler);
}
}
@@ -208292,7 +208292,7 @@ public class Airavata {
}
public org.apache.airavata.model.security.AuthzToken authzToken; // required
- public org.apache.airavata.model.data.product.DataProductModel dataProductModel; // required
+ public org.apache.airavata.model.data.replica.DataProductModel dataProductModel; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -208362,7 +208362,7 @@ public class Airavata {
tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
tmpMap.put(_Fields.DATA_PRODUCT_MODEL, new org.apache.thrift.meta_data.FieldMetaData("dataProductModel", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.product.DataProductModel.class)));
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.replica.DataProductModel.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerDataProduct_args.class, metaDataMap);
}
@@ -208372,7 +208372,7 @@ public class Airavata {
public registerDataProduct_args(
org.apache.airavata.model.security.AuthzToken authzToken,
- org.apache.airavata.model.data.product.DataProductModel dataProductModel)
+ org.apache.airavata.model.data.replica.DataProductModel dataProductModel)
{
this();
this.authzToken = authzToken;
@@ -208387,7 +208387,7 @@ public class Airavata {
this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
}
if (other.isSetDataProductModel()) {
- this.dataProductModel = new org.apache.airavata.model.data.product.DataProductModel(other.dataProductModel);
+ this.dataProductModel = new org.apache.airavata.model.data.replica.DataProductModel(other.dataProductModel);
}
}
@@ -208425,11 +208425,11 @@ public class Airavata {
}
}
- public org.apache.airavata.model.data.product.DataProductModel getDataProductModel() {
+ public org.apache.airavata.model.data.replica.DataProductModel getDataProductModel() {
return this.dataProductModel;
}
- public registerDataProduct_args setDataProductModel(org.apache.airavata.model.data.product.DataProductModel dataProductModel) {
+ public registerDataProduct_args setDataProductModel(org.apache.airavata.model.data.replica.DataProductModel dataProductModel) {
this.dataProductModel = dataProductModel;
return this;
}
@@ -208463,7 +208463,7 @@ public class Airavata {
if (value == null) {
unsetDataProductModel();
} else {
- setDataProductModel((org.apache.airavata.model.data.product.DataProductModel)value);
+ setDataProductModel((org.apache.airavata.model.data.replica.DataProductModel)value);
}
break;
@@ -208677,7 +208677,7 @@ public class Airavata {
break;
case 2: // DATA_PRODUCT_MODEL
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.dataProductModel = new org.apache.airavata.model.data.product.DataProductModel();
+ struct.dataProductModel = new org.apache.airavata.model.data.replica.DataProductModel();
struct.dataProductModel.read(iprot);
struct.setDataProductModelIsSet(true);
} else {
@@ -208736,7 +208736,7 @@ public class Airavata {
struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
struct.authzToken.read(iprot);
struct.setAuthzTokenIsSet(true);
- struct.dataProductModel = new org.apache.airavata.model.data.product.DataProductModel();
+ struct.dataProductModel = new org.apache.airavata.model.data.replica.DataProductModel();
struct.dataProductModel.read(iprot);
struct.setDataProductModelIsSet(true);
}
@@ -210008,7 +210008,7 @@ public class Airavata {
schemes.put(TupleScheme.class, new getDataProduct_resultTupleSchemeFactory());
}
- public org.apache.airavata.model.data.product.DataProductModel success; // required
+ public org.apache.airavata.model.data.replica.DataProductModel success; // required
public org.apache.airavata.model.error.InvalidRequestException ire; // required
public org.apache.airavata.model.error.AiravataClientException ace; // required
public org.apache.airavata.model.error.AiravataSystemException ase; // required
@@ -210089,7 +210089,7 @@ public class Airavata {
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.product.DataProductModel.class)));
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.replica.DataProductModel.class)));
tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -210106,7 +210106,7 @@ public class Airavata {
}
public getDataProduct_result(
- org.apache.airavata.model.data.product.DataProductModel success,
+ org.apache.airavata.model.data.replica.DataProductModel success,
org.apache.airavata.model.error.InvalidRequestException ire,
org.apache.airavata.model.error.AiravataClientException ace,
org.apache.airavata.model.error.AiravataSystemException ase,
@@ -210125,7 +210125,7 @@ public class Airavata {
*/
public getDataProduct_result(getDataProduct_result other) {
if (other.isSetSuccess()) {
- this.success = new org.apache.airavata.model.data.product.DataProductModel(other.success);
+ this.success = new org.apache.airavata.model.data.replica.DataProductModel(other.success);
}
if (other.isSetIre()) {
this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
@@ -210154,11 +210154,11 @@ public class Airavata {
this.ae = null;
}
- public org.apache.airavata.model.data.product.DataProductModel getSuccess() {
+ public org.apache.airavata.model.data.replica.DataProductModel getSuccess() {
return this.success;
}
- public getDataProduct_result setSuccess(org.apache.airavata.model.data.product.DataProductModel success) {
+ public getDataProduct_result setSuccess(org.apache.airavata.model.data.replica.DataProductModel success) {
this.success = success;
return this;
}
@@ -210280,7 +210280,7 @@ public class Airavata {
if (value == null) {
unsetSuccess();
} else {
- setSuccess((org.apache.airavata.model.data.product.DataProductModel)value);
+ setSuccess((org.apache.airavata.model.data.replica.DataProductModel)value);
}
break;
@@ -210619,7 +210619,7 @@ public class Airavata {
switch (schemeField.id) {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.success = new org.apache.airavata.model.data.product.DataProductModel();
+ struct.success = new org.apache.airavata.model.data.replica.DataProductModel();
struct.success.read(iprot);
struct.setSuccessIsSet(true);
} else {
@@ -210758,7 +210758,7 @@ public class Airavata {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
- struct.success = new org.apache.airavata.model.data.product.DataProductModel();
+ struct.success = new org.apache.airavata.model.data.replica.DataProductModel();
struct.success.read(iprot);
struct.setSuccessIsSet(true);
}
@@ -210800,7 +210800,7 @@ public class Airavata {
}
public org.apache.airavata.model.security.AuthzToken authzToken; // required
- public org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel; // required
+ public org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -210870,7 +210870,7 @@ public class Airavata {
tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
tmpMap.put(_Fields.REPLICA_LOCATION_MODEL, new org.apache.thrift.meta_data.FieldMetaData("replicaLocationModel", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.product.DataReplicaLocationModel.class)));
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.replica.DataReplicaLocationModel.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerReplicaLocation_args.class, metaDataMap);
}
@@ -210880,7 +210880,7 @@ public class Airavata {
public registerReplicaLocation_args(
org.apache.airavata.model.security.AuthzToken authzToken,
- org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel)
+ org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel)
{
this();
this.authzToken = authzToken;
@@ -210895,7 +210895,7 @@ public class Airavata {
this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
}
if (other.isSetReplicaLocationModel()) {
- this.replicaLocationModel = new org.apache.airavata.model.data.product.DataReplicaLocationModel(other.replicaLocationModel);
+ this.replicaLocationModel = new org.apache.airavata.model.data.replica.DataReplicaLocationModel(other.replicaLocationModel);
}
}
@@ -210933,11 +210933,11 @@ public class Airavata {
}
}
- public org.apache.airavata.model.data.product.DataReplicaLocationModel getReplicaLocationModel() {
+ public org.apache.airavata.model.data.replica.DataReplicaLocationModel getReplicaLocationModel() {
return this.replicaLocationModel;
}
- public registerReplicaLocation_args setReplicaLocationModel(org.apache.airavata.model.data.product.DataReplicaLocationModel replicaLocationModel) {
+ public registerReplicaLocation_args setReplicaLocationModel(org.apache.airavata.model.data.replica.DataReplicaLocationModel replicaLocationModel) {
this.replicaLocationModel = replicaLocationModel;
return this;
}
@@ -210971,7 +210971,7 @@ public class Airavata {
if (value == null) {
unsetReplicaLocationModel();
} else {
- setReplicaLocationModel((org.apache.airavata.model.data.product.DataReplicaLocationModel)value);
+ setReplicaLocationModel((org.apache.airavata.model.data.replica.DataReplicaLocationModel)value);
}
break;
@@ -211185,7 +211185,7 @@ public class Airavata {
break;
case 2: // REPLICA_LOCATION_MODEL
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.replicaLocationModel = new org.apache.airavata.model.data.product.DataReplicaLocationModel();
+ struct.replicaLocationModel = new org.apache.airavata.model.data.replica.DataReplicaLocationModel();
struct.replicaLocationModel.read(iprot);
struct.setReplicaLocationModelIsSet(true);
} else {
@@ -211244,7 +211244,7 @@ public class Airavata {
struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
struct.authzToken.read(iprot);
struct.setAuthzTokenIsSet(true);
- struct.replicaLocationModel = new org.apache.airavata.model.data.product.DataReplicaLocationModel();
+ struct.replicaLocationModel = new org.apache.airavata.model.data.replica.DataReplicaLocationModel();
struct.replicaLocationModel.read(iprot);
struct.setReplicaLocationModelIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/04f6f593/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 1d6f60a..262de5e 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
@@ -52464,13 +52464,13 @@ bool AiravataClient::recv_isWorkflowExistWithName()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "isWorkflowExistWithName failed: unknown result");
}
-void AiravataClient::registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel)
+void AiravataClient::registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel)
{
send_registerDataProduct(authzToken, dataProductModel);
recv_registerDataProduct(_return);
}
-void AiravataClient::send_registerDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel)
+void AiravataClient::send_registerDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("registerDataProduct", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -52535,7 +52535,7 @@ void AiravataClient::recv_registerDataProduct(std::string& _return)
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "registerDataProduct failed: unknown result");
}
-void AiravataClient::getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri)
+void AiravataClient::getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri)
{
send_getDataProduct(authzToken, dataProductUri);
recv_getDataProduct(_return);
@@ -52556,7 +52556,7 @@ void AiravataClient::send_getDataProduct(const ::apache::airavata::model::secur
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return)
+void AiravataClient::recv_getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return)
{
int32_t rseqid = 0;
@@ -52606,13 +52606,13 @@ void AiravataClient::recv_getDataProduct( ::apache::airavata::model::data::produ
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getDataProduct failed: unknown result");
}
-void AiravataClient::registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel)
+void AiravataClient::registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel)
{
send_registerReplicaLocation(authzToken, replicaLocationModel);
recv_registerReplicaLocation(_return);
}
-void AiravataClient::send_registerReplicaLocation(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel)
+void AiravataClient::send_registerReplicaLocation(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("registerReplicaLocation", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -75365,13 +75365,13 @@ bool AiravataConcurrentClient::recv_isWorkflowExistWithName(const int32_t seqid)
} // end while(true)
}
-void AiravataConcurrentClient::registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel)
+void AiravataConcurrentClient::registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel)
{
int32_t seqid = send_registerDataProduct(authzToken, dataProductModel);
recv_registerDataProduct(_return, seqid);
}
-int32_t AiravataConcurrentClient::send_registerDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel)
+int32_t AiravataConcurrentClient::send_registerDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel)
{
int32_t cseqid = this->sync_.generateSeqId();
::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);
@@ -75466,7 +75466,7 @@ void AiravataConcurrentClient::recv_registerDataProduct(std::string& _return, co
} // end while(true)
}
-void AiravataConcurrentClient::getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri)
+void AiravataConcurrentClient::getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri)
{
int32_t seqid = send_getDataProduct(authzToken, dataProductUri);
recv_getDataProduct(_return, seqid);
@@ -75491,7 +75491,7 @@ int32_t AiravataConcurrentClient::send_getDataProduct(const ::apache::airavata:
return cseqid;
}
-void AiravataConcurrentClient::recv_getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const int32_t seqid)
+void AiravataConcurrentClient::recv_getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const int32_t seqid)
{
int32_t rseqid = 0;
@@ -75567,13 +75567,13 @@ void AiravataConcurrentClient::recv_getDataProduct( ::apache::airavata::model::d
} // end while(true)
}
-void AiravataConcurrentClient::registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel)
+void AiravataConcurrentClient::registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel)
{
int32_t seqid = send_registerReplicaLocation(authzToken, replicaLocationModel);
recv_registerReplicaLocation(_return, seqid);
}
-int32_t AiravataConcurrentClient::send_registerReplicaLocation(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel)
+int32_t AiravataConcurrentClient::send_registerReplicaLocation(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel)
{
int32_t cseqid = this->sync_.generateSeqId();
::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);
http://git-wip-us.apache.org/repos/asf/airavata/blob/04f6f593/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 fd22834..f885e7a 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
@@ -2616,9 +2616,9 @@ class AiravataIf {
* @param authzToken
* @param dataProductModel
*/
- virtual void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel) = 0;
- virtual void getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri) = 0;
- virtual void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel) = 0;
+ virtual void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel) = 0;
+ virtual void getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri) = 0;
+ virtual void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel) = 0;
};
class AiravataIfFactory {
@@ -3093,13 +3093,13 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
- void registerDataProduct(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::data::product::DataProductModel& /* dataProductModel */) {
+ void registerDataProduct(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::data::replica::DataProductModel& /* dataProductModel */) {
return;
}
- void getDataProduct( ::apache::airavata::model::data::product::DataProductModel& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataProductUri */) {
+ void getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataProductUri */) {
return;
}
- void registerReplicaLocation(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::data::product::DataReplicaLocationModel& /* replicaLocationModel */) {
+ void registerReplicaLocation(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& /* replicaLocationModel */) {
return;
}
};
@@ -22019,11 +22019,11 @@ class Airavata_registerDataProduct_args {
virtual ~Airavata_registerDataProduct_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
- ::apache::airavata::model::data::product::DataProductModel dataProductModel;
+ ::apache::airavata::model::data::replica::DataProductModel dataProductModel;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
- void __set_dataProductModel(const ::apache::airavata::model::data::product::DataProductModel& val);
+ void __set_dataProductModel(const ::apache::airavata::model::data::replica::DataProductModel& val);
bool operator == (const Airavata_registerDataProduct_args & rhs) const
{
@@ -22051,7 +22051,7 @@ class Airavata_registerDataProduct_pargs {
virtual ~Airavata_registerDataProduct_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
- const ::apache::airavata::model::data::product::DataProductModel* dataProductModel;
+ const ::apache::airavata::model::data::replica::DataProductModel* dataProductModel;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -22211,7 +22211,7 @@ class Airavata_getDataProduct_result {
}
virtual ~Airavata_getDataProduct_result() throw();
- ::apache::airavata::model::data::product::DataProductModel success;
+ ::apache::airavata::model::data::replica::DataProductModel success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -22219,7 +22219,7 @@ class Airavata_getDataProduct_result {
_Airavata_getDataProduct_result__isset __isset;
- void __set_success(const ::apache::airavata::model::data::product::DataProductModel& val);
+ void __set_success(const ::apache::airavata::model::data::replica::DataProductModel& val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -22268,7 +22268,7 @@ class Airavata_getDataProduct_presult {
virtual ~Airavata_getDataProduct_presult() throw();
- ::apache::airavata::model::data::product::DataProductModel* success;
+ ::apache::airavata::model::data::replica::DataProductModel* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -22291,11 +22291,11 @@ class Airavata_registerReplicaLocation_args {
virtual ~Airavata_registerReplicaLocation_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
- ::apache::airavata::model::data::product::DataReplicaLocationModel replicaLocationModel;
+ ::apache::airavata::model::data::replica::DataReplicaLocationModel replicaLocationModel;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
- void __set_replicaLocationModel(const ::apache::airavata::model::data::product::DataReplicaLocationModel& val);
+ void __set_replicaLocationModel(const ::apache::airavata::model::data::replica::DataReplicaLocationModel& val);
bool operator == (const Airavata_registerReplicaLocation_args & rhs) const
{
@@ -22323,7 +22323,7 @@ class Airavata_registerReplicaLocation_pargs {
virtual ~Airavata_registerReplicaLocation_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
- const ::apache::airavata::model::data::product::DataReplicaLocationModel* replicaLocationModel;
+ const ::apache::airavata::model::data::replica::DataReplicaLocationModel* replicaLocationModel;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -22843,14 +22843,14 @@ 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 registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel);
- void send_registerDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel);
+ void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel);
+ void send_registerDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel);
void recv_registerDataProduct(std::string& _return);
- void getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri);
+ void getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri);
void send_getDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri);
- void recv_getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return);
- void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel);
- void send_registerReplicaLocation(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel);
+ void recv_getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return);
+ void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel);
+ void send_registerReplicaLocation(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel);
void recv_registerReplicaLocation(std::string& _return);
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
@@ -24460,7 +24460,7 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->isWorkflowExistWithName(authzToken, workflowName);
}
- void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel) {
+ void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
@@ -24470,7 +24470,7 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- void getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri) {
+ void getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
@@ -24480,7 +24480,7 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel) {
+ void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
@@ -24922,14 +24922,14 @@ class AiravataConcurrentClient : virtual public AiravataIf {
bool isWorkflowExistWithName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName);
int32_t send_isWorkflowExistWithName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName);
bool recv_isWorkflowExistWithName(const int32_t seqid);
- void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel);
- int32_t send_registerDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel);
+ void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel);
+ int32_t send_registerDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel);
void recv_registerDataProduct(std::string& _return, const int32_t seqid);
- void getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri);
+ void getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri);
int32_t send_getDataProduct(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri);
- void recv_getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const int32_t seqid);
- void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel);
- int32_t send_registerReplicaLocation(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel);
+ void recv_getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const int32_t seqid);
+ void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel);
+ int32_t send_registerReplicaLocation(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel);
void recv_registerReplicaLocation(std::string& _return, const int32_t seqid);
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
http://git-wip-us.apache.org/repos/asf/airavata/blob/04f6f593/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 28ad7aa..f9d80e4 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
@@ -3029,17 +3029,17 @@ class AiravataHandler : virtual public AiravataIf {
* @param authzToken
* @param dataProductModel
*/
- void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataProductModel& dataProductModel) {
+ void registerDataProduct(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataProductModel& dataProductModel) {
// Your implementation goes here
printf("registerDataProduct\n");
}
- void getDataProduct( ::apache::airavata::model::data::product::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri) {
+ void getDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataProductUri) {
// Your implementation goes here
printf("getDataProduct\n");
}
- void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::product::DataReplicaLocationModel& replicaLocationModel) {
+ void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel) {
// Your implementation goes here
printf("registerReplicaLocation\n");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/04f6f593/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 3afad01..5d059c5 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 "gateway_resource_profile_model_types.h"
#include "data_movement_models_types.h"
#include "workflow_data_model_types.h"
-#include "data_catalog_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/04f6f593/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 03958f1..ca6796a 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_catalog_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/04f6f593/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
index 3f67e2d..9e2c499 100644
--- 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
@@ -23,7 +23,7 @@
*/
#include "replica_catalog_models_constants.h"
-namespace apache { namespace airavata { namespace model { namespace data { namespace resource {
+namespace apache { namespace airavata { namespace model { namespace data { namespace replica {
const replica_catalog_modelsConstants g_replica_catalog_models_constants;
http://git-wip-us.apache.org/repos/asf/airavata/blob/04f6f593/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
index 711a581..67322de 100644
--- 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
@@ -26,7 +26,7 @@
#include "replica_catalog_models_types.h"
-namespace apache { namespace airavata { namespace model { namespace data { namespace resource {
+namespace apache { namespace airavata { namespace model { namespace data { namespace replica {
class replica_catalog_modelsConstants {
public: