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/06/29 14:38:28 UTC

[1/8] git commit: Unifying multiple mysql-connector-java versions.

Repository: airavata
Updated Branches:
  refs/heads/master 3d5b9a67f -> eaf09bd90


Unifying multiple mysql-connector-java versions.


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

Branch: refs/heads/master
Commit: c97832e292407bf3a26e4fc5138c21181a4e7fff
Parents: 8ebb254
Author: Suresh Marru <sm...@apache.org>
Authored: Sat Jun 28 23:29:28 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sat Jun 28 23:29:28 2014 -0400

----------------------------------------------------------------------
 .../airavata-client-sdks/java-client-samples/pom.xml      |  7 +------
 modules/gfac/gfac-gsissh/pom.xml                          | 10 +++++-----
 modules/registry/airavata-jpa-registry/pom.xml            |  2 +-
 modules/ws-messenger/pom.xml                              |  2 +-
 pom.xml                                                   |  1 +
 5 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index 4c2e282..f678f3a 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -26,11 +26,6 @@
 
     <dependencies>
     
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.12</version>
-		</dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-data-models</artifactId>
@@ -79,7 +74,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.17</version>
+            <version>${mysql.connector.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.airavata</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/modules/gfac/gfac-gsissh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/pom.xml b/modules/gfac/gfac-gsissh/pom.xml
index d129a5d..49b3ce4 100644
--- a/modules/gfac/gfac-gsissh/pom.xml
+++ b/modules/gfac/gfac-gsissh/pom.xml
@@ -107,10 +107,10 @@
             <artifactId>sshj</artifactId>
             <version>0.6.1</version>
         </dependency>
-	<dependency>
-			<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
-					<version>5.1.31</version>
-				</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.connector.version}</version>
+        </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/modules/registry/airavata-jpa-registry/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/pom.xml b/modules/registry/airavata-jpa-registry/pom.xml
index 7f7d41a..18a860e 100644
--- a/modules/registry/airavata-jpa-registry/pom.xml
+++ b/modules/registry/airavata-jpa-registry/pom.xml
@@ -87,7 +87,7 @@
         <!--dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.6</version>
+            <version>${mysql.connector.version}</version>
         </dependency-->
         <dependency>
             <groupId>org.apache.derby</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/modules/ws-messenger/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ws-messenger/pom.xml b/modules/ws-messenger/pom.xml
index 1865829..363b00d 100644
--- a/modules/ws-messenger/pom.xml
+++ b/modules/ws-messenger/pom.xml
@@ -67,7 +67,7 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.6</version>
+                <version>${mysql.connector.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6698962..046ffe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
         <jglobus.version>2.0.6</jglobus.version>
         <ebay.cors.filter>1.0.0</ebay.cors.filter>
         <thrift.version>0.9.1</thrift.version>
+        <mysql.connector.version>5.1.31</mysql.connector.version>
         <skipTests>false</skipTests>
     </properties>
 


[7/8] git commit: fixing build

Posted by sm...@apache.org.
fixing build


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

Branch: refs/heads/master
Commit: 41dd801d307bf910f9aa98a269e34bd0476e3335
Parents: 8994fc8
Author: Suresh Marru <sm...@apache.org>
Authored: Sun Jun 29 08:22:51 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sun Jun 29 08:22:51 2014 -0400

----------------------------------------------------------------------
 .../api/appcatalog/ApplicationCatalogAPI.java   | 31134 -----------------
 .../applicationCatalogAPIConstants.java         |    55 -
 .../api/client/AiravataClientFactory.java       |     6 +-
 .../model/appcatalog/ApplicationDeployment.java |   600 -
 .../model/appcatalog/ApplicationDescriptor.java |   506 -
 .../model/appcatalog/ApplicationInterface.java  |   658 -
 .../applicationCatalogDataModelConstants.java   |    55 -
 modules/commons/pom.xml                         |     4 +-
 pom.xml                                         |    12 +-
 9 files changed, 15 insertions(+), 33015 deletions(-)
----------------------------------------------------------------------



[2/8] git commit: Removing duplicate pom dependencies

Posted by sm...@apache.org.
Removing duplicate pom dependencies


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

Branch: refs/heads/master
Commit: c84bc06167054c5065fe254e7a8ca89e5d74d2ab
Parents: c97832e
Author: Suresh Marru <sm...@apache.org>
Authored: Sat Jun 28 23:35:09 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sat Jun 28 23:35:09 2014 -0400

----------------------------------------------------------------------
 modules/app-catalog/app-catalog-data/pom.xml   | 5 -----
 modules/distribution/server/pom.xml            | 5 -----
 modules/orchestrator/orchestrator-core/pom.xml | 5 -----
 modules/registry/airavata-jpa-registry/pom.xml | 5 -----
 4 files changed, 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c84bc061/modules/app-catalog/app-catalog-data/pom.xml
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/pom.xml b/modules/app-catalog/app-catalog-data/pom.xml
index 43adbb4..3b6c3db 100644
--- a/modules/app-catalog/app-catalog-data/pom.xml
+++ b/modules/app-catalog/app-catalog-data/pom.xml
@@ -40,11 +40,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-common-utils</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>app-catalog-cpi</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c84bc061/modules/distribution/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml
index 4d51a13..d9055c2 100644
--- a/modules/distribution/server/pom.xml
+++ b/modules/distribution/server/pom.xml
@@ -522,11 +522,6 @@
             <artifactId>cors-filter</artifactId>
             <version>${ebay.cors.filter}</version>
         </dependency>
-		<dependency>
-			<groupId>org.apache.airavata</groupId>
-	    		<artifactId>gsissh</artifactId>
-	    		<version>${project.version}</version>
-		</dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c84bc061/modules/orchestrator/orchestrator-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml
index 95a45a5..5f5382e 100644
--- a/modules/orchestrator/orchestrator-core/pom.xml
+++ b/modules/orchestrator/orchestrator-core/pom.xml
@@ -132,11 +132,6 @@ the License. -->
         	<artifactId>zookeeper</artifactId>
         	<version>3.4.0</version>
         </dependency>
-	<dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-server-configuration</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c84bc061/modules/registry/airavata-jpa-registry/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/pom.xml b/modules/registry/airavata-jpa-registry/pom.xml
index 18a860e..9a58037 100644
--- a/modules/registry/airavata-jpa-registry/pom.xml
+++ b/modules/registry/airavata-jpa-registry/pom.xml
@@ -30,11 +30,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-data-models</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
         </dependency>


[3/8] git commit: Removing third-party repositories

Posted by sm...@apache.org.
Removing third-party repositories


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

Branch: refs/heads/master
Commit: df55c5b299df88e51e38c00ca9c022760da67450
Parents: c84bc06
Author: Suresh Marru <sm...@apache.org>
Authored: Sun Jun 29 00:30:31 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sun Jun 29 00:30:31 2014 -0400

----------------------------------------------------------------------
 pom.xml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/df55c5b2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 046ffe7..9ffe306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -398,11 +398,6 @@
     </dependencyManagement>
 
     <repositories>
-        <!--<repository>-->
-            <!--<name>go.nexus.repo</name>-->
-            <!--<id>go.nexus.repo</id>-->
-            <!--<url>http://code.ceres.auckland.ac.nz/nexus/content/repositories/releases/</url>-->
-        <!--</repository>-->
         <repository>
             <id>central</id>
             <name>Maven Central</name>
@@ -414,12 +409,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-
-        <repository>
-            <id>unicore.eu</id>
-            <name>UNICORE repository</name>
-            <url>http://unicore-dev.zam.kfa-juelich.de/maven</url>
-        </repository>
     </repositories>
 
     <profiles>
@@ -579,11 +568,12 @@
                 </plugins>
             </build>
             <modules>
+                <module>modules/configuration</module>
                 <module>airavata-api</module>
+                <module>modules/commons</module>
                 <module>modules/gfac</module>
                 <module>modules/ws-messenger</module>
                 <module>modules/workflow-model</module>
-                <module>modules/commons</module>
                 <module>modules/registry</module>
                 <module>modules/airavata-client</module>
                 <module>modules/security</module>
@@ -591,7 +581,6 @@
                 <module>modules/orchestrator</module>
                 <module>tools</module>
                 <module>modules/server</module>
-                <module>modules/configuration</module>
                 <module>modules/test-suite</module>
                 <module>modules/distribution</module>
                 <module>modules/integration-tests</module>


[6/8] fixing build

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/41dd801d/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 ae8c533..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.application.interface.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.application.interface.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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.application.interface.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.application.deployment.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.application.deployment.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.application.deployment.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.application.interface.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.application.interface.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.application.interface.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.application.interface.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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.application.deployment.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);
-        this.gsisshJobSubmissionProtocolResourceId = 

