You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/06/29 00:46:04 UTC

[10/12] adding generated code for app-catalog

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebb254f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
index 3d0302d..a2e54f3 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
@@ -4310,7 +4310,7 @@ uint32_t ApplicationCatalogAPI_getApplicationInterface_presult::read(::apache::t
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_addApplicationDeployment_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_registerAppicationModule_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -4321,8 +4321,7 @@ uint32_t ApplicationCatalogAPI_addApplicationDeployment_args::read(::apache::thr
 
   using ::apache::thrift::protocol::TProtocolException;
 
-  bool isset_applicationInterfaceId = false;
-  bool isset_applicationDeployment = false;
+  bool isset_applicationModule = false;
 
   while (true)
   {
@@ -4333,17 +4332,17 @@ uint32_t ApplicationCatalogAPI_addApplicationDeployment_args::read(::apache::thr
     switch (fid)
     {
       case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->applicationInterfaceId);
-          isset_applicationInterfaceId = true;
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->applicationModule.read(iprot);
+          isset_applicationModule = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->applicationDeployment.read(iprot);
-          isset_applicationDeployment = true;
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->publish);
+          this->__isset.publish = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -4357,23 +4356,21 @@ uint32_t ApplicationCatalogAPI_addApplicationDeployment_args::read(::apache::thr
 
   xfer += iprot->readStructEnd();
 
-  if (!isset_applicationInterfaceId)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_applicationDeployment)
+  if (!isset_applicationModule)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_addApplicationDeployment_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_registerAppicationModule_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_addApplicationDeployment_args");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_registerAppicationModule_args");
 
-  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->applicationInterfaceId);
+  xfer += oprot->writeFieldBegin("applicationModule", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->applicationModule.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("applicationDeployment", ::apache::thrift::protocol::T_STRUCT, 2);
-  xfer += this->applicationDeployment.write(oprot);
+  xfer += oprot->writeFieldBegin("publish", ::apache::thrift::protocol::T_BOOL, 2);
+  xfer += oprot->writeBool(this->publish);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4381,16 +4378,16 @@ uint32_t ApplicationCatalogAPI_addApplicationDeployment_args::write(::apache::th
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_addApplicationDeployment_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_registerAppicationModule_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_addApplicationDeployment_pargs");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_registerAppicationModule_pargs");
 
-  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString((*(this->applicationInterfaceId)));
+  xfer += oprot->writeFieldBegin("applicationModule", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += (*(this->applicationModule)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("applicationDeployment", ::apache::thrift::protocol::T_STRUCT, 2);
-  xfer += (*(this->applicationDeployment)).write(oprot);
+  xfer += oprot->writeFieldBegin("publish", ::apache::thrift::protocol::T_BOOL, 2);
+  xfer += oprot->writeBool((*(this->publish)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4398,7 +4395,7 @@ uint32_t ApplicationCatalogAPI_addApplicationDeployment_pargs::write(::apache::t
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_addApplicationDeployment_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_registerAppicationModule_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -4462,11 +4459,11 @@ uint32_t ApplicationCatalogAPI_addApplicationDeployment_result::read(::apache::t
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_addApplicationDeployment_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_registerAppicationModule_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_addApplicationDeployment_result");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_registerAppicationModule_result");
 
   if (this->__isset.success) {
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
@@ -4490,7 +4487,7 @@ uint32_t ApplicationCatalogAPI_addApplicationDeployment_result::write(::apache::
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_addApplicationDeployment_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_registerAppicationModule_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -4554,7 +4551,7 @@ uint32_t ApplicationCatalogAPI_addApplicationDeployment_presult::read(::apache::
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_getAppicationModule_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -4565,7 +4562,7 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::read(::apache:
 
   using ::apache::thrift::protocol::TProtocolException;
 
-  bool isset_applicationInterfaceId = false;
+  bool isset_appModuleId = false;
 
   while (true)
   {
@@ -4577,8 +4574,8 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::read(::apache:
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->applicationInterfaceId);
-          isset_applicationInterfaceId = true;
+          xfer += iprot->readString(this->appModuleId);
+          isset_appModuleId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -4592,17 +4589,17 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::read(::apache:
 
   xfer += iprot->readStructEnd();
 
-  if (!isset_applicationInterfaceId)
+  if (!isset_appModuleId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_getAppicationModule_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_args");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getAppicationModule_args");
 
-  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->applicationInterfaceId);
+  xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->appModuleId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4610,12 +4607,12 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::write(::apache
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_getAppicationModule_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_pargs");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getAppicationModule_pargs");
 
-  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString((*(this->applicationInterfaceId)));
+  xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->appModuleId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4623,7 +4620,7 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_pargs::write(::apach
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_getAppicationModule_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -4644,20 +4641,8 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_result::read(::apach
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->success.clear();
-            uint32_t _size22;
-            ::apache::thrift::protocol::TType _etype25;
-            xfer += iprot->readListBegin(_etype25, _size22);
-            this->success.resize(_size22);
-            uint32_t _i26;
-            for (_i26 = 0; _i26 < _size22; ++_i26)
-            {
-              xfer += iprot->readString(this->success[_i26]);
-            }
-            xfer += iprot->readListEnd();
-          }
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->success.read(iprot);
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -4699,23 +4684,15 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_result::read(::apach
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_getAppicationModule_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_result");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getAppicationModule_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
-      std::vector<std::string> ::const_iterator _iter27;
-      for (_iter27 = this->success.begin(); _iter27 != this->success.end(); ++_iter27)
-      {
-        xfer += oprot->writeString((*_iter27));
-      }
-      xfer += oprot->writeListEnd();
-    }
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+    xfer += this->success.write(oprot);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -4735,7 +4712,7 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_result::write(::apac
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_getAppicationModule_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -4756,20 +4733,8 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_presult::read(::apac
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            (*(this->success)).clear();
-            uint32_t _size28;
-            ::apache::thrift::protocol::TType _etype31;
-            xfer += iprot->readListBegin(_etype31, _size28);
-            (*(this->success)).resize(_size28);
-            uint32_t _i32;
-            for (_i32 = 0; _i32 < _size28; ++_i32)
-            {
-              xfer += iprot->readString((*(this->success))[_i32]);
-            }
-            xfer += iprot->readListEnd();
-          }
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += (*(this->success)).read(iprot);
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -4811,7 +4776,7 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_presult::read(::apac
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_updateAppicationModule_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -4822,8 +4787,8 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
 
   using ::apache::thrift::protocol::TProtocolException;
 
-  bool isset_applicationInterfaceId = false;
-  bool isset_applicationDeploymentId = false;
+  bool isset_appModuleId = false;
+  bool isset_applicationModule = false;
 
   while (true)
   {
@@ -4835,16 +4800,16 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->applicationInterfaceId);
-          isset_applicationInterfaceId = true;
+          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->applicationDeploymentId);
-          isset_applicationDeploymentId = true;
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->applicationModule.read(iprot);
+          isset_applicationModule = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -4858,23 +4823,23 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
 
   xfer += iprot->readStructEnd();
 
-  if (!isset_applicationInterfaceId)
+  if (!isset_appModuleId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_applicationDeploymentId)
+  if (!isset_applicationModule)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_updateAppicationModule_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_args");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_updateAppicationModule_args");
 
-  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->applicationInterfaceId);
+  xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->appModuleId);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->applicationDeploymentId);
+  xfer += oprot->writeFieldBegin("applicationModule", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->applicationModule.write(oprot);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4882,16 +4847,16 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::write(::apache::th
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_getApplicationDeployment_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_updateAppicationModule_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_pargs");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_updateAppicationModule_pargs");
 
-  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString((*(this->applicationInterfaceId)));
+  xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->appModuleId)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->applicationDeploymentId)));
+  xfer += oprot->writeFieldBegin("applicationModule", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->applicationModule)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4899,7 +4864,7 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_pargs::write(::apache::t
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_getApplicationDeployment_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_updateAppicationModule_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -4920,8 +4885,8 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_result::read(::apache::t
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->success.read(iprot);
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->success);
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -4963,15 +4928,15 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_result::read(::apache::t
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_getApplicationDeployment_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t ApplicationCatalogAPI_updateAppicationModule_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_result");
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_updateAppicationModule_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
-    xfer += this->success.write(oprot);
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeBool(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -4991,7 +4956,7 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_result::write(::apache::
   return xfer;
 }
 
-uint32_t ApplicationCatalogAPI_getApplicationDeployment_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t ApplicationCatalogAPI_updateAppicationModule_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -5012,8 +4977,8 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_presult::read(::apache::
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += (*(this->success)).read(iprot);
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool((*(this->success)));
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -5055,109 +5020,1147 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_presult::read(::apache::
   return xfer;
 }
 
-void ApplicationCatalogAPIClient::GetAPIVersion(std::string& _return)
-{
-  send_GetAPIVersion();
-  recv_GetAPIVersion(_return);
-}
-
-void ApplicationCatalogAPIClient::send_GetAPIVersion()
-{
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("GetAPIVersion", ::apache::thrift::protocol::T_CALL, cseqid);
+uint32_t ApplicationCatalogAPI_deleteAppicationModule_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  ApplicationCatalogAPI_GetAPIVersion_pargs args;
-  args.write(oprot_);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->writeEnd();
-  oprot_->getTransport()->flush();
-}
+  xfer += iprot->readStructBegin(fname);
 
-void ApplicationCatalogAPIClient::recv_GetAPIVersion(std::string& _return)
-{
+  using ::apache::thrift::protocol::TProtocolException;
 
-  int32_t rseqid = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TMessageType mtype;
+  bool isset_appModuleId = false;
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
-    ::apache::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != ::apache::thrift::protocol::T_REPLY) {
-    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-  }
-  if (fname.compare("GetAPIVersion") != 0) {
-    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
+  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;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
   }
-  ApplicationCatalogAPI_GetAPIVersion_presult result;
-  result.success = &_return;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
 
-  if (result.__isset.success) {
-    // _return pointer has now been filled
-    return;
-  }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "GetAPIVersion failed: unknown result");
+  xfer += iprot->readStructEnd();
+
+  if (!isset_appModuleId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
 }
 
-void ApplicationCatalogAPIClient::addComputeResourceDescription(std::string& _return, const  ::ComputeResourceDescription& computeResourceDescription)
-{
-  send_addComputeResourceDescription(computeResourceDescription);
-  recv_addComputeResourceDescription(_return);
+uint32_t ApplicationCatalogAPI_deleteAppicationModule_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_deleteAppicationModule_args");
+
+  xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->appModuleId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
 }
 
-void ApplicationCatalogAPIClient::send_addComputeResourceDescription(const  ::ComputeResourceDescription& computeResourceDescription)
-{
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("addComputeResourceDescription", ::apache::thrift::protocol::T_CALL, cseqid);
+uint32_t ApplicationCatalogAPI_deleteAppicationModule_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_deleteAppicationModule_pargs");
 
-  ApplicationCatalogAPI_addComputeResourceDescription_pargs args;
-  args.computeResourceDescription = &computeResourceDescription;
-  args.write(oprot_);
+  xfer += oprot->writeFieldBegin("appModuleId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->appModuleId)));
+  xfer += oprot->writeFieldEnd();
 
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->writeEnd();
-  oprot_->getTransport()->flush();
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
 }
 
-void ApplicationCatalogAPIClient::recv_addComputeResourceDescription(std::string& _return)
-{
+uint32_t ApplicationCatalogAPI_deleteAppicationModule_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  int32_t rseqid = 0;
+  uint32_t xfer = 0;
   std::string fname;
-  ::apache::thrift::protocol::TMessageType mtype;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
 
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
-    ::apache::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != ::apache::thrift::protocol::T_REPLY) {
-    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-  }
-  if (fname.compare("addComputeResourceDescription") != 0) {
-    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ire.read(iprot);
+          this->__isset.ire = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ace.read(iprot);
+          this->__isset.ace = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ase.read(iprot);
+          this->__isset.ase = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_deleteAppicationModule_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_deleteAppicationModule_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeBool(this->success);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ire) {
+    xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ire.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ace) {
+    xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+    xfer += this->ace.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ase) {
+    xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->ase.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_deleteAppicationModule_presult::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;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ire.read(iprot);
+          this->__isset.ire = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ace.read(iprot);
+          this->__isset.ace = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ase.read(iprot);
+          this->__isset.ase = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_addApplicationDeployment_args::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_applicationDeployment = 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_STRUCT) {
+          xfer += this->applicationDeployment.read(iprot);
+          isset_applicationDeployment = 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_applicationDeployment)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_addApplicationDeployment_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_addApplicationDeployment_args");
+
+  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->applicationInterfaceId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("applicationDeployment", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->applicationDeployment.write(oprot);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_addApplicationDeployment_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_addApplicationDeployment_pargs");
+
+  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->applicationInterfaceId)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("applicationDeployment", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->applicationDeployment)).write(oprot);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_addApplicationDeployment_result::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;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ire.read(iprot);
+          this->__isset.ire = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ace.read(iprot);
+          this->__isset.ace = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ase.read(iprot);
+          this->__isset.ase = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_addApplicationDeployment_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_addApplicationDeployment_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+    xfer += oprot->writeString(this->success);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ire) {
+    xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ire.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ace) {
+    xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+    xfer += this->ace.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ase) {
+    xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->ase.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_addApplicationDeployment_presult::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;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ire.read(iprot);
+          this->__isset.ire = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ace.read(iprot);
+          this->__isset.ace = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ase.read(iprot);
+          this->__isset.ase = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::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;
+
+  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;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_applicationInterfaceId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_args");
+
+  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->applicationInterfaceId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_pargs");
+
+  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->applicationInterfaceId)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_result::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;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->success.clear();
+            uint32_t _size22;
+            ::apache::thrift::protocol::TType _etype25;
+            xfer += iprot->readListBegin(_etype25, _size22);
+            this->success.resize(_size22);
+            uint32_t _i26;
+            for (_i26 = 0; _i26 < _size22; ++_i26)
+            {
+              xfer += iprot->readString(this->success[_i26]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ire.read(iprot);
+          this->__isset.ire = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ace.read(iprot);
+          this->__isset.ace = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ase.read(iprot);
+          this->__isset.ase = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
+      std::vector<std::string> ::const_iterator _iter27;
+      for (_iter27 = this->success.begin(); _iter27 != this->success.end(); ++_iter27)
+      {
+        xfer += oprot->writeString((*_iter27));
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ire) {
+    xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ire.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ace) {
+    xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+    xfer += this->ace.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ase) {
+    xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->ase.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_presult::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;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            (*(this->success)).clear();
+            uint32_t _size28;
+            ::apache::thrift::protocol::TType _etype31;
+            xfer += iprot->readListBegin(_etype31, _size28);
+            (*(this->success)).resize(_size28);
+            uint32_t _i32;
+            for (_i32 = 0; _i32 < _size28; ++_i32)
+            {
+              xfer += iprot->readString((*(this->success))[_i32]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ire.read(iprot);
+          this->__isset.ire = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ace.read(iprot);
+          this->__isset.ace = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ase.read(iprot);
+          this->__isset.ase = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::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_applicationDeploymentId = 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->applicationDeploymentId);
+          isset_applicationDeploymentId = 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_applicationDeploymentId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_args");
+
+  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->applicationInterfaceId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->applicationDeploymentId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_getApplicationDeployment_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_pargs");
+
+  xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->applicationInterfaceId)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->applicationDeploymentId)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_getApplicationDeployment_result::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;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->success.read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ire.read(iprot);
+          this->__isset.ire = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ace.read(iprot);
+          this->__isset.ace = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ase.read(iprot);
+          this->__isset.ase = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_getApplicationDeployment_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+  uint32_t xfer = 0;
+
+  xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_result");
+
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+    xfer += this->success.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ire) {
+    xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ire.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ace) {
+    xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+    xfer += this->ace.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ase) {
+    xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->ase.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+uint32_t ApplicationCatalogAPI_getApplicationDeployment_presult::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;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += (*(this->success)).read(iprot);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ire.read(iprot);
+          this->__isset.ire = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ace.read(iprot);
+          this->__isset.ace = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ase.read(iprot);
+          this->__isset.ase = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+void ApplicationCatalogAPIClient::GetAPIVersion(std::string& _return)
+{
+  send_GetAPIVersion();
+  recv_GetAPIVersion(_return);
+}
+
+void ApplicationCatalogAPIClient::send_GetAPIVersion()
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("GetAPIVersion", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ApplicationCatalogAPI_GetAPIVersion_pargs args;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ApplicationCatalogAPIClient::recv_GetAPIVersion(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("GetAPIVersion") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ApplicationCatalogAPI_GetAPIVersion_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "GetAPIVersion failed: unknown result");
+}
+
+void ApplicationCatalogAPIClient::addComputeResourceDescription(std::string& _return, const  ::ComputeResourceDescription& computeResourceDescription)
+{
+  send_addComputeResourceDescription(computeResourceDescription);
+  recv_addComputeResourceDescription(_return);
+}
+
+void ApplicationCatalogAPIClient::send_addComputeResourceDescription(const  ::ComputeResourceDescription& computeResourceDescription)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("addComputeResourceDescription", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ApplicationCatalogAPI_addComputeResourceDescription_pargs args;
+  args.computeResourceDescription = &computeResourceDescription;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ApplicationCatalogAPIClient::recv_addComputeResourceDescription(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("addComputeResourceDescription") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ApplicationCatalogAPI_addComputeResourceDescription_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ire) {
+    throw result.ire;
+  }
+  if (result.__isset.ace) {
+    throw result.ace;
+  }
+  if (result.__isset.ase) {
+    throw result.ase;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addComputeResourceDescription failed: unknown result");
+}
+
+void ApplicationCatalogAPIClient::addSSHJobSubmissionProtocol(std::string& _return, const std::string& computeResourceId, const  ::SSHJobSubmission& jobSubmission)
+{
+  send_addSSHJobSubmissionProtocol(computeResourceId, jobSubmission);
+  recv_addSSHJobSubmissionProtocol(_return);
+}
+
+void ApplicationCatalogAPIClient::send_addSSHJobSubmissionProtocol(const std::string& computeResourceId, const  ::SSHJobSubmission& jobSubmission)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("addSSHJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ApplicationCatalogAPI_addSSHJobSubmissionProtocol_pargs args;
+  args.computeResourceId = &computeResourceId;
+  args.jobSubmission = &jobSubmission;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ApplicationCatalogAPIClient::recv_addSSHJobSubmissionProtocol(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  ApplicationCatalogAPI_addComputeResourceDescription_presult result;
+  if (fname.compare("addSSHJobSubmissionProtocol") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ApplicationCatalogAPI_addSSHJobSubmissionProtocol_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -5176,21 +6179,21 @@ void ApplicationCatalogAPIClient::recv_addComputeResourceDescription(std::string
   if (result.__isset.ase) {
     throw result.ase;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addComputeResourceDescription failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addSSHJobSubmissionProtocol failed: unknown result");
 }
 
-void ApplicationCatalogAPIClient::addSSHJobSubmissionProtocol(std::string& _return, const std::string& computeResourceId, const  ::SSHJobSubmission& jobSubmission)
+void ApplicationCatalogAPIClient::addGSISSHJobSubmissionProtocol(std::string& _return, const std::string& computeResourceId, const  ::GSISSHJobSubmission& jobSubmission)
 {
-  send_addSSHJobSubmissionProtocol(computeResourceId, jobSubmission);
-  recv_addSSHJobSubmissionProtocol(_return);
+  send_addGSISSHJobSubmissionProtocol(computeResourceId, jobSubmission);
+  recv_addGSISSHJobSubmissionProtocol(_return);
 }
 
-void ApplicationCatalogAPIClient::send_addSSHJobSubmissionProtocol(const std::string& computeResourceId, const  ::SSHJobSubmission& jobSubmission)
+void ApplicationCatalogAPIClient::send_addGSISSHJobSubmissionProtocol(const std::string& computeResourceId, const  ::GSISSHJobSubmission& jobSubmission)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("addSSHJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("addGSISSHJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ApplicationCatalogAPI_addSSHJobSubmissionProtocol_pargs args;
+  ApplicationCatalogAPI_addGSISSHJobSubmissionProtocol_pargs args;
   args.computeResourceId = &computeResourceId;
   args.jobSubmission = &jobSubmission;
   args.write(oprot_);
@@ -5200,7 +6203,7 @@ void ApplicationCatalogAPIClient::send_addSSHJobSubmissionProtocol(const std::st
   oprot_->getTransport()->flush();
 }
 
-void ApplicationCatalogAPIClient::recv_addSSHJobSubmissionProtocol(std::string& _return)
+void ApplicationCatalogAPIClient::recv_addGSISSHJobSubmissionProtocol(std::string& _return)
 {
 
   int32_t rseqid = 0;
@@ -5220,12 +6223,12 @@ void ApplicationCatalogAPIClient::recv_addSSHJobSubmissionProtocol(std::string&
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("addSSHJobSubmissionProtocol") != 0) {
+  if (fname.compare("addGSISSHJobSubmissionProtocol") != 0) {
     iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  ApplicationCatalogAPI_addSSHJobSubmissionProtocol_presult result;
+  ApplicationCatalogAPI_addGSISSHJobSubmissionProtocol_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -5244,23 +6247,225 @@ void ApplicationCatalogAPIClient::recv_addSSHJobSubmissionProtocol(std::string&
   if (result.__isset.ase) {
     throw result.ase;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addSSHJobSubmissionProtocol failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGSISSHJobSubmissionProtocol failed: unknown result");
 }
 
-void ApplicationCatalogAPIClient::addGSISSHJobSubmissionProtocol(std::string& _return, const std::string& computeResourceId, const  ::GSISSHJobSubmission& jobSubmission)
+void ApplicationCatalogAPIClient::addGlobusJobSubmissionProtocol(std::string& _return, const std::string& computeResourceId, const  ::GlobusJobSubmission& jobSubmission)
+{
+  send_addGlobusJobSubmissionProtocol(computeResourceId, jobSubmission);
+  recv_addGlobusJobSubmissionProtocol(_return);
+}
+
+void ApplicationCatalogAPIClient::send_addGlobusJobSubmissionProtocol(const std::string& computeResourceId, const  ::GlobusJobSubmission& jobSubmission)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("addGlobusJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ApplicationCatalogAPI_addGlobusJobSubmissionProtocol_pargs args;
+  args.computeResourceId = &computeResourceId;
+  args.jobSubmission = &jobSubmission;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ApplicationCatalogAPIClient::recv_addGlobusJobSubmissionProtocol(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("addGlobusJobSubmissionProtocol") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ApplicationCatalogAPI_addGlobusJobSubmissionProtocol_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ire) {
+    throw result.ire;
+  }
+  if (result.__isset.ace) {
+    throw result.ace;
+  }
+  if (result.__isset.ase) {
+    throw result.ase;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGlobusJobSubmissionProtocol failed: unknown result");
+}
+
+void ApplicationCatalogAPIClient::addSCPDataMovementProtocol(std::string& _return, const std::string& computeResourceId, const  ::SCPDataMovement& dataMovement)
+{
+  send_addSCPDataMovementProtocol(computeResourceId, dataMovement);
+  recv_addSCPDataMovementProtocol(_return);
+}
+
+void ApplicationCatalogAPIClient::send_addSCPDataMovementProtocol(const std::string& computeResourceId, const  ::SCPDataMovement& dataMovement)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("addSCPDataMovementProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ApplicationCatalogAPI_addSCPDataMovementProtocol_pargs args;
+  args.computeResourceId = &computeResourceId;
+  args.dataMovement = &dataMovement;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ApplicationCatalogAPIClient::recv_addSCPDataMovementProtocol(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("addSCPDataMovementProtocol") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ApplicationCatalogAPI_addSCPDataMovementProtocol_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ire) {
+    throw result.ire;
+  }
+  if (result.__isset.ace) {
+    throw result.ace;
+  }
+  if (result.__isset.ase) {
+    throw result.ase;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addSCPDataMovementProtocol failed: unknown result");
+}
+
+void ApplicationCatalogAPIClient::addGridFTPDataMovementProtocol(std::string& _return, const std::string& computeResourceId, const  ::GridFTPDataMovement& dataMovement)
+{
+  send_addGridFTPDataMovementProtocol(computeResourceId, dataMovement);
+  recv_addGridFTPDataMovementProtocol(_return);
+}
+
+void ApplicationCatalogAPIClient::send_addGridFTPDataMovementProtocol(const std::string& computeResourceId, const  ::GridFTPDataMovement& dataMovement)
+{
+  int32_t cseqid = 0;
+  oprot_->writeMessageBegin("addGridFTPDataMovementProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+
+  ApplicationCatalogAPI_addGridFTPDataMovementProtocol_pargs args;
+  args.computeResourceId = &computeResourceId;
+  args.dataMovement = &dataMovement;
+  args.write(oprot_);
+
+  oprot_->writeMessageEnd();
+  oprot_->getTransport()->writeEnd();
+  oprot_->getTransport()->flush();
+}
+
+void ApplicationCatalogAPIClient::recv_addGridFTPDataMovementProtocol(std::string& _return)
+{
+
+  int32_t rseqid = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TMessageType mtype;
+
+  iprot_->readMessageBegin(fname, mtype, rseqid);
+  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+    ::apache::thrift::TApplicationException x;
+    x.read(iprot_);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+    throw x;
+  }
+  if (mtype != ::apache::thrift::protocol::T_REPLY) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  if (fname.compare("addGridFTPDataMovementProtocol") != 0) {
+    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+    iprot_->readMessageEnd();
+    iprot_->getTransport()->readEnd();
+  }
+  ApplicationCatalogAPI_addGridFTPDataMovementProtocol_presult result;
+  result.success = &_return;
+  result.read(iprot_);
+  iprot_->readMessageEnd();
+  iprot_->getTransport()->readEnd();
+
+  if (result.__isset.success) {
+    // _return pointer has now been filled
+    return;
+  }
+  if (result.__isset.ire) {
+    throw result.ire;
+  }
+  if (result.__isset.ace) {
+    throw result.ace;
+  }
+  if (result.__isset.ase) {
+    throw result.ase;
+  }
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGridFTPDataMovementProtocol failed: unknown result");
+}
+
+void ApplicationCatalogAPIClient::listComputeResourceDescriptions(std::vector<std::string> & _return)
 {
-  send_addGSISSHJobSubmissionProtocol(computeResourceId, jobSubmission);
-  recv_addGSISSHJobSubmissionProtocol(_return);
+  send_listComputeResourceDescriptions();
+  recv_listComputeResourceDescriptions(_return);
 }
 
-void ApplicationCatalogAPIClient::send_addGSISSHJobSubmissionProtocol(const std::string& computeResourceId, const  ::GSISSHJobSubmission& jobSubmission)
+void ApplicationCatalogAPIClient::send_listComputeResourceDescriptions()
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("addGSISSHJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("listComputeResourceDescriptions", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ApplicationCatalogAPI_addGSISSHJobSubmissionProtocol_pargs args;
-  args.computeResourceId = &computeResourceId;
-  args.jobSubmission = &jobSubmission;
+  ApplicationCatalogAPI_listComputeResourceDescriptions_pargs args;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -5268,7 +6473,7 @@ void ApplicationCatalogAPIClient::send_addGSISSHJobSubmissionProtocol(const std:
   oprot_->getTransport()->flush();
 }
 
-void ApplicationCatalogAPIClient::recv_addGSISSHJobSubmissionProtocol(std::string& _return)
+void ApplicationCatalogAPIClient::recv_listComputeResourceDescriptions(std::vector<std::string> & _return)
 {
 
   int32_t rseqid = 0;
@@ -5288,12 +6493,12 @@ void ApplicationCatalogAPIClient::recv_addGSISSHJobSubmissionProtocol(std::strin
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("addGSISSHJobSubmissionProtocol") != 0) {
+  if (fname.compare("listComputeResourceDescriptions") != 0) {
     iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  ApplicationCatalogAPI_addGSISSHJobSubmissionProtocol_presult result;
+  ApplicationCatalogAPI_listComputeResourceDescriptions_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -5312,23 +6517,22 @@ void ApplicationCatalogAPIClient::recv_addGSISSHJobSubmissionProtocol(std::strin
   if (result.__isset.ase) {
     throw result.ase;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGSISSHJobSubmissionProtocol failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "listComputeResourceDescriptions failed: unknown result");
 }
 
-void ApplicationCatalogAPIClient::addGlobusJobSubmissionProtocol(std::string& _return, const std::string& computeResourceId, const  ::GlobusJobSubmission& jobSubmission)
+void ApplicationCatalogAPIClient::getComputeResourceDescription( ::ComputeResourceDescription& _return, const std::string& computeResourceId)
 {
-  send_addGlobusJobSubmissionProtocol(computeResourceId, jobSubmission);
-  recv_addGlobusJobSubmissionProtocol(_return);
+  send_getComputeResourceDescription(computeResourceId);
+  recv_getComputeResourceDescription(_return);
 }
 
-void ApplicationCatalogAPIClient::send_addGlobusJobSubmissionProtocol(const std::string& computeResourceId, const  ::GlobusJobSubmission& jobSubmission)
+void ApplicationCatalogAPIClient::send_getComputeResourceDescription(const std::string& computeResourceId)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("addGlobusJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("getComputeResourceDescription", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ApplicationCatalogAPI_addGlobusJobSubmissionProtocol_pargs args;
+  ApplicationCatalogAPI_getComputeResourceDescription_pargs args;
   args.computeResourceId = &computeResourceId;
-  args.jobSubmission = &jobSubmission;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -5336,7 +6540,7 @@ void ApplicationCatalogAPIClient::send_addGlobusJobSubmissionProtocol(const std:
   oprot_->getTransport()->flush();
 }
 
-void ApplicationCatalogAPIClient::recv_addGlobusJobSubmissionProtocol(std::string& _return)
+void ApplicationCatalogAPIClient::recv_getComputeResourceDescription( ::ComputeResourceDescription& _return)
 {
 
   int32_t rseqid = 0;
@@ -5356,12 +6560,12 @@ void ApplicationCatalogAPIClient::recv_addGlobusJobSubmissionProtocol(std::strin
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("addGlobusJobSubmissionProtocol") != 0) {
+  if (fname.compare("getComputeResourceDescription") != 0) {
     iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  ApplicationCatalogAPI_addGlobusJobSubmissionProtocol_presult result;
+  ApplicationCatalogAPI_getComputeResourceDescription_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -5380,23 +6584,22 @@ void ApplicationCatalogAPIClient::recv_addGlobusJobSubmissionProtocol(std::strin
   if (result.__isset.ase) {
     throw result.ase;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGlobusJobSubmissionProtocol failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getComputeResourceDescription failed: unknown result");
 }
 
-void ApplicationCatalogAPIClient::addSCPDataMovementProtocol(std::string& _return, const std::string& computeResourceId, const  ::SCPDataMovement& dataMovement)
+void ApplicationCatalogAPIClient::getSSHJobSubmissionProtocol( ::SSHJobSubmission& _return, const std::string& sshJobSubmissionProtocolResourceId)
 {
-  send_addSCPDataMovementProtocol(computeResourceId, dataMovement);
-  recv_addSCPDataMovementProtocol(_return);
+  send_getSSHJobSubmissionProtocol(sshJobSubmissionProtocolResourceId);
+  recv_getSSHJobSubmissionProtocol(_return);
 }
 
-void ApplicationCatalogAPIClient::send_addSCPDataMovementProtocol(const std::string& computeResourceId, const  ::SCPDataMovement& dataMovement)
+void ApplicationCatalogAPIClient::send_getSSHJobSubmissionProtocol(const std::string& sshJobSubmissionProtocolResourceId)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("addSCPDataMovementProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("getSSHJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ApplicationCatalogAPI_addSCPDataMovementProtocol_pargs args;
-  args.computeResourceId = &computeResourceId;
-  args.dataMovement = &dataMovement;
+  ApplicationCatalogAPI_getSSHJobSubmissionProtocol_pargs args;
+  args.sshJobSubmissionProtocolResourceId = &sshJobSubmissionProtocolResourceId;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -5404,7 +6607,7 @@ void ApplicationCatalogAPIClient::send_addSCPDataMovementProtocol(const std::str
   oprot_->getTransport()->flush();
 }
 
-void ApplicationCatalogAPIClient::recv_addSCPDataMovementProtocol(std::string& _return)
+void ApplicationCatalogAPIClient::recv_getSSHJobSubmissionProtocol( ::SSHJobSubmission& _return)
 {
 
   int32_t rseqid = 0;
@@ -5424,12 +6627,12 @@ void ApplicationCatalogAPIClient::recv_addSCPDataMovementProtocol(std::string& _
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("addSCPDataMovementProtocol") != 0) {
+  if (fname.compare("getSSHJobSubmissionProtocol") != 0) {
     iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  ApplicationCatalogAPI_addSCPDataMovementProtocol_presult result;
+  ApplicationCatalogAPI_getSSHJobSubmissionProtocol_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -5448,23 +6651,22 @@ void ApplicationCatalogAPIClient::recv_addSCPDataMovementProtocol(std::string& _
   if (result.__isset.ase) {
     throw result.ase;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addSCPDataMovementProtocol failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getSSHJobSubmissionProtocol failed: unknown result");
 }
 
-void ApplicationCatalogAPIClient::addGridFTPDataMovementProtocol(std::string& _return, const std::string& computeResourceId, const  ::GridFTPDataMovement& dataMovement)
+void ApplicationCatalogAPIClient::getGSISSHJobSubmissionProtocol( ::GSISSHJobSubmission& _return, const std::string& gsisshJobSubmissionProtocolResourceId)
 {
-  send_addGridFTPDataMovementProtocol(computeResourceId, dataMovement);
-  recv_addGridFTPDataMovementProtocol(_return);
+  send_getGSISSHJobSubmissionProtocol(gsisshJobSubmissionProtocolResourceId);
+  recv_getGSISSHJobSubmissionProtocol(_return);
 }
 
-void ApplicationCatalogAPIClient::send_addGridFTPDataMovementProtocol(const std::string& computeResourceId, const  ::GridFTPDataMovement& dataMovement)
+void ApplicationCatalogAPIClient::send_getGSISSHJobSubmissionProtocol(const std::string& gsisshJobSubmissionProtocolResourceId)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("addGridFTPDataMovementProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("getGSISSHJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ApplicationCatalogAPI_addGridFTPDataMovementProtocol_pargs args;
-  args.computeResourceId = &computeResourceId;
-  args.dataMovement = &dataMovement;
+  ApplicationCatalogAPI_getGSISSHJobSubmissionProtocol_pargs args;
+  args.gsisshJobSubmissionProtocolResourceId = &gsisshJobSubmissionProtocolResourceId;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -5472,7 +6674,7 @@ void ApplicationCatalogAPIClient::send_addGridFTPDataMovementProtocol(const std:
   oprot_->getTransport()->flush();
 }
 
-void ApplicationCatalogAPIClient::recv_addGridFTPDataMovementProtocol(std::string& _return)
+void ApplicationCatalogAPIClient::recv_getGSISSHJobSubmissionProtocol( ::GSISSHJobSubmission& _return)
 {
 
   int32_t rseqid = 0;
@@ -5492,12 +6694,12 @@ void ApplicationCatalogAPIClient::recv_addGridFTPDataMovementProtocol(std::strin
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("addGridFTPDataMovementProtocol") != 0) {
+  if (fname.compare("getGSISSHJobSubmissionProtocol") != 0) {
     iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  ApplicationCatalogAPI_addGridFTPDataMovementProtocol_presult result;
+  ApplicationCatalogAPI_getGSISSHJobSubmissionProtocol_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -5516,21 +6718,22 @@ void ApplicationCatalogAPIClient::recv_addGridFTPDataMovementProtocol(std::strin
   if (result.__isset.ase) {
     throw result.ase;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGridFTPDataMovementProtocol failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getGSISSHJobSubmissionProtocol failed: unknown result");
 }
 
-void ApplicationCatalogAPIClient::listComputeResourceDescriptions(std::vector<std::string> & _return)
+void ApplicationCatalogAPIClient::getGlobusJobSubmissionProtocol( ::GlobusJobSubmission& _return, const std::string& globusJobSubmissionProtocolResourceId)
 {
-  send_listComputeResourceDescriptions();
-  recv_listComputeResourceDescriptions(_return);
+  send_getGlobusJobSubmissionProtocol(globusJobSubmissionProtocolResourceId);
+  recv_getGlobusJobSubmissionProtocol(_return);
 }
 
-void ApplicationCatalogAPIClient::send_listComputeResourceDescriptions()
+void ApplicationCatalogAPIClient::send_getGlobusJobSubmissionProtocol(const std::string& globusJobSubmissionProtocolResourceId)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("listComputeResourceDescriptions", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("getGlobusJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ApplicationCatalogAPI_listComputeResourceDescriptions_pargs args;
+  ApplicationCatalogAPI_getGlobusJobSubmissionProtocol_pargs args;
+  args.globusJobSubmissionProtocolResourceId = &globusJobSubmissionProtocolResourceId;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -5538,7 +6741,7 @@ void ApplicationCatalogAPIClient::send_listComputeResourceDescriptions()
   oprot_->getTransport()->flush();
 }
 
-void ApplicationCatalogAPIClient::recv_listComputeResourceDescriptions(std::vector<std::string> & _return)
+void ApplicationCatalogAPIClient::recv_getGlobusJobSubmissionProtocol( ::GlobusJobSubmission& _return)
 {
 
   int32_t rseqid = 0;
@@ -5558,12 +6761,12 @@ void ApplicationCatalogAPIClient::recv_listComputeResourceDescriptions(std::vect
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("listComputeResourceDescriptions") != 0) {
+  if (fname.compare("getGlobusJobSubmissionProtocol") != 0) {
     iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  ApplicationCatalogAPI_listComputeResourceDescriptions_presult result;
+  ApplicationCatalogAPI_getGlobusJobSubmissionProtocol_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -5582,22 +6785,22 @@ void ApplicationCatalogAPIClient::recv_listComputeResourceDescriptions(std::vect
   if (result.__isset.ase) {
     throw result.ase;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "listComputeResourceDescriptions failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getGlobusJobSubmissionProtocol failed: unknown result");
 }
 
-void ApplicationCatalogAPIClient::getComputeResourceDescription( ::ComputeResourceDescription& _return, const std::string& computeResourceId)
+void ApplicationCatalogAPIClient::getSCPDataMovementProtocol( ::SCPDataMovement& _return, const std::string& scpDataMovementResourceId)
 {
-  send_getComputeResourceDescription(computeResourceId);
-  recv_getComputeResourceDescription(_return);
+  send_getSCPDataMovementProtocol(scpDataMovementResourceId);
+  recv_getSCPDataMovementProtocol(_return);
 }
 
-void ApplicationCatalogAPIClient::send_getComputeResourceDescription(const std::string& computeResourceId)
+void ApplicationCatalogAPIClient::send_getSCPDataMovementProtocol(const std::string& scpDataMovementResourceId)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("getComputeResourceDescription", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("getSCPDataMovementProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ApplicationCatalogAPI_getComputeResourceDescription_pargs args;
-  args.computeResourceId = &computeResourceId;
+  ApplicationCatalogAPI_getSCPDataMovementProtocol_pargs args;
+  args.scpDataMovementResourceId = &scpDataMovementResourceId;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -5605,7 +6808,7 @@ void ApplicationCatalogAPIClient::send_getComputeResourceDescription(const std::
   oprot_->getTransport()->flush();
 }
 
-void ApplicationCatalogAPIClient::recv_getComputeResourceDescription( ::ComputeResourceDescription& _return)
+void ApplicationCatalogAPIClient::recv_getSCPDataMovementProtocol( ::SCPDataMovement& _return)
 {
 
   int32_t rseqid = 0;
@@ -5625,12 +6828,12 @@ void ApplicationCatalogAPIClient::recv_getComputeResourceDescription( ::ComputeR
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("getComputeResourceDescription") != 0) {
+  if (fname.compare("getSCPDataMovementProtocol") != 0) {
     iprot_->skip(::apache::thrift::protocol::T_STRUCT);
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  ApplicationCatalogAPI_getComputeResourceDescription_presult result;
+  ApplicationCatalogAPI_getSCPDataMovementProtocol_presult result;
   result.success = &_return;
   result.read(iprot_);
   iprot_->readMessageEnd();
@@ -5649,22 +6852,22 @@ void ApplicationCatalogAPIClient::recv_getComputeResourceDescription( ::ComputeR
   if (result.__isset.ase) {
     throw result.ase;
   }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getComputeResourceDescription failed: unknown result");
+  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getSCPDataMovementProtocol failed: unknown result");
 }
 
-void ApplicationCatalogAPIClient::getSSHJobSubmissionProtocol( ::SSHJobSubmission& _return, const std::string& sshJobSubmissionProtocolResourceId)
+void ApplicationCatalogAPIClient::getGridFTPDataMovementProtocol( ::GridFTPDataMovement& _return, const std::string& gridFTPDataMovementResourceId)
 {
-  send_getSSHJobSubmissionProtocol(sshJobSubmissionProtocolResourceId);
-  recv_getSSHJobSubmissionProtocol(_return);
+  send_getGridFTPDataMovementProtocol(gridFTPDataMovementResourceId);
+  recv_getGridFTPDataMovementProtocol(_return);
 }
 
-void ApplicationCatalogAPIClient::send_getSSHJobSubmissionProtocol(const std::string& sshJobSubmissionProtocolResourceId)
+void ApplicationCatalogAPIClient::send_getGridFTPDataMovementProtocol(const std::string& gridFTPDataMovementResourceId)
 {
   int32_t cseqid = 0;
-  oprot_->writeMessageBegin("getSSHJobSubmissionProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
+  oprot_->writeMessageBegin("getGridFTPDataMovementProtocol", ::apache::thrift::protocol::T_CALL, cseqid);
 
-  ApplicationCatalogAPI_getSSHJobSubmissionProtocol_pargs args;
-  args.sshJobSubmissionProtocolResourceId = &sshJobSubmissionProtocolResourceId;
+  ApplicationCatalogAPI_getGridFTPDataMovementProtocol_pargs args;
+  args.gridFTPDataMovementResourceId = &gridFTPDataMovementResourceId;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -5672,7 +6875,7 @@ void ApplicationCatalogAPIClient::send_getSSHJobSubmissionProtocol(const std::st
   oprot_->getTransport()->flush();
 }
 
-void ApplicationCatalogAPIClient::recv_getSSHJobSubmissionProtocol( ::SSHJobSubmission& _return)
+void ApplicationCatalogAPIClient::recv_getGridFTPDataMovementProtocol( ::GridFTPDataMovement& _return)
 {
 
   int32_t rseqid = 0;
@@ -5692,12 +6895,12 @@ void ApplicationCatalogAPIClient::recv_getSSHJobSubmissionProtocol( ::SSHJobSubm
     iprot_->readMessageEnd();
     iprot_->getTransport()->readEnd();
   }
-  if (fname.compare("getSSHJobSubmissionProtocol") != 0) {
+  if (fna

<TRUNCATED>