airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [5/6] airavata git commit: fixing build failure
Date Mon, 21 Dec 2015 16:27:35 GMT
fixing build failure


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

Branch: refs/heads/master
Commit: 3a8e117d5ecf87fadac836407cea780e3fc0e72c
Parents: ea0cf5b
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon Dec 21 11:26:27 2015 -0500
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon Dec 21 11:26:28 2015 -0500

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |    82 -
 .../java/org/apache/airavata/api/Airavata.java  | 12965 ++++++-----------
 .../main/resources/lib/airavata/Airavata.cpp    |  3454 ++---
 .../src/main/resources/lib/airavata/Airavata.h  |   490 -
 .../lib/airavata/Airavata_server.skeleton.cpp   |    55 -
 .../org/apache/airavata/model/Workflow.java     |     2 +-
 .../ApplicationDeploymentDescription.java       |     2 +-
 .../appdeployment/ApplicationModule.java        |     2 +-
 .../appcatalog/appdeployment/CommandObject.java |     2 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   |     2 +-
 .../ApplicationInterfaceDescription.java        |     2 +-
 .../appcatalog/computeresource/BatchQueue.java  |     2 +-
 .../computeresource/CloudJobSubmission.java     |     2 +-
 .../ComputeResourceDescription.java             |     2 +-
 .../computeresource/GlobusJobSubmission.java    |     2 +-
 .../computeresource/JobSubmissionInterface.java |     2 +-
 .../computeresource/LOCALSubmission.java        |     2 +-
 .../computeresource/ResourceJobManager.java     |     2 +-
 .../computeresource/SSHJobSubmission.java       |     2 +-
 .../computeresource/UnicoreJobSubmission.java   |     2 +-
 .../ComputeResourcePreference.java              |     2 +-
 .../gatewayprofile/GatewayResourceProfile.java  |     2 +-
 .../gatewayprofile/StoragePreference.java       |     2 +-
 .../StorageResourceDescription.java             |     2 +-
 .../application/io/InputDataObjectType.java     |     2 +-
 .../application/io/OutputDataObjectType.java    |     2 +-
 .../airavata/model/commons/ErrorModel.java      |     2 +-
 .../model/commons/ValidationResults.java        |     2 +-
 .../airavata/model/commons/ValidatorResult.java |     2 +-
 .../data/movement/DataMovementInterface.java    |     2 +-
 .../data/movement/GridFTPDataMovement.java      |     2 +-
 .../model/data/movement/LOCALDataMovement.java  |     2 +-
 .../model/data/movement/SCPDataMovement.java    |     2 +-
 .../data/movement/UnicoreDataMovement.java      |     2 +-
 .../data/resource/DataReplicaLocationModel.java |     2 +-
 .../model/data/resource/DataResourceModel.java  |     2 +-
 .../model/error/AiravataClientException.java    |     2 +-
 .../model/error/AiravataSystemException.java    |     2 +-
 .../model/error/AuthenticationException.java    |     2 +-
 .../model/error/AuthorizationException.java     |     2 +-
 .../error/ExperimentNotFoundException.java      |     2 +-
 .../model/error/InvalidRequestException.java    |     2 +-
 .../model/error/LaunchValidationException.java  |     2 +-
 .../model/error/ProjectNotFoundException.java   |     2 +-
 .../airavata/model/error/TimedOutException.java |     2 +-
 .../airavata/model/error/ValidationResults.java |     2 +-
 .../airavata/model/error/ValidatorResult.java   |     2 +-
 .../model/experiment/ExperimentModel.java       |     2 +-
 .../model/experiment/ExperimentStatistics.java  |     2 +-
 .../experiment/ExperimentSummaryModel.java      |     2 +-
 .../experiment/UserConfigurationDataModel.java  |     2 +-
 .../org/apache/airavata/model/job/JobModel.java |     2 +-
 .../event/ExperimentStatusChangeEvent.java      |     2 +-
 .../model/messaging/event/JobIdentifier.java    |     2 +-
 .../messaging/event/JobStatusChangeEvent.java   |     2 +-
 .../event/JobStatusChangeRequestEvent.java      |     2 +-
 .../airavata/model/messaging/event/Message.java |     2 +-
 .../messaging/event/ProcessIdentifier.java      |     2 +-
 .../event/ProcessStatusChangeEvent.java         |     2 +-
 .../event/ProcessStatusChangeRequestEvent.java  |     2 +-
 .../messaging/event/ProcessSubmitEvent.java     |     2 +-
 .../messaging/event/ProcessTerminateEvent.java  |     2 +-
 .../model/messaging/event/TaskIdentifier.java   |     2 +-
 .../messaging/event/TaskOutputChangeEvent.java  |     2 +-
 .../messaging/event/TaskStatusChangeEvent.java  |     2 +-
 .../event/TaskStatusChangeRequestEvent.java     |     2 +-
 .../airavata/model/process/ProcessModel.java    |     2 +-
 .../ComputationalResourceSchedulingModel.java   |     2 +-
 .../airavata/model/security/AuthzToken.java     |     2 +-
 .../airavata/model/status/ExperimentStatus.java |     2 +-
 .../apache/airavata/model/status/JobStatus.java |     2 +-
 .../airavata/model/status/ProcessStatus.java    |     2 +-
 .../airavata/model/status/TaskStatus.java       |     2 +-
 .../model/task/DataStagingTaskModel.java        |     2 +-
 .../model/task/EnvironmentSetupTaskModel.java   |     2 +-
 .../model/task/JobSubmissionTaskModel.java      |     2 +-
 .../airavata/model/task/MonitorTaskModel.java   |     2 +-
 .../apache/airavata/model/task/TaskModel.java   |     2 +-
 .../airavata/model/workspace/Gateway.java       |     2 +-
 .../apache/airavata/model/workspace/Group.java  |     2 +-
 .../airavata/model/workspace/Project.java       |     2 +-
 .../apache/airavata/model/workspace/User.java   |     2 +-
 82 files changed, 5471 insertions(+), 11729 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/3a8e117d/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 97f8a22..1ceb797 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -30,7 +30,6 @@ import org.apache.airavata.common.utils.AiravataUtils;
 import org.apache.airavata.common.utils.ServerSettings;
 import org.apache.airavata.credential.store.client.CredentialStoreClientFactory;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
