You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/07/09 20:09:33 UTC

[1/5] Adding CPP namespaces to address - AIRAVATA-1334

Repository: airavata
Updated Branches:
  refs/heads/master 1725ccb5e -> 4a8e95766


http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
index 157945c..0f4931b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata_server.skeleton.cpp
@@ -14,7 +14,7 @@ using namespace ::apache::thrift::server;
 
 using boost::shared_ptr;
 
-using namespace  ::airavata::api;
+using namespace  ::apache::airavata::api;
 
 class AiravataHandler : virtual public AiravataIf {
  public:
@@ -27,82 +27,82 @@ class AiravataHandler : virtual public AiravataIf {
     printf("getAPIVersion\n");
   }
 
-  void createProject(std::string& _return, const  ::Project& project) {
+  void createProject(std::string& _return, const  ::apache::airavata::model::workspace::Project& project) {
     // Your implementation goes here
     printf("createProject\n");
   }
 
-  void updateProject(const std::string& projectId, const  ::Project& updatedProject) {
+  void updateProject(const std::string& projectId, const  ::apache::airavata::model::workspace::Project& updatedProject) {
     // Your implementation goes here
     printf("updateProject\n");
   }
 
-  void getProject( ::Project& _return, const std::string& projectId) {
+  void getProject( ::apache::airavata::model::workspace::Project& _return, const std::string& projectId) {
     // Your implementation goes here
     printf("getProject\n");
   }
 
-  void getAllUserProjects(std::vector< ::Project> & _return, const std::string& userName) {
+  void getAllUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName) {
     // Your implementation goes here
     printf("getAllUserProjects\n");
   }
 
-  void searchProjectsByProjectName(std::vector< ::Project> & _return, const std::string& userName, const std::string& projectName) {
+  void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName, const std::string& projectName) {
     // Your implementation goes here
     printf("searchProjectsByProjectName\n");
   }
 
-  void searchProjectsByProjectDesc(std::vector< ::Project> & _return, const std::string& userName, const std::string& description) {
+  void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName, const std::string& description) {
     // Your implementation goes here
     printf("searchProjectsByProjectDesc\n");
   }
 
-  void searchExperimentsByName(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& expName) {
+  void searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& expName) {
     // Your implementation goes here
     printf("searchExperimentsByName\n");
   }
 
-  void searchExperimentsByDesc(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& description) {
+  void searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& description) {
     // Your implementation goes here
     printf("searchExperimentsByDesc\n");
   }
 
-  void searchExperimentsByApplication(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& applicationId) {
+  void searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& applicationId) {
     // Your implementation goes here
     printf("searchExperimentsByApplication\n");
   }
 
-  void getAllExperimentsInProject(std::vector< ::Experiment> & _return, const std::string& projectId) {
+  void getAllExperimentsInProject(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& projectId) {
     // Your implementation goes here
     printf("getAllExperimentsInProject\n");
   }
 
-  void getAllUserExperiments(std::vector< ::Experiment> & _return, const std::string& userName) {
+  void getAllUserExperiments(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& userName) {
     // Your implementation goes here
     printf("getAllUserExperiments\n");
   }
 
-  void createExperiment(std::string& _return, const  ::Experiment& experiment) {
+  void createExperiment(std::string& _return, const  ::apache::airavata::model::workspace::experiment::Experiment& experiment) {
     // Your implementation goes here
     printf("createExperiment\n");
   }
 
-  void getExperiment( ::Experiment& _return, const std::string& airavataExperimentId) {
+  void getExperiment( ::apache::airavata::model::workspace::experiment::Experiment& _return, const std::string& airavataExperimentId) {
     // Your implementation goes here
     printf("getExperiment\n");
   }
 
-  void updateExperiment(const std::string& airavataExperimentId, const  ::Experiment& experiment) {
+  void updateExperiment(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::Experiment& experiment) {
     // Your implementation goes here
     printf("updateExperiment\n");
   }
 
-  void updateExperimentConfiguration(const std::string& airavataExperimentId, const  ::UserConfigurationData& userConfiguration) {
+  void updateExperimentConfiguration(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::UserConfigurationData& userConfiguration) {
     // Your implementation goes here
     printf("updateExperimentConfiguration\n");
   }
 
-  void updateResourceScheduleing(const std::string& airavataExperimentId, const  ::ComputationalResourceScheduling& resourceScheduling) {
+  void updateResourceScheduleing(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& resourceScheduling) {
     // Your implementation goes here
     printf("updateResourceScheduleing\n");
   }
@@ -117,17 +117,17 @@ class AiravataHandler : virtual public AiravataIf {
     printf("launchExperiment\n");
   }
 
-  void getExperimentStatus( ::ExperimentStatus& _return, const std::string& airavataExperimentId) {
+  void getExperimentStatus( ::apache::airavata::model::workspace::experiment::ExperimentStatus& _return, const std::string& airavataExperimentId) {
     // Your implementation goes here
     printf("getExperimentStatus\n");
   }
 
-  void getExperimentOutputs(std::vector< ::DataObjectType> & _return, const std::string& airavataExperimentId) {
+  void getExperimentOutputs(std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType> & _return, const std::string& airavataExperimentId) {
     // Your implementation goes here
     printf("getExperimentOutputs\n");
   }
 
-  void getJobStatuses(std::map<std::string,  ::JobStatus> & _return, const std::string& airavataExperimentId) {
+  void getJobStatuses(std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus> & _return, const std::string& airavataExperimentId) {
     // Your implementation goes here
     printf("getJobStatuses\n");
   }
@@ -142,17 +142,17 @@ class AiravataHandler : virtual public AiravataIf {
     printf("terminateExperiment\n");
   }
 
-  void registerApplicationModule(std::string& _return, const  ::ApplicationModule& applicationModule) {
+  void registerApplicationModule(std::string& _return, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule) {
     // Your implementation goes here
     printf("registerApplicationModule\n");
   }
 
-  void getApplicationModule( ::ApplicationModule& _return, const std::string& appModuleId) {
+  void getApplicationModule( ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& _return, const std::string& appModuleId) {
     // Your implementation goes here
     printf("getApplicationModule\n");
   }
 
-  bool updateApplicationModule(const std::string& appModuleId, const  ::ApplicationModule& applicationModule) {
+  bool updateApplicationModule(const std::string& appModuleId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule) {
     // Your implementation goes here
     printf("updateApplicationModule\n");
   }
@@ -162,17 +162,17 @@ class AiravataHandler : virtual public AiravataIf {
     printf("deleteApplicationModule\n");
   }
 
-  void registerApplicationDeployment(std::string& _return, const  ::ApplicationDeploymentDescription& applicationDeployment) {
+  void registerApplicationDeployment(std::string& _return, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment) {
     // Your implementation goes here
     printf("registerApplicationDeployment\n");
   }
 
-  void getApplicationDeployment( ::ApplicationDeploymentDescription& _return, const std::string& appDeploymentId) {
+  void getApplicationDeployment( ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& _return, const std::string& appDeploymentId) {
     // Your implementation goes here
     printf("getApplicationDeployment\n");
   }
 
-  bool updateApplicationDeployment(const std::string& appDeploymentId, const  ::ApplicationDeploymentDescription& applicationDeployment) {
+  bool updateApplicationDeployment(const std::string& appDeploymentId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment) {
     // Your implementation goes here
     printf("updateApplicationDeployment\n");
   }
@@ -187,17 +187,17 @@ class AiravataHandler : virtual public AiravataIf {
     printf("getAppModuleDeployedResources\n");
   }
 
-  void registerApplicationInterface(std::string& _return, const  ::ApplicationInterfaceDescription& applicationInterface) {
+  void registerApplicationInterface(std::string& _return, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface) {
     // Your implementation goes here
     printf("registerApplicationInterface\n");
   }
 
-  void getApplicationInterface( ::ApplicationInterfaceDescription& _return, const std::string& appInterfaceId) {
+  void getApplicationInterface( ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& _return, const std::string& appInterfaceId) {
     // Your implementation goes here
     printf("getApplicationInterface\n");
   }
 
-  bool updateApplicationInterface(const std::string& appInterfaceId, const  ::ApplicationInterfaceDescription& applicationInterface) {
+  bool updateApplicationInterface(const std::string& appInterfaceId, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface) {
     // Your implementation goes here
     printf("updateApplicationInterface\n");
   }
@@ -212,17 +212,17 @@ class AiravataHandler : virtual public AiravataIf {
     printf("getAllApplicationInterfaceNames\n");
   }
 
-  void getAllApplicationInterfaces(std::vector< ::ApplicationInterfaceDescription> & _return) {
+  void getAllApplicationInterfaces(std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> & _return) {
     // Your implementation goes here
     printf("getAllApplicationInterfaces\n");
   }
 
-  void getApplicationInputs(std::vector< ::InputDataObjectType> & _return, const std::string& appInterfaceId) {
+  void getApplicationInputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> & _return, const std::string& appInterfaceId) {
     // Your implementation goes here
     printf("getApplicationInputs\n");
   }
 
-  void getApplicationOutputs(std::vector< ::OutputDataObjectType> & _return, const std::string& appInterfaceId) {
+  void getApplicationOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& appInterfaceId) {
     // Your implementation goes here
     printf("getApplicationOutputs\n");
   }
@@ -232,12 +232,12 @@ class AiravataHandler : virtual public AiravataIf {
     printf("getAvailableAppInterfaceComputeResources\n");
   }
 
-  void registerComputeResource(std::string& _return, const  ::ComputeResourceDescription& computeResourceDescription) {
+  void registerComputeResource(std::string& _return, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& computeResourceDescription) {
     // Your implementation goes here
     printf("registerComputeResource\n");
   }
 
-  void getComputeResource( ::ComputeResourceDescription& _return, const std::string& computeResourceId) {
+  void getComputeResource( ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& _return, const std::string& computeResourceId) {
     // Your implementation goes here
     printf("getComputeResource\n");
   }
@@ -247,7 +247,7 @@ class AiravataHandler : virtual public AiravataIf {
     printf("getAllComputeResourceNames\n");
   }
 
-  bool updateComputeResource(const std::string& computeResourceId, const  ::ComputeResourceDescription& computeResourceDescription) {
+  bool updateComputeResource(const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& computeResourceDescription) {
     // Your implementation goes here
     printf("updateComputeResource\n");
   }
@@ -257,52 +257,52 @@ class AiravataHandler : virtual public AiravataIf {
     printf("deleteComputeResource\n");
   }
 
-  bool addLocalSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::LOCALSubmission& localSubmission) {
+  bool addLocalSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& localSubmission) {
     // Your implementation goes here
     printf("addLocalSubmissionDetails\n");
   }
 
-  bool updateLocalSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::LOCALSubmission& localSubmission) {
+  bool updateLocalSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& localSubmission) {
     // Your implementation goes here
     printf("updateLocalSubmissionDetails\n");
   }
 
-  bool addSSHJobSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::SSHJobSubmission& sshJobSubmission) {
+  bool addSSHJobSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission) {
     // Your implementation goes here
     printf("addSSHJobSubmissionDetails\n");
   }
 
-  bool updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::SSHJobSubmission& sshJobSubmission) {
+  bool updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission) {
     // Your implementation goes here
     printf("updateSSHJobSubmissionDetails\n");
   }
 
-  bool addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::LOCALDataMovement& localDataMovement) {
+  bool addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
     // Your implementation goes here
     printf("addLocalDataMovementDetails\n");
   }
 
-  bool updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::LOCALDataMovement& localDataMovement) {
+  bool updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
     // Your implementation goes here
     printf("updateLocalDataMovementDetails\n");
   }
 
-  bool addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::SCPDataMovement& scpDataMovement) {
+  bool addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) {
     // Your implementation goes here
     printf("addSCPDataMovementDetails\n");
   }
 
-  bool updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::SCPDataMovement& scpDataMovement) {
+  bool updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) {
     // Your implementation goes here
     printf("updateSCPDataMovementDetails\n");
   }
 
-  bool addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::GridFTPDataMovement& gridFTPDataMovement) {
+  bool addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
     // Your implementation goes here
     printf("addGridFTPDataMovementDetails\n");
   }
 
-  bool updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::GridFTPDataMovement& gridFTPDataMovement) {
+  bool updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
     // Your implementation goes here
     printf("updateGridFTPDataMovementDetails\n");
   }
@@ -337,17 +337,17 @@ class AiravataHandler : virtual public AiravataIf {
     printf("deleteDataMovementInterface\n");
   }
 
-  void registerGatewayResourceProfile(std::string& _return, const  ::GatewayResourceProfile& gatewayResourceProfile) {
+  void registerGatewayResourceProfile(std::string& _return, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& gatewayResourceProfile) {
     // Your implementation goes here
     printf("registerGatewayResourceProfile\n");
   }
 
-  void getGatewayResourceProfile( ::GatewayResourceProfile& _return, const std::string& gatewayID) {
+  void getGatewayResourceProfile( ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& _return, const std::string& gatewayID) {
     // Your implementation goes here
     printf("getGatewayResourceProfile\n");
   }
 
-  bool updateGatewayResourceProfile(const std::string& gatewayID, const  ::GatewayResourceProfile& gatewayResourceProfile) {
+  bool updateGatewayResourceProfile(const std::string& gatewayID, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& gatewayResourceProfile) {
     // Your implementation goes here
     printf("updateGatewayResourceProfile\n");
   }
@@ -357,22 +357,22 @@ class AiravataHandler : virtual public AiravataIf {
     printf("deleteGatewayResourceProfile\n");
   }
 
-  bool addGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::ComputeResourcePreference& computeResourcePreference) {
+  bool addGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference) {
     // Your implementation goes here
     printf("addGatewayComputeResourcePreference\n");
   }
 
-  void getGatewayComputeResourcePreference( ::ComputeResourcePreference& _return, const std::string& gatewayID, const std::string& computeResourceId) {
+  void getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return, const std::string& gatewayID, const std::string& computeResourceId) {
     // Your implementation goes here
     printf("getGatewayComputeResourcePreference\n");
   }
 
-  void getAllGatewayComputeResourcePreferences(std::vector< ::ComputeResourcePreference> & _return, const std::string& gatewayID) {
+  void getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return, const std::string& gatewayID) {
     // Your implementation goes here
     printf("getAllGatewayComputeResourcePreferences\n");
   }
 
-  bool updateGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::ComputeResourcePreference& computeResourcePreference) {
+  bool updateGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference) {
     // Your implementation goes here
     printf("updateGatewayComputeResourcePreference\n");
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
index 250929b..193d136 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
@@ -6,7 +6,7 @@
  */
 #include "airavataAPI_constants.h"
 
-namespace airavata { namespace api {
+namespace apache { namespace airavata { namespace api {
 
 const airavataAPIConstants g_airavataAPI_constants;
 
@@ -15,5 +15,5 @@ airavataAPIConstants::airavataAPIConstants() {
 
 }
 
-}} // namespace
+}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.h
index bbe3692..4761835 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.h
@@ -9,7 +9,7 @@
 
 #include "airavataAPI_types.h"
 
-namespace airavata { namespace api {
+namespace apache { namespace airavata { namespace api {
 
 class airavataAPIConstants {
  public:
@@ -20,6 +20,6 @@ class airavataAPIConstants {
 
 extern const airavataAPIConstants g_airavataAPI_constants;
 
-}} // namespace
+}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.cpp
index 00822cd..ab8c1ba 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.cpp
@@ -8,6 +8,6 @@
 
 #include <algorithm>
 
-namespace airavata { namespace api {
+namespace apache { namespace airavata { namespace api {
 
-}} // namespace
+}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h
index 4eac2cf..5e78871 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h
@@ -23,8 +23,8 @@
 #include "gatewayResourceProfileModel_types.h"
 
 
-namespace airavata { namespace api {
+namespace apache { namespace airavata { namespace api {
 
-}} // namespace
+}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.cpp
index 934ab94..301f322 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.cpp
@@ -6,12 +6,12 @@
  */
 #include "airavataDataModel_constants.h"
 
-
+namespace apache { namespace airavata { namespace model {
 
 const airavataDataModelConstants g_airavataDataModel_constants;
 
 airavataDataModelConstants::airavataDataModelConstants() {
 }
 
-
+}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.h
index e7de9f3..d52ed08 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_constants.h
@@ -9,7 +9,7 @@
 
 #include "airavataDataModel_types.h"
 
-
+namespace apache { namespace airavata { namespace model {
 
 class airavataDataModelConstants {
  public:
@@ -19,6 +19,6 @@ class airavataDataModelConstants {
 
 extern const airavataDataModelConstants g_airavataDataModel_constants;
 
-
+}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.cpp
index c9492d8..936f3ba 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.cpp
@@ -8,6 +8,6 @@
 
 #include <algorithm>
 
+namespace apache { namespace airavata { namespace model {
 
-
-
+}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.h
index dd729ef..0957294 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataDataModel_types.h
@@ -17,8 +17,8 @@
 #include "airavataErrors_types.h"
 
 
+namespace apache { namespace airavata { namespace model {
 
-
-
+}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.cpp
index be2d0cb..6de251f 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.cpp
@@ -6,12 +6,12 @@
  */
 #include "airavataErrors_constants.h"
 
-namespace airavata { namespace api { namespace error {
+namespace apache { namespace airavata { namespace api { namespace error {
 
 const airavataErrorsConstants g_airavataErrors_constants;
 
 airavataErrorsConstants::airavataErrorsConstants() {
 }
 
-}}} // namespace
+}}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.h
index b9823c0..fec5eb9 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_constants.h
@@ -9,7 +9,7 @@
 
 #include "airavataErrors_types.h"
 
-namespace airavata { namespace api { namespace error {
+namespace apache { namespace airavata { namespace api { namespace error {
 
 class airavataErrorsConstants {
  public:
@@ -19,6 +19,6 @@ class airavataErrorsConstants {
 
 extern const airavataErrorsConstants g_airavataErrors_constants;
 
-}}} // namespace
+}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.cpp
index a76d769..fbcf8cb 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-namespace airavata { namespace api { namespace error {
+namespace apache { namespace airavata { namespace api { namespace error {
 
 int _kAiravataErrorTypeValues[] = {
   AiravataErrorType::UNKNOWN,
@@ -817,4 +817,4 @@ void swap(AiravataSystemException &a, AiravataSystemException &b) {
   swap(a.__isset, b.__isset);
 }
 
-}}} // namespace
+}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.h
index a53124e..139287d 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataErrors_types.h
@@ -16,7 +16,7 @@
 #include "experimentModel_types.h"
 
 
-namespace airavata { namespace api { namespace error {
+namespace apache { namespace airavata { namespace api { namespace error {
 
 struct AiravataErrorType {
   enum type {
@@ -504,6 +504,6 @@ class AiravataSystemException : public ::apache::thrift::TException {
 
 void swap(AiravataSystemException &a, AiravataSystemException &b);
 
-}}} // namespace
+}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.cpp
index d247067..52c0dac 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.cpp
@@ -6,7 +6,7 @@
  */
 #include "applicationDeploymentModel_constants.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appdeployment {
 
 const applicationDeploymentModelConstants g_applicationDeploymentModel_constants;
 
@@ -15,5 +15,5 @@ applicationDeploymentModelConstants::applicationDeploymentModelConstants() {
 
 }
 
-
+}}}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.h
index 1fa8e0b..a0ba25e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_constants.h
@@ -9,7 +9,7 @@
 
 #include "applicationDeploymentModel_types.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appdeployment {
 
 class applicationDeploymentModelConstants {
  public:
@@ -20,6 +20,6 @@ class applicationDeploymentModelConstants {
 
 extern const applicationDeploymentModelConstants g_applicationDeploymentModel_constants;
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp
index af206c5..6eee268 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appdeployment {
 
 int _kApplicationParallelismTypeValues[] = {
   ApplicationParallelismType::SERIAL,
@@ -494,4 +494,4 @@ void swap(ApplicationDeploymentDescription &a, ApplicationDeploymentDescription
   swap(a.__isset, b.__isset);
 }
 
-
+}}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
index 9cb5655..62439bb 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
@@ -15,7 +15,7 @@
 #include <thrift/cxxfunctional.h>
 
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appdeployment {
 
 struct ApplicationParallelismType {
   enum type {
@@ -270,6 +270,6 @@ class ApplicationDeploymentDescription {
 
 void swap(ApplicationDeploymentDescription &a, ApplicationDeploymentDescription &b);
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.cpp
index 6d8887f..da96617 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.cpp
@@ -6,7 +6,7 @@
  */
 #include "applicationInterfaceModel_constants.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appinterface {
 
 const applicationInterfaceModelConstants g_applicationInterfaceModel_constants;
 
@@ -15,5 +15,5 @@ applicationInterfaceModelConstants::applicationInterfaceModelConstants() {
 
 }
 
-
+}}}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.h
index 0bf5c4c..cf2a471 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_constants.h
@@ -9,7 +9,7 @@
 
 #include "applicationInterfaceModel_types.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appinterface {
 
 class applicationInterfaceModelConstants {
  public:
@@ -20,6 +20,6 @@ class applicationInterfaceModelConstants {
 
 extern const applicationInterfaceModelConstants g_applicationInterfaceModel_constants;
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp
index 4d7bff5..7b0c4ba 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appinterface {
 
 int _kDataTypeValues[] = {
   DataType::STRING,
@@ -467,4 +467,4 @@ void swap(ApplicationInterfaceDescription &a, ApplicationInterfaceDescription &b
   swap(a.__isset, b.__isset);
 }
 
-
+}}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h
index dd457fc..5627cfa 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationInterfaceModel_types.h
@@ -15,7 +15,7 @@
 #include <thrift/cxxfunctional.h>
 
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appinterface {
 
 struct DataType {
   enum type {
@@ -293,6 +293,6 @@ class ApplicationInterfaceDescription {
 
 void swap(ApplicationInterfaceDescription &a, ApplicationInterfaceDescription &b);
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.cpp
index c201757..4ea6bcb 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.cpp
@@ -6,7 +6,7 @@
  */
 #include "computeResourceModel_constants.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace computeresource {
 
 const computeResourceModelConstants g_computeResourceModel_constants;
 
@@ -15,5 +15,5 @@ computeResourceModelConstants::computeResourceModelConstants() {
 
 }
 
-
+}}}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.h
index 93f2029..abdab96 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_constants.h
@@ -9,7 +9,7 @@
 
 #include "computeResourceModel_types.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace computeresource {
 
 class computeResourceModelConstants {
  public:
@@ -20,6 +20,6 @@ class computeResourceModelConstants {
 
 extern const computeResourceModelConstants g_computeResourceModel_constants;
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
index b6966b8..08eb394 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace computeresource {
 
 int _kResourceJobManagerTypeValues[] = {
   ResourceJobManagerType::FORK,
@@ -1512,4 +1512,4 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) {
   swap(a.__isset, b.__isset);
 }
 
-
+}}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
index ffa2bf3..d6675b6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
@@ -15,7 +15,7 @@
 #include <thrift/cxxfunctional.h>
 
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace computeresource {
 
 struct ResourceJobManagerType {
   enum type {
@@ -837,6 +837,6 @@ class ComputeResourceDescription {
 
 void swap(ComputeResourceDescription &a, ComputeResourceDescription &b);
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.cpp
index 9f94244..2536b3a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.cpp
@@ -6,7 +6,7 @@
  */
 #include "experimentModel_constants.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace workspace { namespace experiment {
 
 const experimentModelConstants g_experimentModel_constants;
 
@@ -19,5 +19,5 @@ experimentModelConstants::experimentModelConstants() {
 
 }
 
-
+}}}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.h
index 7525cc7..907d112 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_constants.h
@@ -9,7 +9,7 @@
 
 #include "experimentModel_types.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace workspace { namespace experiment {
 
 class experimentModelConstants {
  public:
@@ -22,6 +22,6 @@ class experimentModelConstants {
 
 extern const experimentModelConstants g_experimentModel_constants;
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
index e4be44a..08010d0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-
+namespace apache { namespace airavata { namespace model { namespace workspace { namespace experiment {
 
 int _kExperimentStateValues[] = {
   ExperimentState::CREATED,
@@ -3336,4 +3336,4 @@ void swap(ExperimentSummary &a, ExperimentSummary &b) {
   swap(a.__isset, b.__isset);
 }
 
-
+}}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
index e892748..42a6005 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
@@ -16,7 +16,7 @@
 #include "computeResourceModel_types.h"
 
 
-
+namespace apache { namespace airavata { namespace model { namespace workspace { namespace experiment {
 
 struct ExperimentState {
   enum type {
@@ -2072,6 +2072,6 @@ class ExperimentSummary {
 
 void swap(ExperimentSummary &a, ExperimentSummary &b);
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.cpp
index 767cfac..1b7a9c1 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.cpp
@@ -6,7 +6,7 @@
  */
 #include "gatewayResourceProfileModel_constants.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace gatewayprofile {
 
 const gatewayResourceProfileModelConstants g_gatewayResourceProfileModel_constants;
 
@@ -15,5 +15,5 @@ gatewayResourceProfileModelConstants::gatewayResourceProfileModelConstants() {
 
 }
 
-
+}}}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.h
index c8964c3..e584f21 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_constants.h
@@ -9,7 +9,7 @@
 
 #include "gatewayResourceProfileModel_types.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace gatewayprofile {
 
 class gatewayResourceProfileModelConstants {
  public:
@@ -20,6 +20,6 @@ class gatewayResourceProfileModelConstants {
 
 extern const gatewayResourceProfileModelConstants g_gatewayResourceProfileModel_constants;
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.cpp
index 4ae5600..d9951ca 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace gatewayprofile {
 
 const char* ComputeResourcePreference::ascii_fingerprint = "9C98338B7E052CD4DEECB22F243D6DAE";
 const uint8_t ComputeResourcePreference::binary_fingerprint[16] = {0x9C,0x98,0x33,0x8B,0x7E,0x05,0x2C,0xD4,0xDE,0xEC,0xB2,0x2F,0x24,0x3D,0x6D,0xAE};
@@ -290,4 +290,4 @@ void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
   swap(a.__isset, b.__isset);
 }
 
-
+}}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.h
index 291a08d..62ca9e0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/gatewayResourceProfileModel_types.h
@@ -15,7 +15,7 @@
 #include <thrift/cxxfunctional.h>
 
 
-
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace gatewayprofile {
 
 typedef struct _ComputeResourcePreference__isset {
   _ComputeResourcePreference__isset() : preferredJobSubmissionProtocol(false), preferredDataMovementProtocol(false), preferredBatchQueue(false), scratchLocation(false), allocationProjectNumber(false) {}
@@ -192,6 +192,6 @@ class GatewayResourceProfile {
 
 void swap(GatewayResourceProfile &a, GatewayResourceProfile &b);
 
-
+}}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.cpp
index 656aed3..0afb586 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.cpp
@@ -6,12 +6,12 @@
  */
 #include "workspaceModel_constants.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace workspace {
 
 const workspaceModelConstants g_workspaceModel_constants;
 
 workspaceModelConstants::workspaceModelConstants() {
 }
 
-
+}}}} // namespace
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.h
index d3417fd..f1cc0cd 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_constants.h
@@ -9,7 +9,7 @@
 
 #include "workspaceModel_types.h"
 
-
+namespace apache { namespace airavata { namespace model { namespace workspace {
 
 class workspaceModelConstants {
  public:
@@ -19,6 +19,6 @@ class workspaceModelConstants {
 
 extern const workspaceModelConstants g_workspaceModel_constants;
 
-
+}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.cpp
index dd81192..d3e7b7c 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-
+namespace apache { namespace airavata { namespace model { namespace workspace {
 
 const char* Group::ascii_fingerprint = "5B708A954C550ECA9C1A49D3C5CAFAB9";
 const uint8_t Group::binary_fingerprint[16] = {0x5B,0x70,0x8A,0x95,0x4C,0x55,0x0E,0xCA,0x9C,0x1A,0x49,0xD3,0xC5,0xCA,0xFA,0xB9};
@@ -461,4 +461,4 @@ void swap(Gateway &a, Gateway &b) {
   swap(a.name, b.name);
 }
 
-
+}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.h
index 340fd54..2ed8611 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/workspaceModel_types.h
@@ -16,7 +16,7 @@
 #include "experimentModel_types.h"
 
 
-
+namespace apache { namespace airavata { namespace model { namespace workspace {
 
 typedef struct _Group__isset {
   _Group__isset() : description(false) {}
@@ -268,6 +268,6 @@ class Gateway {
 
 void swap(Gateway &a, Gateway &b);
 
-
+}}}} // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index 971ebd7..50d020d 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -35,10 +35,10 @@ include "gatewayResourceProfileModel.thrift"
 
 namespace java org.apache.airavata.api
 namespace php Airavata.API
-namespace cpp airavata.api
-namespace perl AiravataAPI
-namespace py airavata.api
-namespace js AiravataAPI
+namespace cpp apache.airavata.api
+namespace perl ApacheAiravataAPI
+namespace py apache.airavata.api
+namespace js ApacheAiravataAPI
 
 /**
  * Airavata Interface Versions depend upon this Thrift Interface File. When Making changes, please edit the

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/airavataDataModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataDataModel.thrift b/airavata-api/thrift-interface-descriptions/airavataDataModel.thrift
index ee17fcf..8c772e4 100644
--- a/airavata-api/thrift-interface-descriptions/airavataDataModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataDataModel.thrift
@@ -23,6 +23,7 @@ include "airavataErrors.thrift"
 
 namespace java org.apache.airavata.model
 namespace php Airavata.Model
+namespace cpp apache.airavata.model
 
 /*
  * This file describes the definitions of the Airavata Execution Data Structures. Each of the

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/airavataErrors.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataErrors.thrift b/airavata-api/thrift-interface-descriptions/airavataErrors.thrift
index e0348e0..0a91adf 100644
--- a/airavata-api/thrift-interface-descriptions/airavataErrors.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataErrors.thrift
@@ -28,7 +28,7 @@ include "experimentModel.thrift"
 
 namespace java org.apache.airavata.model.error
 namespace php Airavata.API.Error
-namespace cpp airavata.api.error
+namespace cpp apache.airavata.api.error
 namespace perl AiravataAPIError
 namespace py airavata.api.error
 namespace js AiravataAPIError

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
index 199a88e..4ee3978 100644
--- a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
@@ -26,6 +26,7 @@
 
 namespace java org.apache.airavata.model.appcatalog.appdeployment
 namespace php Airavata.Model.AppCatalog.AppDeployment
+namespace cpp apache.airavata.model.appcatalog.appdeployment
 
 const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
index 0e5cc18..7a33078 100644
--- a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
@@ -26,6 +26,7 @@
 
 namespace java org.apache.airavata.model.appcatalog.appinterface
 namespace php Airavata.Model.AppCatalog.AppInterface
+namespace cpp apache.airavata.model.appcatalog.appinterface
 
 const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
index 10b813c..969aa53 100644
--- a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
@@ -20,6 +20,7 @@
 
 namespace java org.apache.airavata.model.appcatalog.computeresource
 namespace php Airavata.Model.AppCatalog.ComputeResource
+namespace cpp apache.airavata.model.appcatalog.computeresource
 
 const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
index 3f61123..5338d2b 100644
--- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
@@ -22,6 +22,7 @@ include "computeResourceModel.thrift"
 
 namespace java org.apache.airavata.model.workspace.experiment
 namespace php Airavata.Model.Workspace.Experiment
+namespace cpp apache.airavata.model.workspace.experiment
 
 /*
  * This file describes the definitions of the Airavata Experiment Data Structures. Each of the

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift b/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift
index c64d121..fb856b3 100644
--- a/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift
@@ -20,6 +20,7 @@
 
 namespace java org.apache.airavata.model.appcatalog.gatewayprofile
 namespace php Airavata.Model.AppCatalog.GatewayProfile
+namespace cpp apache.airavata.model.appcatalog.gatewayprofile
 
 const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/thrift-interface-descriptions/workspaceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/workspaceModel.thrift b/airavata-api/thrift-interface-descriptions/workspaceModel.thrift
index 5db983a..4b0da09 100644
--- a/airavata-api/thrift-interface-descriptions/workspaceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/workspaceModel.thrift
@@ -22,6 +22,7 @@ include "experimentModel.thrift"
 
 namespace java org.apache.airavata.model.workspace
 namespace php Airavata.Model.Workspace
+namespace cpp apache.airavata.model.workspace
 
 /*
  * This file describes the definitions of the Airavata Workspace. The workspace is a container for all user data


[5/5] git commit: Merge remote-tracking branch 'origin/master'

Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 4a8e95766626eb4e836bfe966b9a86028c376f12
Parents: e796062 1725ccb
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Jul 9 14:09:29 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Jul 9 14:09:29 2014 -0400

----------------------------------------------------------------------
 .../data/impl/ApplicationDeploymentImpl.java    | 52 +++++++++++---------
 1 file changed, 30 insertions(+), 22 deletions(-)
----------------------------------------------------------------------



[2/5] Adding CPP namespaces to address - AIRAVATA-1334

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
index 55c1d74..e4fb55e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.h
@@ -10,82 +10,82 @@
 #include <thrift/TDispatchProcessor.h>
 #include "airavataAPI_types.h"
 
-namespace airavata { namespace api {
+namespace apache { namespace airavata { namespace api {
 
 class AiravataIf {
  public:
   virtual ~AiravataIf() {}
   virtual void getAPIVersion(std::string& _return) = 0;
-  virtual void createProject(std::string& _return, const  ::Project& project) = 0;
-  virtual void updateProject(const std::string& projectId, const  ::Project& updatedProject) = 0;
-  virtual void getProject( ::Project& _return, const std::string& projectId) = 0;
-  virtual void getAllUserProjects(std::vector< ::Project> & _return, const std::string& userName) = 0;
-  virtual void searchProjectsByProjectName(std::vector< ::Project> & _return, const std::string& userName, const std::string& projectName) = 0;
-  virtual void searchProjectsByProjectDesc(std::vector< ::Project> & _return, const std::string& userName, const std::string& description) = 0;
-  virtual void searchExperimentsByName(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& expName) = 0;
-  virtual void searchExperimentsByDesc(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& description) = 0;
-  virtual void searchExperimentsByApplication(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& applicationId) = 0;
-  virtual void getAllExperimentsInProject(std::vector< ::Experiment> & _return, const std::string& projectId) = 0;
-  virtual void getAllUserExperiments(std::vector< ::Experiment> & _return, const std::string& userName) = 0;
-  virtual void createExperiment(std::string& _return, const  ::Experiment& experiment) = 0;
-  virtual void getExperiment( ::Experiment& _return, const std::string& airavataExperimentId) = 0;
-  virtual void updateExperiment(const std::string& airavataExperimentId, const  ::Experiment& experiment) = 0;
-  virtual void updateExperimentConfiguration(const std::string& airavataExperimentId, const  ::UserConfigurationData& userConfiguration) = 0;
-  virtual void updateResourceScheduleing(const std::string& airavataExperimentId, const  ::ComputationalResourceScheduling& resourceScheduling) = 0;
+  virtual void createProject(std::string& _return, const  ::apache::airavata::model::workspace::Project& project) = 0;
+  virtual void updateProject(const std::string& projectId, const  ::apache::airavata::model::workspace::Project& updatedProject) = 0;
+  virtual void getProject( ::apache::airavata::model::workspace::Project& _return, const std::string& projectId) = 0;
+  virtual void getAllUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName) = 0;
+  virtual void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName, const std::string& projectName) = 0;
+  virtual void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName, const std::string& description) = 0;
+  virtual void searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& expName) = 0;
+  virtual void searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& description) = 0;
+  virtual void searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& applicationId) = 0;
+  virtual void getAllExperimentsInProject(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& projectId) = 0;
+  virtual void getAllUserExperiments(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& userName) = 0;
+  virtual void createExperiment(std::string& _return, const  ::apache::airavata::model::workspace::experiment::Experiment& experiment) = 0;
+  virtual void getExperiment( ::apache::airavata::model::workspace::experiment::Experiment& _return, const std::string& airavataExperimentId) = 0;
+  virtual void updateExperiment(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::Experiment& experiment) = 0;
+  virtual void updateExperimentConfiguration(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::UserConfigurationData& userConfiguration) = 0;
+  virtual void updateResourceScheduleing(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& resourceScheduling) = 0;
   virtual bool validateExperiment(const std::string& airavataExperimentId) = 0;
   virtual void launchExperiment(const std::string& airavataExperimentId, const std::string& airavataCredStoreToken) = 0;
-  virtual void getExperimentStatus( ::ExperimentStatus& _return, const std::string& airavataExperimentId) = 0;
-  virtual void getExperimentOutputs(std::vector< ::DataObjectType> & _return, const std::string& airavataExperimentId) = 0;
-  virtual void getJobStatuses(std::map<std::string,  ::JobStatus> & _return, const std::string& airavataExperimentId) = 0;
+  virtual void getExperimentStatus( ::apache::airavata::model::workspace::experiment::ExperimentStatus& _return, const std::string& airavataExperimentId) = 0;
+  virtual void getExperimentOutputs(std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType> & _return, const std::string& airavataExperimentId) = 0;
+  virtual void getJobStatuses(std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus> & _return, const std::string& airavataExperimentId) = 0;
   virtual void cloneExperiment(std::string& _return, const std::string& existingExperimentID, const std::string& newExperimentName) = 0;
   virtual void terminateExperiment(const std::string& airavataExperimentId) = 0;
-  virtual void registerApplicationModule(std::string& _return, const  ::ApplicationModule& applicationModule) = 0;
-  virtual void getApplicationModule( ::ApplicationModule& _return, const std::string& appModuleId) = 0;
-  virtual bool updateApplicationModule(const std::string& appModuleId, const  ::ApplicationModule& applicationModule) = 0;
+  virtual void registerApplicationModule(std::string& _return, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule) = 0;
+  virtual void getApplicationModule( ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& _return, const std::string& appModuleId) = 0;
+  virtual bool updateApplicationModule(const std::string& appModuleId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule) = 0;
   virtual bool deleteApplicationModule(const std::string& appModuleId) = 0;
-  virtual void registerApplicationDeployment(std::string& _return, const  ::ApplicationDeploymentDescription& applicationDeployment) = 0;
-  virtual void getApplicationDeployment( ::ApplicationDeploymentDescription& _return, const std::string& appDeploymentId) = 0;
-  virtual bool updateApplicationDeployment(const std::string& appDeploymentId, const  ::ApplicationDeploymentDescription& applicationDeployment) = 0;
+  virtual void registerApplicationDeployment(std::string& _return, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment) = 0;
+  virtual void getApplicationDeployment( ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& _return, const std::string& appDeploymentId) = 0;
+  virtual bool updateApplicationDeployment(const std::string& appDeploymentId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment) = 0;
   virtual bool deleteApplicationDeployment(const std::string& appDeploymentId) = 0;
   virtual void getAppModuleDeployedResources(std::vector<std::string> & _return, const std::string& appModuleId) = 0;
-  virtual void registerApplicationInterface(std::string& _return, const  ::ApplicationInterfaceDescription& applicationInterface) = 0;
-  virtual void getApplicationInterface( ::ApplicationInterfaceDescription& _return, const std::string& appInterfaceId) = 0;
-  virtual bool updateApplicationInterface(const std::string& appInterfaceId, const  ::ApplicationInterfaceDescription& applicationInterface) = 0;
+  virtual void registerApplicationInterface(std::string& _return, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface) = 0;
+  virtual void getApplicationInterface( ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& _return, const std::string& appInterfaceId) = 0;
+  virtual bool updateApplicationInterface(const std::string& appInterfaceId, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface) = 0;
   virtual bool deleteApplicationInterface(const std::string& appInterfaceId) = 0;
   virtual void getAllApplicationInterfaceNames(std::map<std::string, std::string> & _return) = 0;
-  virtual void getAllApplicationInterfaces(std::vector< ::ApplicationInterfaceDescription> & _return) = 0;
-  virtual void getApplicationInputs(std::vector< ::InputDataObjectType> & _return, const std::string& appInterfaceId) = 0;
-  virtual void getApplicationOutputs(std::vector< ::OutputDataObjectType> & _return, const std::string& appInterfaceId) = 0;
+  virtual void getAllApplicationInterfaces(std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> & _return) = 0;
+  virtual void getApplicationInputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> & _return, const std::string& appInterfaceId) = 0;
+  virtual void getApplicationOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& appInterfaceId) = 0;
   virtual void getAvailableAppInterfaceComputeResources(std::vector<std::string> & _return, const std::string& appInterfaceId) = 0;
-  virtual void registerComputeResource(std::string& _return, const  ::ComputeResourceDescription& computeResourceDescription) = 0;
-  virtual void getComputeResource( ::ComputeResourceDescription& _return, const std::string& computeResourceId) = 0;
+  virtual void registerComputeResource(std::string& _return, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& computeResourceDescription) = 0;
+  virtual void getComputeResource( ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& _return, const std::string& computeResourceId) = 0;
   virtual void getAllComputeResourceNames(std::map<std::string, std::string> & _return) = 0;
-  virtual bool updateComputeResource(const std::string& computeResourceId, const  ::ComputeResourceDescription& computeResourceDescription) = 0;
+  virtual bool updateComputeResource(const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& computeResourceDescription) = 0;
   virtual bool deleteComputeResource(const std::string& computeResourceId) = 0;
-  virtual bool addLocalSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::LOCALSubmission& localSubmission) = 0;
-  virtual bool updateLocalSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::LOCALSubmission& localSubmission) = 0;
-  virtual bool addSSHJobSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::SSHJobSubmission& sshJobSubmission) = 0;
-  virtual bool updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::SSHJobSubmission& sshJobSubmission) = 0;
-  virtual bool addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::LOCALDataMovement& localDataMovement) = 0;
-  virtual bool updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::LOCALDataMovement& localDataMovement) = 0;
-  virtual bool addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::SCPDataMovement& scpDataMovement) = 0;
-  virtual bool updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::SCPDataMovement& scpDataMovement) = 0;
-  virtual bool addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::GridFTPDataMovement& gridFTPDataMovement) = 0;
-  virtual bool updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::GridFTPDataMovement& gridFTPDataMovement) = 0;
+  virtual bool addLocalSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& localSubmission) = 0;
+  virtual bool updateLocalSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& localSubmission) = 0;
+  virtual bool addSSHJobSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission) = 0;
+  virtual bool updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission) = 0;
+  virtual bool addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) = 0;
+  virtual bool updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) = 0;
+  virtual bool addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) = 0;
+  virtual bool updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) = 0;
+  virtual bool addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) = 0;
+  virtual bool updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) = 0;
   virtual bool changeJobSubmissionPriority(const std::string& jobSubmissionInterfaceId, const int32_t newPriorityOrder) = 0;
   virtual bool changeDataMovementPriority(const std::string& dataMovementInterfaceId, const int32_t newPriorityOrder) = 0;
   virtual bool changeJobSubmissionPriorities(const std::map<std::string, int32_t> & jobSubmissionPriorityMap) = 0;
   virtual bool changeDataMovementPriorities(const std::map<std::string, int32_t> & dataMovementPriorityMap) = 0;
   virtual bool deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId) = 0;
   virtual bool deleteDataMovementInterface(const std::string& dataMovementInterfaceId) = 0;
-  virtual void registerGatewayResourceProfile(std::string& _return, const  ::GatewayResourceProfile& gatewayResourceProfile) = 0;
-  virtual void getGatewayResourceProfile( ::GatewayResourceProfile& _return, const std::string& gatewayID) = 0;
-  virtual bool updateGatewayResourceProfile(const std::string& gatewayID, const  ::GatewayResourceProfile& gatewayResourceProfile) = 0;
+  virtual void registerGatewayResourceProfile(std::string& _return, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& gatewayResourceProfile) = 0;
+  virtual void getGatewayResourceProfile( ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& _return, const std::string& gatewayID) = 0;
+  virtual bool updateGatewayResourceProfile(const std::string& gatewayID, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& gatewayResourceProfile) = 0;
   virtual bool deleteGatewayResourceProfile(const std::string& gatewayID) = 0;
-  virtual bool addGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::ComputeResourcePreference& computeResourcePreference) = 0;
-  virtual void getGatewayComputeResourcePreference( ::ComputeResourcePreference& _return, const std::string& gatewayID, const std::string& computeResourceId) = 0;
-  virtual void getAllGatewayComputeResourcePreferences(std::vector< ::ComputeResourcePreference> & _return, const std::string& gatewayID) = 0;
-  virtual bool updateGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::ComputeResourcePreference& computeResourcePreference) = 0;
+  virtual bool addGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference) = 0;
+  virtual void getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return, const std::string& gatewayID, const std::string& computeResourceId) = 0;
+  virtual void getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return, const std::string& gatewayID) = 0;
+  virtual bool updateGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference) = 0;
   virtual bool deleteGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId) = 0;
 };
 
@@ -119,52 +119,52 @@ class AiravataNull : virtual public AiravataIf {
   void getAPIVersion(std::string& /* _return */) {
     return;
   }
-  void createProject(std::string& /* _return */, const  ::Project& /* project */) {
+  void createProject(std::string& /* _return */, const  ::apache::airavata::model::workspace::Project& /* project */) {
     return;
   }
-  void updateProject(const std::string& /* projectId */, const  ::Project& /* updatedProject */) {
+  void updateProject(const std::string& /* projectId */, const  ::apache::airavata::model::workspace::Project& /* updatedProject */) {
     return;
   }
-  void getProject( ::Project& /* _return */, const std::string& /* projectId */) {
+  void getProject( ::apache::airavata::model::workspace::Project& /* _return */, const std::string& /* projectId */) {
     return;
   }
-  void getAllUserProjects(std::vector< ::Project> & /* _return */, const std::string& /* userName */) {
+  void getAllUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const std::string& /* userName */) {
     return;
   }
-  void searchProjectsByProjectName(std::vector< ::Project> & /* _return */, const std::string& /* userName */, const std::string& /* projectName */) {
+  void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const std::string& /* userName */, const std::string& /* projectName */) {
     return;
   }
-  void searchProjectsByProjectDesc(std::vector< ::Project> & /* _return */, const std::string& /* userName */, const std::string& /* description */) {
+  void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const std::string& /* userName */, const std::string& /* description */) {
     return;
   }
-  void searchExperimentsByName(std::vector< ::ExperimentSummary> & /* _return */, const std::string& /* userName */, const std::string& /* expName */) {
+  void searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* userName */, const std::string& /* expName */) {
     return;
   }
-  void searchExperimentsByDesc(std::vector< ::ExperimentSummary> & /* _return */, const std::string& /* userName */, const std::string& /* description */) {
+  void searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* userName */, const std::string& /* description */) {
     return;
   }
-  void searchExperimentsByApplication(std::vector< ::ExperimentSummary> & /* _return */, const std::string& /* userName */, const std::string& /* applicationId */) {
+  void searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* userName */, const std::string& /* applicationId */) {
     return;
   }
-  void getAllExperimentsInProject(std::vector< ::Experiment> & /* _return */, const std::string& /* projectId */) {
+  void getAllExperimentsInProject(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & /* _return */, const std::string& /* projectId */) {
     return;
   }
-  void getAllUserExperiments(std::vector< ::Experiment> & /* _return */, const std::string& /* userName */) {
+  void getAllUserExperiments(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & /* _return */, const std::string& /* userName */) {
     return;
   }
-  void createExperiment(std::string& /* _return */, const  ::Experiment& /* experiment */) {
+  void createExperiment(std::string& /* _return */, const  ::apache::airavata::model::workspace::experiment::Experiment& /* experiment */) {
     return;
   }
-  void getExperiment( ::Experiment& /* _return */, const std::string& /* airavataExperimentId */) {
+  void getExperiment( ::apache::airavata::model::workspace::experiment::Experiment& /* _return */, const std::string& /* airavataExperimentId */) {
     return;
   }
-  void updateExperiment(const std::string& /* airavataExperimentId */, const  ::Experiment& /* experiment */) {
+  void updateExperiment(const std::string& /* airavataExperimentId */, const  ::apache::airavata::model::workspace::experiment::Experiment& /* experiment */) {
     return;
   }
-  void updateExperimentConfiguration(const std::string& /* airavataExperimentId */, const  ::UserConfigurationData& /* userConfiguration */) {
+  void updateExperimentConfiguration(const std::string& /* airavataExperimentId */, const  ::apache::airavata::model::workspace::experiment::UserConfigurationData& /* userConfiguration */) {
     return;
   }
-  void updateResourceScheduleing(const std::string& /* airavataExperimentId */, const  ::ComputationalResourceScheduling& /* resourceScheduling */) {
+  void updateResourceScheduleing(const std::string& /* airavataExperimentId */, const  ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& /* resourceScheduling */) {
     return;
   }
   bool validateExperiment(const std::string& /* airavataExperimentId */) {
@@ -174,13 +174,13 @@ class AiravataNull : virtual public AiravataIf {
   void launchExperiment(const std::string& /* airavataExperimentId */, const std::string& /* airavataCredStoreToken */) {
     return;
   }
-  void getExperimentStatus( ::ExperimentStatus& /* _return */, const std::string& /* airavataExperimentId */) {
+  void getExperimentStatus( ::apache::airavata::model::workspace::experiment::ExperimentStatus& /* _return */, const std::string& /* airavataExperimentId */) {
     return;
   }
-  void getExperimentOutputs(std::vector< ::DataObjectType> & /* _return */, const std::string& /* airavataExperimentId */) {
+  void getExperimentOutputs(std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType> & /* _return */, const std::string& /* airavataExperimentId */) {
     return;
   }
-  void getJobStatuses(std::map<std::string,  ::JobStatus> & /* _return */, const std::string& /* airavataExperimentId */) {
+  void getJobStatuses(std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus> & /* _return */, const std::string& /* airavataExperimentId */) {
     return;
   }
   void cloneExperiment(std::string& /* _return */, const std::string& /* existingExperimentID */, const std::string& /* newExperimentName */) {
@@ -189,13 +189,13 @@ class AiravataNull : virtual public AiravataIf {
   void terminateExperiment(const std::string& /* airavataExperimentId */) {
     return;
   }
-  void registerApplicationModule(std::string& /* _return */, const  ::ApplicationModule& /* applicationModule */) {
+  void registerApplicationModule(std::string& /* _return */, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& /* applicationModule */) {
     return;
   }
-  void getApplicationModule( ::ApplicationModule& /* _return */, const std::string& /* appModuleId */) {
+  void getApplicationModule( ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& /* _return */, const std::string& /* appModuleId */) {
     return;
   }
-  bool updateApplicationModule(const std::string& /* appModuleId */, const  ::ApplicationModule& /* applicationModule */) {
+  bool updateApplicationModule(const std::string& /* appModuleId */, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& /* applicationModule */) {
     bool _return = false;
     return _return;
   }
@@ -203,13 +203,13 @@ class AiravataNull : virtual public AiravataIf {
     bool _return = false;
     return _return;
   }
-  void registerApplicationDeployment(std::string& /* _return */, const  ::ApplicationDeploymentDescription& /* applicationDeployment */) {
+  void registerApplicationDeployment(std::string& /* _return */, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& /* applicationDeployment */) {
     return;
   }
-  void getApplicationDeployment( ::ApplicationDeploymentDescription& /* _return */, const std::string& /* appDeploymentId */) {
+  void getApplicationDeployment( ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& /* _return */, const std::string& /* appDeploymentId */) {
     return;
   }
-  bool updateApplicationDeployment(const std::string& /* appDeploymentId */, const  ::ApplicationDeploymentDescription& /* applicationDeployment */) {
+  bool updateApplicationDeployment(const std::string& /* appDeploymentId */, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& /* applicationDeployment */) {
     bool _return = false;
     return _return;
   }
@@ -220,13 +220,13 @@ class AiravataNull : virtual public AiravataIf {
   void getAppModuleDeployedResources(std::vector<std::string> & /* _return */, const std::string& /* appModuleId */) {
     return;
   }
-  void registerApplicationInterface(std::string& /* _return */, const  ::ApplicationInterfaceDescription& /* applicationInterface */) {
+  void registerApplicationInterface(std::string& /* _return */, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& /* applicationInterface */) {
     return;
   }
-  void getApplicationInterface( ::ApplicationInterfaceDescription& /* _return */, const std::string& /* appInterfaceId */) {
+  void getApplicationInterface( ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& /* _return */, const std::string& /* appInterfaceId */) {
     return;
   }
-  bool updateApplicationInterface(const std::string& /* appInterfaceId */, const  ::ApplicationInterfaceDescription& /* applicationInterface */) {
+  bool updateApplicationInterface(const std::string& /* appInterfaceId */, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& /* applicationInterface */) {
     bool _return = false;
     return _return;
   }
@@ -237,28 +237,28 @@ class AiravataNull : virtual public AiravataIf {
   void getAllApplicationInterfaceNames(std::map<std::string, std::string> & /* _return */) {
     return;
   }
-  void getAllApplicationInterfaces(std::vector< ::ApplicationInterfaceDescription> & /* _return */) {
+  void getAllApplicationInterfaces(std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> & /* _return */) {
     return;
   }
-  void getApplicationInputs(std::vector< ::InputDataObjectType> & /* _return */, const std::string& /* appInterfaceId */) {
+  void getApplicationInputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> & /* _return */, const std::string& /* appInterfaceId */) {
     return;
   }
-  void getApplicationOutputs(std::vector< ::OutputDataObjectType> & /* _return */, const std::string& /* appInterfaceId */) {
+  void getApplicationOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & /* _return */, const std::string& /* appInterfaceId */) {
     return;
   }
   void getAvailableAppInterfaceComputeResources(std::vector<std::string> & /* _return */, const std::string& /* appInterfaceId */) {
     return;
   }
-  void registerComputeResource(std::string& /* _return */, const  ::ComputeResourceDescription& /* computeResourceDescription */) {
+  void registerComputeResource(std::string& /* _return */, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& /* computeResourceDescription */) {
     return;
   }
-  void getComputeResource( ::ComputeResourceDescription& /* _return */, const std::string& /* computeResourceId */) {
+  void getComputeResource( ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& /* _return */, const std::string& /* computeResourceId */) {
     return;
   }
   void getAllComputeResourceNames(std::map<std::string, std::string> & /* _return */) {
     return;
   }
-  bool updateComputeResource(const std::string& /* computeResourceId */, const  ::ComputeResourceDescription& /* computeResourceDescription */) {
+  bool updateComputeResource(const std::string& /* computeResourceId */, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& /* computeResourceDescription */) {
     bool _return = false;
     return _return;
   }
@@ -266,43 +266,43 @@ class AiravataNull : virtual public AiravataIf {
     bool _return = false;
     return _return;
   }
-  bool addLocalSubmissionDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::LOCALSubmission& /* localSubmission */) {
+  bool addLocalSubmissionDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& /* localSubmission */) {
     bool _return = false;
     return _return;
   }
-  bool updateLocalSubmissionDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::LOCALSubmission& /* localSubmission */) {
+  bool updateLocalSubmissionDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& /* localSubmission */) {
     bool _return = false;
     return _return;
   }
-  bool addSSHJobSubmissionDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::SSHJobSubmission& /* sshJobSubmission */) {
+  bool addSSHJobSubmissionDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& /* sshJobSubmission */) {
     bool _return = false;
     return _return;
   }
-  bool updateSSHJobSubmissionDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::SSHJobSubmission& /* sshJobSubmission */) {
+  bool updateSSHJobSubmissionDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& /* sshJobSubmission */) {
     bool _return = false;
     return _return;
   }
-  bool addLocalDataMovementDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::LOCALDataMovement& /* localDataMovement */) {
+  bool addLocalDataMovementDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& /* localDataMovement */) {
     bool _return = false;
     return _return;
   }
-  bool updateLocalDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::LOCALDataMovement& /* localDataMovement */) {
+  bool updateLocalDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& /* localDataMovement */) {
     bool _return = false;
     return _return;
   }
-  bool addSCPDataMovementDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::SCPDataMovement& /* scpDataMovement */) {
+  bool addSCPDataMovementDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& /* scpDataMovement */) {
     bool _return = false;
     return _return;
   }
-  bool updateSCPDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::SCPDataMovement& /* scpDataMovement */) {
+  bool updateSCPDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& /* scpDataMovement */) {
     bool _return = false;
     return _return;
   }
-  bool addGridFTPDataMovementDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::GridFTPDataMovement& /* gridFTPDataMovement */) {
+  bool addGridFTPDataMovementDetails(const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& /* gridFTPDataMovement */) {
     bool _return = false;
     return _return;
   }
-  bool updateGridFTPDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::GridFTPDataMovement& /* gridFTPDataMovement */) {
+  bool updateGridFTPDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& /* gridFTPDataMovement */) {
     bool _return = false;
     return _return;
   }
@@ -330,13 +330,13 @@ class AiravataNull : virtual public AiravataIf {
     bool _return = false;
     return _return;
   }
-  void registerGatewayResourceProfile(std::string& /* _return */, const  ::GatewayResourceProfile& /* gatewayResourceProfile */) {
+  void registerGatewayResourceProfile(std::string& /* _return */, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& /* gatewayResourceProfile */) {
     return;
   }
-  void getGatewayResourceProfile( ::GatewayResourceProfile& /* _return */, const std::string& /* gatewayID */) {
+  void getGatewayResourceProfile( ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& /* _return */, const std::string& /* gatewayID */) {
     return;
   }
-  bool updateGatewayResourceProfile(const std::string& /* gatewayID */, const  ::GatewayResourceProfile& /* gatewayResourceProfile */) {
+  bool updateGatewayResourceProfile(const std::string& /* gatewayID */, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& /* gatewayResourceProfile */) {
     bool _return = false;
     return _return;
   }
@@ -344,17 +344,17 @@ class AiravataNull : virtual public AiravataIf {
     bool _return = false;
     return _return;
   }
-  bool addGatewayComputeResourcePreference(const std::string& /* gatewayID */, const std::string& /* computeResourceId */, const  ::ComputeResourcePreference& /* computeResourcePreference */) {
+  bool addGatewayComputeResourcePreference(const std::string& /* gatewayID */, const std::string& /* computeResourceId */, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& /* computeResourcePreference */) {
     bool _return = false;
     return _return;
   }
-  void getGatewayComputeResourcePreference( ::ComputeResourcePreference& /* _return */, const std::string& /* gatewayID */, const std::string& /* computeResourceId */) {
+  void getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& /* _return */, const std::string& /* gatewayID */, const std::string& /* computeResourceId */) {
     return;
   }
-  void getAllGatewayComputeResourcePreferences(std::vector< ::ComputeResourcePreference> & /* _return */, const std::string& /* gatewayID */) {
+  void getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & /* _return */, const std::string& /* gatewayID */) {
     return;
   }
-  bool updateGatewayComputeResourcePreference(const std::string& /* gatewayID */, const std::string& /* computeResourceId */, const  ::ComputeResourcePreference& /* computeResourcePreference */) {
+  bool updateGatewayComputeResourcePreference(const std::string& /* gatewayID */, const std::string& /* computeResourceId */, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& /* computeResourcePreference */) {
     bool _return = false;
     return _return;
   }
@@ -418,9 +418,9 @@ class Airavata_getAPIVersion_result {
   virtual ~Airavata_getAPIVersion_result() throw() {}
 
   std::string success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getAPIVersion_result__isset __isset;
 
@@ -428,15 +428,15 @@ class Airavata_getAPIVersion_result {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -478,9 +478,9 @@ class Airavata_getAPIVersion_presult {
   virtual ~Airavata_getAPIVersion_presult() throw() {}
 
   std::string* success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getAPIVersion_presult__isset __isset;
 
@@ -497,9 +497,9 @@ class Airavata_createProject_args {
 
   virtual ~Airavata_createProject_args() throw() {}
 
-   ::Project project;
+   ::apache::airavata::model::workspace::Project project;
 
-  void __set_project(const  ::Project& val) {
+  void __set_project(const  ::apache::airavata::model::workspace::Project& val) {
     project = val;
   }
 
@@ -527,7 +527,7 @@ class Airavata_createProject_pargs {
 
   virtual ~Airavata_createProject_pargs() throw() {}
 
-  const  ::Project* project;
+  const  ::apache::airavata::model::workspace::Project* project;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -550,9 +550,9 @@ class Airavata_createProject_result {
   virtual ~Airavata_createProject_result() throw() {}
 
   std::string success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_createProject_result__isset __isset;
 
@@ -560,15 +560,15 @@ class Airavata_createProject_result {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -610,9 +610,9 @@ class Airavata_createProject_presult {
   virtual ~Airavata_createProject_presult() throw() {}
 
   std::string* success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_createProject_presult__isset __isset;
 
@@ -630,13 +630,13 @@ class Airavata_updateProject_args {
   virtual ~Airavata_updateProject_args() throw() {}
 
   std::string projectId;
-   ::Project updatedProject;
+   ::apache::airavata::model::workspace::Project updatedProject;
 
   void __set_projectId(const std::string& val) {
     projectId = val;
   }
 
-  void __set_updatedProject(const  ::Project& val) {
+  void __set_updatedProject(const  ::apache::airavata::model::workspace::Project& val) {
     updatedProject = val;
   }
 
@@ -667,7 +667,7 @@ class Airavata_updateProject_pargs {
   virtual ~Airavata_updateProject_pargs() throw() {}
 
   const std::string* projectId;
-  const  ::Project* updatedProject;
+  const  ::apache::airavata::model::workspace::Project* updatedProject;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -689,26 +689,26 @@ class Airavata_updateProject_result {
 
   virtual ~Airavata_updateProject_result() throw() {}
 
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
-   ::airavata::api::error::ProjectNotFoundException pnfe;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::ProjectNotFoundException pnfe;
 
   _Airavata_updateProject_result__isset __isset;
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
-  void __set_pnfe(const  ::airavata::api::error::ProjectNotFoundException& val) {
+  void __set_pnfe(const  ::apache::airavata::api::error::ProjectNotFoundException& val) {
     pnfe = val;
   }
 
@@ -749,10 +749,10 @@ class Airavata_updateProject_presult {
 
   virtual ~Airavata_updateProject_presult() throw() {}
 
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
-   ::airavata::api::error::ProjectNotFoundException pnfe;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::ProjectNotFoundException pnfe;
 
   _Airavata_updateProject_presult__isset __isset;
 
@@ -822,31 +822,31 @@ class Airavata_getProject_result {
 
   virtual ~Airavata_getProject_result() throw() {}
 
-   ::Project success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
-   ::airavata::api::error::ProjectNotFoundException pnfe;
+   ::apache::airavata::model::workspace::Project success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::ProjectNotFoundException pnfe;
 
   _Airavata_getProject_result__isset __isset;
 
-  void __set_success(const  ::Project& val) {
+  void __set_success(const  ::apache::airavata::model::workspace::Project& val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
-  void __set_pnfe(const  ::airavata::api::error::ProjectNotFoundException& val) {
+  void __set_pnfe(const  ::apache::airavata::api::error::ProjectNotFoundException& val) {
     pnfe = val;
   }
 
@@ -890,11 +890,11 @@ class Airavata_getProject_presult {
 
   virtual ~Airavata_getProject_presult() throw() {}
 
-   ::Project* success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
-   ::airavata::api::error::ProjectNotFoundException pnfe;
+   ::apache::airavata::model::workspace::Project* success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::ProjectNotFoundException pnfe;
 
   _Airavata_getProject_presult__isset __isset;
 
@@ -963,26 +963,26 @@ class Airavata_getAllUserProjects_result {
 
   virtual ~Airavata_getAllUserProjects_result() throw() {}
 
-  std::vector< ::Project>  success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::Project>  success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getAllUserProjects_result__isset __isset;
 
-  void __set_success(const std::vector< ::Project> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -1023,10 +1023,10 @@ class Airavata_getAllUserProjects_presult {
 
   virtual ~Airavata_getAllUserProjects_presult() throw() {}
 
-  std::vector< ::Project> * success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::Project> * success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getAllUserProjects_presult__isset __isset;
 
@@ -1103,26 +1103,26 @@ class Airavata_searchProjectsByProjectName_result {
 
   virtual ~Airavata_searchProjectsByProjectName_result() throw() {}
 
-  std::vector< ::Project>  success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::Project>  success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchProjectsByProjectName_result__isset __isset;
 
-  void __set_success(const std::vector< ::Project> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -1163,10 +1163,10 @@ class Airavata_searchProjectsByProjectName_presult {
 
   virtual ~Airavata_searchProjectsByProjectName_presult() throw() {}
 
-  std::vector< ::Project> * success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::Project> * success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchProjectsByProjectName_presult__isset __isset;
 
@@ -1243,26 +1243,26 @@ class Airavata_searchProjectsByProjectDesc_result {
 
   virtual ~Airavata_searchProjectsByProjectDesc_result() throw() {}
 
-  std::vector< ::Project>  success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::Project>  success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchProjectsByProjectDesc_result__isset __isset;
 
-  void __set_success(const std::vector< ::Project> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -1303,10 +1303,10 @@ class Airavata_searchProjectsByProjectDesc_presult {
 
   virtual ~Airavata_searchProjectsByProjectDesc_presult() throw() {}
 
-  std::vector< ::Project> * success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::Project> * success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchProjectsByProjectDesc_presult__isset __isset;
 
@@ -1383,26 +1383,26 @@ class Airavata_searchExperimentsByName_result {
 
   virtual ~Airavata_searchExperimentsByName_result() throw() {}
 
-  std::vector< ::ExperimentSummary>  success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary>  success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchExperimentsByName_result__isset __isset;
 
-  void __set_success(const std::vector< ::ExperimentSummary> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -1443,10 +1443,10 @@ class Airavata_searchExperimentsByName_presult {
 
   virtual ~Airavata_searchExperimentsByName_presult() throw() {}
 
-  std::vector< ::ExperimentSummary> * success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchExperimentsByName_presult__isset __isset;
 
@@ -1523,26 +1523,26 @@ class Airavata_searchExperimentsByDesc_result {
 
   virtual ~Airavata_searchExperimentsByDesc_result() throw() {}
 
-  std::vector< ::ExperimentSummary>  success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary>  success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchExperimentsByDesc_result__isset __isset;
 
-  void __set_success(const std::vector< ::ExperimentSummary> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -1583,10 +1583,10 @@ class Airavata_searchExperimentsByDesc_presult {
 
   virtual ~Airavata_searchExperimentsByDesc_presult() throw() {}
 
-  std::vector< ::ExperimentSummary> * success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchExperimentsByDesc_presult__isset __isset;
 
@@ -1663,26 +1663,26 @@ class Airavata_searchExperimentsByApplication_result {
 
   virtual ~Airavata_searchExperimentsByApplication_result() throw() {}
 
-  std::vector< ::ExperimentSummary>  success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary>  success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchExperimentsByApplication_result__isset __isset;
 
-  void __set_success(const std::vector< ::ExperimentSummary> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -1723,10 +1723,10 @@ class Airavata_searchExperimentsByApplication_presult {
 
   virtual ~Airavata_searchExperimentsByApplication_presult() throw() {}
 
-  std::vector< ::ExperimentSummary> * success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_searchExperimentsByApplication_presult__isset __isset;
 
@@ -1796,31 +1796,31 @@ class Airavata_getAllExperimentsInProject_result {
 
   virtual ~Airavata_getAllExperimentsInProject_result() throw() {}
 
-  std::vector< ::Experiment>  success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
-   ::airavata::api::error::ProjectNotFoundException pnfe;
+  std::vector< ::apache::airavata::model::workspace::experiment::Experiment>  success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::ProjectNotFoundException pnfe;
 
   _Airavata_getAllExperimentsInProject_result__isset __isset;
 
-  void __set_success(const std::vector< ::Experiment> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
-  void __set_pnfe(const  ::airavata::api::error::ProjectNotFoundException& val) {
+  void __set_pnfe(const  ::apache::airavata::api::error::ProjectNotFoundException& val) {
     pnfe = val;
   }
 
@@ -1864,11 +1864,11 @@ class Airavata_getAllExperimentsInProject_presult {
 
   virtual ~Airavata_getAllExperimentsInProject_presult() throw() {}
 
-  std::vector< ::Experiment> * success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
-   ::airavata::api::error::ProjectNotFoundException pnfe;
+  std::vector< ::apache::airavata::model::workspace::experiment::Experiment> * success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::ProjectNotFoundException pnfe;
 
   _Airavata_getAllExperimentsInProject_presult__isset __isset;
 
@@ -1937,26 +1937,26 @@ class Airavata_getAllUserExperiments_result {
 
   virtual ~Airavata_getAllUserExperiments_result() throw() {}
 
-  std::vector< ::Experiment>  success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::experiment::Experiment>  success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getAllUserExperiments_result__isset __isset;
 
-  void __set_success(const std::vector< ::Experiment> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -1997,10 +1997,10 @@ class Airavata_getAllUserExperiments_presult {
 
   virtual ~Airavata_getAllUserExperiments_presult() throw() {}
 
-  std::vector< ::Experiment> * success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+  std::vector< ::apache::airavata::model::workspace::experiment::Experiment> * success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getAllUserExperiments_presult__isset __isset;
 
@@ -2017,9 +2017,9 @@ class Airavata_createExperiment_args {
 
   virtual ~Airavata_createExperiment_args() throw() {}
 
-   ::Experiment experiment;
+   ::apache::airavata::model::workspace::experiment::Experiment experiment;
 
-  void __set_experiment(const  ::Experiment& val) {
+  void __set_experiment(const  ::apache::airavata::model::workspace::experiment::Experiment& val) {
     experiment = val;
   }
 
@@ -2047,7 +2047,7 @@ class Airavata_createExperiment_pargs {
 
   virtual ~Airavata_createExperiment_pargs() throw() {}
 
-  const  ::Experiment* experiment;
+  const  ::apache::airavata::model::workspace::experiment::Experiment* experiment;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -2070,9 +2070,9 @@ class Airavata_createExperiment_result {
   virtual ~Airavata_createExperiment_result() throw() {}
 
   std::string success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_createExperiment_result__isset __isset;
 
@@ -2080,15 +2080,15 @@ class Airavata_createExperiment_result {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -2130,9 +2130,9 @@ class Airavata_createExperiment_presult {
   virtual ~Airavata_createExperiment_presult() throw() {}
 
   std::string* success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_createExperiment_presult__isset __isset;
 
@@ -2202,31 +2202,31 @@ class Airavata_getExperiment_result {
 
   virtual ~Airavata_getExperiment_result() throw() {}
 
-   ::Experiment success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::model::workspace::experiment::Experiment success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getExperiment_result__isset __isset;
 
-  void __set_success(const  ::Experiment& val) {
+  void __set_success(const  ::apache::airavata::model::workspace::experiment::Experiment& val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_enf(const  ::airavata::api::error::ExperimentNotFoundException& val) {
+  void __set_enf(const  ::apache::airavata::api::error::ExperimentNotFoundException& val) {
     enf = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -2270,11 +2270,11 @@ class Airavata_getExperiment_presult {
 
   virtual ~Airavata_getExperiment_presult() throw() {}
 
-   ::Experiment* success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::model::workspace::experiment::Experiment* success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getExperiment_presult__isset __isset;
 
@@ -2292,13 +2292,13 @@ class Airavata_updateExperiment_args {
   virtual ~Airavata_updateExperiment_args() throw() {}
 
   std::string airavataExperimentId;
-   ::Experiment experiment;
+   ::apache::airavata::model::workspace::experiment::Experiment experiment;
 
   void __set_airavataExperimentId(const std::string& val) {
     airavataExperimentId = val;
   }
 
-  void __set_experiment(const  ::Experiment& val) {
+  void __set_experiment(const  ::apache::airavata::model::workspace::experiment::Experiment& val) {
     experiment = val;
   }
 
@@ -2329,7 +2329,7 @@ class Airavata_updateExperiment_pargs {
   virtual ~Airavata_updateExperiment_pargs() throw() {}
 
   const std::string* airavataExperimentId;
-  const  ::Experiment* experiment;
+  const  ::apache::airavata::model::workspace::experiment::Experiment* experiment;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -2351,26 +2351,26 @@ class Airavata_updateExperiment_result {
 
   virtual ~Airavata_updateExperiment_result() throw() {}
 
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_updateExperiment_result__isset __isset;
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_enf(const  ::airavata::api::error::ExperimentNotFoundException& val) {
+  void __set_enf(const  ::apache::airavata::api::error::ExperimentNotFoundException& val) {
     enf = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -2411,10 +2411,10 @@ class Airavata_updateExperiment_presult {
 
   virtual ~Airavata_updateExperiment_presult() throw() {}
 
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_updateExperiment_presult__isset __isset;
 
@@ -2432,13 +2432,13 @@ class Airavata_updateExperimentConfiguration_args {
   virtual ~Airavata_updateExperimentConfiguration_args() throw() {}
 
   std::string airavataExperimentId;
-   ::UserConfigurationData userConfiguration;
+   ::apache::airavata::model::workspace::experiment::UserConfigurationData userConfiguration;
 
   void __set_airavataExperimentId(const std::string& val) {
     airavataExperimentId = val;
   }
 
-  void __set_userConfiguration(const  ::UserConfigurationData& val) {
+  void __set_userConfiguration(const  ::apache::airavata::model::workspace::experiment::UserConfigurationData& val) {
     userConfiguration = val;
   }
 
@@ -2469,7 +2469,7 @@ class Airavata_updateExperimentConfiguration_pargs {
   virtual ~Airavata_updateExperimentConfiguration_pargs() throw() {}
 
   const std::string* airavataExperimentId;
-  const  ::UserConfigurationData* userConfiguration;
+  const  ::apache::airavata::model::workspace::experiment::UserConfigurationData* userConfiguration;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -2522,13 +2522,13 @@ class Airavata_updateResourceScheduleing_args {
   virtual ~Airavata_updateResourceScheduleing_args() throw() {}
 
   std::string airavataExperimentId;
-   ::ComputationalResourceScheduling resourceScheduling;
+   ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling resourceScheduling;
 
   void __set_airavataExperimentId(const std::string& val) {
     airavataExperimentId = val;
   }
 
-  void __set_resourceScheduling(const  ::ComputationalResourceScheduling& val) {
+  void __set_resourceScheduling(const  ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& val) {
     resourceScheduling = val;
   }
 
@@ -2559,7 +2559,7 @@ class Airavata_updateResourceScheduleing_pargs {
   virtual ~Airavata_updateResourceScheduleing_pargs() throw() {}
 
   const std::string* airavataExperimentId;
-  const  ::ComputationalResourceScheduling* resourceScheduling;
+  const  ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling* resourceScheduling;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -2665,10 +2665,10 @@ class Airavata_validateExperiment_result {
   virtual ~Airavata_validateExperiment_result() throw() {}
 
   bool success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_validateExperiment_result__isset __isset;
 
@@ -2676,19 +2676,19 @@ class Airavata_validateExperiment_result {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_enf(const  ::airavata::api::error::ExperimentNotFoundException& val) {
+  void __set_enf(const  ::apache::airavata::api::error::ExperimentNotFoundException& val) {
     enf = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -2733,10 +2733,10 @@ class Airavata_validateExperiment_presult {
   virtual ~Airavata_validateExperiment_presult() throw() {}
 
   bool* success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_validateExperiment_presult__isset __isset;
 
@@ -2814,31 +2814,31 @@ class Airavata_launchExperiment_result {
 
   virtual ~Airavata_launchExperiment_result() throw() {}
 
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
-   ::airavata::api::error::LaunchValidationException lve;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::LaunchValidationException lve;
 
   _Airavata_launchExperiment_result__isset __isset;
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_enf(const  ::airavata::api::error::ExperimentNotFoundException& val) {
+  void __set_enf(const  ::apache::airavata::api::error::ExperimentNotFoundException& val) {
     enf = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
-  void __set_lve(const  ::airavata::api::error::LaunchValidationException& val) {
+  void __set_lve(const  ::apache::airavata::api::error::LaunchValidationException& val) {
     lve = val;
   }
 
@@ -2882,11 +2882,11 @@ class Airavata_launchExperiment_presult {
 
   virtual ~Airavata_launchExperiment_presult() throw() {}
 
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
-   ::airavata::api::error::LaunchValidationException lve;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::LaunchValidationException lve;
 
   _Airavata_launchExperiment_presult__isset __isset;
 
@@ -2956,31 +2956,31 @@ class Airavata_getExperimentStatus_result {
 
   virtual ~Airavata_getExperimentStatus_result() throw() {}
 
-   ::ExperimentStatus success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::model::workspace::experiment::ExperimentStatus success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getExperimentStatus_result__isset __isset;
 
-  void __set_success(const  ::ExperimentStatus& val) {
+  void __set_success(const  ::apache::airavata::model::workspace::experiment::ExperimentStatus& val) {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_enf(const  ::airavata::api::error::ExperimentNotFoundException& val) {
+  void __set_enf(const  ::apache::airavata::api::error::ExperimentNotFoundException& val) {
     enf = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -3024,11 +3024,11 @@ class Airavata_getExperimentStatus_presult {
 
   virtual ~Airavata_getExperimentStatus_presult() throw() {}
 
-   ::ExperimentStatus* success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::model::workspace::experiment::ExperimentStatus* success;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_getExperimentStatus_presult__isset __isset;
 
@@ -3094,11 +3094,11 @@ class Airavata_getExperimentOutputs_result {
 
   virtual ~Airavata_getExperimentOutputs_result() throw() {}
 
-  std::vector< ::DataObjectType>  success;
+  std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType>  success;
 
   _Airavata_getExperimentOutputs_result__isset __isset;
 
-  void __set_success(const std::vector< ::DataObjectType> & val) {
+  void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType> & val) {
     success = val;
   }
 
@@ -3130,7 +3130,7 @@ class Airavata_getExperimentOutputs_presult {
 
   virtual ~Airavata_getExperimentOutputs_presult() throw() {}
 
-  std::vector< ::DataObjectType> * success;
+  std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType> * success;
 
   _Airavata_getExperimentOutputs_presult__isset __isset;
 
@@ -3196,11 +3196,11 @@ class Airavata_getJobStatuses_result {
 
   virtual ~Airavata_getJobStatuses_result() throw() {}
 
-  std::map<std::string,  ::JobStatus>  success;
+  std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus>  success;
 
   _Airavata_getJobStatuses_result__isset __isset;
 
-  void __set_success(const std::map<std::string,  ::JobStatus> & val) {
+  void __set_success(const std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus> & val) {
     success = val;
   }
 
@@ -3232,7 +3232,7 @@ class Airavata_getJobStatuses_presult {
 
   virtual ~Airavata_getJobStatuses_presult() throw() {}
 
-  std::map<std::string,  ::JobStatus> * success;
+  std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus> * success;
 
   _Airavata_getJobStatuses_presult__isset __isset;
 
@@ -3318,10 +3318,10 @@ class Airavata_cloneExperiment_result {
   virtual ~Airavata_cloneExperiment_result() throw() {}
 
   std::string success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_cloneExperiment_result__isset __isset;
 
@@ -3329,19 +3329,19 @@ class Airavata_cloneExperiment_result {
     success = val;
   }
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_enf(const  ::airavata::api::error::ExperimentNotFoundException& val) {
+  void __set_enf(const  ::apache::airavata::api::error::ExperimentNotFoundException& val) {
     enf = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::AiravataClientException& val) {
     ace = val;
   }
 
-  void __set_ase(const  ::airavata::api::error::AiravataSystemException& val) {
+  void __set_ase(const  ::apache::airavata::api::error::AiravataSystemException& val) {
     ase = val;
   }
 
@@ -3386,10 +3386,10 @@ class Airavata_cloneExperiment_presult {
   virtual ~Airavata_cloneExperiment_presult() throw() {}
 
   std::string* success;
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_cloneExperiment_presult__isset __isset;
 
@@ -3464,26 +3464,26 @@ class Airavata_terminateExperiment_result {
 
   virtual ~Airavata_terminateExperiment_result() throw() {}
 
-   ::airavata::api::error::InvalidRequestException ire;
-   ::airavata::api::error::ExperimentNotFoundException enf;
-   ::airavata::api::error::AiravataClientException ace;
-   ::airavata::api::error::AiravataSystemException ase;
+   ::apache::airavata::api::error::InvalidRequestException ire;
+   ::apache::airavata::api::error::ExperimentNotFoundException enf;
+   ::apache::airavata::api::error::AiravataClientException ace;
+   ::apache::airavata::api::error::AiravataSystemException ase;
 
   _Airavata_terminateExperiment_result__isset __isset;
 
-  void __set_ire(const  ::airavata::api::error::InvalidRequestException& val) {
+  void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val) {
     ire = val;
   }
 
-  void __set_enf(const  ::airavata::api::error::ExperimentNotFoundException& val) {
+  void __set_enf(const  ::apache::airavata::api::error::ExperimentNotFoundException& val) {
     enf = val;
   }
 
-  void __set_ace(const  ::airavata::api::error::AiravataClientException& val) {
+  void __set_ace(const  ::apache::airavata::api::error::Airavata

<TRUNCATED>

[4/5] git commit: Adding CPP namespaces to address - AIRAVATA-1334

Posted by sm...@apache.org.
Adding CPP namespaces to address - AIRAVATA-1334


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

Branch: refs/heads/master
Commit: e796062babe0e3d9c850bf8f4119f33a74ee328f
Parents: 607dd92
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Jul 9 14:09:23 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Jul 9 14:09:23 2014 -0400

----------------------------------------------------------------------
 .../src/main/resources/lib/Airavata.cpp         |  670 +++---
 .../src/main/resources/lib/Airavata.h           | 2110 +++++++++---------
 .../resources/lib/Airavata_server.skeleton.cpp  |  104 +-
 .../resources/lib/airavataAPI_constants.cpp     |    4 +-
 .../main/resources/lib/airavataAPI_constants.h  |    4 +-
 .../main/resources/lib/airavataAPI_types.cpp    |    4 +-
 .../src/main/resources/lib/airavataAPI_types.h  |    4 +-
 .../lib/airavataDataModel_constants.cpp         |    4 +-
 .../resources/lib/airavataDataModel_constants.h |    4 +-
 .../resources/lib/airavataDataModel_types.cpp   |    4 +-
 .../resources/lib/airavataDataModel_types.h     |    4 +-
 .../resources/lib/airavataErrors_constants.cpp  |    4 +-
 .../resources/lib/airavataErrors_constants.h    |    4 +-
 .../main/resources/lib/airavataErrors_types.cpp |    4 +-
 .../main/resources/lib/airavataErrors_types.h   |    4 +-
 .../applicationDeploymentModel_constants.cpp    |    4 +-
 .../lib/applicationDeploymentModel_constants.h  |    4 +-
 .../lib/applicationDeploymentModel_types.cpp    |    4 +-
 .../lib/applicationDeploymentModel_types.h      |    4 +-
 .../lib/applicationInterfaceModel_constants.cpp |    4 +-
 .../lib/applicationInterfaceModel_constants.h   |    4 +-
 .../lib/applicationInterfaceModel_types.cpp     |    4 +-
 .../lib/applicationInterfaceModel_types.h       |    4 +-
 .../lib/computeResourceModel_constants.cpp      |    4 +-
 .../lib/computeResourceModel_constants.h        |    4 +-
 .../lib/computeResourceModel_types.cpp          |    4 +-
 .../resources/lib/computeResourceModel_types.h  |    4 +-
 .../resources/lib/experimentModel_constants.cpp |    4 +-
 .../resources/lib/experimentModel_constants.h   |    4 +-
 .../resources/lib/experimentModel_types.cpp     |    4 +-
 .../main/resources/lib/experimentModel_types.h  |    4 +-
 .../gatewayResourceProfileModel_constants.cpp   |    4 +-
 .../lib/gatewayResourceProfileModel_constants.h |    4 +-
 .../lib/gatewayResourceProfileModel_types.cpp   |    4 +-
 .../lib/gatewayResourceProfileModel_types.h     |    4 +-
 .../resources/lib/workspaceModel_constants.cpp  |    4 +-
 .../resources/lib/workspaceModel_constants.h    |    4 +-
 .../main/resources/lib/workspaceModel_types.cpp |    4 +-
 .../main/resources/lib/workspaceModel_types.h   |    4 +-
 .../airavataAPI.thrift                          |    8 +-
 .../airavataDataModel.thrift                    |    1 +
 .../airavataErrors.thrift                       |    2 +-
 .../applicationDeploymentModel.thrift           |    1 +
 .../applicationInterfaceModel.thrift            |    1 +
 .../computeResourceModel.thrift                 |    1 +
 .../experimentModel.thrift                      |    1 +
 .../gatewayResourceProfileModel.thrift          |    1 +
 .../workspaceModel.thrift                       |    1 +
 48 files changed, 1526 insertions(+), 1519 deletions(-)
----------------------------------------------------------------------



[3/5] Adding CPP namespaces to address - AIRAVATA-1334

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e796062b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
index d9ce563..1da4dac 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/Airavata.cpp
@@ -6,7 +6,7 @@
  */
 #include "Airavata.h"
 
-namespace airavata { namespace api {
+namespace apache { namespace airavata { namespace api {
 
 uint32_t Airavata_getAPIVersion_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -1078,7 +1078,7 @@ uint32_t Airavata_getAllUserProjects_result::write(::apache::thrift::protocol::T
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::Project> ::const_iterator _iter5;
+      std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter5;
       for (_iter5 = this->success.begin(); _iter5 != this->success.end(); ++_iter5)
       {
         xfer += (*_iter5).write(oprot);
@@ -1354,7 +1354,7 @@ uint32_t Airavata_searchProjectsByProjectName_result::write(::apache::thrift::pr
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::Project> ::const_iterator _iter16;
+      std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter16;
       for (_iter16 = this->success.begin(); _iter16 != this->success.end(); ++_iter16)
       {
         xfer += (*_iter16).write(oprot);
@@ -1630,7 +1630,7 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::write(::apache::thrift::pr
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::Project> ::const_iterator _iter27;
+      std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter27;
       for (_iter27 = this->success.begin(); _iter27 != this->success.end(); ++_iter27)
       {
         xfer += (*_iter27).write(oprot);
@@ -1906,7 +1906,7 @@ uint32_t Airavata_searchExperimentsByName_result::write(::apache::thrift::protoc
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::ExperimentSummary> ::const_iterator _iter38;
+      std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter38;
       for (_iter38 = this->success.begin(); _iter38 != this->success.end(); ++_iter38)
       {
         xfer += (*_iter38).write(oprot);
@@ -2182,7 +2182,7 @@ uint32_t Airavata_searchExperimentsByDesc_result::write(::apache::thrift::protoc
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::ExperimentSummary> ::const_iterator _iter49;
+      std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter49;
       for (_iter49 = this->success.begin(); _iter49 != this->success.end(); ++_iter49)
       {
         xfer += (*_iter49).write(oprot);
@@ -2458,7 +2458,7 @@ uint32_t Airavata_searchExperimentsByApplication_result::write(::apache::thrift:
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::ExperimentSummary> ::const_iterator _iter60;
+      std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter60;
       for (_iter60 = this->success.begin(); _iter60 != this->success.end(); ++_iter60)
       {
         xfer += (*_iter60).write(oprot);
@@ -2723,7 +2723,7 @@ uint32_t Airavata_getAllExperimentsInProject_result::write(::apache::thrift::pro
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::Experiment> ::const_iterator _iter71;
+      std::vector< ::apache::airavata::model::workspace::experiment::Experiment> ::const_iterator _iter71;
       for (_iter71 = this->success.begin(); _iter71 != this->success.end(); ++_iter71)
       {
         xfer += (*_iter71).write(oprot);
@@ -2992,7 +2992,7 @@ uint32_t Airavata_getAllUserExperiments_result::write(::apache::thrift::protocol
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::Experiment> ::const_iterator _iter82;
+      std::vector< ::apache::airavata::model::workspace::experiment::Experiment> ::const_iterator _iter82;
       for (_iter82 = this->success.begin(); _iter82 != this->success.end(); ++_iter82)
       {
         xfer += (*_iter82).write(oprot);
@@ -4999,7 +4999,7 @@ uint32_t Airavata_getExperimentOutputs_result::write(::apache::thrift::protocol:
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::DataObjectType> ::const_iterator _iter93;
+      std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType> ::const_iterator _iter93;
       for (_iter93 = this->success.begin(); _iter93 != this->success.end(); ++_iter93)
       {
         xfer += (*_iter93).write(oprot);
@@ -5167,7 +5167,7 @@ uint32_t Airavata_getJobStatuses_result::read(::apache::thrift::protocol::TProto
             {
               std::string _key104;
               xfer += iprot->readString(_key104);
-               ::JobStatus& _val105 = this->success[_key104];
+               ::apache::airavata::model::workspace::experiment::JobStatus& _val105 = this->success[_key104];
               xfer += _val105.read(iprot);
             }
             xfer += iprot->readMapEnd();
@@ -5199,7 +5199,7 @@ uint32_t Airavata_getJobStatuses_result::write(::apache::thrift::protocol::TProt
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
     {
       xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::map<std::string,  ::JobStatus> ::const_iterator _iter106;
+      std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus> ::const_iterator _iter106;
       for (_iter106 = this->success.begin(); _iter106 != this->success.end(); ++_iter106)
       {
         xfer += oprot->writeString(_iter106->first);
@@ -5247,7 +5247,7 @@ uint32_t Airavata_getJobStatuses_presult::read(::apache::thrift::protocol::TProt
             {
               std::string _key112;
               xfer += iprot->readString(_key112);
-               ::JobStatus& _val113 = (*(this->success))[_key112];
+               ::apache::airavata::model::workspace::experiment::JobStatus& _val113 = (*(this->success))[_key112];
               xfer += _val113.read(iprot);
             }
             xfer += iprot->readMapEnd();
@@ -9134,7 +9134,7 @@ uint32_t Airavata_getAllApplicationInterfaces_result::write(::apache::thrift::pr
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::ApplicationInterfaceDescription> ::const_iterator _iter145;
+      std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> ::const_iterator _iter145;
       for (_iter145 = this->success.begin(); _iter145 != this->success.end(); ++_iter145)
       {
         xfer += (*_iter145).write(oprot);
@@ -9391,7 +9391,7 @@ uint32_t Airavata_getApplicationInputs_result::write(::apache::thrift::protocol:
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::InputDataObjectType> ::const_iterator _iter156;
+      std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> ::const_iterator _iter156;
       for (_iter156 = this->success.begin(); _iter156 != this->success.end(); ++_iter156)
       {
         xfer += (*_iter156).write(oprot);
@@ -9648,7 +9648,7 @@ uint32_t Airavata_getApplicationOutputs_result::write(::apache::thrift::protocol
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::OutputDataObjectType> ::const_iterator _iter167;
+      std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> ::const_iterator _iter167;
       for (_iter167 = this->success.begin(); _iter167 != this->success.end(); ++_iter167)
       {
         xfer += (*_iter167).write(oprot);
@@ -16736,7 +16736,7 @@ uint32_t Airavata_getAllGatewayComputeResourcePreferences_result::write(::apache
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
-      std::vector< ::ComputeResourcePreference> ::const_iterator _iter222;
+      std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> ::const_iterator _iter222;
       for (_iter222 = this->success.begin(); _iter222 != this->success.end(); ++_iter222)
       {
         xfer += (*_iter222).write(oprot);
@@ -17411,13 +17411,13 @@ void AiravataClient::recv_getAPIVersion(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAPIVersion failed: unknown result");
 }
 
-void AiravataClient::createProject(std::string& _return, const  ::Project& project)
+void AiravataClient::createProject(std::string& _return, const  ::apache::airavata::model::workspace::Project& project)
 {
   send_createProject(project);
   recv_createProject(_return);
 }
 
-void AiravataClient::send_createProject(const  ::Project& project)
+void AiravataClient::send_createProject(const  ::apache::airavata::model::workspace::Project& project)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("createProject", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -17478,13 +17478,13 @@ void AiravataClient::recv_createProject(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "createProject failed: unknown result");
 }
 
-void AiravataClient::updateProject(const std::string& projectId, const  ::Project& updatedProject)
+void AiravataClient::updateProject(const std::string& projectId, const  ::apache::airavata::model::workspace::Project& updatedProject)
 {
   send_updateProject(projectId, updatedProject);
   recv_updateProject();
 }
 
-void AiravataClient::send_updateProject(const std::string& projectId, const  ::Project& updatedProject)
+void AiravataClient::send_updateProject(const std::string& projectId, const  ::apache::airavata::model::workspace::Project& updatedProject)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateProject", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -17544,7 +17544,7 @@ void AiravataClient::recv_updateProject()
   return;
 }
 
-void AiravataClient::getProject( ::Project& _return, const std::string& projectId)
+void AiravataClient::getProject( ::apache::airavata::model::workspace::Project& _return, const std::string& projectId)
 {
   send_getProject(projectId);
   recv_getProject(_return);
@@ -17564,7 +17564,7 @@ void AiravataClient::send_getProject(const std::string& projectId)
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getProject( ::Project& _return)
+void AiravataClient::recv_getProject( ::apache::airavata::model::workspace::Project& _return)
 {
 
   int32_t rseqid = 0;
@@ -17614,7 +17614,7 @@ void AiravataClient::recv_getProject( ::Project& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getProject failed: unknown result");
 }
 
-void AiravataClient::getAllUserProjects(std::vector< ::Project> & _return, const std::string& userName)
+void AiravataClient::getAllUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName)
 {
   send_getAllUserProjects(userName);
   recv_getAllUserProjects(_return);
@@ -17634,7 +17634,7 @@ void AiravataClient::send_getAllUserProjects(const std::string& userName)
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getAllUserProjects(std::vector< ::Project> & _return)
+void AiravataClient::recv_getAllUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return)
 {
 
   int32_t rseqid = 0;
@@ -17681,7 +17681,7 @@ void AiravataClient::recv_getAllUserProjects(std::vector< ::Project> & _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllUserProjects failed: unknown result");
 }
 
-void AiravataClient::searchProjectsByProjectName(std::vector< ::Project> & _return, const std::string& userName, const std::string& projectName)
+void AiravataClient::searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName, const std::string& projectName)
 {
   send_searchProjectsByProjectName(userName, projectName);
   recv_searchProjectsByProjectName(_return);
@@ -17702,7 +17702,7 @@ void AiravataClient::send_searchProjectsByProjectName(const std::string& userNam
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_searchProjectsByProjectName(std::vector< ::Project> & _return)
+void AiravataClient::recv_searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return)
 {
 
   int32_t rseqid = 0;
@@ -17749,7 +17749,7 @@ void AiravataClient::recv_searchProjectsByProjectName(std::vector< ::Project> &
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchProjectsByProjectName failed: unknown result");
 }
 
-void AiravataClient::searchProjectsByProjectDesc(std::vector< ::Project> & _return, const std::string& userName, const std::string& description)
+void AiravataClient::searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& userName, const std::string& description)
 {
   send_searchProjectsByProjectDesc(userName, description);
   recv_searchProjectsByProjectDesc(_return);
@@ -17770,7 +17770,7 @@ void AiravataClient::send_searchProjectsByProjectDesc(const std::string& userNam
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_searchProjectsByProjectDesc(std::vector< ::Project> & _return)
+void AiravataClient::recv_searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return)
 {
 
   int32_t rseqid = 0;
@@ -17817,7 +17817,7 @@ void AiravataClient::recv_searchProjectsByProjectDesc(std::vector< ::Project> &
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
 }
 
-void AiravataClient::searchExperimentsByName(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& expName)
+void AiravataClient::searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& expName)
 {
   send_searchExperimentsByName(userName, expName);
   recv_searchExperimentsByName(_return);
@@ -17838,7 +17838,7 @@ void AiravataClient::send_searchExperimentsByName(const std::string& userName, c
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_searchExperimentsByName(std::vector< ::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
 {
 
   int32_t rseqid = 0;
@@ -17885,7 +17885,7 @@ void AiravataClient::recv_searchExperimentsByName(std::vector< ::ExperimentSumma
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByName failed: unknown result");
 }
 
-void AiravataClient::searchExperimentsByDesc(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& description)
+void AiravataClient::searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& description)
 {
   send_searchExperimentsByDesc(userName, description);
   recv_searchExperimentsByDesc(_return);
@@ -17906,7 +17906,7 @@ void AiravataClient::send_searchExperimentsByDesc(const std::string& userName, c
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_searchExperimentsByDesc(std::vector< ::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
 {
 
   int32_t rseqid = 0;
@@ -17953,7 +17953,7 @@ void AiravataClient::recv_searchExperimentsByDesc(std::vector< ::ExperimentSumma
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByDesc failed: unknown result");
 }
 
-void AiravataClient::searchExperimentsByApplication(std::vector< ::ExperimentSummary> & _return, const std::string& userName, const std::string& applicationId)
+void AiravataClient::searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& userName, const std::string& applicationId)
 {
   send_searchExperimentsByApplication(userName, applicationId);
   recv_searchExperimentsByApplication(_return);
@@ -17974,7 +17974,7 @@ void AiravataClient::send_searchExperimentsByApplication(const std::string& user
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_searchExperimentsByApplication(std::vector< ::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
 {
 
   int32_t rseqid = 0;
@@ -18021,7 +18021,7 @@ void AiravataClient::recv_searchExperimentsByApplication(std::vector< ::Experime
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByApplication failed: unknown result");
 }
 
-void AiravataClient::getAllExperimentsInProject(std::vector< ::Experiment> & _return, const std::string& projectId)
+void AiravataClient::getAllExperimentsInProject(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& projectId)
 {
   send_getAllExperimentsInProject(projectId);
   recv_getAllExperimentsInProject(_return);
@@ -18041,7 +18041,7 @@ void AiravataClient::send_getAllExperimentsInProject(const std::string& projectI
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getAllExperimentsInProject(std::vector< ::Experiment> & _return)
+void AiravataClient::recv_getAllExperimentsInProject(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return)
 {
 
   int32_t rseqid = 0;
@@ -18091,7 +18091,7 @@ void AiravataClient::recv_getAllExperimentsInProject(std::vector< ::Experiment>
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllExperimentsInProject failed: unknown result");
 }
 
-void AiravataClient::getAllUserExperiments(std::vector< ::Experiment> & _return, const std::string& userName)
+void AiravataClient::getAllUserExperiments(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& userName)
 {
   send_getAllUserExperiments(userName);
   recv_getAllUserExperiments(_return);
@@ -18111,7 +18111,7 @@ void AiravataClient::send_getAllUserExperiments(const std::string& userName)
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getAllUserExperiments(std::vector< ::Experiment> & _return)
+void AiravataClient::recv_getAllUserExperiments(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return)
 {
 
   int32_t rseqid = 0;
@@ -18158,13 +18158,13 @@ void AiravataClient::recv_getAllUserExperiments(std::vector< ::Experiment> & _re
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllUserExperiments failed: unknown result");
 }
 
-void AiravataClient::createExperiment(std::string& _return, const  ::Experiment& experiment)
+void AiravataClient::createExperiment(std::string& _return, const  ::apache::airavata::model::workspace::experiment::Experiment& experiment)
 {
   send_createExperiment(experiment);
   recv_createExperiment(_return);
 }
 
-void AiravataClient::send_createExperiment(const  ::Experiment& experiment)
+void AiravataClient::send_createExperiment(const  ::apache::airavata::model::workspace::experiment::Experiment& experiment)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("createExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -18225,7 +18225,7 @@ void AiravataClient::recv_createExperiment(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "createExperiment failed: unknown result");
 }
 
-void AiravataClient::getExperiment( ::Experiment& _return, const std::string& airavataExperimentId)
+void AiravataClient::getExperiment( ::apache::airavata::model::workspace::experiment::Experiment& _return, const std::string& airavataExperimentId)
 {
   send_getExperiment(airavataExperimentId);
   recv_getExperiment(_return);
@@ -18245,7 +18245,7 @@ void AiravataClient::send_getExperiment(const std::string& airavataExperimentId)
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getExperiment( ::Experiment& _return)
+void AiravataClient::recv_getExperiment( ::apache::airavata::model::workspace::experiment::Experiment& _return)
 {
 
   int32_t rseqid = 0;
@@ -18295,13 +18295,13 @@ void AiravataClient::recv_getExperiment( ::Experiment& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperiment failed: unknown result");
 }
 
-void AiravataClient::updateExperiment(const std::string& airavataExperimentId, const  ::Experiment& experiment)
+void AiravataClient::updateExperiment(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::Experiment& experiment)
 {
   send_updateExperiment(airavataExperimentId, experiment);
   recv_updateExperiment();
 }
 
-void AiravataClient::send_updateExperiment(const std::string& airavataExperimentId, const  ::Experiment& experiment)
+void AiravataClient::send_updateExperiment(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::Experiment& experiment)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -18361,13 +18361,13 @@ void AiravataClient::recv_updateExperiment()
   return;
 }
 
-void AiravataClient::updateExperimentConfiguration(const std::string& airavataExperimentId, const  ::UserConfigurationData& userConfiguration)
+void AiravataClient::updateExperimentConfiguration(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::UserConfigurationData& userConfiguration)
 {
   send_updateExperimentConfiguration(airavataExperimentId, userConfiguration);
   recv_updateExperimentConfiguration();
 }
 
-void AiravataClient::send_updateExperimentConfiguration(const std::string& airavataExperimentId, const  ::UserConfigurationData& userConfiguration)
+void AiravataClient::send_updateExperimentConfiguration(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::UserConfigurationData& userConfiguration)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateExperimentConfiguration", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -18415,13 +18415,13 @@ void AiravataClient::recv_updateExperimentConfiguration()
   return;
 }
 
-void AiravataClient::updateResourceScheduleing(const std::string& airavataExperimentId, const  ::ComputationalResourceScheduling& resourceScheduling)
+void AiravataClient::updateResourceScheduleing(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& resourceScheduling)
 {
   send_updateResourceScheduleing(airavataExperimentId, resourceScheduling);
   recv_updateResourceScheduleing();
 }
 
-void AiravataClient::send_updateResourceScheduleing(const std::string& airavataExperimentId, const  ::ComputationalResourceScheduling& resourceScheduling)
+void AiravataClient::send_updateResourceScheduleing(const std::string& airavataExperimentId, const  ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& resourceScheduling)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateResourceScheduleing", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -18608,7 +18608,7 @@ void AiravataClient::recv_launchExperiment()
   return;
 }
 
-void AiravataClient::getExperimentStatus( ::ExperimentStatus& _return, const std::string& airavataExperimentId)
+void AiravataClient::getExperimentStatus( ::apache::airavata::model::workspace::experiment::ExperimentStatus& _return, const std::string& airavataExperimentId)
 {
   send_getExperimentStatus(airavataExperimentId);
   recv_getExperimentStatus(_return);
@@ -18628,7 +18628,7 @@ void AiravataClient::send_getExperimentStatus(const std::string& airavataExperim
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getExperimentStatus( ::ExperimentStatus& _return)
+void AiravataClient::recv_getExperimentStatus( ::apache::airavata::model::workspace::experiment::ExperimentStatus& _return)
 {
 
   int32_t rseqid = 0;
@@ -18678,7 +18678,7 @@ void AiravataClient::recv_getExperimentStatus( ::ExperimentStatus& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentStatus failed: unknown result");
 }
 
-void AiravataClient::getExperimentOutputs(std::vector< ::DataObjectType> & _return, const std::string& airavataExperimentId)
+void AiravataClient::getExperimentOutputs(std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType> & _return, const std::string& airavataExperimentId)
 {
   send_getExperimentOutputs(airavataExperimentId);
   recv_getExperimentOutputs(_return);
@@ -18698,7 +18698,7 @@ void AiravataClient::send_getExperimentOutputs(const std::string& airavataExperi
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getExperimentOutputs(std::vector< ::DataObjectType> & _return)
+void AiravataClient::recv_getExperimentOutputs(std::vector< ::apache::airavata::model::workspace::experiment::DataObjectType> & _return)
 {
 
   int32_t rseqid = 0;
@@ -18736,7 +18736,7 @@ void AiravataClient::recv_getExperimentOutputs(std::vector< ::DataObjectType> &
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentOutputs failed: unknown result");
 }
 
-void AiravataClient::getJobStatuses(std::map<std::string,  ::JobStatus> & _return, const std::string& airavataExperimentId)
+void AiravataClient::getJobStatuses(std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus> & _return, const std::string& airavataExperimentId)
 {
   send_getJobStatuses(airavataExperimentId);
   recv_getJobStatuses(_return);
@@ -18756,7 +18756,7 @@ void AiravataClient::send_getJobStatuses(const std::string& airavataExperimentId
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getJobStatuses(std::map<std::string,  ::JobStatus> & _return)
+void AiravataClient::recv_getJobStatuses(std::map<std::string,  ::apache::airavata::model::workspace::experiment::JobStatus> & _return)
 {
 
   int32_t rseqid = 0;
@@ -18930,13 +18930,13 @@ void AiravataClient::recv_terminateExperiment()
   return;
 }
 
-void AiravataClient::registerApplicationModule(std::string& _return, const  ::ApplicationModule& applicationModule)
+void AiravataClient::registerApplicationModule(std::string& _return, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule)
 {
   send_registerApplicationModule(applicationModule);
   recv_registerApplicationModule(_return);
 }
 
-void AiravataClient::send_registerApplicationModule(const  ::ApplicationModule& applicationModule)
+void AiravataClient::send_registerApplicationModule(const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("registerApplicationModule", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -18997,7 +18997,7 @@ void AiravataClient::recv_registerApplicationModule(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "registerApplicationModule failed: unknown result");
 }
 
-void AiravataClient::getApplicationModule( ::ApplicationModule& _return, const std::string& appModuleId)
+void AiravataClient::getApplicationModule( ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& _return, const std::string& appModuleId)
 {
   send_getApplicationModule(appModuleId);
   recv_getApplicationModule(_return);
@@ -19017,7 +19017,7 @@ void AiravataClient::send_getApplicationModule(const std::string& appModuleId)
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getApplicationModule( ::ApplicationModule& _return)
+void AiravataClient::recv_getApplicationModule( ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& _return)
 {
 
   int32_t rseqid = 0;
@@ -19064,13 +19064,13 @@ void AiravataClient::recv_getApplicationModule( ::ApplicationModule& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getApplicationModule failed: unknown result");
 }
 
-bool AiravataClient::updateApplicationModule(const std::string& appModuleId, const  ::ApplicationModule& applicationModule)
+bool AiravataClient::updateApplicationModule(const std::string& appModuleId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule)
 {
   send_updateApplicationModule(appModuleId, applicationModule);
   return recv_updateApplicationModule();
 }
 
-void AiravataClient::send_updateApplicationModule(const std::string& appModuleId, const  ::ApplicationModule& applicationModule)
+void AiravataClient::send_updateApplicationModule(const std::string& appModuleId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateApplicationModule", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -19199,13 +19199,13 @@ bool AiravataClient::recv_deleteApplicationModule()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteApplicationModule failed: unknown result");
 }
 
-void AiravataClient::registerApplicationDeployment(std::string& _return, const  ::ApplicationDeploymentDescription& applicationDeployment)
+void AiravataClient::registerApplicationDeployment(std::string& _return, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment)
 {
   send_registerApplicationDeployment(applicationDeployment);
   recv_registerApplicationDeployment(_return);
 }
 
-void AiravataClient::send_registerApplicationDeployment(const  ::ApplicationDeploymentDescription& applicationDeployment)
+void AiravataClient::send_registerApplicationDeployment(const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("registerApplicationDeployment", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -19266,7 +19266,7 @@ void AiravataClient::recv_registerApplicationDeployment(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "registerApplicationDeployment failed: unknown result");
 }
 
-void AiravataClient::getApplicationDeployment( ::ApplicationDeploymentDescription& _return, const std::string& appDeploymentId)
+void AiravataClient::getApplicationDeployment( ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& _return, const std::string& appDeploymentId)
 {
   send_getApplicationDeployment(appDeploymentId);
   recv_getApplicationDeployment(_return);
@@ -19286,7 +19286,7 @@ void AiravataClient::send_getApplicationDeployment(const std::string& appDeploym
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getApplicationDeployment( ::ApplicationDeploymentDescription& _return)
+void AiravataClient::recv_getApplicationDeployment( ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& _return)
 {
 
   int32_t rseqid = 0;
@@ -19333,13 +19333,13 @@ void AiravataClient::recv_getApplicationDeployment( ::ApplicationDeploymentDescr
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getApplicationDeployment failed: unknown result");
 }
 
-bool AiravataClient::updateApplicationDeployment(const std::string& appDeploymentId, const  ::ApplicationDeploymentDescription& applicationDeployment)
+bool AiravataClient::updateApplicationDeployment(const std::string& appDeploymentId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment)
 {
   send_updateApplicationDeployment(appDeploymentId, applicationDeployment);
   return recv_updateApplicationDeployment();
 }
 
-void AiravataClient::send_updateApplicationDeployment(const std::string& appDeploymentId, const  ::ApplicationDeploymentDescription& applicationDeployment)
+void AiravataClient::send_updateApplicationDeployment(const std::string& appDeploymentId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateApplicationDeployment", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -19535,13 +19535,13 @@ void AiravataClient::recv_getAppModuleDeployedResources(std::vector<std::string>
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAppModuleDeployedResources failed: unknown result");
 }
 
-void AiravataClient::registerApplicationInterface(std::string& _return, const  ::ApplicationInterfaceDescription& applicationInterface)
+void AiravataClient::registerApplicationInterface(std::string& _return, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface)
 {
   send_registerApplicationInterface(applicationInterface);
   recv_registerApplicationInterface(_return);
 }
 
-void AiravataClient::send_registerApplicationInterface(const  ::ApplicationInterfaceDescription& applicationInterface)
+void AiravataClient::send_registerApplicationInterface(const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("registerApplicationInterface", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -19602,7 +19602,7 @@ void AiravataClient::recv_registerApplicationInterface(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "registerApplicationInterface failed: unknown result");
 }
 
-void AiravataClient::getApplicationInterface( ::ApplicationInterfaceDescription& _return, const std::string& appInterfaceId)
+void AiravataClient::getApplicationInterface( ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& _return, const std::string& appInterfaceId)
 {
   send_getApplicationInterface(appInterfaceId);
   recv_getApplicationInterface(_return);
@@ -19622,7 +19622,7 @@ void AiravataClient::send_getApplicationInterface(const std::string& appInterfac
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getApplicationInterface( ::ApplicationInterfaceDescription& _return)
+void AiravataClient::recv_getApplicationInterface( ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& _return)
 {
 
   int32_t rseqid = 0;
@@ -19669,13 +19669,13 @@ void AiravataClient::recv_getApplicationInterface( ::ApplicationInterfaceDescrip
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getApplicationInterface failed: unknown result");
 }
 
-bool AiravataClient::updateApplicationInterface(const std::string& appInterfaceId, const  ::ApplicationInterfaceDescription& applicationInterface)
+bool AiravataClient::updateApplicationInterface(const std::string& appInterfaceId, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface)
 {
   send_updateApplicationInterface(appInterfaceId, applicationInterface);
   return recv_updateApplicationInterface();
 }
 
-void AiravataClient::send_updateApplicationInterface(const std::string& appInterfaceId, const  ::ApplicationInterfaceDescription& applicationInterface)
+void AiravataClient::send_updateApplicationInterface(const std::string& appInterfaceId, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateApplicationInterface", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -19870,7 +19870,7 @@ void AiravataClient::recv_getAllApplicationInterfaceNames(std::map<std::string,
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllApplicationInterfaceNames failed: unknown result");
 }
 
-void AiravataClient::getAllApplicationInterfaces(std::vector< ::ApplicationInterfaceDescription> & _return)
+void AiravataClient::getAllApplicationInterfaces(std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> & _return)
 {
   send_getAllApplicationInterfaces();
   recv_getAllApplicationInterfaces(_return);
@@ -19889,7 +19889,7 @@ void AiravataClient::send_getAllApplicationInterfaces()
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getAllApplicationInterfaces(std::vector< ::ApplicationInterfaceDescription> & _return)
+void AiravataClient::recv_getAllApplicationInterfaces(std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> & _return)
 {
 
   int32_t rseqid = 0;
@@ -19936,7 +19936,7 @@ void AiravataClient::recv_getAllApplicationInterfaces(std::vector< ::Application
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllApplicationInterfaces failed: unknown result");
 }
 
-void AiravataClient::getApplicationInputs(std::vector< ::InputDataObjectType> & _return, const std::string& appInterfaceId)
+void AiravataClient::getApplicationInputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> & _return, const std::string& appInterfaceId)
 {
   send_getApplicationInputs(appInterfaceId);
   recv_getApplicationInputs(_return);
@@ -19956,7 +19956,7 @@ void AiravataClient::send_getApplicationInputs(const std::string& appInterfaceId
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getApplicationInputs(std::vector< ::InputDataObjectType> & _return)
+void AiravataClient::recv_getApplicationInputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> & _return)
 {
 
   int32_t rseqid = 0;
@@ -20003,7 +20003,7 @@ void AiravataClient::recv_getApplicationInputs(std::vector< ::InputDataObjectTyp
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getApplicationInputs failed: unknown result");
 }
 
-void AiravataClient::getApplicationOutputs(std::vector< ::OutputDataObjectType> & _return, const std::string& appInterfaceId)
+void AiravataClient::getApplicationOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& appInterfaceId)
 {
   send_getApplicationOutputs(appInterfaceId);
   recv_getApplicationOutputs(_return);
@@ -20023,7 +20023,7 @@ void AiravataClient::send_getApplicationOutputs(const std::string& appInterfaceI
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getApplicationOutputs(std::vector< ::OutputDataObjectType> & _return)
+void AiravataClient::recv_getApplicationOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return)
 {
 
   int32_t rseqid = 0;
@@ -20137,13 +20137,13 @@ void AiravataClient::recv_getAvailableAppInterfaceComputeResources(std::vector<s
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAvailableAppInterfaceComputeResources failed: unknown result");
 }
 
-void AiravataClient::registerComputeResource(std::string& _return, const  ::ComputeResourceDescription& computeResourceDescription)
+void AiravataClient::registerComputeResource(std::string& _return, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& computeResourceDescription)
 {
   send_registerComputeResource(computeResourceDescription);
   recv_registerComputeResource(_return);
 }
 
-void AiravataClient::send_registerComputeResource(const  ::ComputeResourceDescription& computeResourceDescription)
+void AiravataClient::send_registerComputeResource(const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& computeResourceDescription)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("registerComputeResource", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20204,7 +20204,7 @@ void AiravataClient::recv_registerComputeResource(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "registerComputeResource failed: unknown result");
 }
 
-void AiravataClient::getComputeResource( ::ComputeResourceDescription& _return, const std::string& computeResourceId)
+void AiravataClient::getComputeResource( ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& _return, const std::string& computeResourceId)
 {
   send_getComputeResource(computeResourceId);
   recv_getComputeResource(_return);
@@ -20224,7 +20224,7 @@ void AiravataClient::send_getComputeResource(const std::string& computeResourceI
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getComputeResource( ::ComputeResourceDescription& _return)
+void AiravataClient::recv_getComputeResource( ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& _return)
 {
 
   int32_t rseqid = 0;
@@ -20337,13 +20337,13 @@ void AiravataClient::recv_getAllComputeResourceNames(std::map<std::string, std::
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllComputeResourceNames failed: unknown result");
 }
 
-bool AiravataClient::updateComputeResource(const std::string& computeResourceId, const  ::ComputeResourceDescription& computeResourceDescription)
+bool AiravataClient::updateComputeResource(const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& computeResourceDescription)
 {
   send_updateComputeResource(computeResourceId, computeResourceDescription);
   return recv_updateComputeResource();
 }
 
-void AiravataClient::send_updateComputeResource(const std::string& computeResourceId, const  ::ComputeResourceDescription& computeResourceDescription)
+void AiravataClient::send_updateComputeResource(const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& computeResourceDescription)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateComputeResource", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20472,13 +20472,13 @@ bool AiravataClient::recv_deleteComputeResource()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteComputeResource failed: unknown result");
 }
 
-bool AiravataClient::addLocalSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::LOCALSubmission& localSubmission)
+bool AiravataClient::addLocalSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& localSubmission)
 {
   send_addLocalSubmissionDetails(computeResourceId, priorityOrder, localSubmission);
   return recv_addLocalSubmissionDetails();
 }
 
-void AiravataClient::send_addLocalSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::LOCALSubmission& localSubmission)
+void AiravataClient::send_addLocalSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& localSubmission)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("addLocalSubmissionDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20541,13 +20541,13 @@ bool AiravataClient::recv_addLocalSubmissionDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addLocalSubmissionDetails failed: unknown result");
 }
 
-bool AiravataClient::updateLocalSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::LOCALSubmission& localSubmission)
+bool AiravataClient::updateLocalSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& localSubmission)
 {
   send_updateLocalSubmissionDetails(jobSubmissionInterfaceId, localSubmission);
   return recv_updateLocalSubmissionDetails();
 }
 
-void AiravataClient::send_updateLocalSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::LOCALSubmission& localSubmission)
+void AiravataClient::send_updateLocalSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALSubmission& localSubmission)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateLocalSubmissionDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20609,13 +20609,13 @@ bool AiravataClient::recv_updateLocalSubmissionDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "updateLocalSubmissionDetails failed: unknown result");
 }
 
-bool AiravataClient::addSSHJobSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::SSHJobSubmission& sshJobSubmission)
+bool AiravataClient::addSSHJobSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission)
 {
   send_addSSHJobSubmissionDetails(computeResourceId, priorityOrder, sshJobSubmission);
   return recv_addSSHJobSubmissionDetails();
 }
 
-void AiravataClient::send_addSSHJobSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::SSHJobSubmission& sshJobSubmission)
+void AiravataClient::send_addSSHJobSubmissionDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("addSSHJobSubmissionDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20678,13 +20678,13 @@ bool AiravataClient::recv_addSSHJobSubmissionDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addSSHJobSubmissionDetails failed: unknown result");
 }
 
-bool AiravataClient::updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::SSHJobSubmission& sshJobSubmission)
+bool AiravataClient::updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission)
 {
   send_updateSSHJobSubmissionDetails(jobSubmissionInterfaceId, sshJobSubmission);
   return recv_updateSSHJobSubmissionDetails();
 }
 
-void AiravataClient::send_updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::SSHJobSubmission& sshJobSubmission)
+void AiravataClient::send_updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateSSHJobSubmissionDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20746,13 +20746,13 @@ bool AiravataClient::recv_updateSSHJobSubmissionDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "updateSSHJobSubmissionDetails failed: unknown result");
 }
 
-bool AiravataClient::addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::LOCALDataMovement& localDataMovement)
+bool AiravataClient::addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement)
 {
   send_addLocalDataMovementDetails(computeResourceId, priorityOrder, localDataMovement);
   return recv_addLocalDataMovementDetails();
 }
 
-void AiravataClient::send_addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::LOCALDataMovement& localDataMovement)
+void AiravataClient::send_addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("addLocalDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20815,13 +20815,13 @@ bool AiravataClient::recv_addLocalDataMovementDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addLocalDataMovementDetails failed: unknown result");
 }
 
-bool AiravataClient::updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::LOCALDataMovement& localDataMovement)
+bool AiravataClient::updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement)
 {
   send_updateLocalDataMovementDetails(jobSubmissionInterfaceId, localDataMovement);
   return recv_updateLocalDataMovementDetails();
 }
 
-void AiravataClient::send_updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::LOCALDataMovement& localDataMovement)
+void AiravataClient::send_updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateLocalDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20883,13 +20883,13 @@ bool AiravataClient::recv_updateLocalDataMovementDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "updateLocalDataMovementDetails failed: unknown result");
 }
 
-bool AiravataClient::addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::SCPDataMovement& scpDataMovement)
+bool AiravataClient::addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement)
 {
   send_addSCPDataMovementDetails(computeResourceId, priorityOrder, scpDataMovement);
   return recv_addSCPDataMovementDetails();
 }
 
-void AiravataClient::send_addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::SCPDataMovement& scpDataMovement)
+void AiravataClient::send_addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("addSCPDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -20952,13 +20952,13 @@ bool AiravataClient::recv_addSCPDataMovementDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addSCPDataMovementDetails failed: unknown result");
 }
 
-bool AiravataClient::updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::SCPDataMovement& scpDataMovement)
+bool AiravataClient::updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement)
 {
   send_updateSCPDataMovementDetails(jobSubmissionInterfaceId, scpDataMovement);
   return recv_updateSCPDataMovementDetails();
 }
 
-void AiravataClient::send_updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::SCPDataMovement& scpDataMovement)
+void AiravataClient::send_updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateSCPDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -21020,13 +21020,13 @@ bool AiravataClient::recv_updateSCPDataMovementDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "updateSCPDataMovementDetails failed: unknown result");
 }
 
-bool AiravataClient::addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::GridFTPDataMovement& gridFTPDataMovement)
+bool AiravataClient::addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement)
 {
   send_addGridFTPDataMovementDetails(computeResourceId, priorityOrder, gridFTPDataMovement);
   return recv_addGridFTPDataMovementDetails();
 }
 
-void AiravataClient::send_addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::GridFTPDataMovement& gridFTPDataMovement)
+void AiravataClient::send_addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("addGridFTPDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -21089,13 +21089,13 @@ bool AiravataClient::recv_addGridFTPDataMovementDetails()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGridFTPDataMovementDetails failed: unknown result");
 }
 
-bool AiravataClient::updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::GridFTPDataMovement& gridFTPDataMovement)
+bool AiravataClient::updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement)
 {
   send_updateGridFTPDataMovementDetails(jobSubmissionInterfaceId, gridFTPDataMovement);
   return recv_updateGridFTPDataMovementDetails();
 }
 
-void AiravataClient::send_updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::GridFTPDataMovement& gridFTPDataMovement)
+void AiravataClient::send_updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateGridFTPDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -21561,13 +21561,13 @@ bool AiravataClient::recv_deleteDataMovementInterface()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteDataMovementInterface failed: unknown result");
 }
 
-void AiravataClient::registerGatewayResourceProfile(std::string& _return, const  ::GatewayResourceProfile& gatewayResourceProfile)
+void AiravataClient::registerGatewayResourceProfile(std::string& _return, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& gatewayResourceProfile)
 {
   send_registerGatewayResourceProfile(gatewayResourceProfile);
   recv_registerGatewayResourceProfile(_return);
 }
 
-void AiravataClient::send_registerGatewayResourceProfile(const  ::GatewayResourceProfile& gatewayResourceProfile)
+void AiravataClient::send_registerGatewayResourceProfile(const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& gatewayResourceProfile)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("registerGatewayResourceProfile", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -21628,7 +21628,7 @@ void AiravataClient::recv_registerGatewayResourceProfile(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "registerGatewayResourceProfile failed: unknown result");
 }
 
-void AiravataClient::getGatewayResourceProfile( ::GatewayResourceProfile& _return, const std::string& gatewayID)
+void AiravataClient::getGatewayResourceProfile( ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& _return, const std::string& gatewayID)
 {
   send_getGatewayResourceProfile(gatewayID);
   recv_getGatewayResourceProfile(_return);
@@ -21648,7 +21648,7 @@ void AiravataClient::send_getGatewayResourceProfile(const std::string& gatewayID
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getGatewayResourceProfile( ::GatewayResourceProfile& _return)
+void AiravataClient::recv_getGatewayResourceProfile( ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& _return)
 {
 
   int32_t rseqid = 0;
@@ -21695,13 +21695,13 @@ void AiravataClient::recv_getGatewayResourceProfile( ::GatewayResourceProfile& _
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getGatewayResourceProfile failed: unknown result");
 }
 
-bool AiravataClient::updateGatewayResourceProfile(const std::string& gatewayID, const  ::GatewayResourceProfile& gatewayResourceProfile)
+bool AiravataClient::updateGatewayResourceProfile(const std::string& gatewayID, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& gatewayResourceProfile)
 {
   send_updateGatewayResourceProfile(gatewayID, gatewayResourceProfile);
   return recv_updateGatewayResourceProfile();
 }
 
-void AiravataClient::send_updateGatewayResourceProfile(const std::string& gatewayID, const  ::GatewayResourceProfile& gatewayResourceProfile)
+void AiravataClient::send_updateGatewayResourceProfile(const std::string& gatewayID, const  ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile& gatewayResourceProfile)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateGatewayResourceProfile", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -21830,13 +21830,13 @@ bool AiravataClient::recv_deleteGatewayResourceProfile()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteGatewayResourceProfile failed: unknown result");
 }
 
-bool AiravataClient::addGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::ComputeResourcePreference& computeResourcePreference)
+bool AiravataClient::addGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference)
 {
   send_addGatewayComputeResourcePreference(gatewayID, computeResourceId, computeResourcePreference);
   return recv_addGatewayComputeResourcePreference();
 }
 
-void AiravataClient::send_addGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::ComputeResourcePreference& computeResourcePreference)
+void AiravataClient::send_addGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("addGatewayComputeResourcePreference", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -21899,7 +21899,7 @@ bool AiravataClient::recv_addGatewayComputeResourcePreference()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGatewayComputeResourcePreference failed: unknown result");
 }
 
-void AiravataClient::getGatewayComputeResourcePreference( ::ComputeResourcePreference& _return, const std::string& gatewayID, const std::string& computeResourceId)
+void AiravataClient::getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return, const std::string& gatewayID, const std::string& computeResourceId)
 {
   send_getGatewayComputeResourcePreference(gatewayID, computeResourceId);
   recv_getGatewayComputeResourcePreference(_return);
@@ -21920,7 +21920,7 @@ void AiravataClient::send_getGatewayComputeResourcePreference(const std::string&
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getGatewayComputeResourcePreference( ::ComputeResourcePreference& _return)
+void AiravataClient::recv_getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return)
 {
 
   int32_t rseqid = 0;
@@ -21967,7 +21967,7 @@ void AiravataClient::recv_getGatewayComputeResourcePreference( ::ComputeResource
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getGatewayComputeResourcePreference failed: unknown result");
 }
 
-void AiravataClient::getAllGatewayComputeResourcePreferences(std::vector< ::ComputeResourcePreference> & _return, const std::string& gatewayID)
+void AiravataClient::getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return, const std::string& gatewayID)
 {
   send_getAllGatewayComputeResourcePreferences(gatewayID);
   recv_getAllGatewayComputeResourcePreferences(_return);
@@ -21987,7 +21987,7 @@ void AiravataClient::send_getAllGatewayComputeResourcePreferences(const std::str
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getAllGatewayComputeResourcePreferences(std::vector< ::ComputeResourcePreference> & _return)
+void AiravataClient::recv_getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return)
 {
 
   int32_t rseqid = 0;
@@ -22034,13 +22034,13 @@ void AiravataClient::recv_getAllGatewayComputeResourcePreferences(std::vector< :
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllGatewayComputeResourcePreferences failed: unknown result");
 }
 
-bool AiravataClient::updateGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::ComputeResourcePreference& computeResourcePreference)
+bool AiravataClient::updateGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference)
 {
   send_updateGatewayComputeResourcePreference(gatewayID, computeResourceId, computeResourcePreference);
   return recv_updateGatewayComputeResourcePreference();
 }
 
-void AiravataClient::send_updateGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::ComputeResourcePreference& computeResourcePreference)
+void AiravataClient::send_updateGatewayComputeResourcePreference(const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateGatewayComputeResourcePreference", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -22215,13 +22215,13 @@ void AiravataProcessor::process_getAPIVersion(int32_t seqid, ::apache::thrift::p
   try {
     iface_->getAPIVersion(result.success);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22278,13 +22278,13 @@ void AiravataProcessor::process_createProject(int32_t seqid, ::apache::thrift::p
   try {
     iface_->createProject(result.success, args.project);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22340,16 +22340,16 @@ void AiravataProcessor::process_updateProject(int32_t seqid, ::apache::thrift::p
   Airavata_updateProject_result result;
   try {
     iface_->updateProject(args.projectId, args.updatedProject);
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
-  } catch ( ::airavata::api::error::ProjectNotFoundException &pnfe) {
+  } catch ( ::apache::airavata::api::error::ProjectNotFoundException &pnfe) {
     result.pnfe = pnfe;
     result.__isset.pnfe = true;
   } catch (const std::exception& e) {
@@ -22406,16 +22406,16 @@ void AiravataProcessor::process_getProject(int32_t seqid, ::apache::thrift::prot
   try {
     iface_->getProject(result.success, args.projectId);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
-  } catch ( ::airavata::api::error::ProjectNotFoundException &pnfe) {
+  } catch ( ::apache::airavata::api::error::ProjectNotFoundException &pnfe) {
     result.pnfe = pnfe;
     result.__isset.pnfe = true;
   } catch (const std::exception& e) {
@@ -22472,13 +22472,13 @@ void AiravataProcessor::process_getAllUserProjects(int32_t seqid, ::apache::thri
   try {
     iface_->getAllUserProjects(result.success, args.userName);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22535,13 +22535,13 @@ void AiravataProcessor::process_searchProjectsByProjectName(int32_t seqid, ::apa
   try {
     iface_->searchProjectsByProjectName(result.success, args.userName, args.projectName);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22598,13 +22598,13 @@ void AiravataProcessor::process_searchProjectsByProjectDesc(int32_t seqid, ::apa
   try {
     iface_->searchProjectsByProjectDesc(result.success, args.userName, args.description);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22661,13 +22661,13 @@ void AiravataProcessor::process_searchExperimentsByName(int32_t seqid, ::apache:
   try {
     iface_->searchExperimentsByName(result.success, args.userName, args.expName);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22724,13 +22724,13 @@ void AiravataProcessor::process_searchExperimentsByDesc(int32_t seqid, ::apache:
   try {
     iface_->searchExperimentsByDesc(result.success, args.userName, args.description);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22787,13 +22787,13 @@ void AiravataProcessor::process_searchExperimentsByApplication(int32_t seqid, ::
   try {
     iface_->searchExperimentsByApplication(result.success, args.userName, args.applicationId);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22850,16 +22850,16 @@ void AiravataProcessor::process_getAllExperimentsInProject(int32_t seqid, ::apac
   try {
     iface_->getAllExperimentsInProject(result.success, args.projectId);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
-  } catch ( ::airavata::api::error::ProjectNotFoundException &pnfe) {
+  } catch ( ::apache::airavata::api::error::ProjectNotFoundException &pnfe) {
     result.pnfe = pnfe;
     result.__isset.pnfe = true;
   } catch (const std::exception& e) {
@@ -22916,13 +22916,13 @@ void AiravataProcessor::process_getAllUserExperiments(int32_t seqid, ::apache::t
   try {
     iface_->getAllUserExperiments(result.success, args.userName);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -22979,13 +22979,13 @@ void AiravataProcessor::process_createExperiment(int32_t seqid, ::apache::thrift
   try {
     iface_->createExperiment(result.success, args.experiment);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23042,16 +23042,16 @@ void AiravataProcessor::process_getExperiment(int32_t seqid, ::apache::thrift::p
   try {
     iface_->getExperiment(result.success, args.airavataExperimentId);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::ExperimentNotFoundException &enf) {
+  } catch ( ::apache::airavata::api::error::ExperimentNotFoundException &enf) {
     result.enf = enf;
     result.__isset.enf = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23107,16 +23107,16 @@ void AiravataProcessor::process_updateExperiment(int32_t seqid, ::apache::thrift
   Airavata_updateExperiment_result result;
   try {
     iface_->updateExperiment(args.airavataExperimentId, args.experiment);
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::ExperimentNotFoundException &enf) {
+  } catch ( ::apache::airavata::api::error::ExperimentNotFoundException &enf) {
     result.enf = enf;
     result.__isset.enf = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23279,16 +23279,16 @@ void AiravataProcessor::process_validateExperiment(int32_t seqid, ::apache::thri
   try {
     result.success = iface_->validateExperiment(args.airavataExperimentId);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::ExperimentNotFoundException &enf) {
+  } catch ( ::apache::airavata::api::error::ExperimentNotFoundException &enf) {
     result.enf = enf;
     result.__isset.enf = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23344,19 +23344,19 @@ void AiravataProcessor::process_launchExperiment(int32_t seqid, ::apache::thrift
   Airavata_launchExperiment_result result;
   try {
     iface_->launchExperiment(args.airavataExperimentId, args.airavataCredStoreToken);
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::ExperimentNotFoundException &enf) {
+  } catch ( ::apache::airavata::api::error::ExperimentNotFoundException &enf) {
     result.enf = enf;
     result.__isset.enf = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
-  } catch ( ::airavata::api::error::LaunchValidationException &lve) {
+  } catch ( ::apache::airavata::api::error::LaunchValidationException &lve) {
     result.lve = lve;
     result.__isset.lve = true;
   } catch (const std::exception& e) {
@@ -23413,16 +23413,16 @@ void AiravataProcessor::process_getExperimentStatus(int32_t seqid, ::apache::thr
   try {
     iface_->getExperimentStatus(result.success, args.airavataExperimentId);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::ExperimentNotFoundException &enf) {
+  } catch ( ::apache::airavata::api::error::ExperimentNotFoundException &enf) {
     result.enf = enf;
     result.__isset.enf = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23587,16 +23587,16 @@ void AiravataProcessor::process_cloneExperiment(int32_t seqid, ::apache::thrift:
   try {
     iface_->cloneExperiment(result.success, args.existingExperimentID, args.newExperimentName);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::ExperimentNotFoundException &enf) {
+  } catch ( ::apache::airavata::api::error::ExperimentNotFoundException &enf) {
     result.enf = enf;
     result.__isset.enf = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23652,16 +23652,16 @@ void AiravataProcessor::process_terminateExperiment(int32_t seqid, ::apache::thr
   Airavata_terminateExperiment_result result;
   try {
     iface_->terminateExperiment(args.airavataExperimentId);
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::ExperimentNotFoundException &enf) {
+  } catch ( ::apache::airavata::api::error::ExperimentNotFoundException &enf) {
     result.enf = enf;
     result.__isset.enf = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23718,13 +23718,13 @@ void AiravataProcessor::process_registerApplicationModule(int32_t seqid, ::apach
   try {
     iface_->registerApplicationModule(result.success, args.applicationModule);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23781,13 +23781,13 @@ void AiravataProcessor::process_getApplicationModule(int32_t seqid, ::apache::th
   try {
     iface_->getApplicationModule(result.success, args.appModuleId);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase) {
+  } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
     result.ase = ase;
     result.__isset.ase = true;
   } catch (const std::exception& e) {
@@ -23844,13 +23844,13 @@ void AiravataProcessor::process_updateApplicationModule(int32_t seqid, ::apache:
   try {
     result.success = iface_->updateApplicationModule(args.appModuleId, args.applicationModule);
     result.__isset.success = true;
-  } catch ( ::airavata::api::error::InvalidRequestException &ire) {
+  } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
-  } catch ( ::airavata::api::error::AiravataClientException &ace) {
+  } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
     result.ace = ace;
     result.__isset.ace = true;
-  } catch ( ::airavata::api::error::AiravataSystemException &ase

<TRUNCATED>