Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/be9af52e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/be9af52e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/be9af52e Branch: refs/heads/master Commit: be9af52e246ba5f91fba83d4b95bc21600a490d0 Parents: e0483f3 420a031 Author: Shameera Rathanyaka <[email protected]> Authored: Thu Sep 3 19:57:26 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Thu Sep 3 19:57:26 2015 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 3 +- .../java/org/apache/airavata/api/Airavata.java | 141 ++----------------- .../main/resources/lib/airavata/Airavata.cpp | 35 +---- .../src/main/resources/lib/airavata/Airavata.h | 32 ++--- .../lib/airavata/Airavata_server.skeleton.cpp | 4 +- .../resources/lib/Airavata/API/Airavata.php | 42 +----- .../lib/apache/airavata/api/Airavata-remote | 8 +- .../lib/apache/airavata/api/Airavata.py | 39 +---- .../client/samples/CreateLaunchBES.java | 2 +- .../client/samples/CreateLaunchExperiment.java | 2 +- .../samples/CreateLaunchExperimentUS3.java | 4 +- .../tools/RegisterOGCEUS3Application.java | 20 +-- .../tools/RegisterSampleApplications.java | 14 +- .../client/tools/RegisterUS3Application.java | 20 +-- .../org/apache/airavata/model/Workflow.java | 2 +- .../ApplicationDeploymentDescription.java | 2 +- .../appdeployment/ApplicationModule.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 2 +- .../computeresource/DataMovementInterface.java | 2 +- .../computeresource/GlobusJobSubmission.java | 2 +- .../computeresource/GridFTPDataMovement.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALDataMovement.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SCPDataMovement.java | 2 +- .../computeresource/SSHJobSubmission.java | 2 +- .../computeresource/UnicoreDataMovement.java | 2 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 2 +- .../gatewayprofile/GatewayResourceProfile.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 +- .../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 +- .../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 +- .../apache/airavata/gfac/core/GFacUtils.java | 84 +++++++++++ .../airavata/gfac/core/context/TaskContext.java | 20 +++ .../airavata/gfac/impl/GFacEngineImpl.java | 2 + .../impl/task/AdvancedSCPDataStageTask.java | 23 ++- .../catalog/impl/ExperimentRegistry.java | 2 +- .../airavata-api/airavata_api.thrift | 2 +- 89 files changed, 266 insertions(+), 371 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/be9af52e/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java ----------------------------------------------------------------------