-import org.apache.airavata.credential.store.datamodel.APICredential;
 import org.apache.airavata.credential.store.datamodel.SSHCredential;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;
 import org.apache.airavata.data.manager.core.DataManagerFactory;
@@ -362,87 +361,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * * Create new API key, API secret pair for a gateway.
-     * *
-     * * @param gatewayId
-     * *         Id of the gateway that a new API credential is needed to be created
-     * *
-     * * @return APICredential
-     * *         API key and API secret pair
-     * *
-     *
-     * @param authzToken
-     * @param gatewayId
-     */
-    @Override
-    public Map<String, String> createNewAPIKey(AuthzToken authzToken, String gatewayId,
String username) throws InvalidRequestException, AiravataClientException, AiravataSystemException,
TException{
-        APICredential apiCredential = null;
-        try {
-            apiCredential = getCredentialStoreServiceClient().generateNewAPICredential(gatewayId,
username);
-            HashMap<String, String> map = new HashMap<>();
-            map.put(apiCredential.getApiKey(),apiCredential.getApiSecret());
-            return map;
-        }catch (Exception e){
-            logger.error("Error occurred while creating API credential", e);
-            AiravataSystemException exception = new AiravataSystemException();
-            exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
-            exception.setMessage("Error occurred while creating API credential. More info
: " + e.getMessage());
-            throw exception;
-        }
-    }
-
-    /**
-     * * Delete an existing API key
-     * *
-     * * @param apiKey
-     * *      api key of the APICredential that needs to be deleted
-     * *
-     * * @return void
-     * *
-     *
-     * @param authzToken
-     * @param apiKey
-     */
-    @Override
-    public void deleteAPIKey(AuthzToken authzToken, String apiKey) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, TException {
-        try {
-            getCredentialStoreServiceClient().removeAPICredential(apiKey);
-        }catch (Exception e){
-            logger.error("Error occurred while removing API credential", e);
-            AiravataSystemException exception = new AiravataSystemException();
-            exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
-            exception.setMessage("Error occurred while removing API credential. More info
: " + e.getMessage());
-            throw exception;
-        }
-    }
-
-    /**
-     * Get all API keys for the given gateway
-     *
-     * @param authzToken
-     * @param gatewayId  The identifier for the requested gateway.
-     * @return Map of API key and API secret pairs
-     */
-    @Override
-    public Map<String, String> getAllGatewayAPIKeys(AuthzToken authzToken, String gatewayId)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException
{
-        List<APICredential> apiCredentials;
-        try {
-            apiCredentials = getCredentialStoreServiceClient().getAllGatewayAPICredentials(gatewayId);
-            HashMap<String, String> map = new HashMap<>();
-            apiCredentials.stream().forEach(apiCredential -> {
-                map.put(apiCredential.getApiKey(),apiCredential.getApiSecret());
-            });
-            return map;
-        }catch (Exception e){
-            logger.error("Error occurred while retreiving API credential", e);
-            AiravataSystemException exception = new AiravataSystemException();
-            exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
-            exception.setMessage("Error occurred while retreiving API credential. More info
: " + e.getMessage());
-            throw exception;
-        }
-    }
-
-    /**
      * Create a Project
      *
      * @param project


Mime
View raw message