You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/18 22:51:24 UTC

[17/17] airavata git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata

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/c3b4b065
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c3b4b065
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c3b4b065

Branch: refs/heads/master
Commit: c3b4b0654bd5105449fe0a80d0cabca4e77fbf72
Parents: f366c38 a1cffdb
Author: Supun Nakandala <sc...@apache.org>
Authored: Fri Jun 19 02:19:36 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Fri Jun 19 02:19:36 2015 +0530

----------------------------------------------------------------------
 .../java/org/apache/airavata/api/Airavata.java  |    2 +-
 .../samples/CreateLaunchExperimentUS3.java      |   64 +-
 .../samples/TestCreateLaunchExperiment.java     |    4 +-
 .../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  |  521 ++++++++
 .../model/error/ProjectNotFoundException.java   |    2 +-
 .../airavata/model/error/TimedOutException.java |    2 +-
 .../airavata/model/error/ValidationResults.java |  559 +++++++++
 .../airavata/model/error/ValidatorResult.java   |  514 ++++++++
 .../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/ProcessSubmitEvent.java     |    2 +-
 .../model/messaging/event/TaskIdentifier.java   |    2 +-
 .../messaging/event/TaskOutputChangeEvent.java  |    2 +-
 .../messaging/event/TaskStatusChangeEvent.java  |    2 +-
 .../event/TaskStatusChangeRequestEvent.java     |    2 +-
 .../model/messaging/event/TaskSubmitEvent.java  |    2 +-
 .../messaging/event/TaskTerminateEvent.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 +-
 .../airavata/common/utils/AiravataZKUtils.java  |   16 +-
 .../apache/airavata/common/utils/Constants.java |    5 -
 .../airavata/common/utils/ServerSettings.java   |    4 +
 .../store/server/CredentialStoreServer.java     |    7 +-
 .../credential/store/client/TestSSLClient.java  |    5 +-
 .../apache/airavata/gfac/cpi/GfacService.java   |   17 +-
 .../gfac/cpi/gfac_cpi_serviceConstants.java     |    3 +-
 .../airavata/gfac/core/GFacConstants.java       |    2 +
 .../apache/airavata/gfac/core/GFacUtils.java    |  138 ++-
 .../gfac/core/context/ProcessContext.java       |   30 +
 .../gfac/core/watcher/CancelRequestWatcher.java |   31 +
 .../core/watcher/RedeliveryRequestWatcher.java  |   31 +
 .../gfac/impl/AiravataJobStatusUpdator.java     |   21 +-
 .../gfac/impl/AiravataProcessStatusUpdator.java |  129 ++
 .../gfac/impl/AiravataTaskStatusUpdator.java    |   16 +-
 .../impl/AiravataWorkflowNodeStatusUpdator.java |  129 --
 .../airavata/gfac/impl/BetterGfacImpl.java      | 1148 ------------------
 .../airavata/gfac/impl/GFacEngineImpl.java      |   41 +-
 .../gfac/impl/task/ForkJobSubmissionTask.java   |   46 +
 .../gfac/impl/task/JobSubmissionTaskImpl.java   |  108 --
 .../gfac/impl/task/LocalJobSubmissionTask.java  |  176 +++
 .../gfac/impl/task/SSHJobSubmissionTask.java    |  185 +++
 .../airavata/gfac/server/GfacServerHandler.java |  114 +-
 .../messaging/client/RabbitMQListener.java      |    4 +-
 .../core/impl/RabbitMQStatusConsumer.java       |    4 +-
 .../core/impl/RabbitMQStatusPublisher.java      |    4 +-
 .../client/OrchestratorClientFactory.java       |    6 +-
 .../orchestrator/cpi/OrchestratorService.java   |  132 +-
 .../cpi/orchestrator_cpi_serviceConstants.java  |    6 +-
 .../sample/OrchestratorClientSample.java        |   22 +-
 .../orchestrator/orchestrator-service/pom.xml   |    5 +
 .../orchestrator/server/OrchestratorServer.java |    4 +-
 .../airavata/app/catalog/AppInterfaceTest.java  |    6 +-
 .../catalog/ExperimentUseCaseTest.java          |   54 +-
 .../catalog/TaskDetailResourceTest.java         |    4 +-
 .../airavata-api/airavata_errors.thrift         |   15 +
 .../gfac-cpi/generate-gfac-stubs.sh             |    7 -
 .../gfac-cpi/gfacDataModel.thrift               |   64 -
 .../generate-orchestrator-stubs.sh              |    9 +-
 109 files changed, 2711 insertions(+), 1829 deletions(-)
----------------------------------------------------------------------