airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [7/7] git commit: Removing the proof of concept interpreter thrift implementation.
Date Fri, 07 Feb 2014 16:35:55 GMT
Removing the proof of concept interpreter thrift implementation.


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

Branch: refs/heads/master
Commit: 77d4925d680b54568d93000b4160ec52d3d1be09
Parents: 3070c3d
Author: Suresh Marru <smarru@apache.org>
Authored: Fri Feb 7 11:35:35 2014 -0500
Committer: Suresh Marru <smarru@apache.org>
Committed: Fri Feb 7 11:35:35 2014 -0500

----------------------------------------------------------------------
 .../thrift/interpreter-service-client/pom.xml   |   48 -
 .../service/client/ExecutionClient.java         |   47 -
 .../thrift/interpreter-service-handler/pom.xml  |   48 -
 .../handler/InterpreterServiceHandler.java      |  204 --
 .../service/handler/MappingUtils.java           |  157 -
 .../service/handler/SimpleThriftServer.java     |   48 -
 modules/thrift/interpreter-service/pom.xml      |   39 -
 .../execution/AmazonWebServicesSettings.java    |  917 -----
 .../CredentialStoreSecuritySettings.java        |  611 ----
 .../execution/ExperimentAdvanceOptions.java     | 1034 ------
 .../experiment/execution/HPCSettings.java       |  798 ----
 .../execution/HostSchedulingSettings.java       |  608 ----
 .../execution/InterpreterService.java           | 3427 ------------------
 .../execution/MyProxyRepositorySettings.java    |  710 ----
 .../experiment/execution/NameValuePairType.java |  611 ----
 .../experiment/execution/NodeSettings.java      |  879 -----
 .../execution/OutputDataSettings.java           |  710 ----
 .../execution/SSHAuthenticationSettings.java    |  509 ---
 .../experiment/execution/SecuritySettings.java  |  733 ----
 .../execution/WorkflowOutputDataSettings.java   |  461 ---
 .../execution/WorkflowSchedulingSettings.java   |  461 ---
 .../src/main/resources/interpreter.thrift       |  117 -
 modules/thrift/pom.xml                          |   43 -
 pom.xml                                         |    3 +-
 24 files changed, 1 insertion(+), 13222 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/77d4925d/modules/thrift/interpreter-service-client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/thrift/interpreter-service-client/pom.xml b/modules/thrift/interpreter-service-client/pom.xml
