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:34 UTC

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

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>