http://git-wip-us.apache.org/repos/asf/airavata/blob/5881af94/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataErrors_types.h
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataErrors_types.h
 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataErrors_types.h
deleted file mode 100644
index b7f648d..0000000
--- 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataErrors_types.h
+++ /dev/null
@@ -1,526 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-#ifndef airavataErrors_TYPES_H
-#define airavataErrors_TYPES_H
-
-#include <thrift/Thrift.h>
-#include <thrift/TApplicationException.h>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/transport/TTransport.h>
-
-#include <thrift/cxxfunctional.h>
-#include "experimentModel_types.h"
-
-
-namespace apache { namespace airavata { namespace api { namespace error {
-
-struct AiravataErrorType {
-  enum type {
-    UNKNOWN = 0,
-    PERMISSION_DENIED = 1,
-    INTERNAL_ERROR = 2,
-    AUTHENTICATION_FAILURE = 3,
-    INVALID_AUTHORIZATION = 4,
-    AUTHORIZATION_EXPIRED = 5,
-    UNKNOWN_GATEWAY_ID = 6,
-    UNSUPPORTED_OPERATION = 7
-  };
-};
-
-extern const std::map<int, const char*> _AiravataErrorType_VALUES_TO_NAMES;
-
-
-class ExperimentNotFoundException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"EFB929595D312AC8F305D5A794CFEDA1";
-  static const uint8_t binary_fingerprint[16]; // = 
{0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
-
-  ExperimentNotFoundException() : message() {
-  }
-
-  virtual ~ExperimentNotFoundException() throw() {}
-
-  std::string message;
-
-  void __set_message(const std::string& val) {
-    message = val;
-  }
-
-  bool operator == (const ExperimentNotFoundException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
-  bool operator != (const ExperimentNotFoundException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const ExperimentNotFoundException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(ExperimentNotFoundException &a, ExperimentNotFoundException &b);
-
-
-class ProjectNotFoundException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"EFB929595D312AC8F305D5A794CFEDA1";
-  static const uint8_t binary_fingerprint[16]; // = 
{0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
-
-  ProjectNotFoundException() : message() {
-  }
-
-  virtual ~ProjectNotFoundException() throw() {}
-
-  std::string message;
-
-  void __set_message(const std::string& val) {
-    message = val;
-  }
-
-  bool operator == (const ProjectNotFoundException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
-  bool operator != (const ProjectNotFoundException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const ProjectNotFoundException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(ProjectNotFoundException &a, ProjectNotFoundException &b);
-
-
-class InvalidRequestException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"EFB929595D312AC8F305D5A794CFEDA1";
-  static const uint8_t binary_fingerprint[16]; // = 
{0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
-
-  InvalidRequestException() : message() {
-  }
-
-  virtual ~InvalidRequestException() throw() {}
-
-  std::string message;
-
-  void __set_message(const std::string& val) {
-    message = val;
-  }
-
-  bool operator == (const InvalidRequestException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
-  bool operator != (const InvalidRequestException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const InvalidRequestException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(InvalidRequestException &a, InvalidRequestException &b);
-
-
-class TimedOutException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"99914B932BD37A50B983C5E7C90AE93B";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x99,0x91,0x4B,0x93,0x2B,0xD3,0x7A,0x50,0xB9,0x83,0xC5,0xE7,0xC9,0x0A,0xE9,0x3B};
-
-  TimedOutException() {
-  }
-
-  virtual ~TimedOutException() throw() {}
-
-
-  bool operator == (const TimedOutException & /* rhs */) const
-  {
-    return true;
-  }
-  bool operator != (const TimedOutException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const TimedOutException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(TimedOutException &a, TimedOutException &b);
-
-
-class AuthenticationException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"EFB929595D312AC8F305D5A794CFEDA1";
-  static const uint8_t binary_fingerprint[16]; // = 
{0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
-
-  AuthenticationException() : message() {
-  }
-
-  virtual ~AuthenticationException() throw() {}
-
-  std::string message;
-
-  void __set_message(const std::string& val) {
-    message = val;
-  }
-
-  bool operator == (const AuthenticationException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
-  bool operator != (const AuthenticationException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const AuthenticationException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(AuthenticationException &a, AuthenticationException &b);
-
-
-class AuthorizationException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"EFB929595D312AC8F305D5A794CFEDA1";
-  static const uint8_t binary_fingerprint[16]; // = 
{0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
-
-  AuthorizationException() : message() {
-  }
-
-  virtual ~AuthorizationException() throw() {}
-
-  std::string message;
-
-  void __set_message(const std::string& val) {
-    message = val;
-  }
-
-  bool operator == (const AuthorizationException & rhs) const
-  {
-    if (!(message == rhs.message))
-      return false;
-    return true;
-  }
-  bool operator != (const AuthorizationException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const AuthorizationException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(AuthorizationException &a, AuthorizationException &b);
-
-typedef struct _AiravataClientException__isset {
-  _AiravataClientException__isset() : parameter(false) {}
-  bool parameter;
-} _AiravataClientException__isset;
-
-class AiravataClientException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"24652790C81ECE22B629CB60A19F1E93";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x24,0x65,0x27,0x90,0xC8,0x1E,0xCE,0x22,0xB6,0x29,0xCB,0x60,0xA1,0x9F,0x1E,0x93};
-
-  AiravataClientException() : airavataErrorType((AiravataErrorType::type)0), 
parameter() {
-  }
-
-  virtual ~AiravataClientException() throw() {}
-
-  AiravataErrorType::type airavataErrorType;
-  std::string parameter;
-
-  _AiravataClientException__isset __isset;
-
-  void __set_airavataErrorType(const AiravataErrorType::type val) {
-    airavataErrorType = val;
-  }
-
-  void __set_parameter(const std::string& val) {
-    parameter = val;
-    __isset.parameter = true;
-  }
-
-  bool operator == (const AiravataClientException & rhs) const
-  {
-    if (!(airavataErrorType == rhs.airavataErrorType))
-      return false;
-    if (__isset.parameter != rhs.__isset.parameter)
-      return false;
-    else if (__isset.parameter && !(parameter == rhs.parameter))
-      return false;
-    return true;
-  }
-  bool operator != (const AiravataClientException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const AiravataClientException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(AiravataClientException &a, AiravataClientException &b);
-
-typedef struct _ValidatorResult__isset {
-  _ValidatorResult__isset() : errorDetails(false) {}
-  bool errorDetails;
-} _ValidatorResult__isset;
-
-class ValidatorResult {
- public:
-
-  static const char* ascii_fingerprint; // = 
"EB04A806CFFC9025AEE48CFFDC378A86";
-  static const uint8_t binary_fingerprint[16]; // = 
{0xEB,0x04,0xA8,0x06,0xCF,0xFC,0x90,0x25,0xAE,0xE4,0x8C,0xFF,0xDC,0x37,0x8A,0x86};
-
-  ValidatorResult() : result(0), errorDetails() {
-  }
-
-  virtual ~ValidatorResult() throw() {}
-
-  bool result;
-  std::string errorDetails;
-
-  _ValidatorResult__isset __isset;
-
-  void __set_result(const bool val) {
-    result = val;
-  }
-
-  void __set_errorDetails(const std::string& val) {
-    errorDetails = val;
-    __isset.errorDetails = true;
-  }
-
-  bool operator == (const ValidatorResult & rhs) const
-  {
-    if (!(result == rhs.result))
-      return false;
-    if (__isset.errorDetails != rhs.__isset.errorDetails)
-      return false;
-    else if (__isset.errorDetails && !(errorDetails == rhs.errorDetails))
-      return false;
-    return true;
-  }
-  bool operator != (const ValidatorResult &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const ValidatorResult & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(ValidatorResult &a, ValidatorResult &b);
-
-
-class ValidationResults {
- public:
-
-  static const char* ascii_fingerprint; // = 
"E73BC8630EE405DA5FB801ED852143D2";
-  static const uint8_t binary_fingerprint[16]; // = 
{0xE7,0x3B,0xC8,0x63,0x0E,0xE4,0x05,0xDA,0x5F,0xB8,0x01,0xED,0x85,0x21,0x43,0xD2};
-
-  ValidationResults() : validationState(0) {
-  }
-
-  virtual ~ValidationResults() throw() {}
-
-  bool validationState;
-  std::vector<ValidatorResult>  validationResultList;
-
-  void __set_validationState(const bool val) {
-    validationState = val;
-  }
-
-  void __set_validationResultList(const std::vector<ValidatorResult> & val) {
-    validationResultList = val;
-  }
-
-  bool operator == (const ValidationResults & rhs) const
-  {
-    if (!(validationState == rhs.validationState))
-      return false;
-    if (!(validationResultList == rhs.validationResultList))
-      return false;
-    return true;
-  }
-  bool operator != (const ValidationResults &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const ValidationResults & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(ValidationResults &a, ValidationResults &b);
-
-typedef struct _LaunchValidationException__isset {
-  _LaunchValidationException__isset() : errorMessage(false) {}
-  bool errorMessage;
-} _LaunchValidationException__isset;
-
-class LaunchValidationException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"99E9D28CC9613B8567277FD2B86021FA";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x99,0xE9,0xD2,0x8C,0xC9,0x61,0x3B,0x85,0x67,0x27,0x7F,0xD2,0xB8,0x60,0x21,0xFA};
-
-  LaunchValidationException() : errorMessage() {
-  }
-
-  virtual ~LaunchValidationException() throw() {}
-
-  ValidationResults validationResult;
-  std::string errorMessage;
-
-  _LaunchValidationException__isset __isset;
-
-  void __set_validationResult(const ValidationResults& val) {
-    validationResult = val;
-  }
-
-  void __set_errorMessage(const std::string& val) {
-    errorMessage = val;
-    __isset.errorMessage = true;
-  }
-
-  bool operator == (const LaunchValidationException & rhs) const
-  {
-    if (!(validationResult == rhs.validationResult))
-      return false;
-    if (__isset.errorMessage != rhs.__isset.errorMessage)
-      return false;
-    else if (__isset.errorMessage && !(errorMessage == rhs.errorMessage))
-      return false;
-    return true;
-  }
-  bool operator != (const LaunchValidationException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const LaunchValidationException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(LaunchValidationException &a, LaunchValidationException &b);
-
-typedef struct _AiravataSystemException__isset {
-  _AiravataSystemException__isset() : message(false) {}
-  bool message;
-} _AiravataSystemException__isset;
-
-class AiravataSystemException : public ::apache::thrift::TException {
- public:
-
-  static const char* ascii_fingerprint; // = 
"24652790C81ECE22B629CB60A19F1E93";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x24,0x65,0x27,0x90,0xC8,0x1E,0xCE,0x22,0xB6,0x29,0xCB,0x60,0xA1,0x9F,0x1E,0x93};
-
-  AiravataSystemException() : airavataErrorType((AiravataErrorType::type)0), 
message() {
-  }
-
-  virtual ~AiravataSystemException() throw() {}
-
-  AiravataErrorType::type airavataErrorType;
-  std::string message;
-
-  _AiravataSystemException__isset __isset;
-
-  void __set_airavataErrorType(const AiravataErrorType::type val) {
-    airavataErrorType = val;
-  }
-
-  void __set_message(const std::string& val) {
-    message = val;
-    __isset.message = true;
-  }
-
-  bool operator == (const AiravataSystemException & rhs) const
-  {
-    if (!(airavataErrorType == rhs.airavataErrorType))
-      return false;
-    if (__isset.message != rhs.__isset.message)
-      return false;
-    else if (__isset.message && !(message == rhs.message))
-      return false;
-    return true;
-  }
-  bool operator != (const AiravataSystemException &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const AiravataSystemException & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(AiravataSystemException &a, AiravataSystemException &b);
-
-}}}} // namespace
-
-#endif

http://git-wip-us.apache.org/repos/asf/airavata/blob/5881af94/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
index 5d059c5..7eb0a43 100644
--- 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
+++ 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
@@ -48,7 +48,6 @@
 #include "gateway_resource_profile_model_types.h"
 #include "data_movement_models_types.h"
 #include "workflow_data_model_types.h"
-#include "replica_catalog_models_types.h"
 
 
 namespace apache { namespace airavata { namespace api {

http://git-wip-us.apache.org/repos/asf/airavata/blob/5881af94/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
index ca6796a..3c27a26 100644
--- 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
+++ 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
@@ -44,7 +44,8 @@
 #include "scheduling_model_types.h"
 #include "status_models_types.h"
 #include "data_movement_models_types.h"
-#include "replica_catalog_models_types.h"
+#include "replica_models_types.h"
+#include "file__transfer_models_types.h"
 
 
 namespace apache { namespace airavata { namespace model {

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

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

http://git-wip-us.apache.org/repos/asf/airavata/blob/5881af94/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationDeploymentModel_types.cpp
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationDeploymentModel_types.cpp
 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationDeploymentModel_types.cpp
deleted file mode 100644
index baea6c6..0000000
--- 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationDeploymentModel_types.cpp
+++ /dev/null
@@ -1,582 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-#include "applicationDeploymentModel_types.h"
-
-#include <algorithm>
-
-namespace apache { namespace airavata { namespace model { namespace appcatalog 
{ namespace appdeployment {
-
-int _kApplicationParallelismTypeValues[] = {
-  ApplicationParallelismType::SERIAL,
-  ApplicationParallelismType::MPI,
-  ApplicationParallelismType::OPENMP,
-  ApplicationParallelismType::OPENMP_MPI
-};
-const char* _kApplicationParallelismTypeNames[] = {
-  "SERIAL",
-  "MPI",
-  "OPENMP",
-  "OPENMP_MPI"
-};
-const std::map<int, const char*> 
_ApplicationParallelismType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, 
_kApplicationParallelismTypeValues, _kApplicationParallelismTypeNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
-
-const char* SetEnvPaths::ascii_fingerprint = 
"07A9615F837F7D0A952B595DD3020972";
-const uint8_t SetEnvPaths::binary_fingerprint[16] = 
{0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
-
-uint32_t SetEnvPaths::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_name = false;
-  bool isset_value = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->name);
-          isset_name = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->value);
-          isset_value = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_name)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_value)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t SetEnvPaths::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("SetEnvPaths");
-
-  xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 
1);
-  xfer += oprot->writeString(this->name);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("value", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->value);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-void swap(SetEnvPaths &a, SetEnvPaths &b) {
-  using ::std::swap;
-  swap(a.name, b.name);
-  swap(a.value, b.value);
-}
-
-const char* ApplicationModule::ascii_fingerprint = 
"FED0FBEAA0C90D1589E8B650561B7675";
-const uint8_t ApplicationModule::binary_fingerprint[16] = 
{0xFE,0xD0,0xFB,0xEA,0xA0,0xC9,0x0D,0x15,0x89,0xE8,0xB6,0x50,0x56,0x1B,0x76,0x75};
-
-uint32_t ApplicationModule::read(::apache::thrift::protocol::TProtocol* iprot) 
{
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_appModuleId = false;
-  bool isset_appModuleName = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->appModuleId);
-          isset_appModuleId = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->appModuleName);
-          isset_appModuleName = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->appModuleVersion);
-          this->__isset.appModuleVersion = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->appModuleDescription);
-          this->__isset.appModuleDescription = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_appModuleId)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_appModuleName)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t ApplicationModule::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationModule");
-
-  xfer += oprot->writeFieldBegin("appModuleId", 
::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->appModuleId);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("appModuleName", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->appModuleName);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.appModuleVersion) {
-    xfer += oprot->writeFieldBegin("appModuleVersion", 
::apache::thrift::protocol::T_STRING, 3);
-    xfer += oprot->writeString(this->appModuleVersion);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.appModuleDescription) {
-    xfer += oprot->writeFieldBegin("appModuleDescription", 
::apache::thrift::protocol::T_STRING, 4);
-    xfer += oprot->writeString(this->appModuleDescription);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-void swap(ApplicationModule &a, ApplicationModule &b) {
-  using ::std::swap;
-  swap(a.appModuleId, b.appModuleId);
-  swap(a.appModuleName, b.appModuleName);
-  swap(a.appModuleVersion, b.appModuleVersion);
-  swap(a.appModuleDescription, b.appModuleDescription);
-  swap(a.__isset, b.__isset);
-}
-
-const char* ApplicationDeploymentDescription::ascii_fingerprint = 
"3B2F93AE9F0E6A621AF867419ADD9E5A";
-const uint8_t ApplicationDeploymentDescription::binary_fingerprint[16] = 
{0x3B,0x2F,0x93,0xAE,0x9F,0x0E,0x6A,0x62,0x1A,0xF8,0x67,0x41,0x9A,0xDD,0x9E,0x5A};
-
-uint32_t 
ApplicationDeploymentDescription::read(::apache::thrift::protocol::TProtocol* 
iprot) {
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_appDeploymentId = false;
-  bool isset_appModuleId = false;
-  bool isset_computeHostId = false;
-  bool isset_executablePath = false;
-  bool isset_parallelism = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->appDeploymentId);
-          isset_appDeploymentId = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->appModuleId);
-          isset_appModuleId = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->computeHostId);
-          isset_computeHostId = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->executablePath);
-          isset_executablePath = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast0;
-          xfer += iprot->readI32(ecast0);
-          this->parallelism = (ApplicationParallelismType::type)ecast0;
-          isset_parallelism = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->appDeploymentDescription);
-          this->__isset.appDeploymentDescription = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->moduleLoadCmds.clear();
-            uint32_t _size1;
-            ::apache::thrift::protocol::TType _etype4;
-            xfer += iprot->readListBegin(_etype4, _size1);
-            this->moduleLoadCmds.resize(_size1);
-            uint32_t _i5;
-            for (_i5 = 0; _i5 < _size1; ++_i5)
-            {
-              xfer += iprot->readString(this->moduleLoadCmds[_i5]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.moduleLoadCmds = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->libPrependPaths.clear();
-            uint32_t _size6;
-            ::apache::thrift::protocol::TType _etype9;
-            xfer += iprot->readListBegin(_etype9, _size6);
-            this->libPrependPaths.resize(_size6);
-            uint32_t _i10;
-            for (_i10 = 0; _i10 < _size6; ++_i10)
-            {
-              xfer += this->libPrependPaths[_i10].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.libPrependPaths = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 9:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->libAppendPaths.clear();
-            uint32_t _size11;
-            ::apache::thrift::protocol::TType _etype14;
-            xfer += iprot->readListBegin(_etype14, _size11);
-            this->libAppendPaths.resize(_size11);
-            uint32_t _i15;
-            for (_i15 = 0; _i15 < _size11; ++_i15)
-            {
-              xfer += this->libAppendPaths[_i15].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.libAppendPaths = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 10:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->setEnvironment.clear();
-            uint32_t _size16;
-            ::apache::thrift::protocol::TType _etype19;
-            xfer += iprot->readListBegin(_etype19, _size16);
-            this->setEnvironment.resize(_size16);
-            uint32_t _i20;
-            for (_i20 = 0; _i20 < _size16; ++_i20)
-            {
-              xfer += this->setEnvironment[_i20].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.setEnvironment = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 11:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->preJobCommands.clear();
-            uint32_t _size21;
-            ::apache::thrift::protocol::TType _etype24;
-            xfer += iprot->readListBegin(_etype24, _size21);
-            this->preJobCommands.resize(_size21);
-            uint32_t _i25;
-            for (_i25 = 0; _i25 < _size21; ++_i25)
-            {
-              xfer += iprot->readString(this->preJobCommands[_i25]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.preJobCommands = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 12:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->postJobCommands.clear();
-            uint32_t _size26;
-            ::apache::thrift::protocol::TType _etype29;
-            xfer += iprot->readListBegin(_etype29, _size26);
-            this->postJobCommands.resize(_size26);
-            uint32_t _i30;
-            for (_i30 = 0; _i30 < _size26; ++_i30)
-            {
-              xfer += iprot->readString(this->postJobCommands[_i30]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.postJobCommands = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_appDeploymentId)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_appModuleId)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_computeHostId)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_executablePath)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_parallelism)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t 
ApplicationDeploymentDescription::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationDeploymentDescription");
-
-  xfer += oprot->writeFieldBegin("appDeploymentId", 
::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->appDeploymentId);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("appModuleId", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->appModuleId);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("computeHostId", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString(this->computeHostId);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("executablePath", 
::apache::thrift::protocol::T_STRING, 4);
-  xfer += oprot->writeString(this->executablePath);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("parallelism", 
::apache::thrift::protocol::T_I32, 5);
-  xfer += oprot->writeI32((int32_t)this->parallelism);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.appDeploymentDescription) {
-    xfer += oprot->writeFieldBegin("appDeploymentDescription", 
::apache::thrift::protocol::T_STRING, 6);
-    xfer += oprot->writeString(this->appDeploymentDescription);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.moduleLoadCmds) {
-    xfer += oprot->writeFieldBegin("moduleLoadCmds", 
::apache::thrift::protocol::T_LIST, 7);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, 
static_cast<uint32_t>(this->moduleLoadCmds.size()));
-      std::vector<std::string> ::const_iterator _iter31;
-      for (_iter31 = this->moduleLoadCmds.begin(); _iter31 != 
this->moduleLoadCmds.end(); ++_iter31)
-      {
-        xfer += oprot->writeString((*_iter31));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.libPrependPaths) {
-    xfer += oprot->writeFieldBegin("libPrependPaths", 
::apache::thrift::protocol::T_LIST, 8);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, 
static_cast<uint32_t>(this->libPrependPaths.size()));
-      std::vector<SetEnvPaths> ::const_iterator _iter32;
-      for (_iter32 = this->libPrependPaths.begin(); _iter32 != 
this->libPrependPaths.end(); ++_iter32)
-      {
-        xfer += (*_iter32).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.libAppendPaths) {
-    xfer += oprot->writeFieldBegin("libAppendPaths", 
::apache::thrift::protocol::T_LIST, 9);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, 
static_cast<uint32_t>(this->libAppendPaths.size()));
-      std::vector<SetEnvPaths> ::const_iterator _iter33;
-      for (_iter33 = this->libAppendPaths.begin(); _iter33 != 
this->libAppendPaths.end(); ++_iter33)
-      {
-        xfer += (*_iter33).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.setEnvironment) {
-    xfer += oprot->writeFieldBegin("setEnvironment", 
::apache::thrift::protocol::T_LIST, 10);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, 
static_cast<uint32_t>(this->setEnvironment.size()));
-      std::vector<SetEnvPaths> ::const_iterator _iter34;
-      for (_iter34 = this->setEnvironment.begin(); _iter34 != 
this->setEnvironment.end(); ++_iter34)
-      {
-        xfer += (*_iter34).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.preJobCommands) {
-    xfer += oprot->writeFieldBegin("preJobCommands", 
::apache::thrift::protocol::T_LIST, 11);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, 
static_cast<uint32_t>(this->preJobCommands.size()));
-      std::vector<std::string> ::const_iterator _iter35;
-      for (_iter35 = this->preJobCommands.begin(); _iter35 != 
this->preJobCommands.end(); ++_iter35)
-      {
-        xfer += oprot->writeString((*_iter35));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.postJobCommands) {
-    xfer += oprot->writeFieldBegin("postJobCommands", 
::apache::thrift::protocol::T_LIST, 12);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, 
static_cast<uint32_t>(this->postJobCommands.size()));
-      std::vector<std::string> ::const_iterator _iter36;
-      for (_iter36 = this->postJobCommands.begin(); _iter36 != 
this->postJobCommands.end(); ++_iter36)
-      {
-        xfer += oprot->writeString((*_iter36));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-void swap(ApplicationDeploymentDescription &a, 
ApplicationDeploymentDescription &b) {
-  using ::std::swap;
-  swap(a.appDeploymentId, b.appDeploymentId);
-  swap(a.appModuleId, b.appModuleId);
-  swap(a.computeHostId, b.computeHostId);
-  swap(a.executablePath, b.executablePath);
-  swap(a.parallelism, b.parallelism);
-  swap(a.appDeploymentDescription, b.appDeploymentDescription);
-  swap(a.moduleLoadCmds, b.moduleLoadCmds);
-  swap(a.libPrependPaths, b.libPrependPaths);
-  swap(a.libAppendPaths, b.libAppendPaths);
-  swap(a.setEnvironment, b.setEnvironment);
-  swap(a.preJobCommands, b.preJobCommands);
-  swap(a.postJobCommands, b.postJobCommands);
-  swap(a.__isset, b.__isset);
-}
-
-}}}}} // namespace

http://git-wip-us.apache.org/repos/asf/airavata/blob/5881af94/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationDeploymentModel_types.h
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationDeploymentModel_types.h
 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationDeploymentModel_types.h
deleted file mode 100644
index 9692d59..0000000
--- 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationDeploymentModel_types.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-#ifndef applicationDeploymentModel_TYPES_H
-#define applicationDeploymentModel_TYPES_H
-
-#include <thrift/Thrift.h>
-#include <thrift/TApplicationException.h>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/transport/TTransport.h>
-
-#include <thrift/cxxfunctional.h>
-
-
-namespace apache { namespace airavata { namespace model { namespace appcatalog 
{ namespace appdeployment {
-
-struct ApplicationParallelismType {
-  enum type {
-    SERIAL = 0,
-    MPI = 1,
-    OPENMP = 2,
-    OPENMP_MPI = 3
-  };
-};
-
-extern const std::map<int, const char*> 
_ApplicationParallelismType_VALUES_TO_NAMES;
-
-
-class SetEnvPaths {
- public:
-
-  static const char* ascii_fingerprint; // = 
"07A9615F837F7D0A952B595DD3020972";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
-
-  SetEnvPaths() : name(), value() {
-  }
-
-  virtual ~SetEnvPaths() throw() {}
-
-  std::string name;
-  std::string value;
-
-  void __set_name(const std::string& val) {
-    name = val;
-  }
-
-  void __set_value(const std::string& val) {
-    value = val;
-  }
-
-  bool operator == (const SetEnvPaths & rhs) const
-  {
-    if (!(name == rhs.name))
-      return false;
-    if (!(value == rhs.value))
-      return false;
-    return true;
-  }
-  bool operator != (const SetEnvPaths &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const SetEnvPaths & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(SetEnvPaths &a, SetEnvPaths &b);
-
-typedef struct _ApplicationModule__isset {
-  _ApplicationModule__isset() : appModuleVersion(false), 
appModuleDescription(false) {}
-  bool appModuleVersion;
-  bool appModuleDescription;
-} _ApplicationModule__isset;
-
-class ApplicationModule {
- public:
-
-  static const char* ascii_fingerprint; // = 
"FED0FBEAA0C90D1589E8B650561B7675";
-  static const uint8_t binary_fingerprint[16]; // = 
{0xFE,0xD0,0xFB,0xEA,0xA0,0xC9,0x0D,0x15,0x89,0xE8,0xB6,0x50,0x56,0x1B,0x76,0x75};
-
-  ApplicationModule() : appModuleId("DO_NOT_SET_AT_CLIENTS"), appModuleName(), 
appModuleVersion(), appModuleDescription() {
-  }
-
-  virtual ~ApplicationModule() throw() {}
-
-  std::string appModuleId;
-  std::string appModuleName;
-  std::string appModuleVersion;
-  std::string appModuleDescription;
-
-  _ApplicationModule__isset __isset;
-
-  void __set_appModuleId(const std::string& val) {
-    appModuleId = val;
-  }
-
-  void __set_appModuleName(const std::string& val) {
-    appModuleName = val;
-  }
-
-  void __set_appModuleVersion(const std::string& val) {
-    appModuleVersion = val;
-    __isset.appModuleVersion = true;
-  }
-
-  void __set_appModuleDescription(const std::string& val) {
-    appModuleDescription = val;
-    __isset.appModuleDescription = true;
-  }
-
-  bool operator == (const ApplicationModule & rhs) const
-  {
-    if (!(appModuleId == rhs.appModuleId))
-      return false;
-    if (!(appModuleName == rhs.appModuleName))
-      return false;
-    if (__isset.appModuleVersion != rhs.__isset.appModuleVersion)
-      return false;
-    else if (__isset.appModuleVersion && !(appModuleVersion == 
rhs.appModuleVersion))
-      return false;
-    if (__isset.appModuleDescription != rhs.__isset.appModuleDescription)
-      return false;
-    else if (__isset.appModuleDescription && !(appModuleDescription == 
rhs.appModuleDescription))
-      return false;
-    return true;
-  }
-  bool operator != (const ApplicationModule &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const ApplicationModule & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(ApplicationModule &a, ApplicationModule &b);
-
-typedef struct _ApplicationDeploymentDescription__isset {
-  _ApplicationDeploymentDescription__isset() : 
appDeploymentDescription(false), moduleLoadCmds(false), libPrependPaths(false), 
libAppendPaths(false), setEnvironment(false), preJobCommands(false), 
postJobCommands(false) {}
-  bool appDeploymentDescription;
-  bool moduleLoadCmds;
-  bool libPrependPaths;
-  bool libAppendPaths;
-  bool setEnvironment;
-  bool preJobCommands;
-  bool postJobCommands;
-} _ApplicationDeploymentDescription__isset;
-
-class ApplicationDeploymentDescription {
- public:
-
-  static const char* ascii_fingerprint; // = 
"3B2F93AE9F0E6A621AF867419ADD9E5A";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x3B,0x2F,0x93,0xAE,0x9F,0x0E,0x6A,0x62,0x1A,0xF8,0x67,0x41,0x9A,0xDD,0x9E,0x5A};
-
-  ApplicationDeploymentDescription() : 
appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), 
executablePath(), parallelism((ApplicationParallelismType::type)0), 
appDeploymentDescription() {
-    parallelism = (ApplicationParallelismType::type)0;
-
-  }
-
-  virtual ~ApplicationDeploymentDescription() throw() {}
-
-  std::string appDeploymentId;
-  std::string appModuleId;
-  std::string computeHostId;
-  std::string executablePath;
-  ApplicationParallelismType::type parallelism;
-  std::string appDeploymentDescription;
-  std::vector<std::string>  moduleLoadCmds;
-  std::vector<SetEnvPaths>  libPrependPaths;
-  std::vector<SetEnvPaths>  libAppendPaths;
-  std::vector<SetEnvPaths>  setEnvironment;
-  std::vector<std::string>  preJobCommands;
-  std::vector<std::string>  postJobCommands;
-
-  _ApplicationDeploymentDescription__isset __isset;
-
-  void __set_appDeploymentId(const std::string& val) {
-    appDeploymentId = val;
-  }
-
-  void __set_appModuleId(const std::string& val) {
-    appModuleId = val;
-  }
-
-  void __set_computeHostId(const std::string& val) {
-    computeHostId = val;
-  }
-
-  void __set_executablePath(const std::string& val) {
-    executablePath = val;
-  }
-
-  void __set_parallelism(const ApplicationParallelismType::type val) {
-    parallelism = val;
-  }
-
-  void __set_appDeploymentDescription(const std::string& val) {
-    appDeploymentDescription = val;
-    __isset.appDeploymentDescription = true;
-  }
-
-  void __set_moduleLoadCmds(const std::vector<std::string> & val) {
-    moduleLoadCmds = val;
-    __isset.moduleLoadCmds = true;
-  }
-
-  void __set_libPrependPaths(const std::vector<SetEnvPaths> & val) {
-    libPrependPaths = val;
-    __isset.libPrependPaths = true;
-  }
-
-  void __set_libAppendPaths(const std::vector<SetEnvPaths> & val) {
-    libAppendPaths = val;
-    __isset.libAppendPaths = true;
-  }
-
-  void __set_setEnvironment(const std::vector<SetEnvPaths> & val) {
-    setEnvironment = val;
-    __isset.setEnvironment = true;
-  }
-
-  void __set_preJobCommands(const std::vector<std::string> & val) {
-    preJobCommands = val;
-    __isset.preJobCommands = true;
-  }
-
-  void __set_postJobCommands(const std::vector<std::string> & val) {
-    postJobCommands = val;
-    __isset.postJobCommands = true;
-  }
-
-  bool operator == (const ApplicationDeploymentDescription & rhs) const
-  {
-    if (!(appDeploymentId == rhs.appDeploymentId))
-      return false;
-    if (!(appModuleId == rhs.appModuleId))
-      return false;
-    if (!(computeHostId == rhs.computeHostId))
-      return false;
-    if (!(executablePath == rhs.executablePath))
-      return false;
-    if (!(parallelism == rhs.parallelism))
-      return false;
-    if (__isset.appDeploymentDescription != 
rhs.__isset.appDeploymentDescription)
-      return false;
-    else if (__isset.appDeploymentDescription && !(appDeploymentDescription == 
rhs.appDeploymentDescription))
-      return false;
-    if (__isset.moduleLoadCmds != rhs.__isset.moduleLoadCmds)
-      return false;
-    else if (__isset.moduleLoadCmds && !(moduleLoadCmds == rhs.moduleLoadCmds))
-      return false;
-    if (__isset.libPrependPaths != rhs.__isset.libPrependPaths)
-      return false;
-    else if (__isset.libPrependPaths && !(libPrependPaths == 
rhs.libPrependPaths))
-      return false;
-    if (__isset.libAppendPaths != rhs.__isset.libAppendPaths)
-      return false;
-    else if (__isset.libAppendPaths && !(libAppendPaths == rhs.libAppendPaths))
-      return false;
-    if (__isset.setEnvironment != rhs.__isset.setEnvironment)
-      return false;
-    else if (__isset.setEnvironment && !(setEnvironment == rhs.setEnvironment))
-      return false;
-    if (__isset.preJobCommands != rhs.__isset.preJobCommands)
-      return false;
-    else if (__isset.preJobCommands && !(preJobCommands == rhs.preJobCommands))
-      return false;
-    if (__isset.postJobCommands != rhs.__isset.postJobCommands)
-      return false;
-    else if (__isset.postJobCommands && !(postJobCommands == 
rhs.postJobCommands))
-      return false;
-    return true;
-  }
-  bool operator != (const ApplicationDeploymentDescription &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const ApplicationDeploymentDescription & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-void swap(ApplicationDeploymentDescription &a, 
ApplicationDeploymentDescription &b);
-
-}}}}} // namespace
-
-#endif

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

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

http://git-wip-us.apache.org/repos/asf/airavata/blob/5881af94/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
deleted file mode 100644
index 1991bda..0000000
--- 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
+++ /dev/null
@@ -1,631 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-#include "applicationInterfaceModel_types.h"
-
-#include <algorithm>
-
-namespace apache { namespace airavata { namespace model { namespace appcatalog 
{ namespace appinterface {
-
-int _kDataTypeValues[] = {
-  DataType::STRING,
-  DataType::INTEGER,
-  DataType::FLOAT,
-  DataType::URI,
-  DataType::STDOUT,
-  DataType::STDERR
-};
-const char* _kDataTypeNames[] = {
-  "STRING",
-  "INTEGER",
-  "FLOAT",
-  "URI",
-  "STDOUT",
-  "STDERR"
-};
-const std::map<int, const char*> 
_DataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kDataTypeValues, 
_kDataTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-
-const char* InputDataObjectType::ascii_fingerprint = 
"22DB8CAA7C1FBBFDD0CA6E19790BA799";
-const uint8_t InputDataObjectType::binary_fingerprint[16] = 
{0x22,0xDB,0x8C,0xAA,0x7C,0x1F,0xBB,0xFD,0xD0,0xCA,0x6E,0x19,0x79,0x0B,0xA7,0x99};
-
-uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* 
iprot) {
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_name = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->name);
-          isset_name = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->value);
-          this->__isset.value = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast0;
-          xfer += iprot->readI32(ecast0);
-          this->type = (DataType::type)ecast0;
-          this->__isset.type = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->applicationArgument);
-          this->__isset.applicationArgument = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->standardInput);
-          this->__isset.standardInput = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->userFriendlyDescription);
-          this->__isset.userFriendlyDescription = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->metaData);
-          this->__isset.metaData = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->inputOrder);
-          this->__isset.inputOrder = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 9:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->isRequired);
-          this->__isset.isRequired = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 10:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->requiredToAddedToCommandLine);
-          this->__isset.requiredToAddedToCommandLine = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 11:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->dataStaged);
-          this->__isset.dataStaged = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_name)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t InputDataObjectType::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("InputDataObjectType");
-
-  xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 
1);
-  xfer += oprot->writeString(this->name);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.value) {
-    xfer += oprot->writeFieldBegin("value", 
::apache::thrift::protocol::T_STRING, 2);
-    xfer += oprot->writeString(this->value);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.type) {
-    xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 
3);
-    xfer += oprot->writeI32((int32_t)this->type);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.applicationArgument) {
-    xfer += oprot->writeFieldBegin("applicationArgument", 
::apache::thrift::protocol::T_STRING, 4);
-    xfer += oprot->writeString(this->applicationArgument);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.standardInput) {
-    xfer += oprot->writeFieldBegin("standardInput", 
::apache::thrift::protocol::T_BOOL, 5);
-    xfer += oprot->writeBool(this->standardInput);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.userFriendlyDescription) {
-    xfer += oprot->writeFieldBegin("userFriendlyDescription", 
::apache::thrift::protocol::T_STRING, 6);
-    xfer += oprot->writeString(this->userFriendlyDescription);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.metaData) {
-    xfer += oprot->writeFieldBegin("metaData", 
::apache::thrift::protocol::T_STRING, 7);
-    xfer += oprot->writeString(this->metaData);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.inputOrder) {
-    xfer += oprot->writeFieldBegin("inputOrder", 
::apache::thrift::protocol::T_I32, 8);
-    xfer += oprot->writeI32(this->inputOrder);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.isRequired) {
-    xfer += oprot->writeFieldBegin("isRequired", 
::apache::thrift::protocol::T_BOOL, 9);
-    xfer += oprot->writeBool(this->isRequired);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.requiredToAddedToCommandLine) {
-    xfer += oprot->writeFieldBegin("requiredToAddedToCommandLine", 
::apache::thrift::protocol::T_BOOL, 10);
-    xfer += oprot->writeBool(this->requiredToAddedToCommandLine);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.dataStaged) {
-    xfer += oprot->writeFieldBegin("dataStaged", 
::apache::thrift::protocol::T_BOOL, 11);
-    xfer += oprot->writeBool(this->dataStaged);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-void swap(InputDataObjectType &a, InputDataObjectType &b) {
-  using ::std::swap;
-  swap(a.name, b.name);
-  swap(a.value, b.value);
-  swap(a.type, b.type);
-  swap(a.applicationArgument, b.applicationArgument);
-  swap(a.standardInput, b.standardInput);
-  swap(a.userFriendlyDescription, b.userFriendlyDescription);
-  swap(a.metaData, b.metaData);
-  swap(a.inputOrder, b.inputOrder);
-  swap(a.isRequired, b.isRequired);
-  swap(a.requiredToAddedToCommandLine, b.requiredToAddedToCommandLine);
-  swap(a.dataStaged, b.dataStaged);
-  swap(a.__isset, b.__isset);
-}
-
-const char* OutputDataObjectType::ascii_fingerprint = 
"3259D81CA906AEEBC4D76ED47386A18B";
-const uint8_t OutputDataObjectType::binary_fingerprint[16] = 
{0x32,0x59,0xD8,0x1C,0xA9,0x06,0xAE,0xEB,0xC4,0xD7,0x6E,0xD4,0x73,0x86,0xA1,0x8B};
-
-uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* 
iprot) {
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_name = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->name);
-          isset_name = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->value);
-          this->__isset.value = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast1;
-          xfer += iprot->readI32(ecast1);
-          this->type = (DataType::type)ecast1;
-          this->__isset.type = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->applicationArgument);
-          this->__isset.applicationArgument = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->isRequired);
-          this->__isset.isRequired = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->requiredToAddedToCommandLine);
-          this->__isset.requiredToAddedToCommandLine = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->dataMovement);
-          this->__isset.dataMovement = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->location);
-          this->__isset.location = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 9:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->searchQuery);
-          this->__isset.searchQuery = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_name)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t OutputDataObjectType::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("OutputDataObjectType");
-
-  xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 
1);
-  xfer += oprot->writeString(this->name);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.value) {
-    xfer += oprot->writeFieldBegin("value", 
::apache::thrift::protocol::T_STRING, 2);
-    xfer += oprot->writeString(this->value);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.type) {
-    xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 
3);
-    xfer += oprot->writeI32((int32_t)this->type);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.applicationArgument) {
-    xfer += oprot->writeFieldBegin("applicationArgument", 
::apache::thrift::protocol::T_STRING, 4);
-    xfer += oprot->writeString(this->applicationArgument);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.isRequired) {
-    xfer += oprot->writeFieldBegin("isRequired", 
::apache::thrift::protocol::T_BOOL, 5);
-    xfer += oprot->writeBool(this->isRequired);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.requiredToAddedToCommandLine) {
-    xfer += oprot->writeFieldBegin("requiredToAddedToCommandLine", 
::apache::thrift::protocol::T_BOOL, 6);
-    xfer += oprot->writeBool(this->requiredToAddedToCommandLine);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.dataMovement) {
-    xfer += oprot->writeFieldBegin("dataMovement", 
::apache::thrift::protocol::T_BOOL, 7);
-    xfer += oprot->writeBool(this->dataMovement);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.location) {
-    xfer += oprot->writeFieldBegin("location", 
::apache::thrift::protocol::T_STRING, 8);
-    xfer += oprot->writeString(this->location);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.searchQuery) {
-    xfer += oprot->writeFieldBegin("searchQuery", 
::apache::thrift::protocol::T_STRING, 9);
-    xfer += oprot->writeString(this->searchQuery);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-void swap(OutputDataObjectType &a, OutputDataObjectType &b) {
-  using ::std::swap;
-  swap(a.name, b.name);
-  swap(a.value, b.value);
-  swap(a.type, b.type);
-  swap(a.applicationArgument, b.applicationArgument);
-  swap(a.isRequired, b.isRequired);
-  swap(a.requiredToAddedToCommandLine, b.requiredToAddedToCommandLine);
-  swap(a.dataMovement, b.dataMovement);
-  swap(a.location, b.location);
-  swap(a.searchQuery, b.searchQuery);
-  swap(a.__isset, b.__isset);
-}
-
-const char* ApplicationInterfaceDescription::ascii_fingerprint = 
"C21011258B830B950ECA4A73DCB61630";
-const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = 
{0xC2,0x10,0x11,0x25,0x8B,0x83,0x0B,0x95,0x0E,0xCA,0x4A,0x73,0xDC,0xB6,0x16,0x30};
-
-uint32_t 
ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProtocol* 
iprot) {
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_applicationInterfaceId = false;
-  bool isset_applicationName = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->applicationInterfaceId);
-          isset_applicationInterfaceId = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->applicationName);
-          isset_applicationName = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->applicationDescription);
-          this->__isset.applicationDescription = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->applicationModules.clear();
-            uint32_t _size2;
-            ::apache::thrift::protocol::TType _etype5;
-            xfer += iprot->readListBegin(_etype5, _size2);
-            this->applicationModules.resize(_size2);
-            uint32_t _i6;
-            for (_i6 = 0; _i6 < _size2; ++_i6)
-            {
-              xfer += iprot->readString(this->applicationModules[_i6]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.applicationModules = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->applicationInputs.clear();
-            uint32_t _size7;
-            ::apache::thrift::protocol::TType _etype10;
-            xfer += iprot->readListBegin(_etype10, _size7);
-            this->applicationInputs.resize(_size7);
-            uint32_t _i11;
-            for (_i11 = 0; _i11 < _size7; ++_i11)
-            {
-              xfer += this->applicationInputs[_i11].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.applicationInputs = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->applicationOutputs.clear();
-            uint32_t _size12;
-            ::apache::thrift::protocol::TType _etype15;
-            xfer += iprot->readListBegin(_etype15, _size12);
-            this->applicationOutputs.resize(_size12);
-            uint32_t _i16;
-            for (_i16 = 0; _i16 < _size12; ++_i16)
-            {
-              xfer += this->applicationOutputs[_i16].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.applicationOutputs = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_applicationInterfaceId)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_applicationName)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t 
ApplicationInterfaceDescription::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationInterfaceDescription");
-
-  xfer += oprot->writeFieldBegin("applicationInterfaceId", 
::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->applicationInterfaceId);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("applicationName", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->applicationName);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.applicationDescription) {
-    xfer += oprot->writeFieldBegin("applicationDescription", 
::apache::thrift::protocol::T_STRING, 3);
-    xfer += oprot->writeString(this->applicationDescription);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.applicationModules) {
-    xfer += oprot->writeFieldBegin("applicationModules", 
::apache::thrift::protocol::T_LIST, 4);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, 
static_cast<uint32_t>(this->applicationModules.size()));
-      std::vector<std::string> ::const_iterator _iter17;
-      for (_iter17 = this->applicationModules.begin(); _iter17 != 
this->applicationModules.end(); ++_iter17)
-      {
-        xfer += oprot->writeString((*_iter17));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.applicationInputs) {
-    xfer += oprot->writeFieldBegin("applicationInputs", 
::apache::thrift::protocol::T_LIST, 5);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, 
static_cast<uint32_t>(this->applicationInputs.size()));
-      std::vector<InputDataObjectType> ::const_iterator _iter18;
-      for (_iter18 = this->applicationInputs.begin(); _iter18 != 
this->applicationInputs.end(); ++_iter18)
-      {
-        xfer += (*_iter18).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.applicationOutputs) {
-    xfer += oprot->writeFieldBegin("applicationOutputs", 
::apache::thrift::protocol::T_LIST, 6);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, 
static_cast<uint32_t>(this->applicationOutputs.size()));
-      std::vector<OutputDataObjectType> ::const_iterator _iter19;
-      for (_iter19 = this->applicationOutputs.begin(); _iter19 != 
this->applicationOutputs.end(); ++_iter19)
-      {
-        xfer += (*_iter19).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-void swap(ApplicationInterfaceDescription &a, ApplicationInterfaceDescription 
&b) {
-  using ::std::swap;
-  swap(a.applicationInterfaceId, b.applicationInterfaceId);
-  swap(a.applicationName, b.applicationName);
-  swap(a.applicationDescription, b.applicationDescription);
-  swap(a.applicationModules, b.applicationModules);
-  swap(a.applicationInputs, b.applicationInputs);
-  swap(a.applicationOutputs, b.applicationOutputs);
-  swap(a.__isset, b.__isset);
-}
-
-}}}}} // namespace

Reply via email to