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

[1/6] Updating ComputeResource Namespace to align with application descrrptions - AIRAVATA-1203

Repository: airavata
Updated Branches:
  refs/heads/master 1ae4201d1 -> 169e6f9d1


http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
new file mode 100644
index 0000000..7c5c970
--- /dev/null
+++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
@@ -0,0 +1,180 @@
+/*
+ * 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.
+ *
+ */
+
+namespace java org.apache.airavata.model.appcatalog.computeresource
+namespace php Airavata.Model.AppCatalog.ComputeResource
+
+const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
+
+/**
+ * Enumeration of local resource job managers supported by Airavata
+ *
+ * FORK:
+ *  Forking of commands without any job manager
+ *
+ * PBS:
+ *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
+ *
+ * UGE:
+ *  Univa Grid Engine, a variation of PBS implementation.
+ *
+ * SLURM:
+ *  The Simple Linux Utility for Resource Management is a open source workload manager.
+ *
+*/
+enum ResourceJobManager {
+    FORK,
+    PBS,
+    UGE,
+    SLURM
+}
+
+/**
+ * Enumeration of Airavata supported Job Submission Mechanisms for High Perforamance Computing Clusters.
+ *
+ * SSH:
+ *  Execute remote job submission commands using via secure shell protocol.
+ *
+ * GRAM:
+ *  Execute remote jobs via Globus GRAM service.
+ *
+ * UNICORE:
+ *  Execute remote jobs via Unicore services
+ *
+*/
+enum JobSubmissionProtocol {
+    SSH,
+    GSISSH,
+    GRAM,
+    UNICORE
+}
+
+/**
+ * Enumeration of data movement supported by Airavata
+ *
+ * SCP:
+ *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
+ *
+ * SFTP:
+ *  The Simple Linux Utility for Resource Management is a open source workload manager.
+ *
+ * GridFTP:
+ *  Globus File Transfer Protocol
+ *
+ * UNICORE_STORAGE_SERVICE:
+ *  Storage Service Provided by Unicore
+ *
+*/
+enum DataMovementProtocol {
+    SCP,
+    SFTP,
+    GridFTP,
+    UNICORE_STORAGE_SERVICE
+}
+
+/**
+ * Enumeration of security authentication and authorization mechanisms supported by Airavata. This enumeration just
+ *  describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential
+ *  store.
+ *
+ * USERNAME_PASSWORD:
+ *  A User Name.
+ *
+ * SSH_KEYS:
+ *  SSH Keys
+ *
+*/
+enum SecurityProtocol {
+    USERNAME_PASSWORD,
+    SSH_KEYS,
+    GSI,
+    KERBEROS,
+    OAUTH
+}
+
+struct SCPDataMovement {
+    1: required string dataMovementDataID = DEFAULT_ID,
+    2: required SecurityProtocol securityProtocol,
+    3: optional i32 sshPort = 22
+}
+
+struct GridFTPDataMovement {
+    1: required string dataMovementDataID = DEFAULT_ID,
+    2: required SecurityProtocol securityProtocol,
+    3: required list<string>  gridFTPEndPoint
+}
+
+struct SSHJobSubmission {
+    1: required string jobSubmissionDataID = DEFAULT_ID,
+    2: required ResourceJobManager resourceJobManager,
+    3: optional i32 sshPort = 22
+}
+
+struct GlobusJobSubmission {
+    1: required string jobSubmissionDataID = DEFAULT_ID,
+    2: required SecurityProtocol securityProtocol,
+    3: required ResourceJobManager resourceJobManager,
+    4: optional list<string> globusGateKeeperEndPoint
+}
+
+struct GSISSHJobSubmission {
+    1: required string jobSubmissionDataID = DEFAULT_ID,
+    2: required ResourceJobManager resourceJobManager,
+    3: optional i32 sshPort = 22,
+    4: optional set<string> exports,
+    5: optional list<string> preJobCommands,
+    6: optional list<string> postJobCommands,
+    7: optional string installedPath,
+    8: optional string monitorMode
+}
+
+/**
+ * Computational Resource Description
+ *
+ * resourceId: Airavata Internal Unique Job ID. This is set by the registry.
+ *
+ * hostName:
+ *   Fully Qualified Host Name.
+ *
+ * ipAddress:
+ *   IP Addresse of the Hostname.
+ *
+ * resourceDescription:
+ *  A user friendly description of the hostname.
+ *
+ * JobSubmissionProtocols:
+ *  A computational resources may have one or more ways of submitting Jobs. This structure
+ *  will hold all available mechanisms to interact with the resource.
+ *
+ * DataMovementProtocol:
+ *  Option to specify a prefered data movement mechanism of the available options.
+ *
+*/
+struct ComputeResourceDescription {
+    1: required bool isEmpty = 0,
+    2: required string resourceId = DEFAULT_ID,
+    3: required string hostName,
+    4: optional set<string> hostAliases,
+    5: optional set<string> ipAddresses,
+    6: optional string resourceDescription,
+    8: optional string preferredJobSubmissionProtocol,
+    9: required map<string, JobSubmissionProtocol> jobSubmissionProtocols,
+    10: required map<string, DataMovementProtocol> dataMovementProtocols
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/thrift-interface-descriptions/experimentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
index 295720a..3f61123 100644
--- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
@@ -18,7 +18,7 @@
  *
  */
 
-include "computeHostModel.thrift"
+include "computeResourceModel.thrift"
 
 namespace java org.apache.airavata.model.workspace.experiment
 namespace php Airavata.Model.Workspace.Experiment

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java b/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
index e0766d5..dbe0bf7 100644
--- a/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
+++ b/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
@@ -1,6 +1,6 @@
 package org.airavata.appcatalog.cpi;
 
-import org.apache.airavata.model.computehost.*;
+import org.apache.airavata.model.appcatalog.computeresource.*;
 
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
index fc2f30a..7cdf362 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
@@ -26,7 +26,7 @@ import org.airavata.appcatalog.cpi.ComputeResource;
 import org.apache.aiaravata.application.catalog.data.resources.*;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogThriftConversion;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogUtils;
-import org.apache.airavata.model.computehost.*;
+import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java
index 1113859..d3896f6 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java
@@ -21,7 +21,7 @@
 
 package org.apache.aiaravata.application.catalog.data.model;
 
-import org.apache.airavata.model.computehost.GSISSHJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.GSISSHJobSubmission;
 
 import javax.persistence.*;
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java
index 75185f1..5d2582d 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java
@@ -21,7 +21,7 @@
 
 package org.apache.aiaravata.application.catalog.data.model;
 
-import org.apache.airavata.model.computehost.GSISSHJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.GSISSHJobSubmission;
 
 import javax.persistence.*;
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java
index 87c71a6..7e393b8 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java
@@ -21,7 +21,7 @@
 
 package org.apache.aiaravata.application.catalog.data.model;
 
-import org.apache.airavata.model.computehost.GSISSHJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.GSISSHJobSubmission;
 
 import javax.persistence.*;
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index 4d0d3c4..027c313 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -32,7 +32,7 @@ import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDes
 import org.apache.airavata.model.appcatalog.appinterface.DataType;
 import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
-import org.apache.airavata.model.computehost.*;
+import org.apache.airavata.model.appcatalog.computeresource.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
index d0d84c6..68ec31c 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
@@ -29,7 +29,7 @@ import org.apache.airavata.common.utils.AiravataUtils;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
-import org.apache.airavata.model.computehost.ComputeResourceDescription;
+import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
index e658eaa..64c61e6 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
@@ -29,7 +29,7 @@ import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
 import org.apache.aiaravata.application.catalog.data.resources.AbstractResource;
 import org.apache.airavata.app.catalog.test.util.Initialize;
 import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.model.computehost.*;
+import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 16a07e6..862a95f 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -74,13 +74,13 @@ import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentD
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
 import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
-import org.apache.airavata.model.computehost.ComputeResourceDescription;
-import org.apache.airavata.model.computehost.DataMovementProtocol;
-import org.apache.airavata.model.computehost.GSISSHJobSubmission;
-import org.apache.airavata.model.computehost.GlobusJobSubmission;
-import org.apache.airavata.model.computehost.GridFTPDataMovement;
-import org.apache.airavata.model.computehost.JobSubmissionProtocol;
-import org.apache.airavata.model.computehost.SSHJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
+import org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol;
+import org.apache.airavata.model.appcatalog.computeresource.GSISSHJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.GlobusJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement;
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
+import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
 import org.apache.airavata.model.workspace.experiment.DataObjectType;
 import org.apache.airavata.model.workspace.experiment.Experiment;
 import org.apache.airavata.model.workspace.experiment.ExperimentState;

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/HostScheduler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/HostScheduler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/HostScheduler.java
index c53fcae..39bca92 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/HostScheduler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/HostScheduler.java
@@ -22,7 +22,7 @@ package org.apache.airavata.gfac.core.scheduler;
 
 import java.util.List;
 
-import org.apache.airavata.model.computehost.ComputeResourceDescription;
+import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 
 public  interface HostScheduler {
     /**

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/impl/SimpleHostScheduler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/impl/SimpleHostScheduler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/impl/SimpleHostScheduler.java
index 3f879c5..37aed30 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/impl/SimpleHostScheduler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/scheduler/impl/SimpleHostScheduler.java
@@ -23,7 +23,7 @@ package org.apache.airavata.gfac.core.scheduler.impl;
 import java.util.List;
 
 import org.apache.airavata.gfac.core.scheduler.HostScheduler;
-import org.apache.airavata.model.computehost.ComputeResourceDescription;
+import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 
 public class SimpleHostScheduler implements HostScheduler {
     public ComputeResourceDescription schedule(List<ComputeResourceDescription> registeredHosts) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 3dc0b91..d89a05a 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -45,7 +45,7 @@ import org.apache.airavata.common.utils.ServerSettings;
 import org.apache.airavata.gfac.core.scheduler.HostScheduler;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
-import org.apache.airavata.model.computehost.ComputeResourceDescription;
+import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 import org.apache.airavata.model.error.LaunchValidationException;
 import org.apache.airavata.model.workspace.experiment.Experiment;
 import org.apache.airavata.model.workspace.experiment.ExperimentState;


[4/6] Updating ComputeResource Namespace to align with application descrrptions - AIRAVATA-1203

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/applicationCatalogAPIConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/applicationCatalogAPIConstants.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/applicationCatalogAPIConstants.java
deleted file mode 100644
index 8fe211d..0000000
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/applicationCatalogAPIConstants.java
+++ /dev/null
@@ -1,55 +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
- */
-package org.apache.airavata.api.appcatalog;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class applicationCatalogAPIConstants {
-
-  public static final String AIRAVATA_API_VERSION = "0.12.0";
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h
index ea6b02d..56201c6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_types.h
@@ -17,7 +17,7 @@
 #include "airavataDataModel_types.h"
 #include "experimentModel_types.h"
 #include "workspaceModel_types.h"
-#include "computeHostModel_types.h"
+#include "computeResourceModel_types.h"
 #include "applicationDeploymentModel_types.h"
 #include "applicationInterfaceModel_types.h"
 #include "gatewayProfileModel_types.h"

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
index 60c0b4b..e892748 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
@@ -13,7 +13,7 @@
 #include <thrift/transport/TTransport.h>
 
 #include <thrift/cxxfunctional.h>
-#include "computeHostModel_types.h"
+#include "computeResourceModel_types.h"
 
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/ComputeHost/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/ComputeHost/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/ComputeHost/Types.php
index 35e0f2c..8f347f2 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/ComputeHost/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/ComputeHost/Types.php
@@ -1257,6 +1257,6 @@ class ComputeResourceDescription {
 
 }
 
-$GLOBALS['computeHostModel_CONSTANTS']['DEFAULT_ID'] = "DO_NOT_SET_AT_CLIENTS";
+$GLOBALS['computeResourceModel_CONSTANTS']['DEFAULT_ID'] = "DO_NOT_SET_AT_CLIENTS";
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ComputeResourceDescription.java
deleted file mode 100644
index 21b3f19..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ComputeResourceDescription.java
+++ /dev/null
@@ -1,1436 +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
- */
-package org.apache.airavata.model.computehost;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Computational Resource Description
- * 
- * resourceId: Airavata Internal Unique Job ID. This is set by the registry.
- * 
- * hostName:
- *   Fully Qualified Host Name.
- * 
- * ipAddress:
- *   IP Addresse of the Hostname.
- * 
- * resourceDescription:
- *  A user friendly description of the hostname.
- * 
- * JobSubmissionProtocols:
- *  A computational resources may have one or more ways of submitting Jobs. This structure
- *  will hold all available mechanisms to interact with the resource.
- * 
- * DataMovementProtocol:
- *  Option to specify a prefered data movement mechanism of the available options.
- * 
- */
-@SuppressWarnings("all") public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription");
-
-  private static final org.apache.thrift.protocol.TField IS_EMPTY_FIELD_DESC = new org.apache.thrift.protocol.TField("isEmpty", org.apache.thrift.protocol.TType.BOOL, (short)1);
-  private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostName", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField HOST_ALIASES_FIELD_DESC = new org.apache.thrift.protocol.TField("hostAliases", org.apache.thrift.protocol.TType.SET, (short)4);
-  private static final org.apache.thrift.protocol.TField IP_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("ipAddresses", org.apache.thrift.protocol.TType.SET, (short)5);
-  private static final org.apache.thrift.protocol.TField RESOURCE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceDescription", org.apache.thrift.protocol.TType.STRING, (short)6);
-  private static final org.apache.thrift.protocol.TField PREFERRED_JOB_SUBMISSION_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("preferredJobSubmissionProtocol", org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_PROTOCOLS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionProtocols", org.apache.thrift.protocol.TType.MAP, (short)9);
-  private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_PROTOCOLS_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementProtocols", org.apache.thrift.protocol.TType.MAP, (short)10);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ComputeResourceDescriptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ComputeResourceDescriptionTupleSchemeFactory());
-  }
-
-  private boolean isEmpty; // required
-  private String resourceId; // required
-  private String hostName; // required
-  private Set<String> hostAliases; // optional
-  private Set<String> ipAddresses; // optional
-  private String resourceDescription; // optional
-  private String preferredJobSubmissionProtocol; // optional
-  private Map<String,JobSubmissionProtocol> jobSubmissionProtocols; // required
-  private Map<String,DataMovementProtocol> dataMovementProtocols; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    IS_EMPTY((short)1, "isEmpty"),
-    RESOURCE_ID((short)2, "resourceId"),
-    HOST_NAME((short)3, "hostName"),
-    HOST_ALIASES((short)4, "hostAliases"),
-    IP_ADDRESSES((short)5, "ipAddresses"),
-    RESOURCE_DESCRIPTION((short)6, "resourceDescription"),
-    PREFERRED_JOB_SUBMISSION_PROTOCOL((short)8, "preferredJobSubmissionProtocol"),
-    JOB_SUBMISSION_PROTOCOLS((short)9, "jobSubmissionProtocols"),
-    DATA_MOVEMENT_PROTOCOLS((short)10, "dataMovementProtocols");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // IS_EMPTY
-          return IS_EMPTY;
-        case 2: // RESOURCE_ID
-          return RESOURCE_ID;
-        case 3: // HOST_NAME
-          return HOST_NAME;
-        case 4: // HOST_ALIASES
-          return HOST_ALIASES;
-        case 5: // IP_ADDRESSES
-          return IP_ADDRESSES;
-        case 6: // RESOURCE_DESCRIPTION
-          return RESOURCE_DESCRIPTION;
-        case 8: // PREFERRED_JOB_SUBMISSION_PROTOCOL
-          return PREFERRED_JOB_SUBMISSION_PROTOCOL;
-        case 9: // JOB_SUBMISSION_PROTOCOLS
-          return JOB_SUBMISSION_PROTOCOLS;
-        case 10: // DATA_MOVEMENT_PROTOCOLS
-          return DATA_MOVEMENT_PROTOCOLS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __ISEMPTY_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.IS_EMPTY, new org.apache.thrift.meta_data.FieldMetaData("isEmpty", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.HOST_NAME, new org.apache.thrift.meta_data.FieldMetaData("hostName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.HOST_ALIASES, new org.apache.thrift.meta_data.FieldMetaData("hostAliases", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.IP_ADDRESSES, new org.apache.thrift.meta_data.FieldMetaData("ipAddresses", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.RESOURCE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("resourceDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("preferredJobSubmissionProtocol", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.JOB_SUBMISSION_PROTOCOLS, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionProtocols", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, JobSubmissionProtocol.class))));
-    tmpMap.put(_Fields.DATA_MOVEMENT_PROTOCOLS, new org.apache.thrift.meta_data.FieldMetaData("dataMovementProtocols", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DataMovementProtocol.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputeResourceDescription.class, metaDataMap);
-  }
-
-  public ComputeResourceDescription() {
-    this.isEmpty = false;
-
-    this.resourceId = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public ComputeResourceDescription(
-    boolean isEmpty,
-    String resourceId,
-    String hostName,
-    Map<String,JobSubmissionProtocol> jobSubmissionProtocols,
-    Map<String,DataMovementProtocol> dataMovementProtocols)
-  {
-    this();
-    this.isEmpty = isEmpty;
-    setIsEmptyIsSet(true);
-    this.resourceId = resourceId;
-    this.hostName = hostName;
-    this.jobSubmissionProtocols = jobSubmissionProtocols;
-    this.dataMovementProtocols = dataMovementProtocols;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ComputeResourceDescription(ComputeResourceDescription other) {
-    __isset_bitfield = other.__isset_bitfield;
-    this.isEmpty = other.isEmpty;
-    if (other.isSetResourceId()) {
-      this.resourceId = other.resourceId;
-    }
-    if (other.isSetHostName()) {
-      this.hostName = other.hostName;
-    }
-    if (other.isSetHostAliases()) {
-      Set<String> __this__hostAliases = new HashSet<String>(other.hostAliases);
-      this.hostAliases = __this__hostAliases;
-    }
-    if (other.isSetIpAddresses()) {
-      Set<String> __this__ipAddresses = new HashSet<String>(other.ipAddresses);
-      this.ipAddresses = __this__ipAddresses;
-    }
-    if (other.isSetResourceDescription()) {
-      this.resourceDescription = other.resourceDescription;
-    }
-    if (other.isSetPreferredJobSubmissionProtocol()) {
-      this.preferredJobSubmissionProtocol = other.preferredJobSubmissionProtocol;
-    }
-    if (other.isSetJobSubmissionProtocols()) {
-      Map<String,JobSubmissionProtocol> __this__jobSubmissionProtocols = new HashMap<String,JobSubmissionProtocol>(other.jobSubmissionProtocols.size());
-      for (Map.Entry<String, JobSubmissionProtocol> other_element : other.jobSubmissionProtocols.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        JobSubmissionProtocol other_element_value = other_element.getValue();
-
-        String __this__jobSubmissionProtocols_copy_key = other_element_key;
-
-        JobSubmissionProtocol __this__jobSubmissionProtocols_copy_value = other_element_value;
-
-        __this__jobSubmissionProtocols.put(__this__jobSubmissionProtocols_copy_key, __this__jobSubmissionProtocols_copy_value);
-      }
-      this.jobSubmissionProtocols = __this__jobSubmissionProtocols;
-    }
-    if (other.isSetDataMovementProtocols()) {
-      Map<String,DataMovementProtocol> __this__dataMovementProtocols = new HashMap<String,DataMovementProtocol>(other.dataMovementProtocols.size());
-      for (Map.Entry<String, DataMovementProtocol> other_element : other.dataMovementProtocols.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        DataMovementProtocol other_element_value = other_element.getValue();
-
-        String __this__dataMovementProtocols_copy_key = other_element_key;
-
-        DataMovementProtocol __this__dataMovementProtocols_copy_value = other_element_value;
-
-        __this__dataMovementProtocols.put(__this__dataMovementProtocols_copy_key, __this__dataMovementProtocols_copy_value);
-      }
-      this.dataMovementProtocols = __this__dataMovementProtocols;
-    }
-  }
-
-  public ComputeResourceDescription deepCopy() {
-    return new ComputeResourceDescription(this);
-  }
-
-  @Override
-  public void clear() {
-    this.isEmpty = false;
-
-    this.resourceId = "DO_NOT_SET_AT_CLIENTS";
-
-    this.hostName = null;
-    this.hostAliases = null;
-    this.ipAddresses = null;
-    this.resourceDescription = null;
-    this.preferredJobSubmissionProtocol = null;
-    this.jobSubmissionProtocols = null;
-    this.dataMovementProtocols = null;
-  }
-
-  public boolean isIsEmpty() {
-    return this.isEmpty;
-  }
-
-  public void setIsEmpty(boolean isEmpty) {
-    this.isEmpty = isEmpty;
-    setIsEmptyIsSet(true);
-  }
-
-  public void unsetIsEmpty() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
-  }
-
-  /** Returns true if field isEmpty is set (has been assigned a value) and false otherwise */
-  public boolean isSetIsEmpty() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISEMPTY_ISSET_ID);
-  }
-
-  public void setIsEmptyIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEMPTY_ISSET_ID, value);
-  }
-
-  public String getResourceId() {
-    return this.resourceId;
-  }
-
-  public void setResourceId(String resourceId) {
-    this.resourceId = resourceId;
-  }
-
-  public void unsetResourceId() {
-    this.resourceId = null;
-  }
-
-  /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceId() {
-    return this.resourceId != null;
-  }
-
-  public void setResourceIdIsSet(boolean value) {
-    if (!value) {
-      this.resourceId = null;
-    }
-  }
-
-  public String getHostName() {
-    return this.hostName;
-  }
-
-  public void setHostName(String hostName) {
-    this.hostName = hostName;
-  }
-
-  public void unsetHostName() {
-    this.hostName = null;
-  }
-
-  /** Returns true if field hostName is set (has been assigned a value) and false otherwise */
-  public boolean isSetHostName() {
-    return this.hostName != null;
-  }
-
-  public void setHostNameIsSet(boolean value) {
-    if (!value) {
-      this.hostName = null;
-    }
-  }
-
-  public int getHostAliasesSize() {
-    return (this.hostAliases == null) ? 0 : this.hostAliases.size();
-  }
-
-  public java.util.Iterator<String> getHostAliasesIterator() {
-    return (this.hostAliases == null) ? null : this.hostAliases.iterator();
-  }
-
-  public void addToHostAliases(String elem) {
-    if (this.hostAliases == null) {
-      this.hostAliases = new HashSet<String>();
-    }
-    this.hostAliases.add(elem);
-  }
-
-  public Set<String> getHostAliases() {
-    return this.hostAliases;
-  }
-
-  public void setHostAliases(Set<String> hostAliases) {
-    this.hostAliases = hostAliases;
-  }
-
-  public void unsetHostAliases() {
-    this.hostAliases = null;
-  }
-
-  /** Returns true if field hostAliases is set (has been assigned a value) and false otherwise */
-  public boolean isSetHostAliases() {
-    return this.hostAliases != null;
-  }
-
-  public void setHostAliasesIsSet(boolean value) {
-    if (!value) {
-      this.hostAliases = null;
-    }
-  }
-
-  public int getIpAddressesSize() {
-    return (this.ipAddresses == null) ? 0 : this.ipAddresses.size();
-  }
-
-  public java.util.Iterator<String> getIpAddressesIterator() {
-    return (this.ipAddresses == null) ? null : this.ipAddresses.iterator();
-  }
-
-  public void addToIpAddresses(String elem) {
-    if (this.ipAddresses == null) {
-      this.ipAddresses = new HashSet<String>();
-    }
-    this.ipAddresses.add(elem);
-  }
-
-  public Set<String> getIpAddresses() {
-    return this.ipAddresses;
-  }
-
-  public void setIpAddresses(Set<String> ipAddresses) {
-    this.ipAddresses = ipAddresses;
-  }
-
-  public void unsetIpAddresses() {
-    this.ipAddresses = null;
-  }
-
-  /** Returns true if field ipAddresses is set (has been assigned a value) and false otherwise */
-  public boolean isSetIpAddresses() {
-    return this.ipAddresses != null;
-  }
-
-  public void setIpAddressesIsSet(boolean value) {
-    if (!value) {
-      this.ipAddresses = null;
-    }
-  }
-
-  public String getResourceDescription() {
-    return this.resourceDescription;
-  }
-
-  public void setResourceDescription(String resourceDescription) {
-    this.resourceDescription = resourceDescription;
-  }
-
-  public void unsetResourceDescription() {
-    this.resourceDescription = null;
-  }
-
-  /** Returns true if field resourceDescription is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceDescription() {
-    return this.resourceDescription != null;
-  }
-
-  public void setResourceDescriptionIsSet(boolean value) {
-    if (!value) {
-      this.resourceDescription = null;
-    }
-  }
-
-  public String getPreferredJobSubmissionProtocol() {
-    return this.preferredJobSubmissionProtocol;
-  }
-
-  public void setPreferredJobSubmissionProtocol(String preferredJobSubmissionProtocol) {
-    this.preferredJobSubmissionProtocol = preferredJobSubmissionProtocol;
-  }
-
-  public void unsetPreferredJobSubmissionProtocol() {
-    this.preferredJobSubmissionProtocol = null;
-  }
-
-  /** Returns true if field preferredJobSubmissionProtocol is set (has been assigned a value) and false otherwise */
-  public boolean isSetPreferredJobSubmissionProtocol() {
-    return this.preferredJobSubmissionProtocol != null;
-  }
-
-  public void setPreferredJobSubmissionProtocolIsSet(boolean value) {
-    if (!value) {
-      this.preferredJobSubmissionProtocol = null;
-    }
-  }
-
-  public int getJobSubmissionProtocolsSize() {
-    return (this.jobSubmissionProtocols == null) ? 0 : this.jobSubmissionProtocols.size();
-  }
-
-  public void putToJobSubmissionProtocols(String key, JobSubmissionProtocol val) {
-    if (this.jobSubmissionProtocols == null) {
-      this.jobSubmissionProtocols = new HashMap<String,JobSubmissionProtocol>();
-    }
-    this.jobSubmissionProtocols.put(key, val);
-  }
-
-  public Map<String,JobSubmissionProtocol> getJobSubmissionProtocols() {
-    return this.jobSubmissionProtocols;
-  }
-
-  public void setJobSubmissionProtocols(Map<String,JobSubmissionProtocol> jobSubmissionProtocols) {
-    this.jobSubmissionProtocols = jobSubmissionProtocols;
-  }
-
-  public void unsetJobSubmissionProtocols() {
-    this.jobSubmissionProtocols = null;
-  }
-
-  /** Returns true if field jobSubmissionProtocols is set (has been assigned a value) and false otherwise */
-  public boolean isSetJobSubmissionProtocols() {
-    return this.jobSubmissionProtocols != null;
-  }
-
-  public void setJobSubmissionProtocolsIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionProtocols = null;
-    }
-  }
-
-  public int getDataMovementProtocolsSize() {
-    return (this.dataMovementProtocols == null) ? 0 : this.dataMovementProtocols.size();
-  }
-
-  public void putToDataMovementProtocols(String key, DataMovementProtocol val) {
-    if (this.dataMovementProtocols == null) {
-      this.dataMovementProtocols = new HashMap<String,DataMovementProtocol>();
-    }
-    this.dataMovementProtocols.put(key, val);
-  }
-
-  public Map<String,DataMovementProtocol> getDataMovementProtocols() {
-    return this.dataMovementProtocols;
-  }
-
-  public void setDataMovementProtocols(Map<String,DataMovementProtocol> dataMovementProtocols) {
-    this.dataMovementProtocols = dataMovementProtocols;
-  }
-
-  public void unsetDataMovementProtocols() {
-    this.dataMovementProtocols = null;
-  }
-
-  /** Returns true if field dataMovementProtocols is set (has been assigned a value) and false otherwise */
-  public boolean isSetDataMovementProtocols() {
-    return this.dataMovementProtocols != null;
-  }
-
-  public void setDataMovementProtocolsIsSet(boolean value) {
-    if (!value) {
-      this.dataMovementProtocols = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case IS_EMPTY:
-      if (value == null) {
-        unsetIsEmpty();
-      } else {
-        setIsEmpty((Boolean)value);
-      }
-      break;
-
-    case RESOURCE_ID:
-      if (value == null) {
-        unsetResourceId();
-      } else {
-        setResourceId((String)value);
-      }
-      break;
-
-    case HOST_NAME:
-      if (value == null) {
-        unsetHostName();
-      } else {
-        setHostName((String)value);
-      }
-      break;
-
-    case HOST_ALIASES:
-      if (value == null) {
-        unsetHostAliases();
-      } else {
-        setHostAliases((Set<String>)value);
-      }
-      break;
-
-    case IP_ADDRESSES:
-      if (value == null) {
-        unsetIpAddresses();
-      } else {
-        setIpAddresses((Set<String>)value);
-      }
-      break;
-
-    case RESOURCE_DESCRIPTION:
-      if (value == null) {
-        unsetResourceDescription();
-      } else {
-        setResourceDescription((String)value);
-      }
-      break;
-
-    case PREFERRED_JOB_SUBMISSION_PROTOCOL:
-      if (value == null) {
-        unsetPreferredJobSubmissionProtocol();
-      } else {
-        setPreferredJobSubmissionProtocol((String)value);
-      }
-      break;
-
-    case JOB_SUBMISSION_PROTOCOLS:
-      if (value == null) {
-        unsetJobSubmissionProtocols();
-      } else {
-        setJobSubmissionProtocols((Map<String,JobSubmissionProtocol>)value);
-      }
-      break;
-
-    case DATA_MOVEMENT_PROTOCOLS:
-      if (value == null) {
-        unsetDataMovementProtocols();
-      } else {
-        setDataMovementProtocols((Map<String,DataMovementProtocol>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case IS_EMPTY:
-      return Boolean.valueOf(isIsEmpty());
-
-    case RESOURCE_ID:
-      return getResourceId();
-
-    case HOST_NAME:
-      return getHostName();
-
-    case HOST_ALIASES:
-      return getHostAliases();
-
-    case IP_ADDRESSES:
-      return getIpAddresses();
-
-    case RESOURCE_DESCRIPTION:
-      return getResourceDescription();
-
-    case PREFERRED_JOB_SUBMISSION_PROTOCOL:
-      return getPreferredJobSubmissionProtocol();
-
-    case JOB_SUBMISSION_PROTOCOLS:
-      return getJobSubmissionProtocols();
-
-    case DATA_MOVEMENT_PROTOCOLS:
-      return getDataMovementProtocols();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case IS_EMPTY:
-      return isSetIsEmpty();
-    case RESOURCE_ID:
-      return isSetResourceId();
-    case HOST_NAME:
-      return isSetHostName();
-    case HOST_ALIASES:
-      return isSetHostAliases();
-    case IP_ADDRESSES:
-      return isSetIpAddresses();
-    case RESOURCE_DESCRIPTION:
-      return isSetResourceDescription();
-    case PREFERRED_JOB_SUBMISSION_PROTOCOL:
-      return isSetPreferredJobSubmissionProtocol();
-    case JOB_SUBMISSION_PROTOCOLS:
-      return isSetJobSubmissionProtocols();
-    case DATA_MOVEMENT_PROTOCOLS:
-      return isSetDataMovementProtocols();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ComputeResourceDescription)
-      return this.equals((ComputeResourceDescription)that);
-    return false;
-  }
-
-  public boolean equals(ComputeResourceDescription that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_isEmpty = true;
-    boolean that_present_isEmpty = true;
-    if (this_present_isEmpty || that_present_isEmpty) {
-      if (!(this_present_isEmpty && that_present_isEmpty))
-        return false;
-      if (this.isEmpty != that.isEmpty)
-        return false;
-    }
-
-    boolean this_present_resourceId = true && this.isSetResourceId();
-    boolean that_present_resourceId = true && that.isSetResourceId();
-    if (this_present_resourceId || that_present_resourceId) {
-      if (!(this_present_resourceId && that_present_resourceId))
-        return false;
-      if (!this.resourceId.equals(that.resourceId))
-        return false;
-    }
-
-    boolean this_present_hostName = true && this.isSetHostName();
-    boolean that_present_hostName = true && that.isSetHostName();
-    if (this_present_hostName || that_present_hostName) {
-      if (!(this_present_hostName && that_present_hostName))
-        return false;
-      if (!this.hostName.equals(that.hostName))
-        return false;
-    }
-
-    boolean this_present_hostAliases = true && this.isSetHostAliases();
-    boolean that_present_hostAliases = true && that.isSetHostAliases();
-    if (this_present_hostAliases || that_present_hostAliases) {
-      if (!(this_present_hostAliases && that_present_hostAliases))
-        return false;
-      if (!this.hostAliases.equals(that.hostAliases))
-        return false;
-    }
-
-    boolean this_present_ipAddresses = true && this.isSetIpAddresses();
-    boolean that_present_ipAddresses = true && that.isSetIpAddresses();
-    if (this_present_ipAddresses || that_present_ipAddresses) {
-      if (!(this_present_ipAddresses && that_present_ipAddresses))
-        return false;
-      if (!this.ipAddresses.equals(that.ipAddresses))
-        return false;
-    }
-
-    boolean this_present_resourceDescription = true && this.isSetResourceDescription();
-    boolean that_present_resourceDescription = true && that.isSetResourceDescription();
-    if (this_present_resourceDescription || that_present_resourceDescription) {
-      if (!(this_present_resourceDescription && that_present_resourceDescription))
-        return false;
-      if (!this.resourceDescription.equals(that.resourceDescription))
-        return false;
-    }
-
-    boolean this_present_preferredJobSubmissionProtocol = true && this.isSetPreferredJobSubmissionProtocol();
-    boolean that_present_preferredJobSubmissionProtocol = true && that.isSetPreferredJobSubmissionProtocol();
-    if (this_present_preferredJobSubmissionProtocol || that_present_preferredJobSubmissionProtocol) {
-      if (!(this_present_preferredJobSubmissionProtocol && that_present_preferredJobSubmissionProtocol))
-        return false;
-      if (!this.preferredJobSubmissionProtocol.equals(that.preferredJobSubmissionProtocol))
-        return false;
-    }
-
-    boolean this_present_jobSubmissionProtocols = true && this.isSetJobSubmissionProtocols();
-    boolean that_present_jobSubmissionProtocols = true && that.isSetJobSubmissionProtocols();
-    if (this_present_jobSubmissionProtocols || that_present_jobSubmissionProtocols) {
-      if (!(this_present_jobSubmissionProtocols && that_present_jobSubmissionProtocols))
-        return false;
-      if (!this.jobSubmissionProtocols.equals(that.jobSubmissionProtocols))
-        return false;
-    }
-
-    boolean this_present_dataMovementProtocols = true && this.isSetDataMovementProtocols();
-    boolean that_present_dataMovementProtocols = true && that.isSetDataMovementProtocols();
-    if (this_present_dataMovementProtocols || that_present_dataMovementProtocols) {
-      if (!(this_present_dataMovementProtocols && that_present_dataMovementProtocols))
-        return false;
-      if (!this.dataMovementProtocols.equals(that.dataMovementProtocols))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(ComputeResourceDescription other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetIsEmpty()).compareTo(other.isSetIsEmpty());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetIsEmpty()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEmpty, other.isEmpty);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetHostName()).compareTo(other.isSetHostName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetHostName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostName, other.hostName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetHostAliases()).compareTo(other.isSetHostAliases());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetHostAliases()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostAliases, other.hostAliases);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetIpAddresses()).compareTo(other.isSetIpAddresses());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetIpAddresses()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ipAddresses, other.ipAddresses);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetResourceDescription()).compareTo(other.isSetResourceDescription());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceDescription, other.resourceDescription);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetPreferredJobSubmissionProtocol()).compareTo(other.isSetPreferredJobSubmissionProtocol());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPreferredJobSubmissionProtocol()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.preferredJobSubmissionProtocol, other.preferredJobSubmissionProtocol);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetJobSubmissionProtocols()).compareTo(other.isSetJobSubmissionProtocols());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionProtocols()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionProtocols, other.jobSubmissionProtocols);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetDataMovementProtocols()).compareTo(other.isSetDataMovementProtocols());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDataMovementProtocols()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementProtocols, other.dataMovementProtocols);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ComputeResourceDescription(");
-    boolean first = true;
-
-    sb.append("isEmpty:");
-    sb.append(this.isEmpty);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("resourceId:");
-    if (this.resourceId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.resourceId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("hostName:");
-    if (this.hostName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.hostName);
-    }
-    first = false;
-    if (isSetHostAliases()) {
-      if (!first) sb.append(", ");
-      sb.append("hostAliases:");
-      if (this.hostAliases == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.hostAliases);
-      }
-      first = false;
-    }
-    if (isSetIpAddresses()) {
-      if (!first) sb.append(", ");
-      sb.append("ipAddresses:");
-      if (this.ipAddresses == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.ipAddresses);
-      }
-      first = false;
-    }
-    if (isSetResourceDescription()) {
-      if (!first) sb.append(", ");
-      sb.append("resourceDescription:");
-      if (this.resourceDescription == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceDescription);
-      }
-      first = false;
-    }
-    if (isSetPreferredJobSubmissionProtocol()) {
-      if (!first) sb.append(", ");
-      sb.append("preferredJobSubmissionProtocol:");
-      if (this.preferredJobSubmissionProtocol == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.preferredJobSubmissionProtocol);
-      }
-      first = false;
-    }
-    if (!first) sb.append(", ");
-    sb.append("jobSubmissionProtocols:");
-    if (this.jobSubmissionProtocols == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionProtocols);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("dataMovementProtocols:");
-    if (this.dataMovementProtocols == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.dataMovementProtocols);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetIsEmpty()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'isEmpty' is unset! Struct:" + toString());
-    }
-
-    if (!isSetResourceId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' is unset! Struct:" + toString());
-    }
-
-    if (!isSetHostName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'hostName' is unset! Struct:" + toString());
-    }
-
-    if (!isSetJobSubmissionProtocols()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionProtocols' is unset! Struct:" + toString());
-    }
-
-    if (!isSetDataMovementProtocols()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementProtocols' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class ComputeResourceDescriptionStandardSchemeFactory implements SchemeFactory {
-    public ComputeResourceDescriptionStandardScheme getScheme() {
-      return new ComputeResourceDescriptionStandardScheme();
-    }
-  }
-
-  private static class ComputeResourceDescriptionStandardScheme extends StandardScheme<ComputeResourceDescription> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ComputeResourceDescription struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // IS_EMPTY
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isEmpty = iprot.readBool();
-              struct.setIsEmptyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // RESOURCE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourceId = iprot.readString();
-              struct.setResourceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // HOST_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.hostName = iprot.readString();
-              struct.setHostNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // HOST_ALIASES
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set40 = iprot.readSetBegin();
-                struct.hostAliases = new HashSet<String>(2*_set40.size);
-                for (int _i41 = 0; _i41 < _set40.size; ++_i41)
-                {
-                  String _elem42;
-                  _elem42 = iprot.readString();
-                  struct.hostAliases.add(_elem42);
-                }
-                iprot.readSetEnd();
-              }
-              struct.setHostAliasesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // IP_ADDRESSES
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set43 = iprot.readSetBegin();
-                struct.ipAddresses = new HashSet<String>(2*_set43.size);
-                for (int _i44 = 0; _i44 < _set43.size; ++_i44)
-                {
-                  String _elem45;
-                  _elem45 = iprot.readString();
-                  struct.ipAddresses.add(_elem45);
-                }
-                iprot.readSetEnd();
-              }
-              struct.setIpAddressesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // RESOURCE_DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourceDescription = iprot.readString();
-              struct.setResourceDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // PREFERRED_JOB_SUBMISSION_PROTOCOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.preferredJobSubmissionProtocol = iprot.readString();
-              struct.setPreferredJobSubmissionProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // JOB_SUBMISSION_PROTOCOLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map46 = iprot.readMapBegin();
-                struct.jobSubmissionProtocols = new HashMap<String,JobSubmissionProtocol>(2*_map46.size);
-                for (int _i47 = 0; _i47 < _map46.size; ++_i47)
-                {
-                  String _key48;
-                  JobSubmissionProtocol _val49;
-                  _key48 = iprot.readString();
-                  _val49 = JobSubmissionProtocol.findByValue(iprot.readI32());
-                  struct.jobSubmissionProtocols.put(_key48, _val49);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setJobSubmissionProtocolsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // DATA_MOVEMENT_PROTOCOLS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin();
-                struct.dataMovementProtocols = new HashMap<String,DataMovementProtocol>(2*_map50.size);
-                for (int _i51 = 0; _i51 < _map50.size; ++_i51)
-                {
-                  String _key52;
-                  DataMovementProtocol _val53;
-                  _key52 = iprot.readString();
-                  _val53 = DataMovementProtocol.findByValue(iprot.readI32());
-                  struct.dataMovementProtocols.put(_key52, _val53);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setDataMovementProtocolsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ComputeResourceDescription struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldBegin(IS_EMPTY_FIELD_DESC);
-      oprot.writeBool(struct.isEmpty);
-      oprot.writeFieldEnd();
-      if (struct.resourceId != null) {
-        oprot.writeFieldBegin(RESOURCE_ID_FIELD_DESC);
-        oprot.writeString(struct.resourceId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.hostName != null) {
-        oprot.writeFieldBegin(HOST_NAME_FIELD_DESC);
-        oprot.writeString(struct.hostName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.hostAliases != null) {
-        if (struct.isSetHostAliases()) {
-          oprot.writeFieldBegin(HOST_ALIASES_FIELD_DESC);
-          {
-            oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.hostAliases.size()));
-            for (String _iter54 : struct.hostAliases)
-            {
-              oprot.writeString(_iter54);
-            }
-            oprot.writeSetEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.ipAddresses != null) {
-        if (struct.isSetIpAddresses()) {
-          oprot.writeFieldBegin(IP_ADDRESSES_FIELD_DESC);
-          {
-            oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.ipAddresses.size()));
-            for (String _iter55 : struct.ipAddresses)
-            {
-              oprot.writeString(_iter55);
-            }
-            oprot.writeSetEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.resourceDescription != null) {
-        if (struct.isSetResourceDescription()) {
-          oprot.writeFieldBegin(RESOURCE_DESCRIPTION_FIELD_DESC);
-          oprot.writeString(struct.resourceDescription);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.preferredJobSubmissionProtocol != null) {
-        if (struct.isSetPreferredJobSubmissionProtocol()) {
-          oprot.writeFieldBegin(PREFERRED_JOB_SUBMISSION_PROTOCOL_FIELD_DESC);
-          oprot.writeString(struct.preferredJobSubmissionProtocol);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.jobSubmissionProtocols != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_PROTOCOLS_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.jobSubmissionProtocols.size()));
-          for (Map.Entry<String, JobSubmissionProtocol> _iter56 : struct.jobSubmissionProtocols.entrySet())
-          {
-            oprot.writeString(_iter56.getKey());
-            oprot.writeI32(_iter56.getValue().getValue());
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      if (struct.dataMovementProtocols != null) {
-        oprot.writeFieldBegin(DATA_MOVEMENT_PROTOCOLS_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.dataMovementProtocols.size()));
-          for (Map.Entry<String, DataMovementProtocol> _iter57 : struct.dataMovementProtocols.entrySet())
-          {
-            oprot.writeString(_iter57.getKey());
-            oprot.writeI32(_iter57.getValue().getValue());
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ComputeResourceDescriptionTupleSchemeFactory implements SchemeFactory {
-    public ComputeResourceDescriptionTupleScheme getScheme() {
-      return new ComputeResourceDescriptionTupleScheme();
-    }
-  }
-
-  private static class ComputeResourceDescriptionTupleScheme extends TupleScheme<ComputeResourceDescription> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ComputeResourceDescription struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeBool(struct.isEmpty);
-      oprot.writeString(struct.resourceId);
-      oprot.writeString(struct.hostName);
-      {
-        oprot.writeI32(struct.jobSubmissionProtocols.size());
-        for (Map.Entry<String, JobSubmissionProtocol> _iter58 : struct.jobSubmissionProtocols.entrySet())
-        {
-          oprot.writeString(_iter58.getKey());
-          oprot.writeI32(_iter58.getValue().getValue());
-        }
-      }
-      {
-        oprot.writeI32(struct.dataMovementProtocols.size());
-        for (Map.Entry<String, DataMovementProtocol> _iter59 : struct.dataMovementProtocols.entrySet())
-        {
-          oprot.writeString(_iter59.getKey());
-          oprot.writeI32(_iter59.getValue().getValue());
-        }
-      }
-      BitSet optionals = new BitSet();
-      if (struct.isSetHostAliases()) {
-        optionals.set(0);
-      }
-      if (struct.isSetIpAddresses()) {
-        optionals.set(1);
-      }
-      if (struct.isSetResourceDescription()) {
-        optionals.set(2);
-      }
-      if (struct.isSetPreferredJobSubmissionProtocol()) {
-        optionals.set(3);
-      }
-      oprot.writeBitSet(optionals, 4);
-      if (struct.isSetHostAliases()) {
-        {
-          oprot.writeI32(struct.hostAliases.size());
-          for (String _iter60 : struct.hostAliases)
-          {
-            oprot.writeString(_iter60);
-          }
-        }
-      }
-      if (struct.isSetIpAddresses()) {
-        {
-          oprot.writeI32(struct.ipAddresses.size());
-          for (String _iter61 : struct.ipAddresses)
-          {
-            oprot.writeString(_iter61);
-          }
-        }
-      }
-      if (struct.isSetResourceDescription()) {
-        oprot.writeString(struct.resourceDescription);
-      }
-      if (struct.isSetPreferredJobSubmissionProtocol()) {
-        oprot.writeString(struct.preferredJobSubmissionProtocol);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ComputeResourceDescription struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.isEmpty = iprot.readBool();
-      struct.setIsEmptyIsSet(true);
-      struct.resourceId = iprot.readString();
-      struct.setResourceIdIsSet(true);
-      struct.hostName = iprot.readString();
-      struct.setHostNameIsSet(true);
-      {
-        org.apache.thrift.protocol.TMap _map62 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
-        struct.jobSubmissionProtocols = new HashMap<String,JobSubmissionProtocol>(2*_map62.size);
-        for (int _i63 = 0; _i63 < _map62.size; ++_i63)
-        {
-          String _key64;
-          JobSubmissionProtocol _val65;
-          _key64 = iprot.readString();
-          _val65 = JobSubmissionProtocol.findByValue(iprot.readI32());
-          struct.jobSubmissionProtocols.put(_key64, _val65);
-        }
-      }
-      struct.setJobSubmissionProtocolsIsSet(true);
-      {
-        org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
-        struct.dataMovementProtocols = new HashMap<String,DataMovementProtocol>(2*_map66.size);
-        for (int _i67 = 0; _i67 < _map66.size; ++_i67)
-        {
-          String _key68;
-          DataMovementProtocol _val69;
-          _key68 = iprot.readString();
-          _val69 = DataMovementProtocol.findByValue(iprot.readI32());
-          struct.dataMovementProtocols.put(_key68, _val69);
-        }
-      }
-      struct.setDataMovementProtocolsIsSet(true);
-      BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TSet _set70 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.hostAliases = new HashSet<String>(2*_set70.size);
-          for (int _i71 = 0; _i71 < _set70.size; ++_i71)
-          {
-            String _elem72;
-            _elem72 = iprot.readString();
-            struct.hostAliases.add(_elem72);
-          }
-        }
-        struct.setHostAliasesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TSet _set73 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.ipAddresses = new HashSet<String>(2*_set73.size);
-          for (int _i74 = 0; _i74 < _set73.size; ++_i74)
-          {
-            String _elem75;
-            _elem75 = iprot.readString();
-            struct.ipAddresses.add(_elem75);
-          }
-        }
-        struct.setIpAddressesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.resourceDescription = iprot.readString();
-        struct.setResourceDescriptionIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.preferredJobSubmissionProtocol = iprot.readString();
-        struct.setPreferredJobSubmissionProtocolIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/DataMovementProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/DataMovementProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/DataMovementProtocol.java
deleted file mode 100644
index 5f178a6..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/DataMovementProtocol.java
+++ /dev/null
@@ -1,83 +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
- */
-package org.apache.airavata.model.computehost;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of data movement supported by Airavata
- * 
- * SCP:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
- * 
- * SFTP:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- * 
- * GridFTP:
- *  Globus File Transfer Protocol
- * 
- * UNICORE_STORAGE_SERVICE:
- *  Storage Service Provided by Unicore
- * 
- */
-@SuppressWarnings("all") public enum DataMovementProtocol implements org.apache.thrift.TEnum {
-  SCP(0),
-  SFTP(1),
-  GridFTP(2),
-  UNICORE_STORAGE_SERVICE(3);
-
-  private final int value;
-
-  private DataMovementProtocol(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static DataMovementProtocol findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return SCP;
-      case 1:
-        return SFTP;
-      case 2:
-        return GridFTP;
-      case 3:
-        return UNICORE_STORAGE_SERVICE;
-      default:
-        return null;
-    }
-  }
-}


[6/6] git commit: Updating ComputeResource Namespace to align with application descrrptions - AIRAVATA-1203

Posted by sm...@apache.org.
Updating ComputeResource Namespace to align with application descrrptions - AIRAVATA-1203


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

Branch: refs/heads/master
Commit: 169e6f9d167a1495556b1bffd23b4a5d367a2d4d
Parents: 1ae4201
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 3 10:09:56 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 3 10:09:56 2014 -0400

----------------------------------------------------------------------
 .../api/appcatalog/ApplicationCatalogAPI.java   | 31134 -----------------
 .../applicationCatalogAPIConstants.java         |    55 -
 .../src/main/resources/lib/airavataAPI_types.h  |     2 +-
 .../main/resources/lib/experimentModel_types.h  |     2 +-
 .../lib/Airavata/Model/ComputeHost/Types.php    |     2 +-
 .../computehost/ComputeResourceDescription.java |  1436 -
 .../model/computehost/DataMovementProtocol.java |    83 -
 .../model/computehost/GSISSHJobSubmission.java  |  1262 -
 .../model/computehost/GlobusJobSubmission.java  |   768 -
 .../model/computehost/GridFTPDataMovement.java  |   651 -
 .../computehost/JobSubmissionProtocol.java      |    80 -
 .../model/computehost/ResourceJobManager.java   |    83 -
 .../model/computehost/SCPDataMovement.java      |   610 -
 .../model/computehost/SSHJobSubmission.java     |   610 -
 .../model/computehost/SecurityProtocol.java     |    82 -
 .../computehost/computeHostModelConstants.java  |    55 -
 .../model/util/ComputeResourceUtil.java         |     2 +-
 .../airavataAPI.thrift                          |     2 +-
 .../appCatalogModels.thrift                     |     2 +-
 .../computeHostModel.thrift                     |   180 -
 .../computeResourceModel.thrift                 |   180 +
 .../experimentModel.thrift                      |     2 +-
 .../appcatalog/cpi/ComputeResource.java         |     2 +-
 .../catalog/data/impl/ComputeResourceImpl.java  |     2 +-
 .../catalog/data/model/GSISSHExport.java        |     2 +-
 .../data/model/GSISSHPostJobCommand.java        |     2 +-
 .../catalog/data/model/GSISSHPreJobCommand.java |     2 +-
 .../data/util/AppCatalogThriftConversion.java   |     2 +-
 .../app/catalog/test/AppDeploymentTest.java     |     2 +-
 .../app/catalog/test/ComputeResourceTest.java   |     2 +-
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  |    14 +-
 .../gfac/core/scheduler/HostScheduler.java      |     2 +-
 .../scheduler/impl/SimpleHostScheduler.java     |     2 +-
 .../server/OrchestratorServerHandler.java       |     2 +-
 34 files changed, 205 insertions(+), 37114 deletions(-)
----------------------------------------------------------------------



[5/6] Updating ComputeResource Namespace to align with application descrrptions - AIRAVATA-1203

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
deleted file mode 100644
index 6f4f060..0000000
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
+++ /dev/null
@@ -1,31134 +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
- */
-package org.apache.airavata.api.appcatalog;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class ApplicationCatalogAPI {
-
-  public interface Iface {
-
-    /**
-     * Query Airavata to fetch the API version
-     */
-    public String GetAPIVersion() throws org.apache.thrift.TException;
-
-    /**
-     * Manage Computer Resources
-     * 
-     * @param computeResourceDescription
-     */
-    public String addComputeResourceDescription(org.apache.airavata.model.computehost.ComputeResourceDescription computeResourceDescription) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public String addSSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.SSHJobSubmission jobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public String addGSISSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GSISSHJobSubmission jobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public String addGlobusJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GlobusJobSubmission jobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public String addSCPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.SCPDataMovement dataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public String addGridFTPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.GridFTPDataMovement dataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public List<String> listComputeResourceDescriptions() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.computehost.ComputeResourceDescription getComputeResourceDescription(String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.computehost.SSHJobSubmission getSSHJobSubmissionProtocol(String sshJobSubmissionProtocolResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.computehost.GSISSHJobSubmission getGSISSHJobSubmissionProtocol(String gsisshJobSubmissionProtocolResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.computehost.GlobusJobSubmission getGlobusJobSubmissionProtocol(String globusJobSubmissionProtocolResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.computehost.SCPDataMovement getSCPDataMovementProtocol(String scpDataMovementResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.computehost.GridFTPDataMovement getGridFTPDataMovementProtocol(String gridFTPDataMovementResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public boolean isComputeResourceDescriptionRegistered(String hostName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.computehost.ComputeResourceDescription getComputeResourceDescriptionFromHostName(String hostName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    /**
-     * Manage Application Interfaces
-     * 
-     * @param applicationInterface
-     */
-    public String addApplicationInterface(org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription applicationInterface) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public List<String> listApplicationInterfaceIds() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription getApplicationInterface(String applicationInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    /**
-     * Manage application modules
-     * 
-     * @param applicationModule
-     * @param publish
-     */
-    public String registerAppicationModule(org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule, boolean publish) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule getAppicationModule(String appModuleId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public boolean updateAppicationModule(String appModuleId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public boolean deleteAppicationModule(String appModuleId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    /**
-     * Manage application modules
-     * 
-     * @param applicationInterfaceId
-     * @param applicationDeployment
-     */
-    public String addApplicationDeployment(String applicationInterfaceId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription applicationDeployment) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public List<String> listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-    public org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-    public void GetAPIVersion(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void addComputeResourceDescription(org.apache.airavata.model.computehost.ComputeResourceDescription computeResourceDescription, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void addSSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.SSHJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void addGSISSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GSISSHJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void addGlobusJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GlobusJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void addSCPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.SCPDataMovement dataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void addGridFTPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.GridFTPDataMovement dataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void listComputeResourceDescriptions(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getComputeResourceDescription(String computeResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getSSHJobSubmissionProtocol(String sshJobSubmissionProtocolResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getGSISSHJobSubmissionProtocol(String gsisshJobSubmissionProtocolResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getGlobusJobSubmissionProtocol(String globusJobSubmissionProtocolResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getSCPDataMovementProtocol(String scpDataMovementResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getGridFTPDataMovementProtocol(String gridFTPDataMovementResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void isComputeResourceDescriptionRegistered(String hostName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getComputeResourceDescriptionFromHostName(String hostName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void addApplicationInterface(org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription applicationInterface, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void listApplicationInterfaceIds(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getApplicationInterface(String applicationInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void registerAppicationModule(org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule, boolean publish, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getAppicationModule(String appModuleId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void updateAppicationModule(String appModuleId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void deleteAppicationModule(String appModuleId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void addApplicationDeployment(String applicationInterfaceId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription applicationDeployment, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void listApplicationDeploymentIds(String applicationInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-    public void getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
-    public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
-      public Factory() {}
-      public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-        return new Client(prot);
-      }
-      public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
-        return new Client(iprot, oprot);
-      }
-    }
-
-    public Client(org.apache.thrift.protocol.TProtocol prot)
-    {
-      super(prot, prot);
-    }
-
-    public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) {
-      super(iprot, oprot);
-    }
-
-    public String GetAPIVersion() throws org.apache.thrift.TException
-    {
-      send_GetAPIVersion();
-      return recv_GetAPIVersion();
-    }
-
-    public void send_GetAPIVersion() throws org.apache.thrift.TException
-    {
-      GetAPIVersion_args args = new GetAPIVersion_args();
-      sendBase("GetAPIVersion", args);
-    }
-
-    public String recv_GetAPIVersion() throws org.apache.thrift.TException
-    {
-      GetAPIVersion_result result = new GetAPIVersion_result();
-      receiveBase(result, "GetAPIVersion");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "GetAPIVersion failed: unknown result");
-    }
-
-    public String addComputeResourceDescription(org.apache.airavata.model.computehost.ComputeResourceDescription computeResourceDescription) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_addComputeResourceDescription(computeResourceDescription);
-      return recv_addComputeResourceDescription();
-    }
-
-    public void send_addComputeResourceDescription(org.apache.airavata.model.computehost.ComputeResourceDescription computeResourceDescription) throws org.apache.thrift.TException
-    {
-      addComputeResourceDescription_args args = new addComputeResourceDescription_args();
-      args.setComputeResourceDescription(computeResourceDescription);
-      sendBase("addComputeResourceDescription", args);
-    }
-
-    public String recv_addComputeResourceDescription() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      addComputeResourceDescription_result result = new addComputeResourceDescription_result();
-      receiveBase(result, "addComputeResourceDescription");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addComputeResourceDescription failed: unknown result");
-    }
-
-    public String addSSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.SSHJobSubmission jobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_addSSHJobSubmissionProtocol(computeResourceId, jobSubmission);
-      return recv_addSSHJobSubmissionProtocol();
-    }
-
-    public void send_addSSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.SSHJobSubmission jobSubmission) throws org.apache.thrift.TException
-    {
-      addSSHJobSubmissionProtocol_args args = new addSSHJobSubmissionProtocol_args();
-      args.setComputeResourceId(computeResourceId);
-      args.setJobSubmission(jobSubmission);
-      sendBase("addSSHJobSubmissionProtocol", args);
-    }
-
-    public String recv_addSSHJobSubmissionProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      addSSHJobSubmissionProtocol_result result = new addSSHJobSubmissionProtocol_result();
-      receiveBase(result, "addSSHJobSubmissionProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addSSHJobSubmissionProtocol failed: unknown result");
-    }
-
-    public String addGSISSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GSISSHJobSubmission jobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_addGSISSHJobSubmissionProtocol(computeResourceId, jobSubmission);
-      return recv_addGSISSHJobSubmissionProtocol();
-    }
-
-    public void send_addGSISSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GSISSHJobSubmission jobSubmission) throws org.apache.thrift.TException
-    {
-      addGSISSHJobSubmissionProtocol_args args = new addGSISSHJobSubmissionProtocol_args();
-      args.setComputeResourceId(computeResourceId);
-      args.setJobSubmission(jobSubmission);
-      sendBase("addGSISSHJobSubmissionProtocol", args);
-    }
-
-    public String recv_addGSISSHJobSubmissionProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      addGSISSHJobSubmissionProtocol_result result = new addGSISSHJobSubmissionProtocol_result();
-      receiveBase(result, "addGSISSHJobSubmissionProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGSISSHJobSubmissionProtocol failed: unknown result");
-    }
-
-    public String addGlobusJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GlobusJobSubmission jobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_addGlobusJobSubmissionProtocol(computeResourceId, jobSubmission);
-      return recv_addGlobusJobSubmissionProtocol();
-    }
-
-    public void send_addGlobusJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GlobusJobSubmission jobSubmission) throws org.apache.thrift.TException
-    {
-      addGlobusJobSubmissionProtocol_args args = new addGlobusJobSubmissionProtocol_args();
-      args.setComputeResourceId(computeResourceId);
-      args.setJobSubmission(jobSubmission);
-      sendBase("addGlobusJobSubmissionProtocol", args);
-    }
-
-    public String recv_addGlobusJobSubmissionProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      addGlobusJobSubmissionProtocol_result result = new addGlobusJobSubmissionProtocol_result();
-      receiveBase(result, "addGlobusJobSubmissionProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGlobusJobSubmissionProtocol failed: unknown result");
-    }
-
-    public String addSCPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.SCPDataMovement dataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_addSCPDataMovementProtocol(computeResourceId, dataMovement);
-      return recv_addSCPDataMovementProtocol();
-    }
-
-    public void send_addSCPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.SCPDataMovement dataMovement) throws org.apache.thrift.TException
-    {
-      addSCPDataMovementProtocol_args args = new addSCPDataMovementProtocol_args();
-      args.setComputeResourceId(computeResourceId);
-      args.setDataMovement(dataMovement);
-      sendBase("addSCPDataMovementProtocol", args);
-    }
-
-    public String recv_addSCPDataMovementProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      addSCPDataMovementProtocol_result result = new addSCPDataMovementProtocol_result();
-      receiveBase(result, "addSCPDataMovementProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addSCPDataMovementProtocol failed: unknown result");
-    }
-
-    public String addGridFTPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.GridFTPDataMovement dataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_addGridFTPDataMovementProtocol(computeResourceId, dataMovement);
-      return recv_addGridFTPDataMovementProtocol();
-    }
-
-    public void send_addGridFTPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.GridFTPDataMovement dataMovement) throws org.apache.thrift.TException
-    {
-      addGridFTPDataMovementProtocol_args args = new addGridFTPDataMovementProtocol_args();
-      args.setComputeResourceId(computeResourceId);
-      args.setDataMovement(dataMovement);
-      sendBase("addGridFTPDataMovementProtocol", args);
-    }
-
-    public String recv_addGridFTPDataMovementProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      addGridFTPDataMovementProtocol_result result = new addGridFTPDataMovementProtocol_result();
-      receiveBase(result, "addGridFTPDataMovementProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGridFTPDataMovementProtocol failed: unknown result");
-    }
-
-    public List<String> listComputeResourceDescriptions() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_listComputeResourceDescriptions();
-      return recv_listComputeResourceDescriptions();
-    }
-
-    public void send_listComputeResourceDescriptions() throws org.apache.thrift.TException
-    {
-      listComputeResourceDescriptions_args args = new listComputeResourceDescriptions_args();
-      sendBase("listComputeResourceDescriptions", args);
-    }
-
-    public List<String> recv_listComputeResourceDescriptions() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      listComputeResourceDescriptions_result result = new listComputeResourceDescriptions_result();
-      receiveBase(result, "listComputeResourceDescriptions");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listComputeResourceDescriptions failed: unknown result");
-    }
-
-    public org.apache.airavata.model.computehost.ComputeResourceDescription getComputeResourceDescription(String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getComputeResourceDescription(computeResourceId);
-      return recv_getComputeResourceDescription();
-    }
-
-    public void send_getComputeResourceDescription(String computeResourceId) throws org.apache.thrift.TException
-    {
-      getComputeResourceDescription_args args = new getComputeResourceDescription_args();
-      args.setComputeResourceId(computeResourceId);
-      sendBase("getComputeResourceDescription", args);
-    }
-
-    public org.apache.airavata.model.computehost.ComputeResourceDescription recv_getComputeResourceDescription() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getComputeResourceDescription_result result = new getComputeResourceDescription_result();
-      receiveBase(result, "getComputeResourceDescription");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getComputeResourceDescription failed: unknown result");
-    }
-
-    public org.apache.airavata.model.computehost.SSHJobSubmission getSSHJobSubmissionProtocol(String sshJobSubmissionProtocolResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getSSHJobSubmissionProtocol(sshJobSubmissionProtocolResourceId);
-      return recv_getSSHJobSubmissionProtocol();
-    }
-
-    public void send_getSSHJobSubmissionProtocol(String sshJobSubmissionProtocolResourceId) throws org.apache.thrift.TException
-    {
-      getSSHJobSubmissionProtocol_args args = new getSSHJobSubmissionProtocol_args();
-      args.setSshJobSubmissionProtocolResourceId(sshJobSubmissionProtocolResourceId);
-      sendBase("getSSHJobSubmissionProtocol", args);
-    }
-
-    public org.apache.airavata.model.computehost.SSHJobSubmission recv_getSSHJobSubmissionProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getSSHJobSubmissionProtocol_result result = new getSSHJobSubmissionProtocol_result();
-      receiveBase(result, "getSSHJobSubmissionProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSSHJobSubmissionProtocol failed: unknown result");
-    }
-
-    public org.apache.airavata.model.computehost.GSISSHJobSubmission getGSISSHJobSubmissionProtocol(String gsisshJobSubmissionProtocolResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getGSISSHJobSubmissionProtocol(gsisshJobSubmissionProtocolResourceId);
-      return recv_getGSISSHJobSubmissionProtocol();
-    }
-
-    public void send_getGSISSHJobSubmissionProtocol(String gsisshJobSubmissionProtocolResourceId) throws org.apache.thrift.TException
-    {
-      getGSISSHJobSubmissionProtocol_args args = new getGSISSHJobSubmissionProtocol_args();
-      args.setGsisshJobSubmissionProtocolResourceId(gsisshJobSubmissionProtocolResourceId);
-      sendBase("getGSISSHJobSubmissionProtocol", args);
-    }
-
-    public org.apache.airavata.model.computehost.GSISSHJobSubmission recv_getGSISSHJobSubmissionProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getGSISSHJobSubmissionProtocol_result result = new getGSISSHJobSubmissionProtocol_result();
-      receiveBase(result, "getGSISSHJobSubmissionProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGSISSHJobSubmissionProtocol failed: unknown result");
-    }
-
-    public org.apache.airavata.model.computehost.GlobusJobSubmission getGlobusJobSubmissionProtocol(String globusJobSubmissionProtocolResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getGlobusJobSubmissionProtocol(globusJobSubmissionProtocolResourceId);
-      return recv_getGlobusJobSubmissionProtocol();
-    }
-
-    public void send_getGlobusJobSubmissionProtocol(String globusJobSubmissionProtocolResourceId) throws org.apache.thrift.TException
-    {
-      getGlobusJobSubmissionProtocol_args args = new getGlobusJobSubmissionProtocol_args();
-      args.setGlobusJobSubmissionProtocolResourceId(globusJobSubmissionProtocolResourceId);
-      sendBase("getGlobusJobSubmissionProtocol", args);
-    }
-
-    public org.apache.airavata.model.computehost.GlobusJobSubmission recv_getGlobusJobSubmissionProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getGlobusJobSubmissionProtocol_result result = new getGlobusJobSubmissionProtocol_result();
-      receiveBase(result, "getGlobusJobSubmissionProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGlobusJobSubmissionProtocol failed: unknown result");
-    }
-
-    public org.apache.airavata.model.computehost.SCPDataMovement getSCPDataMovementProtocol(String scpDataMovementResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getSCPDataMovementProtocol(scpDataMovementResourceId);
-      return recv_getSCPDataMovementProtocol();
-    }
-
-    public void send_getSCPDataMovementProtocol(String scpDataMovementResourceId) throws org.apache.thrift.TException
-    {
-      getSCPDataMovementProtocol_args args = new getSCPDataMovementProtocol_args();
-      args.setScpDataMovementResourceId(scpDataMovementResourceId);
-      sendBase("getSCPDataMovementProtocol", args);
-    }
-
-    public org.apache.airavata.model.computehost.SCPDataMovement recv_getSCPDataMovementProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getSCPDataMovementProtocol_result result = new getSCPDataMovementProtocol_result();
-      receiveBase(result, "getSCPDataMovementProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSCPDataMovementProtocol failed: unknown result");
-    }
-
-    public org.apache.airavata.model.computehost.GridFTPDataMovement getGridFTPDataMovementProtocol(String gridFTPDataMovementResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getGridFTPDataMovementProtocol(gridFTPDataMovementResourceId);
-      return recv_getGridFTPDataMovementProtocol();
-    }
-
-    public void send_getGridFTPDataMovementProtocol(String gridFTPDataMovementResourceId) throws org.apache.thrift.TException
-    {
-      getGridFTPDataMovementProtocol_args args = new getGridFTPDataMovementProtocol_args();
-      args.setGridFTPDataMovementResourceId(gridFTPDataMovementResourceId);
-      sendBase("getGridFTPDataMovementProtocol", args);
-    }
-
-    public org.apache.airavata.model.computehost.GridFTPDataMovement recv_getGridFTPDataMovementProtocol() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getGridFTPDataMovementProtocol_result result = new getGridFTPDataMovementProtocol_result();
-      receiveBase(result, "getGridFTPDataMovementProtocol");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGridFTPDataMovementProtocol failed: unknown result");
-    }
-
-    public boolean isComputeResourceDescriptionRegistered(String hostName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_isComputeResourceDescriptionRegistered(hostName);
-      return recv_isComputeResourceDescriptionRegistered();
-    }
-
-    public void send_isComputeResourceDescriptionRegistered(String hostName) throws org.apache.thrift.TException
-    {
-      isComputeResourceDescriptionRegistered_args args = new isComputeResourceDescriptionRegistered_args();
-      args.setHostName(hostName);
-      sendBase("isComputeResourceDescriptionRegistered", args);
-    }
-
-    public boolean recv_isComputeResourceDescriptionRegistered() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      isComputeResourceDescriptionRegistered_result result = new isComputeResourceDescriptionRegistered_result();
-      receiveBase(result, "isComputeResourceDescriptionRegistered");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isComputeResourceDescriptionRegistered failed: unknown result");
-    }
-
-    public org.apache.airavata.model.computehost.ComputeResourceDescription getComputeResourceDescriptionFromHostName(String hostName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getComputeResourceDescriptionFromHostName(hostName);
-      return recv_getComputeResourceDescriptionFromHostName();
-    }
-
-    public void send_getComputeResourceDescriptionFromHostName(String hostName) throws org.apache.thrift.TException
-    {
-      getComputeResourceDescriptionFromHostName_args args = new getComputeResourceDescriptionFromHostName_args();
-      args.setHostName(hostName);
-      sendBase("getComputeResourceDescriptionFromHostName", args);
-    }
-
-    public org.apache.airavata.model.computehost.ComputeResourceDescription recv_getComputeResourceDescriptionFromHostName() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getComputeResourceDescriptionFromHostName_result result = new getComputeResourceDescriptionFromHostName_result();
-      receiveBase(result, "getComputeResourceDescriptionFromHostName");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getComputeResourceDescriptionFromHostName failed: unknown result");
-    }
-
-    public String addApplicationInterface(org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription applicationInterface) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_addApplicationInterface(applicationInterface);
-      return recv_addApplicationInterface();
-    }
-
-    public void send_addApplicationInterface(org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription applicationInterface) throws org.apache.thrift.TException
-    {
-      addApplicationInterface_args args = new addApplicationInterface_args();
-      args.setApplicationInterface(applicationInterface);
-      sendBase("addApplicationInterface", args);
-    }
-
-    public String recv_addApplicationInterface() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      addApplicationInterface_result result = new addApplicationInterface_result();
-      receiveBase(result, "addApplicationInterface");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addApplicationInterface failed: unknown result");
-    }
-
-    public List<String> listApplicationInterfaceIds() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_listApplicationInterfaceIds();
-      return recv_listApplicationInterfaceIds();
-    }
-
-    public void send_listApplicationInterfaceIds() throws org.apache.thrift.TException
-    {
-      listApplicationInterfaceIds_args args = new listApplicationInterfaceIds_args();
-      sendBase("listApplicationInterfaceIds", args);
-    }
-
-    public List<String> recv_listApplicationInterfaceIds() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      listApplicationInterfaceIds_result result = new listApplicationInterfaceIds_result();
-      receiveBase(result, "listApplicationInterfaceIds");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listApplicationInterfaceIds failed: unknown result");
-    }
-
-    public org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription getApplicationInterface(String applicationInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getApplicationInterface(applicationInterfaceId);
-      return recv_getApplicationInterface();
-    }
-
-    public void send_getApplicationInterface(String applicationInterfaceId) throws org.apache.thrift.TException
-    {
-      getApplicationInterface_args args = new getApplicationInterface_args();
-      args.setApplicationInterfaceId(applicationInterfaceId);
-      sendBase("getApplicationInterface", args);
-    }
-
-    public org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription recv_getApplicationInterface() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getApplicationInterface_result result = new getApplicationInterface_result();
-      receiveBase(result, "getApplicationInterface");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getApplicationInterface failed: unknown result");
-    }
-
-    public String registerAppicationModule(org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule, boolean publish) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_registerAppicationModule(applicationModule, publish);
-      return recv_registerAppicationModule();
-    }
-
-    public void send_registerAppicationModule(org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule, boolean publish) throws org.apache.thrift.TException
-    {
-      registerAppicationModule_args args = new registerAppicationModule_args();
-      args.setApplicationModule(applicationModule);
-      args.setPublish(publish);
-      sendBase("registerAppicationModule", args);
-    }
-
-    public String recv_registerAppicationModule() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      registerAppicationModule_result result = new registerAppicationModule_result();
-      receiveBase(result, "registerAppicationModule");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "registerAppicationModule failed: unknown result");
-    }
-
-    public org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule getAppicationModule(String appModuleId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getAppicationModule(appModuleId);
-      return recv_getAppicationModule();
-    }
-
-    public void send_getAppicationModule(String appModuleId) throws org.apache.thrift.TException
-    {
-      getAppicationModule_args args = new getAppicationModule_args();
-      args.setAppModuleId(appModuleId);
-      sendBase("getAppicationModule", args);
-    }
-
-    public org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule recv_getAppicationModule() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getAppicationModule_result result = new getAppicationModule_result();
-      receiveBase(result, "getAppicationModule");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAppicationModule failed: unknown result");
-    }
-
-    public boolean updateAppicationModule(String appModuleId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_updateAppicationModule(appModuleId, applicationModule);
-      return recv_updateAppicationModule();
-    }
-
-    public void send_updateAppicationModule(String appModuleId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule) throws org.apache.thrift.TException
-    {
-      updateAppicationModule_args args = new updateAppicationModule_args();
-      args.setAppModuleId(appModuleId);
-      args.setApplicationModule(applicationModule);
-      sendBase("updateAppicationModule", args);
-    }
-
-    public boolean recv_updateAppicationModule() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      updateAppicationModule_result result = new updateAppicationModule_result();
-      receiveBase(result, "updateAppicationModule");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateAppicationModule failed: unknown result");
-    }
-
-    public boolean deleteAppicationModule(String appModuleId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_deleteAppicationModule(appModuleId);
-      return recv_deleteAppicationModule();
-    }
-
-    public void send_deleteAppicationModule(String appModuleId) throws org.apache.thrift.TException
-    {
-      deleteAppicationModule_args args = new deleteAppicationModule_args();
-      args.setAppModuleId(appModuleId);
-      sendBase("deleteAppicationModule", args);
-    }
-
-    public boolean recv_deleteAppicationModule() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      deleteAppicationModule_result result = new deleteAppicationModule_result();
-      receiveBase(result, "deleteAppicationModule");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteAppicationModule failed: unknown result");
-    }
-
-    public String addApplicationDeployment(String applicationInterfaceId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription applicationDeployment) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_addApplicationDeployment(applicationInterfaceId, applicationDeployment);
-      return recv_addApplicationDeployment();
-    }
-
-    public void send_addApplicationDeployment(String applicationInterfaceId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription applicationDeployment) throws org.apache.thrift.TException
-    {
-      addApplicationDeployment_args args = new addApplicationDeployment_args();
-      args.setApplicationInterfaceId(applicationInterfaceId);
-      args.setApplicationDeployment(applicationDeployment);
-      sendBase("addApplicationDeployment", args);
-    }
-
-    public String recv_addApplicationDeployment() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      addApplicationDeployment_result result = new addApplicationDeployment_result();
-      receiveBase(result, "addApplicationDeployment");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addApplicationDeployment failed: unknown result");
-    }
-
-    public List<String> listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_listApplicationDeploymentIds(applicationInterfaceId);
-      return recv_listApplicationDeploymentIds();
-    }
-
-    public void send_listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.thrift.TException
-    {
-      listApplicationDeploymentIds_args args = new listApplicationDeploymentIds_args();
-      args.setApplicationInterfaceId(applicationInterfaceId);
-      sendBase("listApplicationDeploymentIds", args);
-    }
-
-    public List<String> recv_listApplicationDeploymentIds() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      listApplicationDeploymentIds_result result = new listApplicationDeploymentIds_result();
-      receiveBase(result, "listApplicationDeploymentIds");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listApplicationDeploymentIds failed: unknown result");
-    }
-
-    public org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      send_getApplicationDeployment(applicationInterfaceId, applicationDeploymentId);
-      return recv_getApplicationDeployment();
-    }
-
-    public void send_getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.thrift.TException
-    {
-      getApplicationDeployment_args args = new getApplicationDeployment_args();
-      args.setApplicationInterfaceId(applicationInterfaceId);
-      args.setApplicationDeploymentId(applicationDeploymentId);
-      sendBase("getApplicationDeployment", args);
-    }
-
-    public org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription recv_getApplicationDeployment() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
-    {
-      getApplicationDeployment_result result = new getApplicationDeployment_result();
-      receiveBase(result, "getApplicationDeployment");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ace != null) {
-        throw result.ace;
-      }
-      if (result.ase != null) {
-        throw result.ase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getApplicationDeployment failed: unknown result");
-    }
-
-  }
-  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
-    public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
-      private org.apache.thrift.async.TAsyncClientManager clientManager;
-      private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
-      public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
-        this.clientManager = clientManager;
-        this.protocolFactory = protocolFactory;
-      }
-      public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
-        return new AsyncClient(protocolFactory, clientManager, transport);
-      }
-    }
-
-    public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) {
-      super(protocolFactory, clientManager, transport);
-    }
-
-    public void GetAPIVersion(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      GetAPIVersion_call method_call = new GetAPIVersion_call(resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class GetAPIVersion_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public GetAPIVersion_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("GetAPIVersion", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        GetAPIVersion_args args = new GetAPIVersion_args();
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public String getResult() throws org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_GetAPIVersion();
-      }
-    }
-
-    public void addComputeResourceDescription(org.apache.airavata.model.computehost.ComputeResourceDescription computeResourceDescription, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      addComputeResourceDescription_call method_call = new addComputeResourceDescription_call(computeResourceDescription, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class addComputeResourceDescription_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.airavata.model.computehost.ComputeResourceDescription computeResourceDescription;
-      public addComputeResourceDescription_call(org.apache.airavata.model.computehost.ComputeResourceDescription computeResourceDescription, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.computeResourceDescription = computeResourceDescription;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addComputeResourceDescription", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        addComputeResourceDescription_args args = new addComputeResourceDescription_args();
-        args.setComputeResourceDescription(computeResourceDescription);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_addComputeResourceDescription();
-      }
-    }
-
-    public void addSSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.SSHJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      addSSHJobSubmissionProtocol_call method_call = new addSSHJobSubmissionProtocol_call(computeResourceId, jobSubmission, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class addSSHJobSubmissionProtocol_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String computeResourceId;
-      private org.apache.airavata.model.computehost.SSHJobSubmission jobSubmission;
-      public addSSHJobSubmissionProtocol_call(String computeResourceId, org.apache.airavata.model.computehost.SSHJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.computeResourceId = computeResourceId;
-        this.jobSubmission = jobSubmission;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addSSHJobSubmissionProtocol", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        addSSHJobSubmissionProtocol_args args = new addSSHJobSubmissionProtocol_args();
-        args.setComputeResourceId(computeResourceId);
-        args.setJobSubmission(jobSubmission);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_addSSHJobSubmissionProtocol();
-      }
-    }
-
-    public void addGSISSHJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GSISSHJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      addGSISSHJobSubmissionProtocol_call method_call = new addGSISSHJobSubmissionProtocol_call(computeResourceId, jobSubmission, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class addGSISSHJobSubmissionProtocol_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String computeResourceId;
-      private org.apache.airavata.model.computehost.GSISSHJobSubmission jobSubmission;
-      public addGSISSHJobSubmissionProtocol_call(String computeResourceId, org.apache.airavata.model.computehost.GSISSHJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.computeResourceId = computeResourceId;
-        this.jobSubmission = jobSubmission;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGSISSHJobSubmissionProtocol", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        addGSISSHJobSubmissionProtocol_args args = new addGSISSHJobSubmissionProtocol_args();
-        args.setComputeResourceId(computeResourceId);
-        args.setJobSubmission(jobSubmission);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_addGSISSHJobSubmissionProtocol();
-      }
-    }
-
-    public void addGlobusJobSubmissionProtocol(String computeResourceId, org.apache.airavata.model.computehost.GlobusJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      addGlobusJobSubmissionProtocol_call method_call = new addGlobusJobSubmissionProtocol_call(computeResourceId, jobSubmission, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class addGlobusJobSubmissionProtocol_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String computeResourceId;
-      private org.apache.airavata.model.computehost.GlobusJobSubmission jobSubmission;
-      public addGlobusJobSubmissionProtocol_call(String computeResourceId, org.apache.airavata.model.computehost.GlobusJobSubmission jobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.computeResourceId = computeResourceId;
-        this.jobSubmission = jobSubmission;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGlobusJobSubmissionProtocol", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        addGlobusJobSubmissionProtocol_args args = new addGlobusJobSubmissionProtocol_args();
-        args.setComputeResourceId(computeResourceId);
-        args.setJobSubmission(jobSubmission);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_addGlobusJobSubmissionProtocol();
-      }
-    }
-
-    public void addSCPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.SCPDataMovement dataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      addSCPDataMovementProtocol_call method_call = new addSCPDataMovementProtocol_call(computeResourceId, dataMovement, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class addSCPDataMovementProtocol_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String computeResourceId;
-      private org.apache.airavata.model.computehost.SCPDataMovement dataMovement;
-      public addSCPDataMovementProtocol_call(String computeResourceId, org.apache.airavata.model.computehost.SCPDataMovement dataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.computeResourceId = computeResourceId;
-        this.dataMovement = dataMovement;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addSCPDataMovementProtocol", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        addSCPDataMovementProtocol_args args = new addSCPDataMovementProtocol_args();
-        args.setComputeResourceId(computeResourceId);
-        args.setDataMovement(dataMovement);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_addSCPDataMovementProtocol();
-      }
-    }
-
-    public void addGridFTPDataMovementProtocol(String computeResourceId, org.apache.airavata.model.computehost.GridFTPDataMovement dataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      addGridFTPDataMovementProtocol_call method_call = new addGridFTPDataMovementProtocol_call(computeResourceId, dataMovement, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class addGridFTPDataMovementProtocol_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String computeResourceId;
-      private org.apache.airavata.model.computehost.GridFTPDataMovement dataMovement;
-      public addGridFTPDataMovementProtocol_call(String computeResourceId, org.apache.airavata.model.computehost.GridFTPDataMovement dataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.computeResourceId = computeResourceId;
-        this.dataMovement = dataMovement;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGridFTPDataMovementProtocol", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        addGridFTPDataMovementProtocol_args args = new addGridFTPDataMovementProtocol_args();
-        args.setComputeResourceId(computeResourceId);
-        args.setDataMovement(dataMovement);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_addGridFTPDataMovementProtocol();
-      }
-    }
-
-    public void listComputeResourceDescriptions(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      listComputeResourceDescriptions_call method_call = new listComputeResourceDescriptions_call(resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class listComputeResourceDescriptions_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public listComputeResourceDescriptions_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("listComputeResourceDescriptions", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        listComputeResourceDescriptions_args args = new listComputeResourceDescriptions_args();
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public List<String> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_listComputeResourceDescriptions();
-      }
-    }
-
-    public void getComputeResourceDescription(String computeResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      getComputeResourceDescription_call method_call = new getComputeResourceDescription_call(computeResourceId, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class getComputeResourceDescription_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String computeResourceId;
-      public getComputeResourceDescription_call(String computeResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.computeResourceId = computeResourceId;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getComputeResourceDescription", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getComputeResourceDescription_args args = new getComputeResourceDescription_args();
-        args.setComputeResourceId(computeResourceId);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public org.apache.airavata.model.computehost.ComputeResourceDescription getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_getComputeResourceDescription();
-      }
-    }
-
-    public void getSSHJobSubmissionProtocol(String sshJobSubmissionProtocolResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      getSSHJobSubmissionProtocol_call method_call = new getSSHJobSubmissionProtocol_call(sshJobSubmissionProtocolResourceId, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class getSSHJobSubmissionProtocol_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String sshJobSubmissionProtocolResourceId;
-      public getSSHJobSubmissionProtocol_call(String sshJobSubmissionProtocolResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.sshJobSubmissionProtocolResourceId = sshJobSubmissionProtocolResourceId;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getSSHJobSubmissionProtocol", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getSSHJobSubmissionProtocol_args args = new getSSHJobSubmissionProtocol_args();
-        args.setSshJobSubmissionProtocolResourceId(sshJobSubmissionProtocolResourceId);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public org.apache.airavata.model.computehost.SSHJobSubmission getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_getSSHJobSubmissionProtocol();
-      }
-    }
-
-    public void getGSISSHJobSubmissionProtocol(String gsisshJobSubmissionProtocolResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      getGSISSHJobSubmissionProtocol_call method_call = new getGSISSHJobSubmissionProtocol_call(gsisshJobSubmissionProtocolResourceId, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class getGSISSHJobSubmissionProtocol_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String gsisshJobSubmissionProtocolResourceId;
-      public getGSISSHJobSubmissionProtocol_call(String gsisshJobSubmissionProtocolResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-   

<TRUNCATED>

[3/6] Updating ComputeResource Namespace to align with application descrrptions - AIRAVATA-1203

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GSISSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GSISSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GSISSHJobSubmission.java
deleted file mode 100644
index fd45d57..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GSISSHJobSubmission.java
+++ /dev/null
@@ -1,1262 +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
- */
-package org.apache.airavata.model.computehost;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class GSISSHJobSubmission implements org.apache.thrift.TBase<GSISSHJobSubmission, GSISSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GSISSHJobSubmission> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GSISSHJobSubmission");
-
-  private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionDataID", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceJobManager", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField SSH_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sshPort", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField EXPORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("exports", org.apache.thrift.protocol.TType.SET, (short)4);
-  private static final org.apache.thrift.protocol.TField PRE_JOB_COMMANDS_FIELD_DESC = new org.apache.thrift.protocol.TField("preJobCommands", org.apache.thrift.protocol.TType.LIST, (short)5);
-  private static final org.apache.thrift.protocol.TField POST_JOB_COMMANDS_FIELD_DESC = new org.apache.thrift.protocol.TField("postJobCommands", org.apache.thrift.protocol.TType.LIST, (short)6);
-  private static final org.apache.thrift.protocol.TField INSTALLED_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("installedPath", org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField MONITOR_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("monitorMode", org.apache.thrift.protocol.TType.STRING, (short)8);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new GSISSHJobSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new GSISSHJobSubmissionTupleSchemeFactory());
-  }
-
-  private String jobSubmissionDataID; // required
-  private ResourceJobManager resourceJobManager; // required
-  private int sshPort; // optional
-  private Set<String> exports; // optional
-  private List<String> preJobCommands; // optional
-  private List<String> postJobCommands; // optional
-  private String installedPath; // optional
-  private String monitorMode; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    JOB_SUBMISSION_DATA_ID((short)1, "jobSubmissionDataID"),
-    /**
-     * 
-     * @see ResourceJobManager
-     */
-    RESOURCE_JOB_MANAGER((short)2, "resourceJobManager"),
-    SSH_PORT((short)3, "sshPort"),
-    EXPORTS((short)4, "exports"),
-    PRE_JOB_COMMANDS((short)5, "preJobCommands"),
-    POST_JOB_COMMANDS((short)6, "postJobCommands"),
-    INSTALLED_PATH((short)7, "installedPath"),
-    MONITOR_MODE((short)8, "monitorMode");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // JOB_SUBMISSION_DATA_ID
-          return JOB_SUBMISSION_DATA_ID;
-        case 2: // RESOURCE_JOB_MANAGER
-          return RESOURCE_JOB_MANAGER;
-        case 3: // SSH_PORT
-          return SSH_PORT;
-        case 4: // EXPORTS
-          return EXPORTS;
-        case 5: // PRE_JOB_COMMANDS
-          return PRE_JOB_COMMANDS;
-        case 6: // POST_JOB_COMMANDS
-          return POST_JOB_COMMANDS;
-        case 7: // INSTALLED_PATH
-          return INSTALLED_PATH;
-        case 8: // MONITOR_MODE
-          return MONITOR_MODE;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __SSHPORT_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SSH_PORT,_Fields.EXPORTS,_Fields.PRE_JOB_COMMANDS,_Fields.POST_JOB_COMMANDS,_Fields.INSTALLED_PATH,_Fields.MONITOR_MODE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.JOB_SUBMISSION_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionDataID", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.RESOURCE_JOB_MANAGER, new org.apache.thrift.meta_data.FieldMetaData("resourceJobManager", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceJobManager.class)));
-    tmpMap.put(_Fields.SSH_PORT, new org.apache.thrift.meta_data.FieldMetaData("sshPort", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.EXPORTS, new org.apache.thrift.meta_data.FieldMetaData("exports", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.PRE_JOB_COMMANDS, new org.apache.thrift.meta_data.FieldMetaData("preJobCommands", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.POST_JOB_COMMANDS, new org.apache.thrift.meta_data.FieldMetaData("postJobCommands", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.INSTALLED_PATH, new org.apache.thrift.meta_data.FieldMetaData("installedPath", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.MONITOR_MODE, new org.apache.thrift.meta_data.FieldMetaData("monitorMode", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GSISSHJobSubmission.class, metaDataMap);
-  }
-
-  public GSISSHJobSubmission() {
-    this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.sshPort = 22;
-
-  }
-
-  public GSISSHJobSubmission(
-    String jobSubmissionDataID,
-    ResourceJobManager resourceJobManager)
-  {
-    this();
-    this.jobSubmissionDataID = jobSubmissionDataID;
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public GSISSHJobSubmission(GSISSHJobSubmission other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetJobSubmissionDataID()) {
-      this.jobSubmissionDataID = other.jobSubmissionDataID;
-    }
-    if (other.isSetResourceJobManager()) {
-      this.resourceJobManager = other.resourceJobManager;
-    }
-    this.sshPort = other.sshPort;
-    if (other.isSetExports()) {
-      Set<String> __this__exports = new HashSet<String>(other.exports);
-      this.exports = __this__exports;
-    }
-    if (other.isSetPreJobCommands()) {
-      List<String> __this__preJobCommands = new ArrayList<String>(other.preJobCommands);
-      this.preJobCommands = __this__preJobCommands;
-    }
-    if (other.isSetPostJobCommands()) {
-      List<String> __this__postJobCommands = new ArrayList<String>(other.postJobCommands);
-      this.postJobCommands = __this__postJobCommands;
-    }
-    if (other.isSetInstalledPath()) {
-      this.installedPath = other.installedPath;
-    }
-    if (other.isSetMonitorMode()) {
-      this.monitorMode = other.monitorMode;
-    }
-  }
-
-  public GSISSHJobSubmission deepCopy() {
-    return new GSISSHJobSubmission(this);
-  }
-
-  @Override
-  public void clear() {
-    this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.resourceJobManager = null;
-    this.sshPort = 22;
-
-    this.exports = null;
-    this.preJobCommands = null;
-    this.postJobCommands = null;
-    this.installedPath = null;
-    this.monitorMode = null;
-  }
-
-  public String getJobSubmissionDataID() {
-    return this.jobSubmissionDataID;
-  }
-
-  public void setJobSubmissionDataID(String jobSubmissionDataID) {
-    this.jobSubmissionDataID = jobSubmissionDataID;
-  }
-
-  public void unsetJobSubmissionDataID() {
-    this.jobSubmissionDataID = null;
-  }
-
-  /** Returns true if field jobSubmissionDataID is set (has been assigned a value) and false otherwise */
-  public boolean isSetJobSubmissionDataID() {
-    return this.jobSubmissionDataID != null;
-  }
-
-  public void setJobSubmissionDataIDIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionDataID = null;
-    }
-  }
-
-  /**
-   * 
-   * @see ResourceJobManager
-   */
-  public ResourceJobManager getResourceJobManager() {
-    return this.resourceJobManager;
-  }
-
-  /**
-   * 
-   * @see ResourceJobManager
-   */
-  public void setResourceJobManager(ResourceJobManager resourceJobManager) {
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  public void unsetResourceJobManager() {
-    this.resourceJobManager = null;
-  }
-
-  /** Returns true if field resourceJobManager is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceJobManager() {
-    return this.resourceJobManager != null;
-  }
-
-  public void setResourceJobManagerIsSet(boolean value) {
-    if (!value) {
-      this.resourceJobManager = null;
-    }
-  }
-
-  public int getSshPort() {
-    return this.sshPort;
-  }
-
-  public void setSshPort(int sshPort) {
-    this.sshPort = sshPort;
-    setSshPortIsSet(true);
-  }
-
-  public void unsetSshPort() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SSHPORT_ISSET_ID);
-  }
-
-  /** Returns true if field sshPort is set (has been assigned a value) and false otherwise */
-  public boolean isSetSshPort() {
-    return EncodingUtils.testBit(__isset_bitfield, __SSHPORT_ISSET_ID);
-  }
-
-  public void setSshPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SSHPORT_ISSET_ID, value);
-  }
-
-  public int getExportsSize() {
-    return (this.exports == null) ? 0 : this.exports.size();
-  }
-
-  public java.util.Iterator<String> getExportsIterator() {
-    return (this.exports == null) ? null : this.exports.iterator();
-  }
-
-  public void addToExports(String elem) {
-    if (this.exports == null) {
-      this.exports = new HashSet<String>();
-    }
-    this.exports.add(elem);
-  }
-
-  public Set<String> getExports() {
-    return this.exports;
-  }
-
-  public void setExports(Set<String> exports) {
-    this.exports = exports;
-  }
-
-  public void unsetExports() {
-    this.exports = null;
-  }
-
-  /** Returns true if field exports is set (has been assigned a value) and false otherwise */
-  public boolean isSetExports() {
-    return this.exports != null;
-  }
-
-  public void setExportsIsSet(boolean value) {
-    if (!value) {
-      this.exports = null;
-    }
-  }
-
-  public int getPreJobCommandsSize() {
-    return (this.preJobCommands == null) ? 0 : this.preJobCommands.size();
-  }
-
-  public java.util.Iterator<String> getPreJobCommandsIterator() {
-    return (this.preJobCommands == null) ? null : this.preJobCommands.iterator();
-  }
-
-  public void addToPreJobCommands(String elem) {
-    if (this.preJobCommands == null) {
-      this.preJobCommands = new ArrayList<String>();
-    }
-    this.preJobCommands.add(elem);
-  }
-
-  public List<String> getPreJobCommands() {
-    return this.preJobCommands;
-  }
-
-  public void setPreJobCommands(List<String> preJobCommands) {
-    this.preJobCommands = preJobCommands;
-  }
-
-  public void unsetPreJobCommands() {
-    this.preJobCommands = null;
-  }
-
-  /** Returns true if field preJobCommands is set (has been assigned a value) and false otherwise */
-  public boolean isSetPreJobCommands() {
-    return this.preJobCommands != null;
-  }
-
-  public void setPreJobCommandsIsSet(boolean value) {
-    if (!value) {
-      this.preJobCommands = null;
-    }
-  }
-
-  public int getPostJobCommandsSize() {
-    return (this.postJobCommands == null) ? 0 : this.postJobCommands.size();
-  }
-
-  public java.util.Iterator<String> getPostJobCommandsIterator() {
-    return (this.postJobCommands == null) ? null : this.postJobCommands.iterator();
-  }
-
-  public void addToPostJobCommands(String elem) {
-    if (this.postJobCommands == null) {
-      this.postJobCommands = new ArrayList<String>();
-    }
-    this.postJobCommands.add(elem);
-  }
-
-  public List<String> getPostJobCommands() {
-    return this.postJobCommands;
-  }
-
-  public void setPostJobCommands(List<String> postJobCommands) {
-    this.postJobCommands = postJobCommands;
-  }
-
-  public void unsetPostJobCommands() {
-    this.postJobCommands = null;
-  }
-
-  /** Returns true if field postJobCommands is set (has been assigned a value) and false otherwise */
-  public boolean isSetPostJobCommands() {
-    return this.postJobCommands != null;
-  }
-
-  public void setPostJobCommandsIsSet(boolean value) {
-    if (!value) {
-      this.postJobCommands = null;
-    }
-  }
-
-  public String getInstalledPath() {
-    return this.installedPath;
-  }
-
-  public void setInstalledPath(String installedPath) {
-    this.installedPath = installedPath;
-  }
-
-  public void unsetInstalledPath() {
-    this.installedPath = null;
-  }
-
-  /** Returns true if field installedPath is set (has been assigned a value) and false otherwise */
-  public boolean isSetInstalledPath() {
-    return this.installedPath != null;
-  }
-
-  public void setInstalledPathIsSet(boolean value) {
-    if (!value) {
-      this.installedPath = null;
-    }
-  }
-
-  public String getMonitorMode() {
-    return this.monitorMode;
-  }
-
-  public void setMonitorMode(String monitorMode) {
-    this.monitorMode = monitorMode;
-  }
-
-  public void unsetMonitorMode() {
-    this.monitorMode = null;
-  }
-
-  /** Returns true if field monitorMode is set (has been assigned a value) and false otherwise */
-  public boolean isSetMonitorMode() {
-    return this.monitorMode != null;
-  }
-
-  public void setMonitorModeIsSet(boolean value) {
-    if (!value) {
-      this.monitorMode = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      if (value == null) {
-        unsetJobSubmissionDataID();
-      } else {
-        setJobSubmissionDataID((String)value);
-      }
-      break;
-
-    case RESOURCE_JOB_MANAGER:
-      if (value == null) {
-        unsetResourceJobManager();
-      } else {
-        setResourceJobManager((ResourceJobManager)value);
-      }
-      break;
-
-    case SSH_PORT:
-      if (value == null) {
-        unsetSshPort();
-      } else {
-        setSshPort((Integer)value);
-      }
-      break;
-
-    case EXPORTS:
-      if (value == null) {
-        unsetExports();
-      } else {
-        setExports((Set<String>)value);
-      }
-      break;
-
-    case PRE_JOB_COMMANDS:
-      if (value == null) {
-        unsetPreJobCommands();
-      } else {
-        setPreJobCommands((List<String>)value);
-      }
-      break;
-
-    case POST_JOB_COMMANDS:
-      if (value == null) {
-        unsetPostJobCommands();
-      } else {
-        setPostJobCommands((List<String>)value);
-      }
-      break;
-
-    case INSTALLED_PATH:
-      if (value == null) {
-        unsetInstalledPath();
-      } else {
-        setInstalledPath((String)value);
-      }
-      break;
-
-    case MONITOR_MODE:
-      if (value == null) {
-        unsetMonitorMode();
-      } else {
-        setMonitorMode((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      return getJobSubmissionDataID();
-
-    case RESOURCE_JOB_MANAGER:
-      return getResourceJobManager();
-
-    case SSH_PORT:
-      return Integer.valueOf(getSshPort());
-
-    case EXPORTS:
-      return getExports();
-
-    case PRE_JOB_COMMANDS:
-      return getPreJobCommands();
-
-    case POST_JOB_COMMANDS:
-      return getPostJobCommands();
-
-    case INSTALLED_PATH:
-      return getInstalledPath();
-
-    case MONITOR_MODE:
-      return getMonitorMode();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      return isSetJobSubmissionDataID();
-    case RESOURCE_JOB_MANAGER:
-      return isSetResourceJobManager();
-    case SSH_PORT:
-      return isSetSshPort();
-    case EXPORTS:
-      return isSetExports();
-    case PRE_JOB_COMMANDS:
-      return isSetPreJobCommands();
-    case POST_JOB_COMMANDS:
-      return isSetPostJobCommands();
-    case INSTALLED_PATH:
-      return isSetInstalledPath();
-    case MONITOR_MODE:
-      return isSetMonitorMode();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof GSISSHJobSubmission)
-      return this.equals((GSISSHJobSubmission)that);
-    return false;
-  }
-
-  public boolean equals(GSISSHJobSubmission that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_jobSubmissionDataID = true && this.isSetJobSubmissionDataID();
-    boolean that_present_jobSubmissionDataID = true && that.isSetJobSubmissionDataID();
-    if (this_present_jobSubmissionDataID || that_present_jobSubmissionDataID) {
-      if (!(this_present_jobSubmissionDataID && that_present_jobSubmissionDataID))
-        return false;
-      if (!this.jobSubmissionDataID.equals(that.jobSubmissionDataID))
-        return false;
-    }
-
-    boolean this_present_resourceJobManager = true && this.isSetResourceJobManager();
-    boolean that_present_resourceJobManager = true && that.isSetResourceJobManager();
-    if (this_present_resourceJobManager || that_present_resourceJobManager) {
-      if (!(this_present_resourceJobManager && that_present_resourceJobManager))
-        return false;
-      if (!this.resourceJobManager.equals(that.resourceJobManager))
-        return false;
-    }
-
-    boolean this_present_sshPort = true && this.isSetSshPort();
-    boolean that_present_sshPort = true && that.isSetSshPort();
-    if (this_present_sshPort || that_present_sshPort) {
-      if (!(this_present_sshPort && that_present_sshPort))
-        return false;
-      if (this.sshPort != that.sshPort)
-        return false;
-    }
-
-    boolean this_present_exports = true && this.isSetExports();
-    boolean that_present_exports = true && that.isSetExports();
-    if (this_present_exports || that_present_exports) {
-      if (!(this_present_exports && that_present_exports))
-        return false;
-      if (!this.exports.equals(that.exports))
-        return false;
-    }
-
-    boolean this_present_preJobCommands = true && this.isSetPreJobCommands();
-    boolean that_present_preJobCommands = true && that.isSetPreJobCommands();
-    if (this_present_preJobCommands || that_present_preJobCommands) {
-      if (!(this_present_preJobCommands && that_present_preJobCommands))
-        return false;
-      if (!this.preJobCommands.equals(that.preJobCommands))
-        return false;
-    }
-
-    boolean this_present_postJobCommands = true && this.isSetPostJobCommands();
-    boolean that_present_postJobCommands = true && that.isSetPostJobCommands();
-    if (this_present_postJobCommands || that_present_postJobCommands) {
-      if (!(this_present_postJobCommands && that_present_postJobCommands))
-        return false;
-      if (!this.postJobCommands.equals(that.postJobCommands))
-        return false;
-    }
-
-    boolean this_present_installedPath = true && this.isSetInstalledPath();
-    boolean that_present_installedPath = true && that.isSetInstalledPath();
-    if (this_present_installedPath || that_present_installedPath) {
-      if (!(this_present_installedPath && that_present_installedPath))
-        return false;
-      if (!this.installedPath.equals(that.installedPath))
-        return false;
-    }
-
-    boolean this_present_monitorMode = true && this.isSetMonitorMode();
-    boolean that_present_monitorMode = true && that.isSetMonitorMode();
-    if (this_present_monitorMode || that_present_monitorMode) {
-      if (!(this_present_monitorMode && that_present_monitorMode))
-        return false;
-      if (!this.monitorMode.equals(that.monitorMode))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(GSISSHJobSubmission other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetJobSubmissionDataID()).compareTo(other.isSetJobSubmissionDataID());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionDataID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionDataID, other.jobSubmissionDataID);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetResourceJobManager()).compareTo(other.isSetResourceJobManager());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceJobManager()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceJobManager, other.resourceJobManager);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSshPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshPort, other.sshPort);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetExports()).compareTo(other.isSetExports());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetExports()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.exports, other.exports);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetPreJobCommands()).compareTo(other.isSetPreJobCommands());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPreJobCommands()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.preJobCommands, other.preJobCommands);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetPostJobCommands()).compareTo(other.isSetPostJobCommands());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPostJobCommands()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.postJobCommands, other.postJobCommands);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetInstalledPath()).compareTo(other.isSetInstalledPath());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetInstalledPath()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.installedPath, other.installedPath);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetMonitorMode()).compareTo(other.isSetMonitorMode());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetMonitorMode()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.monitorMode, other.monitorMode);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("GSISSHJobSubmission(");
-    boolean first = true;
-
-    sb.append("jobSubmissionDataID:");
-    if (this.jobSubmissionDataID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionDataID);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("resourceJobManager:");
-    if (this.resourceJobManager == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.resourceJobManager);
-    }
-    first = false;
-    if (isSetSshPort()) {
-      if (!first) sb.append(", ");
-      sb.append("sshPort:");
-      sb.append(this.sshPort);
-      first = false;
-    }
-    if (isSetExports()) {
-      if (!first) sb.append(", ");
-      sb.append("exports:");
-      if (this.exports == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.exports);
-      }
-      first = false;
-    }
-    if (isSetPreJobCommands()) {
-      if (!first) sb.append(", ");
-      sb.append("preJobCommands:");
-      if (this.preJobCommands == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.preJobCommands);
-      }
-      first = false;
-    }
-    if (isSetPostJobCommands()) {
-      if (!first) sb.append(", ");
-      sb.append("postJobCommands:");
-      if (this.postJobCommands == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.postJobCommands);
-      }
-      first = false;
-    }
-    if (isSetInstalledPath()) {
-      if (!first) sb.append(", ");
-      sb.append("installedPath:");
-      if (this.installedPath == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.installedPath);
-      }
-      first = false;
-    }
-    if (isSetMonitorMode()) {
-      if (!first) sb.append(", ");
-      sb.append("monitorMode:");
-      if (this.monitorMode == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.monitorMode);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetJobSubmissionDataID()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionDataID' is unset! Struct:" + toString());
-    }
-
-    if (!isSetResourceJobManager()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceJobManager' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class GSISSHJobSubmissionStandardSchemeFactory implements SchemeFactory {
-    public GSISSHJobSubmissionStandardScheme getScheme() {
-      return new GSISSHJobSubmissionStandardScheme();
-    }
-  }
-
-  private static class GSISSHJobSubmissionStandardScheme extends StandardScheme<GSISSHJobSubmission> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GSISSHJobSubmission struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // JOB_SUBMISSION_DATA_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.jobSubmissionDataID = iprot.readString();
-              struct.setJobSubmissionDataIDIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // RESOURCE_JOB_MANAGER
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
-              struct.setResourceJobManagerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SSH_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.sshPort = iprot.readI32();
-              struct.setSshPortIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // EXPORTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
-              {
-                org.apache.thrift.protocol.TSet _set16 = iprot.readSetBegin();
-                struct.exports = new HashSet<String>(2*_set16.size);
-                for (int _i17 = 0; _i17 < _set16.size; ++_i17)
-                {
-                  String _elem18;
-                  _elem18 = iprot.readString();
-                  struct.exports.add(_elem18);
-                }
-                iprot.readSetEnd();
-              }
-              struct.setExportsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PRE_JOB_COMMANDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list19 = iprot.readListBegin();
-                struct.preJobCommands = new ArrayList<String>(_list19.size);
-                for (int _i20 = 0; _i20 < _list19.size; ++_i20)
-                {
-                  String _elem21;
-                  _elem21 = iprot.readString();
-                  struct.preJobCommands.add(_elem21);
-                }
-                iprot.readListEnd();
-              }
-              struct.setPreJobCommandsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // POST_JOB_COMMANDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
-                struct.postJobCommands = new ArrayList<String>(_list22.size);
-                for (int _i23 = 0; _i23 < _list22.size; ++_i23)
-                {
-                  String _elem24;
-                  _elem24 = iprot.readString();
-                  struct.postJobCommands.add(_elem24);
-                }
-                iprot.readListEnd();
-              }
-              struct.setPostJobCommandsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // INSTALLED_PATH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.installedPath = iprot.readString();
-              struct.setInstalledPathIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // MONITOR_MODE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.monitorMode = iprot.readString();
-              struct.setMonitorModeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, GSISSHJobSubmission struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.jobSubmissionDataID != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_DATA_ID_FIELD_DESC);
-        oprot.writeString(struct.jobSubmissionDataID);
-        oprot.writeFieldEnd();
-      }
-      if (struct.resourceJobManager != null) {
-        oprot.writeFieldBegin(RESOURCE_JOB_MANAGER_FIELD_DESC);
-        oprot.writeI32(struct.resourceJobManager.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetSshPort()) {
-        oprot.writeFieldBegin(SSH_PORT_FIELD_DESC);
-        oprot.writeI32(struct.sshPort);
-        oprot.writeFieldEnd();
-      }
-      if (struct.exports != null) {
-        if (struct.isSetExports()) {
-          oprot.writeFieldBegin(EXPORTS_FIELD_DESC);
-          {
-            oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.exports.size()));
-            for (String _iter25 : struct.exports)
-            {
-              oprot.writeString(_iter25);
-            }
-            oprot.writeSetEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.preJobCommands != null) {
-        if (struct.isSetPreJobCommands()) {
-          oprot.writeFieldBegin(PRE_JOB_COMMANDS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.preJobCommands.size()));
-            for (String _iter26 : struct.preJobCommands)
-            {
-              oprot.writeString(_iter26);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.postJobCommands != null) {
-        if (struct.isSetPostJobCommands()) {
-          oprot.writeFieldBegin(POST_JOB_COMMANDS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.postJobCommands.size()));
-            for (String _iter27 : struct.postJobCommands)
-            {
-              oprot.writeString(_iter27);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.installedPath != null) {
-        if (struct.isSetInstalledPath()) {
-          oprot.writeFieldBegin(INSTALLED_PATH_FIELD_DESC);
-          oprot.writeString(struct.installedPath);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.monitorMode != null) {
-        if (struct.isSetMonitorMode()) {
-          oprot.writeFieldBegin(MONITOR_MODE_FIELD_DESC);
-          oprot.writeString(struct.monitorMode);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class GSISSHJobSubmissionTupleSchemeFactory implements SchemeFactory {
-    public GSISSHJobSubmissionTupleScheme getScheme() {
-      return new GSISSHJobSubmissionTupleScheme();
-    }
-  }
-
-  private static class GSISSHJobSubmissionTupleScheme extends TupleScheme<GSISSHJobSubmission> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GSISSHJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.jobSubmissionDataID);
-      oprot.writeI32(struct.resourceJobManager.getValue());
-      BitSet optionals = new BitSet();
-      if (struct.isSetSshPort()) {
-        optionals.set(0);
-      }
-      if (struct.isSetExports()) {
-        optionals.set(1);
-      }
-      if (struct.isSetPreJobCommands()) {
-        optionals.set(2);
-      }
-      if (struct.isSetPostJobCommands()) {
-        optionals.set(3);
-      }
-      if (struct.isSetInstalledPath()) {
-        optionals.set(4);
-      }
-      if (struct.isSetMonitorMode()) {
-        optionals.set(5);
-      }
-      oprot.writeBitSet(optionals, 6);
-      if (struct.isSetSshPort()) {
-        oprot.writeI32(struct.sshPort);
-      }
-      if (struct.isSetExports()) {
-        {
-          oprot.writeI32(struct.exports.size());
-          for (String _iter28 : struct.exports)
-          {
-            oprot.writeString(_iter28);
-          }
-        }
-      }
-      if (struct.isSetPreJobCommands()) {
-        {
-          oprot.writeI32(struct.preJobCommands.size());
-          for (String _iter29 : struct.preJobCommands)
-          {
-            oprot.writeString(_iter29);
-          }
-        }
-      }
-      if (struct.isSetPostJobCommands()) {
-        {
-          oprot.writeI32(struct.postJobCommands.size());
-          for (String _iter30 : struct.postJobCommands)
-          {
-            oprot.writeString(_iter30);
-          }
-        }
-      }
-      if (struct.isSetInstalledPath()) {
-        oprot.writeString(struct.installedPath);
-      }
-      if (struct.isSetMonitorMode()) {
-        oprot.writeString(struct.monitorMode);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GSISSHJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.jobSubmissionDataID = iprot.readString();
-      struct.setJobSubmissionDataIDIsSet(true);
-      struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
-      struct.setResourceJobManagerIsSet(true);
-      BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.sshPort = iprot.readI32();
-        struct.setSshPortIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TSet _set31 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.exports = new HashSet<String>(2*_set31.size);
-          for (int _i32 = 0; _i32 < _set31.size; ++_i32)
-          {
-            String _elem33;
-            _elem33 = iprot.readString();
-            struct.exports.add(_elem33);
-          }
-        }
-        struct.setExportsIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list34 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.preJobCommands = new ArrayList<String>(_list34.size);
-          for (int _i35 = 0; _i35 < _list34.size; ++_i35)
-          {
-            String _elem36;
-            _elem36 = iprot.readString();
-            struct.preJobCommands.add(_elem36);
-          }
-        }
-        struct.setPreJobCommandsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.postJobCommands = new ArrayList<String>(_list37.size);
-          for (int _i38 = 0; _i38 < _list37.size; ++_i38)
-          {
-            String _elem39;
-            _elem39 = iprot.readString();
-            struct.postJobCommands.add(_elem39);
-          }
-        }
-        struct.setPostJobCommandsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.installedPath = iprot.readString();
-        struct.setInstalledPathIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.monitorMode = iprot.readString();
-        struct.setMonitorModeIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GlobusJobSubmission.java
deleted file mode 100644
index ca2782f..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GlobusJobSubmission.java
+++ /dev/null
@@ -1,768 +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
- */
-package org.apache.airavata.model.computehost;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
-
-  private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionDataID", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField SECURITY_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("securityProtocol", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceJobManager", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC = new org.apache.thrift.protocol.TField("globusGateKeeperEndPoint", org.apache.thrift.protocol.TType.LIST, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new GlobusJobSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new GlobusJobSubmissionTupleSchemeFactory());
-  }
-
-  private String jobSubmissionDataID; // required
-  private SecurityProtocol securityProtocol; // required
-  private ResourceJobManager resourceJobManager; // required
-  private List<String> globusGateKeeperEndPoint; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    JOB_SUBMISSION_DATA_ID((short)1, "jobSubmissionDataID"),
-    /**
-     * 
-     * @see SecurityProtocol
-     */
-    SECURITY_PROTOCOL((short)2, "securityProtocol"),
-    /**
-     * 
-     * @see ResourceJobManager
-     */
-    RESOURCE_JOB_MANAGER((short)3, "resourceJobManager"),
-    GLOBUS_GATE_KEEPER_END_POINT((short)4, "globusGateKeeperEndPoint");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // JOB_SUBMISSION_DATA_ID
-          return JOB_SUBMISSION_DATA_ID;
-        case 2: // SECURITY_PROTOCOL
-          return SECURITY_PROTOCOL;
-        case 3: // RESOURCE_JOB_MANAGER
-          return RESOURCE_JOB_MANAGER;
-        case 4: // GLOBUS_GATE_KEEPER_END_POINT
-          return GLOBUS_GATE_KEEPER_END_POINT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private _Fields optionals[] = {_Fields.GLOBUS_GATE_KEEPER_END_POINT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.JOB_SUBMISSION_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionDataID", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SecurityProtocol.class)));
-    tmpMap.put(_Fields.RESOURCE_JOB_MANAGER, new org.apache.thrift.meta_data.FieldMetaData("resourceJobManager", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceJobManager.class)));
-    tmpMap.put(_Fields.GLOBUS_GATE_KEEPER_END_POINT, new org.apache.thrift.meta_data.FieldMetaData("globusGateKeeperEndPoint", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GlobusJobSubmission.class, metaDataMap);
-  }
-
-  public GlobusJobSubmission() {
-    this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public GlobusJobSubmission(
-    String jobSubmissionDataID,
-    SecurityProtocol securityProtocol,
-    ResourceJobManager resourceJobManager)
-  {
-    this();
-    this.jobSubmissionDataID = jobSubmissionDataID;
-    this.securityProtocol = securityProtocol;
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public GlobusJobSubmission(GlobusJobSubmission other) {
-    if (other.isSetJobSubmissionDataID()) {
-      this.jobSubmissionDataID = other.jobSubmissionDataID;
-    }
-    if (other.isSetSecurityProtocol()) {
-      this.securityProtocol = other.securityProtocol;
-    }
-    if (other.isSetResourceJobManager()) {
-      this.resourceJobManager = other.resourceJobManager;
-    }
-    if (other.isSetGlobusGateKeeperEndPoint()) {
-      List<String> __this__globusGateKeeperEndPoint = new ArrayList<String>(other.globusGateKeeperEndPoint);
-      this.globusGateKeeperEndPoint = __this__globusGateKeeperEndPoint;
-    }
-  }
-
-  public GlobusJobSubmission deepCopy() {
-    return new GlobusJobSubmission(this);
-  }
-
-  @Override
-  public void clear() {
-    this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.securityProtocol = null;
-    this.resourceJobManager = null;
-    this.globusGateKeeperEndPoint = null;
-  }
-
-  public String getJobSubmissionDataID() {
-    return this.jobSubmissionDataID;
-  }
-
-  public void setJobSubmissionDataID(String jobSubmissionDataID) {
-    this.jobSubmissionDataID = jobSubmissionDataID;
-  }
-
-  public void unsetJobSubmissionDataID() {
-    this.jobSubmissionDataID = null;
-  }
-
-  /** Returns true if field jobSubmissionDataID is set (has been assigned a value) and false otherwise */
-  public boolean isSetJobSubmissionDataID() {
-    return this.jobSubmissionDataID != null;
-  }
-
-  public void setJobSubmissionDataIDIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionDataID = null;
-    }
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public SecurityProtocol getSecurityProtocol() {
-    return this.securityProtocol;
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public void setSecurityProtocol(SecurityProtocol securityProtocol) {
-    this.securityProtocol = securityProtocol;
-  }
-
-  public void unsetSecurityProtocol() {
-    this.securityProtocol = null;
-  }
-
-  /** Returns true if field securityProtocol is set (has been assigned a value) and false otherwise */
-  public boolean isSetSecurityProtocol() {
-    return this.securityProtocol != null;
-  }
-
-  public void setSecurityProtocolIsSet(boolean value) {
-    if (!value) {
-      this.securityProtocol = null;
-    }
-  }
-
-  /**
-   * 
-   * @see ResourceJobManager
-   */
-  public ResourceJobManager getResourceJobManager() {
-    return this.resourceJobManager;
-  }
-
-  /**
-   * 
-   * @see ResourceJobManager
-   */
-  public void setResourceJobManager(ResourceJobManager resourceJobManager) {
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  public void unsetResourceJobManager() {
-    this.resourceJobManager = null;
-  }
-
-  /** Returns true if field resourceJobManager is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceJobManager() {
-    return this.resourceJobManager != null;
-  }
-
-  public void setResourceJobManagerIsSet(boolean value) {
-    if (!value) {
-      this.resourceJobManager = null;
-    }
-  }
-
-  public int getGlobusGateKeeperEndPointSize() {
-    return (this.globusGateKeeperEndPoint == null) ? 0 : this.globusGateKeeperEndPoint.size();
-  }
-
-  public java.util.Iterator<String> getGlobusGateKeeperEndPointIterator() {
-    return (this.globusGateKeeperEndPoint == null) ? null : this.globusGateKeeperEndPoint.iterator();
-  }
-
-  public void addToGlobusGateKeeperEndPoint(String elem) {
-    if (this.globusGateKeeperEndPoint == null) {
-      this.globusGateKeeperEndPoint = new ArrayList<String>();
-    }
-    this.globusGateKeeperEndPoint.add(elem);
-  }
-
-  public List<String> getGlobusGateKeeperEndPoint() {
-    return this.globusGateKeeperEndPoint;
-  }
-
-  public void setGlobusGateKeeperEndPoint(List<String> globusGateKeeperEndPoint) {
-    this.globusGateKeeperEndPoint = globusGateKeeperEndPoint;
-  }
-
-  public void unsetGlobusGateKeeperEndPoint() {
-    this.globusGateKeeperEndPoint = null;
-  }
-
-  /** Returns true if field globusGateKeeperEndPoint is set (has been assigned a value) and false otherwise */
-  public boolean isSetGlobusGateKeeperEndPoint() {
-    return this.globusGateKeeperEndPoint != null;
-  }
-
-  public void setGlobusGateKeeperEndPointIsSet(boolean value) {
-    if (!value) {
-      this.globusGateKeeperEndPoint = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      if (value == null) {
-        unsetJobSubmissionDataID();
-      } else {
-        setJobSubmissionDataID((String)value);
-      }
-      break;
-
-    case SECURITY_PROTOCOL:
-      if (value == null) {
-        unsetSecurityProtocol();
-      } else {
-        setSecurityProtocol((SecurityProtocol)value);
-      }
-      break;
-
-    case RESOURCE_JOB_MANAGER:
-      if (value == null) {
-        unsetResourceJobManager();
-      } else {
-        setResourceJobManager((ResourceJobManager)value);
-      }
-      break;
-
-    case GLOBUS_GATE_KEEPER_END_POINT:
-      if (value == null) {
-        unsetGlobusGateKeeperEndPoint();
-      } else {
-        setGlobusGateKeeperEndPoint((List<String>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      return getJobSubmissionDataID();
-
-    case SECURITY_PROTOCOL:
-      return getSecurityProtocol();
-
-    case RESOURCE_JOB_MANAGER:
-      return getResourceJobManager();
-
-    case GLOBUS_GATE_KEEPER_END_POINT:
-      return getGlobusGateKeeperEndPoint();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      return isSetJobSubmissionDataID();
-    case SECURITY_PROTOCOL:
-      return isSetSecurityProtocol();
-    case RESOURCE_JOB_MANAGER:
-      return isSetResourceJobManager();
-    case GLOBUS_GATE_KEEPER_END_POINT:
-      return isSetGlobusGateKeeperEndPoint();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof GlobusJobSubmission)
-      return this.equals((GlobusJobSubmission)that);
-    return false;
-  }
-
-  public boolean equals(GlobusJobSubmission that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_jobSubmissionDataID = true && this.isSetJobSubmissionDataID();
-    boolean that_present_jobSubmissionDataID = true && that.isSetJobSubmissionDataID();
-    if (this_present_jobSubmissionDataID || that_present_jobSubmissionDataID) {
-      if (!(this_present_jobSubmissionDataID && that_present_jobSubmissionDataID))
-        return false;
-      if (!this.jobSubmissionDataID.equals(that.jobSubmissionDataID))
-        return false;
-    }
-
-    boolean this_present_securityProtocol = true && this.isSetSecurityProtocol();
-    boolean that_present_securityProtocol = true && that.isSetSecurityProtocol();
-    if (this_present_securityProtocol || that_present_securityProtocol) {
-      if (!(this_present_securityProtocol && that_present_securityProtocol))
-        return false;
-      if (!this.securityProtocol.equals(that.securityProtocol))
-        return false;
-    }
-
-    boolean this_present_resourceJobManager = true && this.isSetResourceJobManager();
-    boolean that_present_resourceJobManager = true && that.isSetResourceJobManager();
-    if (this_present_resourceJobManager || that_present_resourceJobManager) {
-      if (!(this_present_resourceJobManager && that_present_resourceJobManager))
-        return false;
-      if (!this.resourceJobManager.equals(that.resourceJobManager))
-        return false;
-    }
-
-    boolean this_present_globusGateKeeperEndPoint = true && this.isSetGlobusGateKeeperEndPoint();
-    boolean that_present_globusGateKeeperEndPoint = true && that.isSetGlobusGateKeeperEndPoint();
-    if (this_present_globusGateKeeperEndPoint || that_present_globusGateKeeperEndPoint) {
-      if (!(this_present_globusGateKeeperEndPoint && that_present_globusGateKeeperEndPoint))
-        return false;
-      if (!this.globusGateKeeperEndPoint.equals(that.globusGateKeeperEndPoint))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(GlobusJobSubmission other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetJobSubmissionDataID()).compareTo(other.isSetJobSubmissionDataID());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionDataID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionDataID, other.jobSubmissionDataID);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSecurityProtocol()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.securityProtocol, other.securityProtocol);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetResourceJobManager()).compareTo(other.isSetResourceJobManager());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceJobManager()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceJobManager, other.resourceJobManager);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetGlobusGateKeeperEndPoint()).compareTo(other.isSetGlobusGateKeeperEndPoint());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGlobusGateKeeperEndPoint()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.globusGateKeeperEndPoint, other.globusGateKeeperEndPoint);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("GlobusJobSubmission(");
-    boolean first = true;
-
-    sb.append("jobSubmissionDataID:");
-    if (this.jobSubmissionDataID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionDataID);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("securityProtocol:");
-    if (this.securityProtocol == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.securityProtocol);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("resourceJobManager:");
-    if (this.resourceJobManager == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.resourceJobManager);
-    }
-    first = false;
-    if (isSetGlobusGateKeeperEndPoint()) {
-      if (!first) sb.append(", ");
-      sb.append("globusGateKeeperEndPoint:");
-      if (this.globusGateKeeperEndPoint == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.globusGateKeeperEndPoint);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetJobSubmissionDataID()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionDataID' is unset! Struct:" + toString());
-    }
-
-    if (!isSetSecurityProtocol()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'securityProtocol' is unset! Struct:" + toString());
-    }
-
-    if (!isSetResourceJobManager()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceJobManager' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class GlobusJobSubmissionStandardSchemeFactory implements SchemeFactory {
-    public GlobusJobSubmissionStandardScheme getScheme() {
-      return new GlobusJobSubmissionStandardScheme();
-    }
-  }
-
-  private static class GlobusJobSubmissionStandardScheme extends StandardScheme<GlobusJobSubmission> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // JOB_SUBMISSION_DATA_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.jobSubmissionDataID = iprot.readString();
-              struct.setJobSubmissionDataIDIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SECURITY_PROTOCOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
-              struct.setSecurityProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // RESOURCE_JOB_MANAGER
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
-              struct.setResourceJobManagerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // GLOBUS_GATE_KEEPER_END_POINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
-                struct.globusGateKeeperEndPoint = new ArrayList<String>(_list8.size);
-                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
-                {
-                  String _elem10;
-                  _elem10 = iprot.readString();
-                  struct.globusGateKeeperEndPoint.add(_elem10);
-                }
-                iprot.readListEnd();
-              }
-              struct.setGlobusGateKeeperEndPointIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.jobSubmissionDataID != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_DATA_ID_FIELD_DESC);
-        oprot.writeString(struct.jobSubmissionDataID);
-        oprot.writeFieldEnd();
-      }
-      if (struct.securityProtocol != null) {
-        oprot.writeFieldBegin(SECURITY_PROTOCOL_FIELD_DESC);
-        oprot.writeI32(struct.securityProtocol.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.resourceJobManager != null) {
-        oprot.writeFieldBegin(RESOURCE_JOB_MANAGER_FIELD_DESC);
-        oprot.writeI32(struct.resourceJobManager.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.globusGateKeeperEndPoint != null) {
-        if (struct.isSetGlobusGateKeeperEndPoint()) {
-          oprot.writeFieldBegin(GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.globusGateKeeperEndPoint.size()));
-            for (String _iter11 : struct.globusGateKeeperEndPoint)
-            {
-              oprot.writeString(_iter11);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class GlobusJobSubmissionTupleSchemeFactory implements SchemeFactory {
-    public GlobusJobSubmissionTupleScheme getScheme() {
-      return new GlobusJobSubmissionTupleScheme();
-    }
-  }
-
-  private static class GlobusJobSubmissionTupleScheme extends TupleScheme<GlobusJobSubmission> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.jobSubmissionDataID);
-      oprot.writeI32(struct.securityProtocol.getValue());
-      oprot.writeI32(struct.resourceJobManager.getValue());
-      BitSet optionals = new BitSet();
-      if (struct.isSetGlobusGateKeeperEndPoint()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetGlobusGateKeeperEndPoint()) {
-        {
-          oprot.writeI32(struct.globusGateKeeperEndPoint.size());
-          for (String _iter12 : struct.globusGateKeeperEndPoint)
-          {
-            oprot.writeString(_iter12);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.jobSubmissionDataID = iprot.readString();
-      struct.setJobSubmissionDataIDIsSet(true);
-      struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
-      struct.setSecurityProtocolIsSet(true);
-      struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
-      struct.setResourceJobManagerIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.globusGateKeeperEndPoint = new ArrayList<String>(_list13.size);
-          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
-          {
-            String _elem15;
-            _elem15 = iprot.readString();
-            struct.globusGateKeeperEndPoint.add(_elem15);
-          }
-        }
-        struct.setGlobusGateKeeperEndPointIsSet(true);
-      }
-    }
-  }
-
-}
-


[2/6] Updating ComputeResource Namespace to align with application descrrptions - AIRAVATA-1203

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GridFTPDataMovement.java
deleted file mode 100644
index 1cc4328..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GridFTPDataMovement.java
+++ /dev/null
@@ -1,651 +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
- */
-package org.apache.airavata.model.computehost;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
-
-  private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementDataID", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField SECURITY_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("securityProtocol", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField GRID_FTPEND_POINT_FIELD_DESC = new org.apache.thrift.protocol.TField("gridFTPEndPoint", org.apache.thrift.protocol.TType.LIST, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new GridFTPDataMovementStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new GridFTPDataMovementTupleSchemeFactory());
-  }
-
-  private String dataMovementDataID; // required
-  private SecurityProtocol securityProtocol; // required
-  private List<String> gridFTPEndPoint; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    DATA_MOVEMENT_DATA_ID((short)1, "dataMovementDataID"),
-    /**
-     * 
-     * @see SecurityProtocol
-     */
-    SECURITY_PROTOCOL((short)2, "securityProtocol"),
-    GRID_FTPEND_POINT((short)3, "gridFTPEndPoint");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // DATA_MOVEMENT_DATA_ID
-          return DATA_MOVEMENT_DATA_ID;
-        case 2: // SECURITY_PROTOCOL
-          return SECURITY_PROTOCOL;
-        case 3: // GRID_FTPEND_POINT
-          return GRID_FTPEND_POINT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.DATA_MOVEMENT_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementDataID", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SecurityProtocol.class)));
-    tmpMap.put(_Fields.GRID_FTPEND_POINT, new org.apache.thrift.meta_data.FieldMetaData("gridFTPEndPoint", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GridFTPDataMovement.class, metaDataMap);
-  }
-
-  public GridFTPDataMovement() {
-    this.dataMovementDataID = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public GridFTPDataMovement(
-    String dataMovementDataID,
-    SecurityProtocol securityProtocol,
-    List<String> gridFTPEndPoint)
-  {
-    this();
-    this.dataMovementDataID = dataMovementDataID;
-    this.securityProtocol = securityProtocol;
-    this.gridFTPEndPoint = gridFTPEndPoint;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public GridFTPDataMovement(GridFTPDataMovement other) {
-    if (other.isSetDataMovementDataID()) {
-      this.dataMovementDataID = other.dataMovementDataID;
-    }
-    if (other.isSetSecurityProtocol()) {
-      this.securityProtocol = other.securityProtocol;
-    }
-    if (other.isSetGridFTPEndPoint()) {
-      List<String> __this__gridFTPEndPoint = new ArrayList<String>(other.gridFTPEndPoint);
-      this.gridFTPEndPoint = __this__gridFTPEndPoint;
-    }
-  }
-
-  public GridFTPDataMovement deepCopy() {
-    return new GridFTPDataMovement(this);
-  }
-
-  @Override
-  public void clear() {
-    this.dataMovementDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.securityProtocol = null;
-    this.gridFTPEndPoint = null;
-  }
-
-  public String getDataMovementDataID() {
-    return this.dataMovementDataID;
-  }
-
-  public void setDataMovementDataID(String dataMovementDataID) {
-    this.dataMovementDataID = dataMovementDataID;
-  }
-
-  public void unsetDataMovementDataID() {
-    this.dataMovementDataID = null;
-  }
-
-  /** Returns true if field dataMovementDataID is set (has been assigned a value) and false otherwise */
-  public boolean isSetDataMovementDataID() {
-    return this.dataMovementDataID != null;
-  }
-
-  public void setDataMovementDataIDIsSet(boolean value) {
-    if (!value) {
-      this.dataMovementDataID = null;
-    }
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public SecurityProtocol getSecurityProtocol() {
-    return this.securityProtocol;
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public void setSecurityProtocol(SecurityProtocol securityProtocol) {
-    this.securityProtocol = securityProtocol;
-  }
-
-  public void unsetSecurityProtocol() {
-    this.securityProtocol = null;
-  }
-
-  /** Returns true if field securityProtocol is set (has been assigned a value) and false otherwise */
-  public boolean isSetSecurityProtocol() {
-    return this.securityProtocol != null;
-  }
-
-  public void setSecurityProtocolIsSet(boolean value) {
-    if (!value) {
-      this.securityProtocol = null;
-    }
-  }
-
-  public int getGridFTPEndPointSize() {
-    return (this.gridFTPEndPoint == null) ? 0 : this.gridFTPEndPoint.size();
-  }
-
-  public java.util.Iterator<String> getGridFTPEndPointIterator() {
-    return (this.gridFTPEndPoint == null) ? null : this.gridFTPEndPoint.iterator();
-  }
-
-  public void addToGridFTPEndPoint(String elem) {
-    if (this.gridFTPEndPoint == null) {
-      this.gridFTPEndPoint = new ArrayList<String>();
-    }
-    this.gridFTPEndPoint.add(elem);
-  }
-
-  public List<String> getGridFTPEndPoint() {
-    return this.gridFTPEndPoint;
-  }
-
-  public void setGridFTPEndPoint(List<String> gridFTPEndPoint) {
-    this.gridFTPEndPoint = gridFTPEndPoint;
-  }
-
-  public void unsetGridFTPEndPoint() {
-    this.gridFTPEndPoint = null;
-  }
-
-  /** Returns true if field gridFTPEndPoint is set (has been assigned a value) and false otherwise */
-  public boolean isSetGridFTPEndPoint() {
-    return this.gridFTPEndPoint != null;
-  }
-
-  public void setGridFTPEndPointIsSet(boolean value) {
-    if (!value) {
-      this.gridFTPEndPoint = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      if (value == null) {
-        unsetDataMovementDataID();
-      } else {
-        setDataMovementDataID((String)value);
-      }
-      break;
-
-    case SECURITY_PROTOCOL:
-      if (value == null) {
-        unsetSecurityProtocol();
-      } else {
-        setSecurityProtocol((SecurityProtocol)value);
-      }
-      break;
-
-    case GRID_FTPEND_POINT:
-      if (value == null) {
-        unsetGridFTPEndPoint();
-      } else {
-        setGridFTPEndPoint((List<String>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      return getDataMovementDataID();
-
-    case SECURITY_PROTOCOL:
-      return getSecurityProtocol();
-
-    case GRID_FTPEND_POINT:
-      return getGridFTPEndPoint();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      return isSetDataMovementDataID();
-    case SECURITY_PROTOCOL:
-      return isSetSecurityProtocol();
-    case GRID_FTPEND_POINT:
-      return isSetGridFTPEndPoint();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof GridFTPDataMovement)
-      return this.equals((GridFTPDataMovement)that);
-    return false;
-  }
-
-  public boolean equals(GridFTPDataMovement that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_dataMovementDataID = true && this.isSetDataMovementDataID();
-    boolean that_present_dataMovementDataID = true && that.isSetDataMovementDataID();
-    if (this_present_dataMovementDataID || that_present_dataMovementDataID) {
-      if (!(this_present_dataMovementDataID && that_present_dataMovementDataID))
-        return false;
-      if (!this.dataMovementDataID.equals(that.dataMovementDataID))
-        return false;
-    }
-
-    boolean this_present_securityProtocol = true && this.isSetSecurityProtocol();
-    boolean that_present_securityProtocol = true && that.isSetSecurityProtocol();
-    if (this_present_securityProtocol || that_present_securityProtocol) {
-      if (!(this_present_securityProtocol && that_present_securityProtocol))
-        return false;
-      if (!this.securityProtocol.equals(that.securityProtocol))
-        return false;
-    }
-
-    boolean this_present_gridFTPEndPoint = true && this.isSetGridFTPEndPoint();
-    boolean that_present_gridFTPEndPoint = true && that.isSetGridFTPEndPoint();
-    if (this_present_gridFTPEndPoint || that_present_gridFTPEndPoint) {
-      if (!(this_present_gridFTPEndPoint && that_present_gridFTPEndPoint))
-        return false;
-      if (!this.gridFTPEndPoint.equals(that.gridFTPEndPoint))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(GridFTPDataMovement other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDataMovementDataID()).compareTo(other.isSetDataMovementDataID());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDataMovementDataID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementDataID, other.dataMovementDataID);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSecurityProtocol()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.securityProtocol, other.securityProtocol);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetGridFTPEndPoint()).compareTo(other.isSetGridFTPEndPoint());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGridFTPEndPoint()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gridFTPEndPoint, other.gridFTPEndPoint);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("GridFTPDataMovement(");
-    boolean first = true;
-
-    sb.append("dataMovementDataID:");
-    if (this.dataMovementDataID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.dataMovementDataID);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("securityProtocol:");
-    if (this.securityProtocol == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.securityProtocol);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("gridFTPEndPoint:");
-    if (this.gridFTPEndPoint == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.gridFTPEndPoint);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDataMovementDataID()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementDataID' is unset! Struct:" + toString());
-    }
-
-    if (!isSetSecurityProtocol()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'securityProtocol' is unset! Struct:" + toString());
-    }
-
-    if (!isSetGridFTPEndPoint()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gridFTPEndPoint' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class GridFTPDataMovementStandardSchemeFactory implements SchemeFactory {
-    public GridFTPDataMovementStandardScheme getScheme() {
-      return new GridFTPDataMovementStandardScheme();
-    }
-  }
-
-  private static class GridFTPDataMovementStandardScheme extends StandardScheme<GridFTPDataMovement> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GridFTPDataMovement struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // DATA_MOVEMENT_DATA_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dataMovementDataID = iprot.readString();
-              struct.setDataMovementDataIDIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SECURITY_PROTOCOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
-              struct.setSecurityProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // GRID_FTPEND_POINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.gridFTPEndPoint = new ArrayList<String>(_list0.size);
-                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
-                {
-                  String _elem2;
-                  _elem2 = iprot.readString();
-                  struct.gridFTPEndPoint.add(_elem2);
-                }
-                iprot.readListEnd();
-              }
-              struct.setGridFTPEndPointIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, GridFTPDataMovement struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.dataMovementDataID != null) {
-        oprot.writeFieldBegin(DATA_MOVEMENT_DATA_ID_FIELD_DESC);
-        oprot.writeString(struct.dataMovementDataID);
-        oprot.writeFieldEnd();
-      }
-      if (struct.securityProtocol != null) {
-        oprot.writeFieldBegin(SECURITY_PROTOCOL_FIELD_DESC);
-        oprot.writeI32(struct.securityProtocol.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.gridFTPEndPoint != null) {
-        oprot.writeFieldBegin(GRID_FTPEND_POINT_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.gridFTPEndPoint.size()));
-          for (String _iter3 : struct.gridFTPEndPoint)
-          {
-            oprot.writeString(_iter3);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class GridFTPDataMovementTupleSchemeFactory implements SchemeFactory {
-    public GridFTPDataMovementTupleScheme getScheme() {
-      return new GridFTPDataMovementTupleScheme();
-    }
-  }
-
-  private static class GridFTPDataMovementTupleScheme extends TupleScheme<GridFTPDataMovement> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GridFTPDataMovement struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.dataMovementDataID);
-      oprot.writeI32(struct.securityProtocol.getValue());
-      {
-        oprot.writeI32(struct.gridFTPEndPoint.size());
-        for (String _iter4 : struct.gridFTPEndPoint)
-        {
-          oprot.writeString(_iter4);
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GridFTPDataMovement struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.dataMovementDataID = iprot.readString();
-      struct.setDataMovementDataIDIsSet(true);
-      struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
-      struct.setSecurityProtocolIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-        struct.gridFTPEndPoint = new ArrayList<String>(_list5.size);
-        for (int _i6 = 0; _i6 < _list5.size; ++_i6)
-        {
-          String _elem7;
-          _elem7 = iprot.readString();
-          struct.gridFTPEndPoint.add(_elem7);
-        }
-      }
-      struct.setGridFTPEndPointIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/JobSubmissionProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/JobSubmissionProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/JobSubmissionProtocol.java
deleted file mode 100644
index be3b6e1..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/JobSubmissionProtocol.java
+++ /dev/null
@@ -1,80 +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
- */
-package org.apache.airavata.model.computehost;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of Airavata supported Job Submission Mechanisms for High Perforamance Computing Clusters.
- * 
- * SSH:
- *  Execute remote job submission commands using via secure shell protocol.
- * 
- * GRAM:
- *  Execute remote jobs via Globus GRAM service.
- * 
- * UNICORE:
- *  Execute remote jobs via Unicore services
- * 
- */
-@SuppressWarnings("all") public enum JobSubmissionProtocol implements org.apache.thrift.TEnum {
-  SSH(0),
-  GSISSH(1),
-  GRAM(2),
-  UNICORE(3);
-
-  private final int value;
-
-  private JobSubmissionProtocol(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static JobSubmissionProtocol findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return SSH;
-      case 1:
-        return GSISSH;
-      case 2:
-        return GRAM;
-      case 3:
-        return UNICORE;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ResourceJobManager.java
deleted file mode 100644
index 49c5581..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ResourceJobManager.java
+++ /dev/null
@@ -1,83 +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
- */
-package org.apache.airavata.model.computehost;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of local resource job managers supported by Airavata
- * 
- * FORK:
- *  Forking of commands without any job manager
- * 
- * PBS:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
- * 
- * UGE:
- *  Univa Grid Engine, a variation of PBS implementation.
- * 
- * SLURM:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- * 
- */
-@SuppressWarnings("all") public enum ResourceJobManager implements org.apache.thrift.TEnum {
-  FORK(0),
-  PBS(1),
-  UGE(2),
-  SLURM(3);
-
-  private final int value;
-
-  private ResourceJobManager(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static ResourceJobManager findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return FORK;
-      case 1:
-        return PBS;
-      case 2:
-        return UGE;
-      case 3:
-        return SLURM;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SCPDataMovement.java
deleted file mode 100644
index 699dfaf..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SCPDataMovement.java
+++ /dev/null
@@ -1,610 +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
- */
-package org.apache.airavata.model.computehost;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
-
-  private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementDataID", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField SECURITY_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("securityProtocol", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField SSH_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sshPort", org.apache.thrift.protocol.TType.I32, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SCPDataMovementStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SCPDataMovementTupleSchemeFactory());
-  }
-
-  private String dataMovementDataID; // required
-  private SecurityProtocol securityProtocol; // required
-  private int sshPort; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    DATA_MOVEMENT_DATA_ID((short)1, "dataMovementDataID"),
-    /**
-     * 
-     * @see SecurityProtocol
-     */
-    SECURITY_PROTOCOL((short)2, "securityProtocol"),
-    SSH_PORT((short)3, "sshPort");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // DATA_MOVEMENT_DATA_ID
-          return DATA_MOVEMENT_DATA_ID;
-        case 2: // SECURITY_PROTOCOL
-          return SECURITY_PROTOCOL;
-        case 3: // SSH_PORT
-          return SSH_PORT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __SSHPORT_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SSH_PORT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.DATA_MOVEMENT_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementDataID", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SECURITY_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("securityProtocol", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SecurityProtocol.class)));
-    tmpMap.put(_Fields.SSH_PORT, new org.apache.thrift.meta_data.FieldMetaData("sshPort", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SCPDataMovement.class, metaDataMap);
-  }
-
-  public SCPDataMovement() {
-    this.dataMovementDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.sshPort = 22;
-
-  }
-
-  public SCPDataMovement(
-    String dataMovementDataID,
-    SecurityProtocol securityProtocol)
-  {
-    this();
-    this.dataMovementDataID = dataMovementDataID;
-    this.securityProtocol = securityProtocol;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SCPDataMovement(SCPDataMovement other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetDataMovementDataID()) {
-      this.dataMovementDataID = other.dataMovementDataID;
-    }
-    if (other.isSetSecurityProtocol()) {
-      this.securityProtocol = other.securityProtocol;
-    }
-    this.sshPort = other.sshPort;
-  }
-
-  public SCPDataMovement deepCopy() {
-    return new SCPDataMovement(this);
-  }
-
-  @Override
-  public void clear() {
-    this.dataMovementDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.securityProtocol = null;
-    this.sshPort = 22;
-
-  }
-
-  public String getDataMovementDataID() {
-    return this.dataMovementDataID;
-  }
-
-  public void setDataMovementDataID(String dataMovementDataID) {
-    this.dataMovementDataID = dataMovementDataID;
-  }
-
-  public void unsetDataMovementDataID() {
-    this.dataMovementDataID = null;
-  }
-
-  /** Returns true if field dataMovementDataID is set (has been assigned a value) and false otherwise */
-  public boolean isSetDataMovementDataID() {
-    return this.dataMovementDataID != null;
-  }
-
-  public void setDataMovementDataIDIsSet(boolean value) {
-    if (!value) {
-      this.dataMovementDataID = null;
-    }
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public SecurityProtocol getSecurityProtocol() {
-    return this.securityProtocol;
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public void setSecurityProtocol(SecurityProtocol securityProtocol) {
-    this.securityProtocol = securityProtocol;
-  }
-
-  public void unsetSecurityProtocol() {
-    this.securityProtocol = null;
-  }
-
-  /** Returns true if field securityProtocol is set (has been assigned a value) and false otherwise */
-  public boolean isSetSecurityProtocol() {
-    return this.securityProtocol != null;
-  }
-
-  public void setSecurityProtocolIsSet(boolean value) {
-    if (!value) {
-      this.securityProtocol = null;
-    }
-  }
-
-  public int getSshPort() {
-    return this.sshPort;
-  }
-
-  public void setSshPort(int sshPort) {
-    this.sshPort = sshPort;
-    setSshPortIsSet(true);
-  }
-
-  public void unsetSshPort() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SSHPORT_ISSET_ID);
-  }
-
-  /** Returns true if field sshPort is set (has been assigned a value) and false otherwise */
-  public boolean isSetSshPort() {
-    return EncodingUtils.testBit(__isset_bitfield, __SSHPORT_ISSET_ID);
-  }
-
-  public void setSshPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SSHPORT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      if (value == null) {
-        unsetDataMovementDataID();
-      } else {
-        setDataMovementDataID((String)value);
-      }
-      break;
-
-    case SECURITY_PROTOCOL:
-      if (value == null) {
-        unsetSecurityProtocol();
-      } else {
-        setSecurityProtocol((SecurityProtocol)value);
-      }
-      break;
-
-    case SSH_PORT:
-      if (value == null) {
-        unsetSshPort();
-      } else {
-        setSshPort((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      return getDataMovementDataID();
-
-    case SECURITY_PROTOCOL:
-      return getSecurityProtocol();
-
-    case SSH_PORT:
-      return Integer.valueOf(getSshPort());
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      return isSetDataMovementDataID();
-    case SECURITY_PROTOCOL:
-      return isSetSecurityProtocol();
-    case SSH_PORT:
-      return isSetSshPort();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SCPDataMovement)
-      return this.equals((SCPDataMovement)that);
-    return false;
-  }
-
-  public boolean equals(SCPDataMovement that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_dataMovementDataID = true && this.isSetDataMovementDataID();
-    boolean that_present_dataMovementDataID = true && that.isSetDataMovementDataID();
-    if (this_present_dataMovementDataID || that_present_dataMovementDataID) {
-      if (!(this_present_dataMovementDataID && that_present_dataMovementDataID))
-        return false;
-      if (!this.dataMovementDataID.equals(that.dataMovementDataID))
-        return false;
-    }
-
-    boolean this_present_securityProtocol = true && this.isSetSecurityProtocol();
-    boolean that_present_securityProtocol = true && that.isSetSecurityProtocol();
-    if (this_present_securityProtocol || that_present_securityProtocol) {
-      if (!(this_present_securityProtocol && that_present_securityProtocol))
-        return false;
-      if (!this.securityProtocol.equals(that.securityProtocol))
-        return false;
-    }
-
-    boolean this_present_sshPort = true && this.isSetSshPort();
-    boolean that_present_sshPort = true && that.isSetSshPort();
-    if (this_present_sshPort || that_present_sshPort) {
-      if (!(this_present_sshPort && that_present_sshPort))
-        return false;
-      if (this.sshPort != that.sshPort)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(SCPDataMovement other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDataMovementDataID()).compareTo(other.isSetDataMovementDataID());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDataMovementDataID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementDataID, other.dataMovementDataID);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSecurityProtocol()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.securityProtocol, other.securityProtocol);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSshPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshPort, other.sshPort);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("SCPDataMovement(");
-    boolean first = true;
-
-    sb.append("dataMovementDataID:");
-    if (this.dataMovementDataID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.dataMovementDataID);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("securityProtocol:");
-    if (this.securityProtocol == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.securityProtocol);
-    }
-    first = false;
-    if (isSetSshPort()) {
-      if (!first) sb.append(", ");
-      sb.append("sshPort:");
-      sb.append(this.sshPort);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDataMovementDataID()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementDataID' is unset! Struct:" + toString());
-    }
-
-    if (!isSetSecurityProtocol()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'securityProtocol' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class SCPDataMovementStandardSchemeFactory implements SchemeFactory {
-    public SCPDataMovementStandardScheme getScheme() {
-      return new SCPDataMovementStandardScheme();
-    }
-  }
-
-  private static class SCPDataMovementStandardScheme extends StandardScheme<SCPDataMovement> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SCPDataMovement struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // DATA_MOVEMENT_DATA_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dataMovementDataID = iprot.readString();
-              struct.setDataMovementDataIDIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SECURITY_PROTOCOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
-              struct.setSecurityProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SSH_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.sshPort = iprot.readI32();
-              struct.setSshPortIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SCPDataMovement struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.dataMovementDataID != null) {
-        oprot.writeFieldBegin(DATA_MOVEMENT_DATA_ID_FIELD_DESC);
-        oprot.writeString(struct.dataMovementDataID);
-        oprot.writeFieldEnd();
-      }
-      if (struct.securityProtocol != null) {
-        oprot.writeFieldBegin(SECURITY_PROTOCOL_FIELD_DESC);
-        oprot.writeI32(struct.securityProtocol.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetSshPort()) {
-        oprot.writeFieldBegin(SSH_PORT_FIELD_DESC);
-        oprot.writeI32(struct.sshPort);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SCPDataMovementTupleSchemeFactory implements SchemeFactory {
-    public SCPDataMovementTupleScheme getScheme() {
-      return new SCPDataMovementTupleScheme();
-    }
-  }
-
-  private static class SCPDataMovementTupleScheme extends TupleScheme<SCPDataMovement> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.dataMovementDataID);
-      oprot.writeI32(struct.securityProtocol.getValue());
-      BitSet optionals = new BitSet();
-      if (struct.isSetSshPort()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetSshPort()) {
-        oprot.writeI32(struct.sshPort);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.dataMovementDataID = iprot.readString();
-      struct.setDataMovementDataIDIsSet(true);
-      struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
-      struct.setSecurityProtocolIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.sshPort = iprot.readI32();
-        struct.setSshPortIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SSHJobSubmission.java
deleted file mode 100644
index 127dc27..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SSHJobSubmission.java
+++ /dev/null
@@ -1,610 +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
- */
-package org.apache.airavata.model.computehost;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission");
-
-  private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionDataID", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceJobManager", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField SSH_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sshPort", org.apache.thrift.protocol.TType.I32, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SSHJobSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SSHJobSubmissionTupleSchemeFactory());
-  }
-
-  private String jobSubmissionDataID; // required
-  private ResourceJobManager resourceJobManager; // required
-  private int sshPort; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    JOB_SUBMISSION_DATA_ID((short)1, "jobSubmissionDataID"),
-    /**
-     * 
-     * @see ResourceJobManager
-     */
-    RESOURCE_JOB_MANAGER((short)2, "resourceJobManager"),
-    SSH_PORT((short)3, "sshPort");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // JOB_SUBMISSION_DATA_ID
-          return JOB_SUBMISSION_DATA_ID;
-        case 2: // RESOURCE_JOB_MANAGER
-          return RESOURCE_JOB_MANAGER;
-        case 3: // SSH_PORT
-          return SSH_PORT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __SSHPORT_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SSH_PORT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.JOB_SUBMISSION_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionDataID", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.RESOURCE_JOB_MANAGER, new org.apache.thrift.meta_data.FieldMetaData("resourceJobManager", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceJobManager.class)));
-    tmpMap.put(_Fields.SSH_PORT, new org.apache.thrift.meta_data.FieldMetaData("sshPort", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SSHJobSubmission.class, metaDataMap);
-  }
-
-  public SSHJobSubmission() {
-    this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.sshPort = 22;
-
-  }
-
-  public SSHJobSubmission(
-    String jobSubmissionDataID,
-    ResourceJobManager resourceJobManager)
-  {
-    this();
-    this.jobSubmissionDataID = jobSubmissionDataID;
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SSHJobSubmission(SSHJobSubmission other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetJobSubmissionDataID()) {
-      this.jobSubmissionDataID = other.jobSubmissionDataID;
-    }
-    if (other.isSetResourceJobManager()) {
-      this.resourceJobManager = other.resourceJobManager;
-    }
-    this.sshPort = other.sshPort;
-  }
-
-  public SSHJobSubmission deepCopy() {
-    return new SSHJobSubmission(this);
-  }
-
-  @Override
-  public void clear() {
-    this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.resourceJobManager = null;
-    this.sshPort = 22;
-
-  }
-
-  public String getJobSubmissionDataID() {
-    return this.jobSubmissionDataID;
-  }
-
-  public void setJobSubmissionDataID(String jobSubmissionDataID) {
-    this.jobSubmissionDataID = jobSubmissionDataID;
-  }
-
-  public void unsetJobSubmissionDataID() {
-    this.jobSubmissionDataID = null;
-  }
-
-  /** Returns true if field jobSubmissionDataID is set (has been assigned a value) and false otherwise */
-  public boolean isSetJobSubmissionDataID() {
-    return this.jobSubmissionDataID != null;
-  }
-
-  public void setJobSubmissionDataIDIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionDataID = null;
-    }
-  }
-
-  /**
-   * 
-   * @see ResourceJobManager
-   */
-  public ResourceJobManager getResourceJobManager() {
-    return this.resourceJobManager;
-  }
-
-  /**
-   * 
-   * @see ResourceJobManager
-   */
-  public void setResourceJobManager(ResourceJobManager resourceJobManager) {
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  public void unsetResourceJobManager() {
-    this.resourceJobManager = null;
-  }
-
-  /** Returns true if field resourceJobManager is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceJobManager() {
-    return this.resourceJobManager != null;
-  }
-
-  public void setResourceJobManagerIsSet(boolean value) {
-    if (!value) {
-      this.resourceJobManager = null;
-    }
-  }
-
-  public int getSshPort() {
-    return this.sshPort;
-  }
-
-  public void setSshPort(int sshPort) {
-    this.sshPort = sshPort;
-    setSshPortIsSet(true);
-  }
-
-  public void unsetSshPort() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SSHPORT_ISSET_ID);
-  }
-
-  /** Returns true if field sshPort is set (has been assigned a value) and false otherwise */
-  public boolean isSetSshPort() {
-    return EncodingUtils.testBit(__isset_bitfield, __SSHPORT_ISSET_ID);
-  }
-
-  public void setSshPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SSHPORT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      if (value == null) {
-        unsetJobSubmissionDataID();
-      } else {
-        setJobSubmissionDataID((String)value);
-      }
-      break;
-
-    case RESOURCE_JOB_MANAGER:
-      if (value == null) {
-        unsetResourceJobManager();
-      } else {
-        setResourceJobManager((ResourceJobManager)value);
-      }
-      break;
-
-    case SSH_PORT:
-      if (value == null) {
-        unsetSshPort();
-      } else {
-        setSshPort((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      return getJobSubmissionDataID();
-
-    case RESOURCE_JOB_MANAGER:
-      return getResourceJobManager();
-
-    case SSH_PORT:
-      return Integer.valueOf(getSshPort());
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      return isSetJobSubmissionDataID();
-    case RESOURCE_JOB_MANAGER:
-      return isSetResourceJobManager();
-    case SSH_PORT:
-      return isSetSshPort();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SSHJobSubmission)
-      return this.equals((SSHJobSubmission)that);
-    return false;
-  }
-
-  public boolean equals(SSHJobSubmission that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_jobSubmissionDataID = true && this.isSetJobSubmissionDataID();
-    boolean that_present_jobSubmissionDataID = true && that.isSetJobSubmissionDataID();
-    if (this_present_jobSubmissionDataID || that_present_jobSubmissionDataID) {
-      if (!(this_present_jobSubmissionDataID && that_present_jobSubmissionDataID))
-        return false;
-      if (!this.jobSubmissionDataID.equals(that.jobSubmissionDataID))
-        return false;
-    }
-
-    boolean this_present_resourceJobManager = true && this.isSetResourceJobManager();
-    boolean that_present_resourceJobManager = true && that.isSetResourceJobManager();
-    if (this_present_resourceJobManager || that_present_resourceJobManager) {
-      if (!(this_present_resourceJobManager && that_present_resourceJobManager))
-        return false;
-      if (!this.resourceJobManager.equals(that.resourceJobManager))
-        return false;
-    }
-
-    boolean this_present_sshPort = true && this.isSetSshPort();
-    boolean that_present_sshPort = true && that.isSetSshPort();
-    if (this_present_sshPort || that_present_sshPort) {
-      if (!(this_present_sshPort && that_present_sshPort))
-        return false;
-      if (this.sshPort != that.sshPort)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(SSHJobSubmission other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetJobSubmissionDataID()).compareTo(other.isSetJobSubmissionDataID());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionDataID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionDataID, other.jobSubmissionDataID);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetResourceJobManager()).compareTo(other.isSetResourceJobManager());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceJobManager()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceJobManager, other.resourceJobManager);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSshPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshPort, other.sshPort);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("SSHJobSubmission(");
-    boolean first = true;
-
-    sb.append("jobSubmissionDataID:");
-    if (this.jobSubmissionDataID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionDataID);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("resourceJobManager:");
-    if (this.resourceJobManager == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.resourceJobManager);
-    }
-    first = false;
-    if (isSetSshPort()) {
-      if (!first) sb.append(", ");
-      sb.append("sshPort:");
-      sb.append(this.sshPort);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetJobSubmissionDataID()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionDataID' is unset! Struct:" + toString());
-    }
-
-    if (!isSetResourceJobManager()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceJobManager' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class SSHJobSubmissionStandardSchemeFactory implements SchemeFactory {
-    public SSHJobSubmissionStandardScheme getScheme() {
-      return new SSHJobSubmissionStandardScheme();
-    }
-  }
-
-  private static class SSHJobSubmissionStandardScheme extends StandardScheme<SSHJobSubmission> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SSHJobSubmission struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // JOB_SUBMISSION_DATA_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.jobSubmissionDataID = iprot.readString();
-              struct.setJobSubmissionDataIDIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // RESOURCE_JOB_MANAGER
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
-              struct.setResourceJobManagerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SSH_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.sshPort = iprot.readI32();
-              struct.setSshPortIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SSHJobSubmission struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.jobSubmissionDataID != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_DATA_ID_FIELD_DESC);
-        oprot.writeString(struct.jobSubmissionDataID);
-        oprot.writeFieldEnd();
-      }
-      if (struct.resourceJobManager != null) {
-        oprot.writeFieldBegin(RESOURCE_JOB_MANAGER_FIELD_DESC);
-        oprot.writeI32(struct.resourceJobManager.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetSshPort()) {
-        oprot.writeFieldBegin(SSH_PORT_FIELD_DESC);
-        oprot.writeI32(struct.sshPort);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SSHJobSubmissionTupleSchemeFactory implements SchemeFactory {
-    public SSHJobSubmissionTupleScheme getScheme() {
-      return new SSHJobSubmissionTupleScheme();
-    }
-  }
-
-  private static class SSHJobSubmissionTupleScheme extends TupleScheme<SSHJobSubmission> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SSHJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.jobSubmissionDataID);
-      oprot.writeI32(struct.resourceJobManager.getValue());
-      BitSet optionals = new BitSet();
-      if (struct.isSetSshPort()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetSshPort()) {
-        oprot.writeI32(struct.sshPort);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SSHJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.jobSubmissionDataID = iprot.readString();
-      struct.setJobSubmissionDataIDIsSet(true);
-      struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
-      struct.setResourceJobManagerIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.sshPort = iprot.readI32();
-        struct.setSshPortIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SecurityProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SecurityProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SecurityProtocol.java
deleted file mode 100644
index 0f6673a..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SecurityProtocol.java
+++ /dev/null
@@ -1,82 +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
- */
-package org.apache.airavata.model.computehost;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of security authentication and authorization mechanisms supported by Airavata. This enumeration just
- *  describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential
- *  store.
- * 
- * USERNAME_PASSWORD:
- *  A User Name.
- * 
- * SSH_KEYS:
- *  SSH Keys
- * 
- */
-@SuppressWarnings("all") public enum SecurityProtocol implements org.apache.thrift.TEnum {
-  USERNAME_PASSWORD(0),
-  SSH_KEYS(1),
-  GSI(2),
-  KERBEROS(3),
-  OAUTH(4);
-
-  private final int value;
-
-  private SecurityProtocol(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static SecurityProtocol findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return USERNAME_PASSWORD;
-      case 1:
-        return SSH_KEYS;
-      case 2:
-        return GSI;
-      case 3:
-        return KERBEROS;
-      case 4:
-        return OAUTH;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/computeHostModelConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/computeHostModelConstants.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/computeHostModelConstants.java
deleted file mode 100644
index fa923f3..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/computeHostModelConstants.java
+++ /dev/null
@@ -1,55 +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
- */
-package org.apache.airavata.model.computehost;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class computeHostModelConstants {
-
-  public static final String DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS";
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
index 49d80b0..8a885b6 100644
--- a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
+++ b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.model.util;
 
-import org.apache.airavata.model.computehost.*;
+import org.apache.airavata.model.appcatalog.computeresource.*;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index 4bf2d04..98693e1 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -28,7 +28,7 @@ include "airavataErrors.thrift"
 include "airavataDataModel.thrift"
 include "experimentModel.thrift"
 include "workspaceModel.thrift"
-include "computeHostModel.thrift"
+include "computeResourceModel.thrift"
 include "applicationDeploymentModel.thrift"
 include "applicationInterfaceModel.thrift"
 include "gatewayProfileModel.thrift"

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift b/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift
index 7397e33..2e9a6c0 100644
--- a/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift
+++ b/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift
@@ -18,7 +18,7 @@
  *
  */
 
-include "computeHostModel.thrift"
+include "computeResourceModel.thrift"
 include "applicationDeploymentModel.thrift"
 include "applicationInterfaceModel.thrift"
 include "gatewayProfileModel.thrift"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/thrift-interface-descriptions/computeHostModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/computeHostModel.thrift b/airavata-api/thrift-interface-descriptions/computeHostModel.thrift
deleted file mode 100644
index 01754d8..0000000
--- a/airavata-api/thrift-interface-descriptions/computeHostModel.thrift
+++ /dev/null
@@ -1,180 +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.
- *
- */
-
-namespace java org.apache.airavata.model.computehost
-namespace php Airavata.Model.ComputeHost
-
-const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
-
-/**
- * Enumeration of local resource job managers supported by Airavata
- *
- * FORK:
- *  Forking of commands without any job manager
- *
- * PBS:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
- *
- * UGE:
- *  Univa Grid Engine, a variation of PBS implementation.
- *
- * SLURM:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- *
-*/
-enum ResourceJobManager {
-    FORK,
-    PBS,
-    UGE,
-    SLURM
-}
-
-/**
- * Enumeration of Airavata supported Job Submission Mechanisms for High Perforamance Computing Clusters.
- *
- * SSH:
- *  Execute remote job submission commands using via secure shell protocol.
- *
- * GRAM:
- *  Execute remote jobs via Globus GRAM service.
- *
- * UNICORE:
- *  Execute remote jobs via Unicore services
- *
-*/
-enum JobSubmissionProtocol {
-    SSH,
-    GSISSH,
-    GRAM,
-    UNICORE
-}
-
-/**
- * Enumeration of data movement supported by Airavata
- *
- * SCP:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
- *
- * SFTP:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- *
- * GridFTP:
- *  Globus File Transfer Protocol
- *
- * UNICORE_STORAGE_SERVICE:
- *  Storage Service Provided by Unicore
- *
-*/
-enum DataMovementProtocol {
-    SCP,
-    SFTP,
-    GridFTP,
-    UNICORE_STORAGE_SERVICE
-}
-
-/**
- * Enumeration of security authentication and authorization mechanisms supported by Airavata. This enumeration just
- *  describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential
- *  store.
- *
- * USERNAME_PASSWORD:
- *  A User Name.
- *
- * SSH_KEYS:
- *  SSH Keys
- *
-*/
-enum SecurityProtocol {
-    USERNAME_PASSWORD,
-    SSH_KEYS,
-    GSI,
-    KERBEROS,
-    OAUTH
-}
-
-struct SCPDataMovement {
-    1: required string dataMovementDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: optional i32 sshPort = 22
-}
-
-struct GridFTPDataMovement {
-    1: required string dataMovementDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: required list<string>  gridFTPEndPoint
-}
-
-struct SSHJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required ResourceJobManager resourceJobManager,
-    3: optional i32 sshPort = 22
-}
-
-struct GlobusJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: required ResourceJobManager resourceJobManager,
-    4: optional list<string> globusGateKeeperEndPoint
-}
-
-struct GSISSHJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required ResourceJobManager resourceJobManager,
-    3: optional i32 sshPort = 22,
-    4: optional set<string> exports,
-    5: optional list<string> preJobCommands,
-    6: optional list<string> postJobCommands,
-    7: optional string installedPath,
-    8: optional string monitorMode
-}
-
-/**
- * Computational Resource Description
- *
- * resourceId: Airavata Internal Unique Job ID. This is set by the registry.
- *
- * hostName:
- *   Fully Qualified Host Name.
- *
- * ipAddress:
- *   IP Addresse of the Hostname.
- *
- * resourceDescription:
- *  A user friendly description of the hostname.
- *
- * JobSubmissionProtocols:
- *  A computational resources may have one or more ways of submitting Jobs. This structure
- *  will hold all available mechanisms to interact with the resource.
- *
- * DataMovementProtocol:
- *  Option to specify a prefered data movement mechanism of the available options.
- *
-*/
-struct ComputeResourceDescription {
-    1: required bool isEmpty = 0,
-    2: required string resourceId = DEFAULT_ID,
-    3: required string hostName,
-    4: optional set<string> hostAliases,
-    5: optional set<string> ipAddresses,
-    6: optional string resourceDescription,
-    8: optional string preferredJobSubmissionProtocol,
-    9: required map<string, JobSubmissionProtocol> jobSubmissionProtocols,
-    10: required map<string, DataMovementProtocol> dataMovementProtocols
-}
\ No newline at end of file