<TRUNCATED>

[8/8] git commit: moving unicore repo into bes provider. This should be removed soon.

Posted by sm...@apache.org.
moving unicore repo into bes provider. This should be removed soon.


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

Branch: refs/heads/master
Commit: eaf09bd90df4ed5efec765ad5d86c3516399b009
Parents: 41dd801
Author: Suresh Marru <sm...@apache.org>
Authored: Sun Jun 29 08:38:04 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sun Jun 29 08:38:04 2014 -0400

----------------------------------------------------------------------
 modules/gfac/gfac-bes/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/eaf09bd9/modules/gfac/gfac-bes/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-bes/pom.xml b/modules/gfac/gfac-bes/pom.xml
index 351fa47..8e6fe5a 100644
--- a/modules/gfac/gfac-bes/pom.xml
+++ b/modules/gfac/gfac-bes/pom.xml
@@ -22,6 +22,14 @@
     <description>This is the extension of GFAC to use GRAM </description>
     <url>http://airavata.apache.org/</url>
 
+    <repositories>
+        <repository>
+            <id>unicore.eu</id>
+            <name>UNICORE repository</name>
+            <url>http://unicore-dev.zam.kfa-juelich.de/maven</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.jglobus</groupId>


[5/8] fixing build

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/41dd801d/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/41dd801d/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
index a8fefb6..bc8cde5 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
@@ -24,7 +24,7 @@ package org.apache.airavata.api.client;
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.airavata.api.Airavata;
-import org.apache.airavata.api.appcatalog.ApplicationCatalogAPI;
+//import org.apache.airavata.api.appcatalog.ApplicationCatalogAPI;
 import org.apache.airavata.model.error.AiravataClientConnectException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TMultiplexedProtocol;
@@ -51,7 +51,7 @@ public class AiravataClientFactory {
         }
     }
     
