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:11 UTC

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

Branch: refs/heads/master
Commit: 8a0e6ce4439abece41e30522d635aafc7afaa10c
Parents: ce04fb9 7873292
Author: Supun Nakandala <sc...@apache.org>
Authored: Sat Jun 13 15:01:39 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Sat Jun 13 15:01:39 2015 +0530

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |  417 +-
 .../AiravataExperimentStatusUpdator.java        |   14 +-
 .../java/org/apache/airavata/api/Airavata.java  | 6757 +++++++-----------
 .../airavata/api/airavata_apiConstants.java     |   72 +
 .../org/apache/airavata/model/Workflow.java     |   78 +-
 .../ApplicationDeploymentDescription.java       |    2 +-
 .../appdeployment/ApplicationModule.java        |    2 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   |    2 +-
 .../applicationDeploymentModelConstants.java    |   56 -
 .../application_deployment_modelConstants.java  |   58 +
 .../ApplicationInterfaceDescription.java        |   78 +-
 .../model/appcatalog/appinterface/DataType.java |   78 -
 .../appinterface/InputDataObjectType.java       | 1481 ----
 .../appinterface/InputMetadataType.java         |   62 -
 .../appinterface/OutputDataObjectType.java      | 1279 ----
 .../applicationInterfaceModelConstants.java     |   56 -
 .../application_interface_modelConstants.java   |   58 +
 .../computeresource/AuthenticationMode.java     |   70 -
 .../appcatalog/computeresource/BatchQueue.java  |    2 +-
 .../computeresource/CloudJobSubmission.java     |    2 +-
 .../computeresource/CloundJobSubmission.java    |  908 ---
 .../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 +-
 .../computeResourceModelConstants.java          |   56 -
 .../compute_resource_modelConstants.java        |   58 +
 .../ComputeResourcePreference.java              |    2 +-
 .../gatewayprofile/GatewayResourceProfile.java  |    2 +-
 .../gatewayResourceProfileModelConstants.java   |   56 -
 .../airavata/model/application/io/DataType.java |   78 +
 .../application/io/InputDataObjectType.java     | 1481 ++++
 .../application/io/OutputDataObjectType.java    | 1279 ++++
 .../airavata/model/commons/ErrorModel.java      |  984 +++
 .../model/commons/ValidationResults.java        |  559 ++
 .../airavata/model/commons/ValidatorResult.java |  521 ++
 .../commons/airavata_commonsConstants.java      |   58 +
 .../error/AiravataClientConnectException.java   |   32 -
 .../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       | 2222 ++++++
 .../experiment/ExperimentSearchFields.java      |   74 +
 .../model/experiment/ExperimentStatistics.java  | 1332 ++++
 .../experiment/ExperimentSummaryModel.java      | 1139 +++
 .../model/experiment/ExperimentType.java        |   62 +
 .../experiment/UserConfigurationDataModel.java  | 1032 +++
 .../org/apache/airavata/model/job/JobModel.java | 1043 +++
 .../event/ExperimentStatusChangeEvent.java      |   24 +-
 .../model/messaging/event/JobIdentifier.java    |    2 +-
 .../messaging/event/JobStatusChangeEvent.java   |   24 +-
 .../event/JobStatusChangeRequestEvent.java      |   24 +-
 .../airavata/model/messaging/event/Message.java |    2 +-
 .../messaging/event/ProcessSubmitEvent.java     |    2 +-
 .../model/messaging/event/TaskIdentifier.java   |    2 +-
 .../messaging/event/TaskOutputChangeEvent.java  |   42 +-
 .../messaging/event/TaskStatusChangeEvent.java  |   24 +-
 .../event/TaskStatusChangeRequestEvent.java     |   24 +-
 .../model/messaging/event/TaskSubmitEvent.java  |    2 +-
 .../messaging/event/TaskTerminateEvent.java     |    2 +-
 .../messaging/event/WorkflowIdentifier.java     |  608 --
 .../event/WorkflowNodeStatusChangeEvent.java    |  524 --
 .../event/messagingEventsConstants.java         |   56 -
 .../event/messaging_eventsConstants.java        |   58 +
 .../airavata/model/process/ProcessModel.java    | 1856 +++++
 .../ComputationalResourceSchedulingModel.java   | 1020 +++
 .../airavata/model/security/AuthzToken.java     |    2 +-
 .../airavata/model/status/ExperimentState.java  |   83 +
 .../airavata/model/status/ExperimentStatus.java |  644 ++
 .../apache/airavata/model/status/JobState.java  |   80 +
 .../apache/airavata/model/status/JobStatus.java |  631 ++
 .../airavata/model/status/ProcessState.java     |   77 +
 .../airavata/model/status/ProcessStatus.java    |  631 ++
 .../apache/airavata/model/status/TaskState.java |   71 +
 .../airavata/model/status/TaskStatus.java       |  631 ++
 .../model/task/DataStagingTaskModel.java        |  826 +++
 .../apache/airavata/model/task/TaskModel.java   | 1252 ++++
 .../apache/airavata/model/task/TaskTypes.java   |   75 +
 .../model/workflowDataModelConstants.java       |   56 -
 .../model/workflow_data_modelConstants.java     |   58 +
 .../airavata/model/workspace/Gateway.java       |    2 +-
 .../apache/airavata/model/workspace/Group.java  |    2 +-
 .../airavata/model/workspace/Project.java       |    7 +-
 .../apache/airavata/model/workspace/User.java   |    2 +-
 .../workspace/experiment/ActionableGroup.java   |   71 -
 .../experiment/AdvancedInputDataHandling.java   |  726 --
 .../experiment/AdvancedOutputDataHandling.java  |  625 --
 .../workspace/experiment/ApplicationStatus.java |  513 --
 .../ComputationalResourceScheduling.java        | 1330 ----
 .../workspace/experiment/CorrectiveAction.java  |   65 -
 .../experiment/DataTransferDetails.java         |  728 --
 .../workspace/experiment/ErrorCategory.java     |   80 -
 .../workspace/experiment/ErrorDetails.java      | 1338 ----
 .../workspace/experiment/ExecutionUnit.java     |   68 -
 .../model/workspace/experiment/Experiment.java  | 2856 --------
 .../experiment/ExperimentSearchFields.java      |   74 -
 .../workspace/experiment/ExperimentState.java   |   89 -
 .../experiment/ExperimentStatistics.java        | 1332 ----
 .../workspace/experiment/ExperimentStatus.java  |  525 --
 .../workspace/experiment/ExperimentSummary.java | 1139 ---
 .../model/workspace/experiment/JobDetails.java  | 1317 ----
 .../model/workspace/experiment/JobState.java    |   92 -
 .../model/workspace/experiment/JobStatus.java   |  525 --
 .../experiment/QualityOfServiceParams.java      |  623 --
 .../model/workspace/experiment/TaskDetails.java | 2338 ------
 .../model/workspace/experiment/TaskState.java   |   95 -
 .../model/workspace/experiment/TaskStatus.java  |  525 --
 .../workspace/experiment/TransferState.java     |   95 -
 .../workspace/experiment/TransferStatus.java    |  525 --
 .../experiment/UserConfigurationData.java       | 1365 ----
 .../workspace/experiment/ValidationResults.java |  559 --
 .../workspace/experiment/ValidatorResult.java   |  521 --
 .../experiment/WorkflowNodeDetails.java         | 1597 -----
 .../workspace/experiment/WorkflowNodeState.java |   80 -
 .../experiment/WorkflowNodeStatus.java          |  525 --
 .../experiment/experimentModelConstants.java    |   60 -
 .../exception/AiravataStartupException.java     |   46 +
 .../exception/AiravataStratupException.java     |    9 -
 .../airavata/common/logger/AiravataLogger.java  |  677 --
 .../common/logger/AiravataLoggerFactory.java    |   34 -
 .../common/logger/AiravataLoggerImpl.java       |  323 -
 .../apache/airavata/common/utils/Constants.java |   31 +-
 .../common/utils/LocalEventPublisher.java       |   47 +
 .../airavata/common/utils/MonitorPublisher.java |   47 -
 .../airavata/common/utils/ServerSettings.java   |   74 +-
 .../main/resources/airavata-server.properties   |  153 +-
 .../gfac/bes/provider/impl/BESProvider.java     |    2 +-
 .../gfac/bes/security/X509SecurityContext.java  |    8 +-
 .../gfac/bes/utils/DataTransferrer.java         |    4 +-
 .../apache/airavata/gfac/core/Constants.java    |   82 -
 .../org/apache/airavata/gfac/core/GFac.java     |    4 +-
 .../airavata/gfac/core/GFacConfiguration.java   |   34 +-
 .../airavata/gfac/core/GFacConstants.java       |   86 +
 .../gfac/core/GFacThreadPoolExecutor.java       |    6 +-
 .../apache/airavata/gfac/core/GFacUtils.java    |   21 +-
 .../apache/airavata/gfac/core/RequestData.java  |   10 +-
 .../apache/airavata/gfac/core/Scheduler.java    |   22 +-
 .../gfac/core/context/JobExecutionContext.java  |   12 +-
 .../gfac/core/context/ProcessContext.java       |   89 +
 .../gfac/core/handler/AbstractHandler.java      |    6 +-
 .../security/TokenizedMyProxyAuthInfo.java      |   10 +-
 .../gfac/impl/AiravataJobStatusUpdator.java     |   10 +-
 .../gfac/impl/AiravataTaskStatusUpdator.java    |   12 +-
 .../impl/AiravataWorkflowNodeStatusUpdator.java |   10 +-
 .../airavata/gfac/impl/BetterGfacImpl.java      |   94 +-
 .../apache/airavata/gfac/impl/GFacEngine.java   |   53 +
 .../apache/airavata/gfac/impl/GFacWorker.java   |   87 +
 .../airavata/gfac/impl/OutHandlerWorker.java    |   16 +-
 .../gfac/local/provider/impl/LocalProvider.java |   10 +-
 .../monitor/core/AiravataAbstractMonitor.java   |    3 +-
 .../gfac/monitor/email/EmailBasedMonitor.java   |    2 +-
 .../handlers/GridPullMonitorHandler.java        |    2 +-
 .../monitor/impl/pull/qstat/HPCPullMonitor.java |   16 +-
 .../monitor/impl/push/amqp/AMQPMonitor.java     |   16 +-
 .../monitor/impl/push/amqp/BasicConsumer.java   |    6 +-
 .../gfac/ssh/handler/SSHOutputHandler.java      |    4 +-
 .../gfac/ssh/provider/impl/SSHProvider.java     |   22 +-
 .../gfac/ssh/security/TokenizedSSHAuthInfo.java |   10 +-
 .../airavata/gfac/ssh/util/GFACSSHUtils.java    |    4 +-
 .../gfac/services/impl/LocalProviderTest.java   |    4 +-
 .../apache/airavata/job/AMQPMonitorTest.java    |   10 +-
 .../job/QstatMonitorTestWithMyProxyAuth.java    |    6 +-
 .../airavata/gfac/server/GfacServerHandler.java |  250 +-
 .../registry/cpi/ApplicationInterface.java      |    4 +-
 .../engine/util/ProxyMonitorPublisher.java      |    8 +-
 .../airavata-api/airavata_api.thrift            |   70 +-
 .../airavata-api/airavata_commons.thrift        |   54 +
 .../airavata-api/airavata_data_models.thrift    |    3 +
 .../airavata-api/airavata_errors.thrift         |   15 -
 .../application_interface_model.thrift          |   96 +-
 .../airavata-api/application_io_models.thrift   |  117 +
 .../airavata-api/experiment_model.thrift        |  391 +-
 .../airavata-api/job_model.thrift               |   37 +
 .../airavata-api/messaging_events.thrift        |   27 +-
 .../airavata-api/process_model.thrift           |   56 +
 .../airavata-api/scheduling_model.thrift        |   39 +
 .../airavata-api/status_models.thrift           |  102 +
 .../airavata-api/task_model.thrift              |   75 +
 .../airavata-api/workflow_data_model.thrift     |    6 +-
 .../airavata-api/workspace_model.thrift         |    4 +-
 .../airavata_commons.thrift                     |   23 +-
 .../experiment_model.thrift                     |  105 +
 .../airavata-data-models/process_model.thrift   |   23 +-
 .../airavata-data-models/status_models.thrift   |   56 +-
 .../airavata-data-models/task_model.thrift      |    4 +-
 201 files changed, 24744 insertions(+), 36118 deletions(-)
----------------------------------------------------------------------