deleted file mode 100644
index f9782b9..0000000
--- a/modules/thrift/interpreter-service-client/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>thrift</artifactId>
-        <version>0.12-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>airavata-interpreter-service-client</artifactId>
-    <packaging>jar</packaging>
-    <name>Airavata Interpreter Service Client</name>
-    <url>http://airavata.apache.org/</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-            <version>0.9.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-interpreter-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-common-utils</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/77d4925d/modules/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java
----------------------------------------------------------------------
diff --git a/modules/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java b/modules/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java
deleted file mode 100644
index 813eea8..0000000
--- a/modules/thrift/interpreter-service-client/src/main/java/org/apache/airavata/interpreter/service/client/ExecutionClient.java
+++ /dev/null
@@ -1,47 +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.
- *
- */
-
-package org.apache.airavata.interpreter.service.client;
-
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.experiment.execution.InterpreterService;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.apache.airavata.common.utils.ClientSettings;
-
-public class ExecutionClient {
-    public static final int THRIFT_SERVER_PORT = 9090 ;
-
-    public InterpreterService.Client getInterpreterServiceClient (){
-        try {
-            TTransport transport = new TSocket("localhost", THRIFT_SERVER_PORT);
-            transport.open();
-            TProtocol protocol = new TBinaryProtocol(transport);
-            return new InterpreterService.Client(protocol);
-        } catch (TTransportException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/77d4925d/modules/thrift/interpreter-service-handler/pom.xml
----------------------------------------------------------------------
diff --git a/modules/thrift/interpreter-service-handler/pom.xml b/modules/thrift/interpreter-service-handler/pom.xml
deleted file mode 100644
index e2f396a..0000000
--- a/modules/thrift/interpreter-service-handler/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>thrift</artifactId>
-        <version>0.12-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>airavata-interpreter-service-handler</artifactId>
-    <packaging>jar</packaging>
-    <name>Airavata Interpreter Service Handler</name>
-    <url>http://airavata.apache.org/</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-            <version>0.9.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-xbaya-gui</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-interpreter-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/77d4925d/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/InterpreterServiceHandler.java
----------------------------------------------------------------------
diff --git a/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/InterpreterServiceHandler.java b/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/InterpreterServiceHandler.java
deleted file mode 100644
index 798291d..0000000
--- a/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/InterpreterServiceHandler.java
+++ /dev/null
@@ -1,204 +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.
- *
- */
-
-package org.apache.airavata.interpreter.service.handler;
-
-
-import org.apache.airavata.client.AiravataAPIFactory;
-import org.apache.airavata.client.AiravataAPIUtils;
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.experiment.execution.ExperimentAdvanceOptions;
-import org.apache.airavata.experiment.execution.InterpreterService;
-import org.apache.airavata.workflow.model.wf.Workflow;
-import org.apache.airavata.ws.monitor.*;
-import org.apache.airavata.xbaya.interpretor.WorkflowInterpretorSkeleton;
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.UUID;
-
-public class InterpreterServiceHandler implements InterpreterService.Iface{
-    private static final Logger log = LoggerFactory.getLogger(InterpreterServiceHandler.class);
-    private WorkflowInterpretorSkeleton interpreterService;
-    private AiravataAPI airavataAPI;
-
-    public String runExperiment(String workflowTemplateName, Map<String, String> workflowInputs, ExperimentAdvanceOptions experimentAdOptions) throws TException {
-        String user =  getAiravataAPI().getUserManager().getAiravataUser();
-        String gatewayId = getAiravataAPI().getGateway();
-        String experimentID;
-        Workflow workflowObj;
-        try {
-            workflowObj = extractWorkflow(workflowTemplateName);
-            experimentID = experimentAdOptions.getCustomExperimentId();
-            workflowTemplateName = workflowObj.getName();
-            if (experimentID == null || experimentID.isEmpty()) {
-                experimentID = workflowTemplateName + "_" + UUID.randomUUID();
-            }
-            experimentAdOptions.setCustomExperimentId(experimentID);
-            getAiravataAPI().getProvenanceManager().setWorkflowInstanceTemplateName(experimentID, workflowTemplateName);
-
-            String submissionUser = getAiravataAPI().getUserManager().getAiravataUser();
-            String executionUser=experimentAdOptions.getExecutionUser();
-            if (executionUser==null){
-                executionUser=submissionUser;
-            }
-            experimentAdOptions.setExecutionUser(executionUser);
-            runPreWorkflowExecutionTasks(experimentID, executionUser, experimentAdOptions.getMetadata(), experimentAdOptions.getExperimentName());
-
-            EventDataListener listener = new EventDataListenerAdapter() {
-                @Override
-                public void notify(EventDataRepository eventDataRepo, EventData eventData) {
-
-                }
-            };
-
-            getExperimentMonitor(experimentID, listener).startMonitoring();
-            String workflowContent = extractWorkflowContent(workflowTemplateName);
-
-            return getInterpreterService().setupAndLaunch(workflowContent,
-                    experimentID,
-                    gatewayId,
-                    user,
-                    workflowInputs,
-                    true,
-                    AiravataAPIUtils.createWorkflowContextHeaderBuilder(MappingUtils.getExperimentOptionsObject(experimentAdOptions), experimentAdOptions.getExecutionUser(), user));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public Monitor getExperimentMonitor(String experimentId, EventDataListener listener) throws AiravataAPIInvocationException {
-        MonitorConfiguration monitorConfiguration;
-        try {
-            monitorConfiguration = new MonitorConfiguration(
-                    getAiravataAPI().getAiravataManager().getMessageBoxServiceURL(), experimentId,
-                    true, getAiravataAPI().getAiravataManager().getMessageBoxServiceURL());
-            final Monitor monitor = new Monitor(monitorConfiguration);
-            monitor.printRawMessage(false);
-            if (listener!=null) {
-                monitor.getEventDataRepository().registerEventListener(listener);
-                listener.setExperimentMonitor(monitor);
-            }
-            if (!monitor.getExperimentId().equals(">")){
-                monitor.getEventDataRepository().registerEventListener(new EventDataListenerAdapter() {
-                    public void notify(EventDataRepository eventDataRepo, EventData eventData) {
-                        if (eventData.getType()== MonitorUtil.EventType.WORKFLOW_TERMINATED || eventData.getType()== MonitorUtil.EventType.SENDING_FAULT){
-                            monitor.stopMonitoring();
-                        }
-                    }
-                });
-            }
-            return monitor;
-        } catch (Exception e) {
-            throw new AiravataAPIInvocationException(e);
-        }
-    }
-
-    private void runPreWorkflowExecutionTasks(String experimentId, String user,
-                                              String metadata, String experimentName) throws AiravataAPIInvocationException {
-        if (user != null) {
-            getAiravataAPI().getProvenanceManager().setExperimentUser(experimentId, user);
-        }
-        if (metadata != null) {
-            getAiravataAPI().getProvenanceManager().setExperimentMetadata(experimentId, metadata);
-        }
-        if (experimentName == null) {
-            experimentName = experimentId;
-        }
-        getAiravataAPI().getProvenanceManager().setExperimentName(experimentId, experimentName);
-    }
-
-    private Workflow extractWorkflow(String workflowName) throws AiravataAPIInvocationException {
-        Workflow workflowObj = null;
-        //FIXME - There should be a better way to figure-out if the passed string is a name or an xml
-        if(!workflowName.contains("http://airavata.apache.org/xbaya/xwf")){//(getClient().getWorkflowManager().isWorkflowExists(workflowName)) {
-            workflowObj = getAiravataAPI().getWorkflowManager().getWorkflow(workflowName);
-        }else {
-            try{
-                workflowObj = getAiravataAPI().getWorkflowManager().getWorkflowFromString(workflowName);
-            }catch (AiravataAPIInvocationException e){
-                getAiravataAPI().getWorkflowManager().getWorkflow(workflowName);
-            }
-        }
-        return workflowObj;
-    }
-
-    private AiravataAPI getAiravataAPI(){
-        if (airavataAPI==null) {
-            try {
-                String systemUserName = ServerSettings.getSystemUser();
-                String gateway = ServerSettings.getSystemUserGateway();
-                airavataAPI = AiravataAPIFactory.getAPI(gateway, systemUserName);
-            } catch (ApplicationSettingsException e) {
-                log.error("Unable to read the properties file", e);
-            } catch (AiravataAPIInvocationException e) {
-                log.error("Unable to create Airavata API", e);
-            }
-        }
-        return airavataAPI;
-    }
-
-    private String extractWorkflowContent(String workflowName) throws AiravataAPIInvocationException {
-        if(workflowName.contains("http://airavata.apache.org/xbaya/xwf")){//(getClient().getWorkflowManager().isWorkflowExists(workflowName)) {
-            return workflowName;
-        }else {
-            return getAiravataAPI().getWorkflowManager().getWorkflowAsString(workflowName);
-        }
-    }
-
-    public void cancelExperiment(String experimentID) throws TException {
-        try {
-            getInterpreterService().haltWorkflow(experimentID);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void suspendExperiment(String experimentID) throws TException {
-        try {
-            getInterpreterService().suspendWorkflow(experimentID);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void resumeExperiment(String experimentID) throws TException {
-        try {
-            getInterpreterService().resumeWorkflow(experimentID);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public WorkflowInterpretorSkeleton getInterpreterService() {
-        if (interpreterService==null){
-            interpreterService=new WorkflowInterpretorSkeleton();
-        }
-        return interpreterService;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/77d4925d/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/MappingUtils.java
----------------------------------------------------------------------
diff --git a/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/MappingUtils.java b/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/MappingUtils.java
deleted file mode 100644
index 5f4beae..0000000
--- a/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/MappingUtils.java
+++ /dev/null
@@ -1,157 +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.
- *
- */
-
-package org.apache.airavata.interpreter.service.handler;
-
-import org.apache.airavata.client.api.*;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.impl.*;
-import org.apache.airavata.client.tools.NameValuePairType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MappingUtils {
-    public static ExperimentAdvanceOptions getExperimentOptionsObject(org.apache.airavata.experiment.execution.ExperimentAdvanceOptions advanceOptions){
-        try {
-            ExperimentAdvanceOptions experimentAdvanceOptions = new ExperimentAdvanceOptions();
-            experimentAdvanceOptions.setCustomExperimentId(advanceOptions.getCustomExperimentId());
-            experimentAdvanceOptions.setExperimentExecutionUser(advanceOptions.getExecutionUser());
-            experimentAdvanceOptions.setExperimentCustomMetadata(advanceOptions.getMetadata());
-            experimentAdvanceOptions.setExperimentName(advanceOptions.getExperimentName());
-
-            if (advanceOptions.getWorkflowSchedulingSettings() != null){
-                List<org.apache.airavata.experiment.execution.NodeSettings> nodeSettingsList = advanceOptions.getWorkflowSchedulingSettings().getNodeSettingsList();
-                for (org.apache.airavata.experiment.execution.NodeSettings nodeSettings : nodeSettingsList){
-                    NodeSettings n = getNodeSettingObject(nodeSettings);
-                    org.apache.airavata.experiment.execution.HPCSettings hpcSettings = nodeSettings.getHpcSettings();
-                    HPCSettings hpcSettingsObject = getHPCSettingsObject(hpcSettings);
-                    n.setHPCSettings(hpcSettingsObject);
-                    org.apache.airavata.experiment.execution.HostSchedulingSettings hostSchedulingSettings = nodeSettings.getHostSchedulingSettings();
-                    HostSchedulingSettings hostSchedulingSettingsObj = getHostSchedulingSettingsObj(hostSchedulingSettings);
-                    n.setHostSettings(hostSchedulingSettingsObj);
-                    experimentAdvanceOptions.getCustomWorkflowSchedulingSettings().addNewNodeSettings(n);
-                }
-            }
-
-            org.apache.airavata.experiment.execution.WorkflowOutputDataSettings workflowOutputDataSettings = advanceOptions.getWorkflowOutputDataSettings();
-            if (workflowOutputDataSettings != null){
-                WorkflowOutputDataSettings dataSettings = getWorkflowOutputDataSettingsObject(workflowOutputDataSettings);
-                experimentAdvanceOptions.getCustomWorkflowOutputDataSettings().addNewOutputDataSettings(dataSettings.getOutputDataSettingsList());
-            }
-
-            SecuritySettings securitySettings = experimentAdvanceOptions.getCustomSecuritySettings();
-            org.apache.airavata.experiment.execution.SecuritySettings securitySettings1 = advanceOptions.getSecuritySettings();
-            if (securitySettings != null && securitySettings1 != null){
-                AmazonWebServicesSettings amazonWSSettings = securitySettings.getAmazonWSSettings();
-                if (amazonWSSettings != null){
-                    amazonWSSettings.setAccessKeyId(securitySettings1.getAmazonWSSettings().getAccessKey());
-                    amazonWSSettings.setAMIId(securitySettings1.getAmazonWSSettings().getAmiID());
-                    amazonWSSettings.setInstanceId(securitySettings1.getAmazonWSSettings().getInstanceID());
-                    amazonWSSettings.setInstanceType(securitySettings1.getAmazonWSSettings().getInstanceType());
-                    amazonWSSettings.setSecretAccessKey(securitySettings1.getAmazonWSSettings().getSecretAccessKey());
-                    amazonWSSettings.setUsername(securitySettings1.getAmazonWSSettings().getUsername());
-                }
-                CredentialStoreSecuritySettings storeSecuritySettings = securitySettings.getCredentialStoreSecuritySettings();
-                if (storeSecuritySettings != null){
-                    storeSecuritySettings.setGatewayId(securitySettings1.getCredentialStoreSettings().getGatewayID());
-                    storeSecuritySettings.setPortalUser(securitySettings1.getCredentialStoreSettings().getPortalUser());
-                    storeSecuritySettings.setTokenId(securitySettings1.getCredentialStoreSettings().getTokenId());
-                }
-
-//                GridMyProxyRepositorySettings myProxyRepositorySettings = securitySettings.getGridMyProxyRepositorySettings();
-//                if (myProxyRepositorySettings != null){
-//                    myProxyRepositorySettings.setUsername(securitySettings1.getMyproxySettings().getUserName());
-//                    myProxyRepositorySettings.setPassword(securitySettings1.getMyproxySettings().getPassword());
-//                    myProxyRepositorySettings.setLifeTime(securitySettings1.getMyproxySettings().getLifetime());
-//                    myProxyRepositorySettings.setMyProxyServer(securitySettings1.getMyproxySettings().getMyproxyServer());
-//                }
-//
-//                SSHAuthenticationSettings authenticationSettings = securitySettings.getSSHAuthenticationSettings();
-//                if (authenticationSettings != null){
-//                    authenticationSettings.setAccessKeyId(securitySettings1.getSshAuthSettings().getAccessKeyID());
-//                    authenticationSettings.setSecretAccessKey(securitySettings1.getSshAuthSettings().getSecretAccessKey());
-//                }
-            }
-            return experimentAdvanceOptions;
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    public static NodeSettingsImpl getNodeSettingObject (org.apache.airavata.experiment.execution.NodeSettings nodeSettings){
-        NodeSettings n = new NodeSettingsImpl(nodeSettings.getNodeId());
-        n.setServiceId(nodeSettings.getServiceId());
-        List<NameValuePairType> nameValuePairTypes = new ArrayList<NameValuePairType>();
-        List<org.apache.airavata.experiment.execution.NameValuePairType> nameValuePairList = nodeSettings.getNameValuePairList();
-        for (org.apache.airavata.experiment.execution.NameValuePairType np : nameValuePairList) {
-            NameValuePairType nameValuePairObject = getNameValuePairObject(np);
-            nameValuePairTypes.add(nameValuePairObject);
-        }
-        n.setNameValuePair(nameValuePairTypes);
-        return (NodeSettingsImpl)n;
-
-    }
-
-    public static NameValuePairType getNameValuePairObject(org.apache.airavata.experiment.execution.NameValuePairType nameValuePairType){
-        NameValuePairType nameValuePair = new NameValuePairType();
-        nameValuePair.setName(nameValuePairType.getName());
-        nameValuePair.setValue(nameValuePairType.getValue());
-        nameValuePair.setDescription(nameValuePairType.getDescription());
-        return nameValuePair;
-    }
-
-    public static HPCSettings getHPCSettingsObject (org.apache.airavata.experiment.execution.HPCSettings hsettings){
-        HPCSettings hpcSettings = new HPCSettingsImpl();
-        hpcSettings.setCPUCount(hsettings.getCpuCount());
-        hpcSettings.setJobManager(hsettings.getJobManager());
-        hpcSettings.setMaxWallTime(hsettings.getMaxWalltime());
-        hpcSettings.setNodeCount(hsettings.getNodeCount());
-        hpcSettings.setQueueName(hsettings.getQueueName());
-        return hpcSettings;
-    }
-
-    public static HostSchedulingSettings getHostSchedulingSettingsObj (org.apache.airavata.experiment.execution.HostSchedulingSettings schedulingSettings){
-        HostSchedulingSettings hostSchedulingSettings = new HostSchedulingSettingsImpl();
-        hostSchedulingSettings.setHostId(schedulingSettings.getHostID());
-        hostSchedulingSettings.setGatekeeperEPR(schedulingSettings.getGatekeeperEPR());
-        hostSchedulingSettings.setWSGramPreffered(schedulingSettings.isIsWSGramPreferred());
-        return hostSchedulingSettings;
-    }
-
-    public static WorkflowOutputDataSettings getWorkflowOutputDataSettingsObject(org.apache.airavata.experiment.execution.WorkflowOutputDataSettings wfods) {
-        WorkflowOutputDataSettings wfOutDataSettings = new WorkflowOutputDataSettingsImpl();
-        List<org.apache.airavata.experiment.execution.OutputDataSettings> dataSettingsList = wfods.getOutputDataSettingsList();
-        for (org.apache.airavata.experiment.execution.OutputDataSettings outPutDSettng : dataSettingsList) {
-            OutputDataSettings outputDataSettings = new ApplicationOutputDataSettingsImpl(outPutDSettng.getNodeID());
-            outputDataSettings.setDataPersistent(outPutDSettng.isIsdataPersisted());
-            outputDataSettings.setDataRegistryUrl(outPutDSettng.getDataRegURL());
-            outputDataSettings.setOutputDataDirectory(outPutDSettng.getOutputdataDir());
-            wfOutDataSettings.addNewOutputDataSettings(outputDataSettings);
-        }
-        return wfOutDataSettings;
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/77d4925d/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/SimpleThriftServer.java
----------------------------------------------------------------------
diff --git a/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/SimpleThriftServer.java b/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/SimpleThriftServer.java
deleted file mode 100644
index 5968349..0000000
--- a/modules/thrift/interpreter-service-handler/src/main/java/org/apache/airavata/interpreter/service/handler/SimpleThriftServer.java
+++ /dev/null
@@ -1,48 +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.
- *
- */
-
-package org.apache.airavata.interpreter.service.handler;
-
-import org.apache.airavata.experiment.execution.InterpreterService;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.transport.TServerSocket;
-import org.apache.thrift.transport.TServerTransport;
-
-public class SimpleThriftServer {
-    public static void StartsimpleServer(InterpreterService.Processor<InterpreterServiceHandler> processor) {
-        try {
-            TServerTransport serverTransport = new TServerSocket(9090);
-            TServer server = new TSimpleServer(
-                    new TServer.Args(serverTransport).processor(processor));
-
-            System.out.println("Starting the simple server...");
-            server.serve();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String[] args) {
-        InterpreterService.Processor<InterpreterServiceHandler> processor = new InterpreterService.Processor<InterpreterServiceHandler>(new InterpreterServiceHandler());
-        StartsimpleServer(processor);
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/77d4925d/modules/thrift/interpreter-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/thrift/interpreter-service/pom.xml b/modules/thrift/interpreter-service/pom.xml
deleted file mode 100644
index e4211c9..0000000
--- a/modules/thrift/interpreter-service/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>thrift</artifactId>
-        <version>0.12-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>airavata-interpreter-service</artifactId>
-    <packaging>jar</packaging>
-    <name>Airavata Interpreter Service</name>
-    <url>http://airavata.apache.org/</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-            <version>0.9.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
-        </dependency>
-
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/77d4925d/modules/thrift/interpreter-service/src/main/java/org/apache/airavata/experiment/execution/AmazonWebServicesSettings.java
----------------------------------------------------------------------
diff --git a/modules/thrift/interpreter-service/src/main/java/org/apache/airavata/experiment/execution/AmazonWebServicesSettings.java b/modules/thrift/interpreter-service/src/main/java/org/apache/airavata/experiment/execution/AmazonWebServicesSettings.java
deleted file mode 100644
index d1a16eb..0000000
--- a/modules/thrift/interpreter-service/src/main/java/org/apache/airavata/experiment/execution/AmazonWebServicesSettings.java
+++ /dev/null
@@ -1,917 +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.experiment.execution;
-
-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;
-
-public class AmazonWebServicesSettings implements org.apache.thrift.TBase<AmazonWebServicesSettings, AmazonWebServicesSettings._Fields>, java.io.Serializable, Cloneable, Comparable<AmazonWebServicesSettings> {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AmazonWebServicesSettings");
-
-    private static final org.apache.thrift.protocol.TField ACCESS_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("accessKey", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField AMI_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("amiID", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField INSTANCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("instanceID", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField INSTANCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("instanceType", org.apache.thrift.protocol.TType.STRING, (short)4);
-    private static final org.apache.thrift.protocol.TField SECRET_ACCESS_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("secretAccessKey", org.apache.thrift.protocol.TType.STRING, (short)5);
-    private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)6);
-
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-        schemes.put(StandardScheme.class, new AmazonWebServicesSettingsStandardSchemeFactory());
-        schemes.put(TupleScheme.class, new AmazonWebServicesSettingsTupleSchemeFactory());
-    }
-
-    public String accessKey; // optional
-    public String amiID; // optional
-    public String instanceID; // optional
-    public String instanceType; // optional
-    public String secretAccessKey; // optional
-    public String username; // optional
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-        ACCESS_KEY((short)1, "accessKey"),
-        AMI_ID((short)2, "amiID"),
-        INSTANCE_ID((short)3, "instanceID"),
-        INSTANCE_TYPE((short)4, "instanceType"),
-        SECRET_ACCESS_KEY((short)5, "secretAccessKey"),
-        USERNAME((short)6, "username");
-
-        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: // ACCESS_KEY
-                    return ACCESS_KEY;
-                case 2: // AMI_ID
-                    return AMI_ID;
-                case 3: // INSTANCE_ID
-                    return INSTANCE_ID;
-                case 4: // INSTANCE_TYPE
-                    return INSTANCE_TYPE;
-                case 5: // SECRET_ACCESS_KEY
-                    return SECRET_ACCESS_KEY;
-                case 6: // USERNAME
-                    return USERNAME;
-                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.ACCESS_KEY,_Fields.AMI_ID,_Fields.INSTANCE_ID,_Fields.INSTANCE_TYPE,_Fields.SECRET_ACCESS_KEY,_Fields.USERNAME};
-    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.ACCESS_KEY, new org.apache.thrift.meta_data.FieldMetaData("accessKey", org.apache.thrift.TFieldRequirementType.OPTIONAL,
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-        tmpMap.put(_Fields.AMI_ID, new org.apache.thrift.meta_data.FieldMetaData("amiID", org.apache.thrift.TFieldRequirementType.OPTIONAL,
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-        tmpMap.put(_Fields.INSTANCE_ID, new org.apache.thrift.meta_data.FieldMetaData("instanceID", org.apache.thrift.TFieldRequirementType.OPTIONAL,
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-        tmpMap.put(_Fields.INSTANCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("instanceType", org.apache.thrift.TFieldRequirementType.OPTIONAL,
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-        tmpMap.put(_Fields.SECRET_ACCESS_KEY, new org.apache.thrift.meta_data.FieldMetaData("secretAccessKey", org.apache.thrift.TFieldRequirementType.OPTIONAL,
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-        tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", 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(AmazonWebServicesSettings.class, metaDataMap);
-    }
-
-    public AmazonWebServicesSettings() {
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public AmazonWebServicesSettings(AmazonWebServicesSettings other) {
-        if (other.isSetAccessKey()) {
-            this.accessKey = other.accessKey;
-        }
-        if (other.isSetAmiID()) {
-            this.amiID = other.amiID;
-        }
-        if (other.isSetInstanceID()) {
-            this.instanceID = other.instanceID;
-        }
-        if (other.isSetInstanceType()) {
-            this.instanceType = other.instanceType;
-        }
-        if (other.isSetSecretAccessKey()) {
-            this.secretAccessKey = other.secretAccessKey;
-        }
-        if (other.isSetUsername()) {
-            this.username = other.username;
-        }
-    }
-
-    public AmazonWebServicesSettings deepCopy() {
-        return new AmazonWebServicesSettings(this);
-    }
-
-    @Override
-    public void clear() {
-        this.accessKey = null;
-        this.amiID = null;
-        this.instanceID = null;
-        this.instanceType = null;
-        this.secretAccessKey = null;
-        this.username = null;
-    }
-
-    public String getAccessKey() {
-        return this.accessKey;
-    }
-
-    public AmazonWebServicesSettings setAccessKey(String accessKey) {
-        this.accessKey = accessKey;
-        return this;
-    }
-
-    public void unsetAccessKey() {
-        this.accessKey = null;
-    }
-
-    /** Returns true if field accessKey is set (has been assigned a value) and false otherwise */
-    public boolean isSetAccessKey() {
-        return this.accessKey != null;
-    }
-
-    public void setAccessKeyIsSet(boolean value) {
-        if (!value) {
-            this.accessKey = null;
-        }
-    }
-
-    public String getAmiID() {
-        return this.amiID;
-    }
-
-    public AmazonWebServicesSettings setAmiID(String amiID) {
-        this.amiID = amiID;
-        return this;
-    }
-
-    public void unsetAmiID() {
-        this.amiID = null;
-    }
-
-    /** Returns true if field amiID is set (has been assigned a value) and false otherwise */
-    public boolean isSetAmiID() {
-        return this.amiID != null;
-    }
-
-    public void setAmiIDIsSet(boolean value) {
-        if (!value) {
-            this.amiID = null;
-        }
-    }
-
-    public String getInstanceID() {
-        return this.instanceID;
-    }
-
-    public AmazonWebServicesSettings setInstanceID(String instanceID) {
-        this.instanceID = instanceID;
-        return this;
-    }
-
-    public void unsetInstanceID() {
-        this.instanceID = null;
-    }
-
-    /** Returns true if field instanceID is set (has been assigned a value) and false otherwise */
-    public boolean isSetInstanceID() {
-        return this.instanceID != null;
-    }
-
-    public void setInstanceIDIsSet(boolean value) {
-        if (!value) {
-            this.instanceID = null;
-        }
-    }
-
-    public String getInstanceType() {
-        return this.instanceType;
-    }
-
-    public AmazonWebServicesSettings setInstanceType(String instanceType) {
-        this.instanceType = instanceType;
-        return this;
-    }
-
-    public void unsetInstanceType() {
-        this.instanceType = null;
-    }
-
-    /** Returns true if field instanceType is set (has been assigned a value) and false otherwise */
-    public boolean isSetInstanceType() {
-        return this.instanceType != null;
-    }
-
-    public void setInstanceTypeIsSet(boolean value) {
-        if (!value) {
-            this.instanceType = null;
-        }
-    }
-
-    public String getSecretAccessKey() {
-        return this.secretAccessKey;
-    }
-
-    public AmazonWebServicesSettings setSecretAccessKey(String secretAccessKey) {
-        this.secretAccessKey = secretAccessKey;
-        return this;
-    }
-
-    public void unsetSecretAccessKey() {
-        this.secretAccessKey = null;
-    }
-
-    /** Returns true if field secretAccessKey is set (has been assigned a value) and false otherwise */
-    public boolean isSetSecretAccessKey() {
-        return this.secretAccessKey != null;
-    }
-
-    public void setSecretAccessKeyIsSet(boolean value) {
-        if (!value) {
-            this.secretAccessKey = null;
-        }
-    }
-
-    public String getUsername() {
-        return this.username;
-    }
-
-    public AmazonWebServicesSettings setUsername(String username) {
-        this.username = username;
-        return this;
-    }
-
-    public void unsetUsername() {
-        this.username = null;
-    }
-
-    /** Returns true if field username is set (has been assigned a value) and false otherwise */
-    public boolean isSetUsername() {
-        return this.username != null;
-    }
-
-    public void setUsernameIsSet(boolean value) {
-        if (!value) {
-            this.username = null;
-        }
-    }
-
-    public void setFieldValue(_Fields field, Object value) {
-        switch (field) {
-            case ACCESS_KEY:
-                if (value == null) {
-                    unsetAccessKey();
-                } else {
-                    setAccessKey((String)value);
-                }
-                break;
-
-            case AMI_ID:
-                if (value == null) {
-                    unsetAmiID();
-                } else {
-                    setAmiID((String)value);
-                }
-                break;
-
-            case INSTANCE_ID:
-                if (value == null) {
-                    unsetInstanceID();
-                } else {
-                    setInstanceID((String)value);
-                }
-                break;
-
-            case INSTANCE_TYPE:
-                if (value == null) {
-                    unsetInstanceType();
-                } else {
-                    setInstanceType((String)value);
-                }
-                break;
-
-            case SECRET_ACCESS_KEY:
-                if (value == null) {
-                    unsetSecretAccessKey();
-                } else {
-                    setSecretAccessKey((String)value);
-                }
-                break;
-
-            case USERNAME:
-                if (value == null) {
-                    unsetUsername();
-                } else {
-                    setUsername((String)value);
-                }
-                break;
-
-        }
-    }
-
-    public Object getFieldValue(_Fields field) {
-        switch (field) {
-            case ACCESS_KEY:
-                return getAccessKey();
-
-            case AMI_ID:
-                return getAmiID();
-
-            case INSTANCE_ID:
-                return getInstanceID();
-
-            case INSTANCE_TYPE:
-                return getInstanceType();
-
-            case SECRET_ACCESS_KEY:
-                return getSecretAccessKey();
-
-            case USERNAME:
-                return getUsername();
-
-        }
-        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 ACCESS_KEY:
-                return isSetAccessKey();
-            case AMI_ID:
-                return isSetAmiID();
-            case INSTANCE_ID:
-                return isSetInstanceID();
-            case INSTANCE_TYPE:
-                return isSetInstanceType();
-            case SECRET_ACCESS_KEY:
-                return isSetSecretAccessKey();
-            case USERNAME:
-                return isSetUsername();
-        }
-        throw new IllegalStateException();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (that == null)
-            return false;
-        if (that instanceof AmazonWebServicesSettings)
-            return this.equals((AmazonWebServicesSettings)that);
-        return false;
-    }
-
-    public boolean equals(AmazonWebServicesSettings that) {
-        if (that == null)
-            return false;
-
-        boolean this_present_accessKey = true && this.isSetAccessKey();
-        boolean that_present_accessKey = true && that.isSetAccessKey();
-        if (this_present_accessKey || that_present_accessKey) {
-            if (!(this_present_accessKey && that_present_accessKey))
-                return false;
-            if (!this.accessKey.equals(that.accessKey))
-                return false;
-        }
-
-        boolean this_present_amiID = true && this.isSetAmiID();
-        boolean that_present_amiID = true && that.isSetAmiID();
-        if (this_present_amiID || that_present_amiID) {
-            if (!(this_present_amiID && that_present_amiID))
-                return false;
-            if (!this.amiID.equals(that.amiID))
-                return false;
-        }
-
-        boolean this_present_instanceID = true && this.isSetInstanceID();
-        boolean that_present_instanceID = true && that.isSetInstanceID();
-        if (this_present_instanceID || that_present_instanceID) {
-            if (!(this_present_instanceID && that_present_instanceID))
-                return false;
-            if (!this.instanceID.equals(that.instanceID))
-                return false;
-        }
-
-        boolean this_present_instanceType = true && this.isSetInstanceType();
-        boolean that_present_instanceType = true && that.isSetInstanceType();
-        if (this_present_instanceType || that_present_instanceType) {
-            if (!(this_present_instanceType && that_present_instanceType))
-                return false;
-            if (!this.instanceType.equals(that.instanceType))
-                return false;
-        }
-
-        boolean this_present_secretAccessKey = true && this.isSetSecretAccessKey();
-        boolean that_present_secretAccessKey = true && that.isSetSecretAccessKey();
-        if (this_present_secretAccessKey || that_present_secretAccessKey) {
-            if (!(this_present_secretAccessKey && that_present_secretAccessKey))
-                return false;
-            if (!this.secretAccessKey.equals(that.secretAccessKey))
-                return false;
-        }
-
-        boolean this_present_username = true && this.isSetUsername();
-        boolean that_present_username = true && that.isSetUsername();
-        if (this_present_username || that_present_username) {
-            if (!(this_present_username && that_present_username))
-                return false;
-            if (!this.username.equals(that.username))
-                return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return 0;
-    }
-
-    @Override
-    public int compareTo(AmazonWebServicesSettings other) {
-        if (!getClass().equals(other.getClass())) {
-            return getClass().getName().compareTo(other.getClass().getName());
-        }
-
-        int lastComparison = 0;
-
-        lastComparison = Boolean.valueOf(isSetAccessKey()).compareTo(other.isSetAccessKey());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        if (isSetAccessKey()) {
-            lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.accessKey, other.accessKey);
-            if (lastComparison != 0) {
-                return lastComparison;
-            }
-        }
-        lastComparison = Boolean.valueOf(isSetAmiID()).compareTo(other.isSetAmiID());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        if (isSetAmiID()) {
-            lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.amiID, other.amiID);
-            if (lastComparison != 0) {
-                return lastComparison;
-            }
-        }
-        lastComparison = Boolean.valueOf(isSetInstanceID()).compareTo(other.isSetInstanceID());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        if (isSetInstanceID()) {
-            lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.instanceID, other.instanceID);
-            if (lastComparison != 0) {
-                return lastComparison;
-            }
-        }
-        lastComparison = Boolean.valueOf(isSetInstanceType()).compareTo(other.isSetInstanceType());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        if (isSetInstanceType()) {
-            lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.instanceType, other.instanceType);
-            if (lastComparison != 0) {
-                return lastComparison;
-            }
-        }
-        lastComparison = Boolean.valueOf(isSetSecretAccessKey()).compareTo(other.isSetSecretAccessKey());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        if (isSetSecretAccessKey()) {
-            lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.secretAccessKey, other.secretAccessKey);
-            if (lastComparison != 0) {
-                return lastComparison;
-            }
-        }
-        lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        if (isSetUsername()) {
-            lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username);
-            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("AmazonWebServicesSettings(");
-        boolean first = true;
-
-        if (isSetAccessKey()) {
-            sb.append("accessKey:");
-            if (this.accessKey == null) {
-                sb.append("null");
-            } else {
-                sb.append(this.accessKey);
-            }
-            first = false;
-        }
-        if (isSetAmiID()) {
-            if (!first) sb.append(", ");
-            sb.append("amiID:");
-            if (this.amiID == null) {
-                sb.append("null");
-            } else {
-                sb.append(this.amiID);
-            }
-            first = false;
-        }
-        if (isSetInstanceID()) {
-            if (!first) sb.append(", ");
-            sb.append("instanceID:");
-            if (this.instanceID == null) {
-                sb.append("null");
-            } else {
-                sb.append(this.instanceID);
-            }
-            first = false;
-        }
-        if (isSetInstanceType()) {
-            if (!first) sb.append(", ");
-            sb.append("instanceType:");
-            if (this.instanceType == null) {
-                sb.append("null");
-            } else {
-                sb.append(this.instanceType);
-            }
-            first = false;
-        }
-        if (isSetSecretAccessKey()) {
-            if (!first) sb.append(", ");
-            sb.append("secretAccessKey:");
-            if (this.secretAccessKey == null) {
-                sb.append("null");
-            } else {
-                sb.append(this.secretAccessKey);
-            }
-            first = false;
-        }
-        if (isSetUsername()) {
-            if (!first) sb.append(", ");
-            sb.append("username:");
-            if (this.username == null) {
-                sb.append("null");
-            } else {
-                sb.append(this.username);
-            }
-            first = false;
-        }
-        sb.append(")");
-        return sb.toString();
-    }
-
-    public void validate() throws org.apache.thrift.TException {
-        // check for required fields
-        // 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 AmazonWebServicesSettingsStandardSchemeFactory implements SchemeFactory {
-        public AmazonWebServicesSettingsStandardScheme getScheme() {
-            return new AmazonWebServicesSettingsStandardScheme();
-        }
-    }
-
-    private static class AmazonWebServicesSettingsStandardScheme extends StandardScheme<AmazonWebServicesSettings> {
-
-        public void read(org.apache.thrift.protocol.TProtocol iprot, AmazonWebServicesSettings 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: // ACCESS_KEY
-                        if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                            struct.accessKey = iprot.readString();
-                            struct.setAccessKeyIsSet(true);
-                        } else {
-                            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-                        }
-                        break;
-                    case 2: // AMI_ID
-                        if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                            struct.amiID = iprot.readString();
-                            struct.setAmiIDIsSet(true);
-                        } else {
-                            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-                        }
-                        break;
-                    case 3: // INSTANCE_ID
-                        if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                            struct.instanceID = iprot.readString();
-                            struct.setInstanceIDIsSet(true);
-                        } else {
-                            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-                        }
-                        break;
-                    case 4: // INSTANCE_TYPE
-                        if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                            struct.instanceType = iprot.readString();
-                            struct.setInstanceTypeIsSet(true);
-                        } else {
-                            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-                        }
-                        break;
-                    case 5: // SECRET_ACCESS_KEY
-                        if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                            struct.secretAccessKey = iprot.readString();
-                            struct.setSecretAccessKeyIsSet(true);
-                        } else {
-                            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-                        }
-                        break;
-                    case 6: // USERNAME
-                        if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                            struct.username = iprot.readString();
-                            struct.setUsernameIsSet(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();
-
-            // check for required fields of primitive type, which can't be checked in the validate method
-            struct.validate();
-        }
-
-        public void write(org.apache.thrift.protocol.TProtocol oprot, AmazonWebServicesSettings struct) throws org.apache.thrift.TException {
-            struct.validate();
-
-            oprot.writeStructBegin(STRUCT_DESC);
-            if (struct.accessKey != null) {
-                if (struct.isSetAccessKey()) {
-                    oprot.writeFieldBegin(ACCESS_KEY_FIELD_DESC);
-                    oprot.writeString(struct.accessKey);
-                    oprot.writeFieldEnd();
-                }
-            }
-            if (struct.amiID != null) {
-                if (struct.isSetAmiID()) {
-                    oprot.writeFieldBegin(AMI_ID_FIELD_DESC);
-                    oprot.writeString(struct.amiID);
-                    oprot.writeFieldEnd();
-                }
-            }
-            if (struct.instanceID != null) {
-                if (struct.isSetInstanceID()) {
-                    oprot.writeFieldBegin(INSTANCE_ID_FIELD_DESC);
-                    oprot.writeString(struct.instanceID);
-                    oprot.writeFieldEnd();
-                }
-            }
-            if (struct.instanceType != null) {
-                if (struct.isSetInstanceType()) {
-                    oprot.writeFieldBegin(INSTANCE_TYPE_FIELD_DESC);
-                    oprot.writeString(struct.instanceType);
-                    oprot.writeFieldEnd();
-                }
-            }
-            if (struct.secretAccessKey != null) {
-                if (struct.isSetSecretAccessKey()) {
-                    oprot.writeFieldBegin(SECRET_ACCESS_KEY_FIELD_DESC);
-                    oprot.writeString(struct.secretAccessKey);
-                    oprot.writeFieldEnd();
-                }
-            }
-            if (struct.username != null) {
-                if (struct.isSetUsername()) {
-                    oprot.writeFieldBegin(USERNAME_FIELD_DESC);
-                    oprot.writeString(struct.username);
-                    oprot.writeFieldEnd();
-                }
-            }
-            oprot.writeFieldStop();
-            oprot.writeStructEnd();
-        }
-
-    }
-
-    private static class AmazonWebServicesSettingsTupleSchemeFactory implements SchemeFactory {
-        public AmazonWebServicesSettingsTupleScheme getScheme() {
-            return new AmazonWebServicesSettingsTupleScheme();
-        }
-    }
-
-    private static class AmazonWebServicesSettingsTupleScheme extends TupleScheme<AmazonWebServicesSettings> {
-
-        @Override
-        public void write(org.apache.thrift.protocol.TProtocol prot, AmazonWebServicesSettings struct) throws org.apache.thrift.TException {
-            TTupleProtocol oprot = (TTupleProtocol) prot;
-            BitSet optionals = new BitSet();
-            if (struct.isSetAccessKey()) {
-                optionals.set(0);
-            }
-            if (struct.isSetAmiID()) {
-                optionals.set(1);
-            }
-            if (struct.isSetInstanceID()) {
-                optionals.set(2);
-            }
-            if (struct.isSetInstanceType()) {
-                optionals.set(3);
-            }
-            if (struct.isSetSecretAccessKey()) {
-                optionals.set(4);
-            }
-            if (struct.isSetUsername()) {
-                optionals.set(5);
-            }
-            oprot.writeBitSet(optionals, 6);
-            if (struct.isSetAccessKey()) {
-                oprot.writeString(struct.accessKey);
-            }
-            if (struct.isSetAmiID()) {
-                oprot.writeString(struct.amiID);
-            }
-            if (struct.isSetInstanceID()) {
-                oprot.writeString(struct.instanceID);
-            }
-            if (struct.isSetInstanceType()) {
-                oprot.writeString(struct.instanceType);
-            }
-            if (struct.isSetSecretAccessKey()) {
-                oprot.writeString(struct.secretAccessKey);
-            }
-            if (struct.isSetUsername()) {
-                oprot.writeString(struct.username);
-            }
-        }
-
-        @Override
-        public void read(org.apache.thrift.protocol.TProtocol prot, AmazonWebServicesSettings struct) throws org.apache.thrift.TException {
-            TTupleProtocol iprot = (TTupleProtocol) prot;
-            BitSet incoming = iprot.readBitSet(6);
-            if (incoming.get(0)) {
-                struct.accessKey = iprot.readString();
-                struct.setAccessKeyIsSet(true);
-            }
-            if (incoming.get(1)) {
-                struct.amiID = iprot.readString();
-                struct.setAmiIDIsSet(true);
-            }
-            if (incoming.get(2)) {
-                struct.instanceID = iprot.readString();
-                struct.setInstanceIDIsSet(true);
-            }
-            if (incoming.get(3)) {
-                struct.instanceType = iprot.readString();
-                struct.setInstanceTypeIsSet(true);
-            }
-            if (incoming.get(4)) {
-                struct.secretAccessKey = iprot.readString();
-                struct.setSecretAccessKeyIsSet(true);
-            }
-            if (incoming.get(5)) {
-                struct.username = iprot.readString();
-                struct.setUsernameIsSet(true);
-            }
-        }
-    }
-
-}
-


Mime
View raw message