-    public static ApplicationCatalogAPI.Client createApplicationCatalogClient(String serverHost, int serverPort) throws AiravataClientConnectException{
+    /*public static ApplicationCatalogAPI.Client createApplicationCatalogClient(String serverHost, int serverPort) throws AiravataClientConnectException{
         try {
             TTransport transport = new TSocket(serverHost, serverPort);
             transport.open();
@@ -75,5 +75,5 @@ public class AiravataClientFactory {
         } catch (Exception e) {
 			throw new Exception("Invalid Airavata API Service "+type.getClass().getCanonicalName());
 		}
-    }
+    }*/
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/41dd801d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationDeployment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationDeployment.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationDeployment.java
deleted file mode 100644
index 0faa7af..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationDeployment.java
+++ /dev/null
@@ -1,600 +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.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 ApplicationDeployment implements org.apache.thrift.TBase<ApplicationDeployment, ApplicationDeployment._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeployment> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeployment");
-
-  private static final org.apache.thrift.protocol.TField DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("deploymentId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceDescription", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-  private static final org.apache.thrift.protocol.TField APPLICATION_DESCRIPTOR_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDescriptor", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ApplicationDeploymentStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ApplicationDeploymentTupleSchemeFactory());
-  }
-
-  private String deploymentId; // required
-  private ComputeResourceDescription computeResourceDescription; // required
-  private ApplicationDescriptor applicationDescriptor; // 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 {
-    DEPLOYMENT_ID((short)1, "deploymentId"),
-    COMPUTE_RESOURCE_DESCRIPTION((short)2, "computeResourceDescription"),
-    APPLICATION_DESCRIPTOR((short)3, "applicationDescriptor");
-
-    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: // DEPLOYMENT_ID
-          return DEPLOYMENT_ID;
-        case 2: // COMPUTE_RESOURCE_DESCRIPTION
-          return COMPUTE_RESOURCE_DESCRIPTION;
-        case 3: // APPLICATION_DESCRIPTOR
-          return APPLICATION_DESCRIPTOR;
-        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.DEPLOYMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("deploymentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COMPUTE_RESOURCE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("computeResourceDescription", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComputeResourceDescription.class)));
-    tmpMap.put(_Fields.APPLICATION_DESCRIPTOR, new org.apache.thrift.meta_data.FieldMetaData("applicationDescriptor", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ApplicationDescriptor.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ApplicationDeployment.class, metaDataMap);
-  }
-
-  public ApplicationDeployment() {
-    this.deploymentId = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public ApplicationDeployment(
-    String deploymentId,
-    ComputeResourceDescription computeResourceDescription,
-    ApplicationDescriptor applicationDescriptor)
-  {
-    this();
-    this.deploymentId = deploymentId;
-    this.computeResourceDescription = computeResourceDescription;
-    this.applicationDescriptor = applicationDescriptor;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ApplicationDeployment(ApplicationDeployment other) {
-    if (other.isSetDeploymentId()) {
-      this.deploymentId = other.deploymentId;
-    }
-    if (other.isSetComputeResourceDescription()) {
-      this.computeResourceDescription = new ComputeResourceDescription(other.computeResourceDescription);
-    }
-    if (other.isSetApplicationDescriptor()) {
-      this.applicationDescriptor = new ApplicationDescriptor(other.applicationDescriptor);
-    }
-  }
-
-  public ApplicationDeployment deepCopy() {
-    return new ApplicationDeployment(this);
-  }
-
-  @Override
-  public void clear() {
-    this.deploymentId = "DO_NOT_SET_AT_CLIENTS";
-
-    this.computeResourceDescription = null;
-    this.applicationDescriptor = null;
-  }
-
-  public String getDeploymentId() {
-    return this.deploymentId;
-  }
-
-  public void setDeploymentId(String deploymentId) {
-    this.deploymentId = deploymentId;
-  }
-
-  public void unsetDeploymentId() {
-    this.deploymentId = null;
-  }
-
-  /** Returns true if field deploymentId is set (has been assigned a value) and false otherwise */
-  public boolean isSetDeploymentId() {
-    return this.deploymentId != null;
-  }
-
-  public void setDeploymentIdIsSet(boolean value) {
-    if (!value) {
-      this.deploymentId = null;
-    }
-  }
-
-  public ComputeResourceDescription getComputeResourceDescription() {
-    return this.computeResourceDescription;
-  }
-
-  public void setComputeResourceDescription(ComputeResourceDescription computeResourceDescription) {
-    this.computeResourceDescription = computeResourceDescription;
-  }
-
-  public void unsetComputeResourceDescription() {
-    this.computeResourceDescription = null;
-  }
-
-  /** Returns true if field computeResourceDescription is set (has been assigned a value) and false otherwise */
-  public boolean isSetComputeResourceDescription() {
-    return this.computeResourceDescription != null;
-  }
-
-  public void setComputeResourceDescriptionIsSet(boolean value) {
-    if (!value) {
-      this.computeResourceDescription = null;
-    }
-  }
-
-  public ApplicationDescriptor getApplicationDescriptor() {
-    return this.applicationDescriptor;
-  }
-
-  public void setApplicationDescriptor(ApplicationDescriptor applicationDescriptor) {
-    this.applicationDescriptor = applicationDescriptor;
-  }
-
-  public void unsetApplicationDescriptor() {
-    this.applicationDescriptor = null;
-  }
-
-  /** Returns true if field applicationDescriptor is set (has been assigned a value) and false otherwise */
-  public boolean isSetApplicationDescriptor() {
-    return this.applicationDescriptor != null;
-  }
-
-  public void setApplicationDescriptorIsSet(boolean value) {
-    if (!value) {
-      this.applicationDescriptor = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DEPLOYMENT_ID:
-      if (value == null) {
-        unsetDeploymentId();
-      } else {
-        setDeploymentId((String)value);
-      }
-      break;
-
-    case COMPUTE_RESOURCE_DESCRIPTION:
-      if (value == null) {
-        unsetComputeResourceDescription();
-      } else {
-        setComputeResourceDescription((ComputeResourceDescription)value);
-      }
-      break;
-
-    case APPLICATION_DESCRIPTOR:
-      if (value == null) {
-        unsetApplicationDescriptor();
-      } else {
-        setApplicationDescriptor((ApplicationDescriptor)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DEPLOYMENT_ID:
-      return getDeploymentId();
-
-    case COMPUTE_RESOURCE_DESCRIPTION:
-      return getComputeResourceDescription();
-
-    case APPLICATION_DESCRIPTOR:
-      return getApplicationDescriptor();
-
-    }
-    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 DEPLOYMENT_ID:
-      return isSetDeploymentId();
-    case COMPUTE_RESOURCE_DESCRIPTION:
-      return isSetComputeResourceDescription();
-    case APPLICATION_DESCRIPTOR:
-      return isSetApplicationDescriptor();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ApplicationDeployment)
-      return this.equals((ApplicationDeployment)that);
-    return false;
-  }
-
-  public boolean equals(ApplicationDeployment that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_deploymentId = true && this.isSetDeploymentId();
-    boolean that_present_deploymentId = true && that.isSetDeploymentId();
-    if (this_present_deploymentId || that_present_deploymentId) {
-      if (!(this_present_deploymentId && that_present_deploymentId))
-        return false;
-      if (!this.deploymentId.equals(that.deploymentId))
-        return false;
-    }
-
-    boolean this_present_computeResourceDescription = true && this.isSetComputeResourceDescription();
-    boolean that_present_computeResourceDescription = true && that.isSetComputeResourceDescription();
-    if (this_present_computeResourceDescription || that_present_computeResourceDescription) {
-      if (!(this_present_computeResourceDescription && that_present_computeResourceDescription))
-        return false;
-      if (!this.computeResourceDescription.equals(that.computeResourceDescription))
-        return false;
-    }
-
-    boolean this_present_applicationDescriptor = true && this.isSetApplicationDescriptor();
-    boolean that_present_applicationDescriptor = true && that.isSetApplicationDescriptor();
-    if (this_present_applicationDescriptor || that_present_applicationDescriptor) {
-      if (!(this_present_applicationDescriptor && that_present_applicationDescriptor))
-        return false;
-      if (!this.applicationDescriptor.equals(that.applicationDescriptor))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(ApplicationDeployment other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDeploymentId()).compareTo(other.isSetDeploymentId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDeploymentId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deploymentId, other.deploymentId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetComputeResourceDescription()).compareTo(other.isSetComputeResourceDescription());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetComputeResourceDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.computeResourceDescription, other.computeResourceDescription);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetApplicationDescriptor()).compareTo(other.isSetApplicationDescriptor());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetApplicationDescriptor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationDescriptor, other.applicationDescriptor);
-      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("ApplicationDeployment(");
-    boolean first = true;
-
-    sb.append("deploymentId:");
-    if (this.deploymentId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.deploymentId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("computeResourceDescription:");
-    if (this.computeResourceDescription == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.computeResourceDescription);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("applicationDescriptor:");
-    if (this.applicationDescriptor == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.applicationDescriptor);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDeploymentId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'deploymentId' is unset! Struct:" + toString());
-    }
-
-    if (!isSetComputeResourceDescription()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'computeResourceDescription' is unset! Struct:" + toString());
-    }
-
-    if (!isSetApplicationDescriptor()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationDescriptor' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-    if (computeResourceDescription != null) {
-      computeResourceDescription.validate();
-    }
-    if (applicationDescriptor != null) {
-      applicationDescriptor.validate();
-    }
-  }
-
-  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 ApplicationDeploymentStandardSchemeFactory implements SchemeFactory {
-    public ApplicationDeploymentStandardScheme getScheme() {
-      return new ApplicationDeploymentStandardScheme();
-    }
-  }
-
-  private static class ApplicationDeploymentStandardScheme extends StandardScheme<ApplicationDeployment> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ApplicationDeployment 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: // DEPLOYMENT_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.deploymentId = iprot.readString();
-              struct.setDeploymentIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // COMPUTE_RESOURCE_DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.computeResourceDescription = new ComputeResourceDescription();
-              struct.computeResourceDescription.read(iprot);
-              struct.setComputeResourceDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // APPLICATION_DESCRIPTOR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.applicationDescriptor = new ApplicationDescriptor();
-              struct.applicationDescriptor.read(iprot);
-              struct.setApplicationDescriptorIsSet(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, ApplicationDeployment struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.deploymentId != null) {
-        oprot.writeFieldBegin(DEPLOYMENT_ID_FIELD_DESC);
-        oprot.writeString(struct.deploymentId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.computeResourceDescription != null) {
-        oprot.writeFieldBegin(COMPUTE_RESOURCE_DESCRIPTION_FIELD_DESC);
-        struct.computeResourceDescription.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (struct.applicationDescriptor != null) {
-        oprot.writeFieldBegin(APPLICATION_DESCRIPTOR_FIELD_DESC);
-        struct.applicationDescriptor.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ApplicationDeploymentTupleSchemeFactory implements SchemeFactory {
-    public ApplicationDeploymentTupleScheme getScheme() {
-      return new ApplicationDeploymentTupleScheme();
-    }
-  }
-
-  private static class ApplicationDeploymentTupleScheme extends TupleScheme<ApplicationDeployment> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationDeployment struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.deploymentId);
-      struct.computeResourceDescription.write(oprot);
-      struct.applicationDescriptor.write(oprot);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationDeployment struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.deploymentId = iprot.readString();
-      struct.setDeploymentIdIsSet(true);
-      struct.computeResourceDescription = new ComputeResourceDescription();
-      struct.computeResourceDescription.read(iprot);
-      struct.setComputeResourceDescriptionIsSet(true);
-      struct.applicationDescriptor = new ApplicationDescriptor();
-      struct.applicationDescriptor.read(iprot);
-      struct.setApplicationDescriptorIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/41dd801d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationDescriptor.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationDescriptor.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationDescriptor.java
deleted file mode 100644
index 90f5d0c..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationDescriptor.java
+++ /dev/null
@@ -1,506 +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.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;
-
-/**
- * Following structs are added for completeness of the application catalog
- */
-@SuppressWarnings("all") public class ApplicationDescriptor implements org.apache.thrift.TBase<ApplicationDescriptor, ApplicationDescriptor._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDescriptor> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDescriptor");
-
-  private static final org.apache.thrift.protocol.TField APPLICATION_DESCRIPTOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDescriptorId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField APPLICATION_DESCRIPTOR_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDescriptorData", org.apache.thrift.protocol.TType.STRING, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ApplicationDescriptorStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ApplicationDescriptorTupleSchemeFactory());
-  }
-
-  private String applicationDescriptorId; // required
-  private String applicationDescriptorData; // 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 {
-    APPLICATION_DESCRIPTOR_ID((short)1, "applicationDescriptorId"),
-    APPLICATION_DESCRIPTOR_DATA((short)2, "applicationDescriptorData");
-
-    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: // APPLICATION_DESCRIPTOR_ID
-          return APPLICATION_DESCRIPTOR_ID;
-        case 2: // APPLICATION_DESCRIPTOR_DATA
-          return APPLICATION_DESCRIPTOR_DATA;
-        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.APPLICATION_DESCRIPTOR_DATA};
-  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.APPLICATION_DESCRIPTOR_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationDescriptorId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.APPLICATION_DESCRIPTOR_DATA, new org.apache.thrift.meta_data.FieldMetaData("applicationDescriptorData", 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(ApplicationDescriptor.class, metaDataMap);
-  }
-
-  public ApplicationDescriptor() {
-    this.applicationDescriptorId = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public ApplicationDescriptor(
-    String applicationDescriptorId)
-  {
-    this();
-    this.applicationDescriptorId = applicationDescriptorId;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ApplicationDescriptor(ApplicationDescriptor other) {
-    if (other.isSetApplicationDescriptorId()) {
-      this.applicationDescriptorId = other.applicationDescriptorId;
-    }
-    if (other.isSetApplicationDescriptorData()) {
-      this.applicationDescriptorData = other.applicationDescriptorData;
-    }
-  }
-
-  public ApplicationDescriptor deepCopy() {
-    return new ApplicationDescriptor(this);
-  }
-
-  @Override
-  public void clear() {
-    this.applicationDescriptorId = "DO_NOT_SET_AT_CLIENTS";
-
-    this.applicationDescriptorData = null;
-  }
-
-  public String getApplicationDescriptorId() {
-    return this.applicationDescriptorId;
-  }
-
-  public void setApplicationDescriptorId(String applicationDescriptorId) {
-    this.applicationDescriptorId = applicationDescriptorId;
-  }
-
-  public void unsetApplicationDescriptorId() {
-    this.applicationDescriptorId = null;
-  }
-
-  /** Returns true if field applicationDescriptorId is set (has been assigned a value) and false otherwise */
-  public boolean isSetApplicationDescriptorId() {
-    return this.applicationDescriptorId != null;
-  }
-
-  public void setApplicationDescriptorIdIsSet(boolean value) {
-    if (!value) {
-      this.applicationDescriptorId = null;
-    }
-  }
-
-  public String getApplicationDescriptorData() {
-    return this.applicationDescriptorData;
-  }
-
-  public void setApplicationDescriptorData(String applicationDescriptorData) {
-    this.applicationDescriptorData = applicationDescriptorData;
-  }
-
-  public void unsetApplicationDescriptorData() {
-    this.applicationDescriptorData = null;
-  }
-
-  /** Returns true if field applicationDescriptorData is set (has been assigned a value) and false otherwise */
-  public boolean isSetApplicationDescriptorData() {
-    return this.applicationDescriptorData != null;
-  }
-
-  public void setApplicationDescriptorDataIsSet(boolean value) {
-    if (!value) {
-      this.applicationDescriptorData = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case APPLICATION_DESCRIPTOR_ID:
-      if (value == null) {
-        unsetApplicationDescriptorId();
-      } else {
-        setApplicationDescriptorId((String)value);
-      }
-      break;
-
-    case APPLICATION_DESCRIPTOR_DATA:
-      if (value == null) {
-        unsetApplicationDescriptorData();
-      } else {
-        setApplicationDescriptorData((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case APPLICATION_DESCRIPTOR_ID:
-      return getApplicationDescriptorId();
-
-    case APPLICATION_DESCRIPTOR_DATA:
-      return getApplicationDescriptorData();
-
-    }
-    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 APPLICATION_DESCRIPTOR_ID:
-      return isSetApplicationDescriptorId();
-    case APPLICATION_DESCRIPTOR_DATA:
-      return isSetApplicationDescriptorData();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ApplicationDescriptor)
-      return this.equals((ApplicationDescriptor)that);
-    return false;
-  }
-
-  public boolean equals(ApplicationDescriptor that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_applicationDescriptorId = true && this.isSetApplicationDescriptorId();
-    boolean that_present_applicationDescriptorId = true && that.isSetApplicationDescriptorId();
-    if (this_present_applicationDescriptorId || that_present_applicationDescriptorId) {
-      if (!(this_present_applicationDescriptorId && that_present_applicationDescriptorId))
-        return false;
-      if (!this.applicationDescriptorId.equals(that.applicationDescriptorId))
-        return false;
-    }
-
-    boolean this_present_applicationDescriptorData = true && this.isSetApplicationDescriptorData();
-    boolean that_present_applicationDescriptorData = true && that.isSetApplicationDescriptorData();
-    if (this_present_applicationDescriptorData || that_present_applicationDescriptorData) {
-      if (!(this_present_applicationDescriptorData && that_present_applicationDescriptorData))
-        return false;
-      if (!this.applicationDescriptorData.equals(that.applicationDescriptorData))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(ApplicationDescriptor other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetApplicationDescriptorId()).compareTo(other.isSetApplicationDescriptorId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetApplicationDescriptorId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationDescriptorId, other.applicationDescriptorId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetApplicationDescriptorData()).compareTo(other.isSetApplicationDescriptorData());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetApplicationDescriptorData()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationDescriptorData, other.applicationDescriptorData);
-      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("ApplicationDescriptor(");
-    boolean first = true;
-
-    sb.append("applicationDescriptorId:");
-    if (this.applicationDescriptorId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.applicationDescriptorId);
-    }
-    first = false;
-    if (isSetApplicationDescriptorData()) {
-      if (!first) sb.append(", ");
-      sb.append("applicationDescriptorData:");
-      if (this.applicationDescriptorData == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.applicationDescriptorData);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetApplicationDescriptorId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationDescriptorId' 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 ApplicationDescriptorStandardSchemeFactory implements SchemeFactory {
-    public ApplicationDescriptorStandardScheme getScheme() {
-      return new ApplicationDescriptorStandardScheme();
-    }
-  }
-
-  private static class ApplicationDescriptorStandardScheme extends StandardScheme<ApplicationDescriptor> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ApplicationDescriptor 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: // APPLICATION_DESCRIPTOR_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.applicationDescriptorId = iprot.readString();
-              struct.setApplicationDescriptorIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // APPLICATION_DESCRIPTOR_DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.applicationDescriptorData = iprot.readString();
-              struct.setApplicationDescriptorDataIsSet(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, ApplicationDescriptor struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.applicationDescriptorId != null) {
-        oprot.writeFieldBegin(APPLICATION_DESCRIPTOR_ID_FIELD_DESC);
-        oprot.writeString(struct.applicationDescriptorId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.applicationDescriptorData != null) {
-        if (struct.isSetApplicationDescriptorData()) {
-          oprot.writeFieldBegin(APPLICATION_DESCRIPTOR_DATA_FIELD_DESC);
-          oprot.writeString(struct.applicationDescriptorData);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ApplicationDescriptorTupleSchemeFactory implements SchemeFactory {
-    public ApplicationDescriptorTupleScheme getScheme() {
-      return new ApplicationDescriptorTupleScheme();
-    }
-  }
-
-  private static class ApplicationDescriptorTupleScheme extends TupleScheme<ApplicationDescriptor> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationDescriptor struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.applicationDescriptorId);
-      BitSet optionals = new BitSet();
-      if (struct.isSetApplicationDescriptorData()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetApplicationDescriptorData()) {
-        oprot.writeString(struct.applicationDescriptorData);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationDescriptor struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.applicationDescriptorId = iprot.readString();
-      struct.setApplicationDescriptorIdIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.applicationDescriptorData = iprot.readString();
-        struct.setApplicationDescriptorDataIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/41dd801d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java
deleted file mode 100644
index f66753b..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/ApplicationInterface.java
+++ /dev/null
@@ -1,658 +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.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 ApplicationInterface implements org.apache.thrift.TBase<ApplicationInterface, ApplicationInterface._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterface> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterface");
-
-  private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceData", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField APPLICATION_DEPLOYMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDeployments", 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 ApplicationInterfaceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ApplicationInterfaceTupleSchemeFactory());
-  }
-
-  private String applicationInterfaceId; // required
-  private String applicationInterfaceData; // optional
-  private List<ApplicationDeployment> applicationDeployments; // 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 {
-    APPLICATION_INTERFACE_ID((short)1, "applicationInterfaceId"),
-    APPLICATION_INTERFACE_DATA((short)2, "applicationInterfaceData"),
-    APPLICATION_DEPLOYMENTS((short)3, "applicationDeployments");
-
-    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: // APPLICATION_INTERFACE_ID
-          return APPLICATION_INTERFACE_ID;
-        case 2: // APPLICATION_INTERFACE_DATA
-          return APPLICATION_INTERFACE_DATA;
-        case 3: // APPLICATION_DEPLOYMENTS
-          return APPLICATION_DEPLOYMENTS;
-        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.APPLICATION_INTERFACE_DATA,_Fields.APPLICATION_DEPLOYMENTS};
-  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.APPLICATION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.APPLICATION_INTERFACE_DATA, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceData", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.APPLICATION_DEPLOYMENTS, new org.apache.thrift.meta_data.FieldMetaData("applicationDeployments", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ApplicationDeployment.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ApplicationInterface.class, metaDataMap);
-  }
-
-  public ApplicationInterface() {
-    this.applicationInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public ApplicationInterface(
-    String applicationInterfaceId)
-  {
-    this();
-    this.applicationInterfaceId = applicationInterfaceId;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ApplicationInterface(ApplicationInterface other) {
-    if (other.isSetApplicationInterfaceId()) {
-      this.applicationInterfaceId = other.applicationInterfaceId;
-    }
-    if (other.isSetApplicationInterfaceData()) {
-      this.applicationInterfaceData = other.applicationInterfaceData;
-    }
-    if (other.isSetApplicationDeployments()) {
-      List<ApplicationDeployment> __this__applicationDeployments = new ArrayList<ApplicationDeployment>(other.applicationDeployments.size());
-      for (ApplicationDeployment other_element : other.applicationDeployments) {
-        __this__applicationDeployments.add(new ApplicationDeployment(other_element));
-      }
-      this.applicationDeployments = __this__applicationDeployments;
-    }
-  }
-
-  public ApplicationInterface deepCopy() {
-    return new ApplicationInterface(this);
-  }
-
-  @Override
-  public void clear() {
-    this.applicationInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
-    this.applicationInterfaceData = null;
-    this.applicationDeployments = null;
-  }
-
-  public String getApplicationInterfaceId() {
-    return this.applicationInterfaceId;
-  }
-
-  public void setApplicationInterfaceId(String applicationInterfaceId) {
-    this.applicationInterfaceId = applicationInterfaceId;
-  }
-
-  public void unsetApplicationInterfaceId() {
-    this.applicationInterfaceId = null;
-  }
-
-  /** Returns true if field applicationInterfaceId is set (has been assigned a value) and false otherwise */
-  public boolean isSetApplicationInterfaceId() {
-    return this.applicationInterfaceId != null;
-  }
-
-  public void setApplicationInterfaceIdIsSet(boolean value) {
-    if (!value) {
-      this.applicationInterfaceId = null;
-    }
-  }
-
-  public String getApplicationInterfaceData() {
-    return this.applicationInterfaceData;
-  }
-
-  public void setApplicationInterfaceData(String applicationInterfaceData) {
-    this.applicationInterfaceData = applicationInterfaceData;
-  }
-
-  public void unsetApplicationInterfaceData() {
-    this.applicationInterfaceData = null;
-  }
-
-  /** Returns true if field applicationInterfaceData is set (has been assigned a value) and false otherwise */
-  public boolean isSetApplicationInterfaceData() {
-    return this.applicationInterfaceData != null;
-  }
-
-  public void setApplicationInterfaceDataIsSet(boolean value) {
-    if (!value) {
-      this.applicationInterfaceData = null;
-    }
-  }
-
-  public int getApplicationDeploymentsSize() {
-    return (this.applicationDeployments == null) ? 0 : this.applicationDeployments.size();
-  }
-
-  public java.util.Iterator<ApplicationDeployment> getApplicationDeploymentsIterator() {
-    return (this.applicationDeployments == null) ? null : this.applicationDeployments.iterator();
-  }
-
-  public void addToApplicationDeployments(ApplicationDeployment elem) {
-    if (this.applicationDeployments == null) {
-      this.applicationDeployments = new ArrayList<ApplicationDeployment>();
-    }
-    this.applicationDeployments.add(elem);
-  }
-
-  public List<ApplicationDeployment> getApplicationDeployments() {
-    return this.applicationDeployments;
-  }
-
-  public void setApplicationDeployments(List<ApplicationDeployment> applicationDeployments) {
-    this.applicationDeployments = applicationDeployments;
-  }
-
-  public void unsetApplicationDeployments() {
-    this.applicationDeployments = null;
-  }
-
-  /** Returns true if field applicationDeployments is set (has been assigned a value) and false otherwise */
-  public boolean isSetApplicationDeployments() {
-    return this.applicationDeployments != null;
-  }
-
-  public void setApplicationDeploymentsIsSet(boolean value) {
-    if (!value) {
-      this.applicationDeployments = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case APPLICATION_INTERFACE_ID:
-      if (value == null) {
-        unsetApplicationInterfaceId();
-      } else {
-        setApplicationInterfaceId((String)value);
-      }
-      break;
-
-    case APPLICATION_INTERFACE_DATA:
-      if (value == null) {
-        unsetApplicationInterfaceData();
-      } else {
-        setApplicationInterfaceData((String)value);
-      }
-      break;
-
-    case APPLICATION_DEPLOYMENTS:
-      if (value == null) {
-        unsetApplicationDeployments();
-      } else {
-        setApplicationDeployments((List<ApplicationDeployment>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case APPLICATION_INTERFACE_ID:
-      return getApplicationInterfaceId();
-
-    case APPLICATION_INTERFACE_DATA:
-      return getApplicationInterfaceData();
-
-    case APPLICATION_DEPLOYMENTS:
-      return getApplicationDeployments();
-
-    }
-    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 APPLICATION_INTERFACE_ID:
-      return isSetApplicationInterfaceId();
-    case APPLICATION_INTERFACE_DATA:
-      return isSetApplicationInterfaceData();
-    case APPLICATION_DEPLOYMENTS:
-      return isSetApplicationDeployments();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ApplicationInterface)
-      return this.equals((ApplicationInterface)that);
-    return false;
-  }
-
-  public boolean equals(ApplicationInterface that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_applicationInterfaceId = true && this.isSetApplicationInterfaceId();
-    boolean that_present_applicationInterfaceId = true && that.isSetApplicationInterfaceId();
-    if (this_present_applicationInterfaceId || that_present_applicationInterfaceId) {
-      if (!(this_present_applicationInterfaceId && that_present_applicationInterfaceId))
-        return false;
-      if (!this.applicationInterfaceId.equals(that.applicationInterfaceId))
-        return false;
-    }
-
-    boolean this_present_applicationInterfaceData = true && this.isSetApplicationInterfaceData();
-    boolean that_present_applicationInterfaceData = true && that.isSetApplicationInterfaceData();
-    if (this_present_applicationInterfaceData || that_present_applicationInterfaceData) {
-      if (!(this_present_applicationInterfaceData && that_present_applicationInterfaceData))
-        return false;
-      if (!this.applicationInterfaceData.equals(that.applicationInterfaceData))
-        return false;
-    }
-
-    boolean this_present_applicationDeployments = true && this.isSetApplicationDeployments();
-    boolean that_present_applicationDeployments = true && that.isSetApplicationDeployments();
-    if (this_present_applicationDeployments || that_present_applicationDeployments) {
-      if (!(this_present_applicationDeployments && that_present_applicationDeployments))
-        return false;
-      if (!this.applicationDeployments.equals(that.applicationDeployments))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(ApplicationInterface other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetApplicationInterfaceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationInterfaceId, other.applicationInterfaceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetApplicationInterfaceData()).compareTo(other.isSetApplicationInterfaceData());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetApplicationInterfaceData()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationInterfaceData, other.applicationInterfaceData);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetApplicationDeployments()).compareTo(other.isSetApplicationDeployments());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetApplicationDeployments()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationDeployments, other.applicationDeployments);
-      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("ApplicationInterface(");
-    boolean first = true;
-
-    sb.append("applicationInterfaceId:");
-    if (this.applicationInterfaceId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.applicationInterfaceId);
-    }
-    first = false;
-    if (isSetApplicationInterfaceData()) {
-      if (!first) sb.append(", ");
-      sb.append("applicationInterfaceData:");
-      if (this.applicationInterfaceData == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.applicationInterfaceData);
-      }
-      first = false;
-    }
-    if (isSetApplicationDeployments()) {
-      if (!first) sb.append(", ");
-      sb.append("applicationDeployments:");
-      if (this.applicationDeployments == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.applicationDeployments);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetApplicationInterfaceId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationInterfaceId' 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 ApplicationInterfaceStandardSchemeFactory implements SchemeFactory {
-    public ApplicationInterfaceStandardScheme getScheme() {
-      return new ApplicationInterfaceStandardScheme();
-    }
-  }
-
-  private static class ApplicationInterfaceStandardScheme extends StandardScheme<ApplicationInterface> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ApplicationInterface 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: // APPLICATION_INTERFACE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.applicationInterfaceId = iprot.readString();
-              struct.setApplicationInterfaceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // APPLICATION_INTERFACE_DATA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.applicationInterfaceData = iprot.readString();
-              struct.setApplicationInterfaceDataIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // APPLICATION_DEPLOYMENTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list76 = iprot.readListBegin();
-                struct.applicationDeployments = new ArrayList<ApplicationDeployment>(_list76.size);
-                for (int _i77 = 0; _i77 < _list76.size; ++_i77)
-                {
-                  ApplicationDeployment _elem78;
-                  _elem78 = new ApplicationDeployment();
-                  _elem78.read(iprot);
-                  struct.applicationDeployments.add(_elem78);
-                }
-                iprot.readListEnd();
-              }
-              struct.setApplicationDeploymentsIsSet(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, ApplicationInterface struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.applicationInterfaceId != null) {
-        oprot.writeFieldBegin(APPLICATION_INTERFACE_ID_FIELD_DESC);
-        oprot.writeString(struct.applicationInterfaceId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.applicationInterfaceData != null) {
-        if (struct.isSetApplicationInterfaceData()) {
-          oprot.writeFieldBegin(APPLICATION_INTERFACE_DATA_FIELD_DESC);
-          oprot.writeString(struct.applicationInterfaceData);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.applicationDeployments != null) {
-        if (struct.isSetApplicationDeployments()) {
-          oprot.writeFieldBegin(APPLICATION_DEPLOYMENTS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.applicationDeployments.size()));
-            for (ApplicationDeployment _iter79 : struct.applicationDeployments)
-            {
-              _iter79.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ApplicationInterfaceTupleSchemeFactory implements SchemeFactory {
-    public ApplicationInterfaceTupleScheme getScheme() {
-      return new ApplicationInterfaceTupleScheme();
-    }
-  }
-
-  private static class ApplicationInterfaceTupleScheme extends TupleScheme<ApplicationInterface> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationInterface struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.applicationInterfaceId);
-      BitSet optionals = new BitSet();
-      if (struct.isSetApplicationInterfaceData()) {
-        optionals.set(0);
-      }
-      if (struct.isSetApplicationDeployments()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetApplicationInterfaceData()) {
-        oprot.writeString(struct.applicationInterfaceData);
-      }
-      if (struct.isSetApplicationDeployments()) {
-        {
-          oprot.writeI32(struct.applicationDeployments.size());
-          for (ApplicationDeployment _iter80 : struct.applicationDeployments)
-          {
-            _iter80.write(oprot);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationInterface struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.applicationInterfaceId = iprot.readString();
-      struct.setApplicationInterfaceIdIsSet(true);
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.applicationInterfaceData = iprot.readString();
-        struct.setApplicationInterfaceDataIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list81 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.applicationDeployments = new ArrayList<ApplicationDeployment>(_list81.size);
-          for (int _i82 = 0; _i82 < _list81.size; ++_i82)
-          {
-            ApplicationDeployment _elem83;
-            _elem83 = new ApplicationDeployment();
-            _elem83.read(iprot);
-            struct.applicationDeployments.add(_elem83);
-          }
-        }
-        struct.setApplicationDeploymentsIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/41dd801d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/applicationCatalogDataModelConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/applicationCatalogDataModelConstants.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/applicationCatalogDataModelConstants.java
deleted file mode 100644
index 14070bb..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/applicationCatalogDataModelConstants.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.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 applicationCatalogDataModelConstants {
-
-  public static final String DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS";
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/41dd801d/modules/commons/pom.xml
----------------------------------------------------------------------
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 0cdce55..383c3b7 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -30,9 +30,9 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>workflow-tracking</module>
-                <module>gfac-schema</module>
                 <module>utils</module>
+                <module>gfac-schema</module>
+                <module>workflow-tracking</module>
                 <module>workflow-execution-context</module>
             </modules>
         </profile>

http://git-wip-us.apache.org/repos/asf/airavata/blob/41dd801d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ffe306..1aa1ea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -399,6 +399,14 @@
 
     <repositories>
         <repository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://repository.apache.org/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+        <repository>
             <id>central</id>
             <name>Maven Central</name>
             <url>http://repo1.maven.org/maven2</url>
@@ -483,10 +491,11 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
+                <module>modules/configuration</module>
                 <module>airavata-api</module>
+                <module>modules/commons</module>
                 <module>modules/gfac</module>
                 <module>modules/workflow-model</module>
-                <module>modules/commons</module>
                 <module>modules/registry</module>
                 <module>modules/app-catalog</module>
                 <module>modules/airavata-client</module>
@@ -497,7 +506,6 @@
                 <module>modules/server</module>
                 <module>modules/test-suite</module>
                 <module>modules/distribution</module>
-                <module>modules/configuration</module>
                 <module>modules/ws-messenger</module>
                 <module>modules/integration-tests</module>
             </modules>


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

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


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

Branch: refs/heads/master
Commit: 8994fc86a2412a8c78df5622dfb99965a1924e2a
Parents: df55c5b 3d5b9a6
Author: Suresh Marru <sm...@apache.org>
Authored: Sun Jun 29 07:22:02 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sun Jun 29 07:22:02 2014 -0400

----------------------------------------------------------------------
 .../org/airavata/appcatalog/cpi/AppCatalog.java |  4 +-
 .../appcatalog/cpi/ApplicationDeployment.java   |  4 ++
 .../appcatalog/cpi/ApplicationInterface.java    |  4 ++
 .../appcatalog/cpi/ComputeResource.java         | 53 ++++++++++++++++++++
 4 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------