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/cb3a8a55 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cb3a8a55 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cb3a8a55 Branch: refs/heads/master Commit: cb3a8a55f8a244867aa7e3b70162dc9c0b0d7ca0 Parents: ce90264 7d5d102 Author: lahiru <[email protected]> Authored: Mon Feb 17 12:40:58 2014 -0500 Committer: lahiru <[email protected]> Committed: Mon Feb 17 12:40:58 2014 -0500 ---------------------------------------------------------------------- .../model/experiment/ActionableGroup.java | 70 + .../experiment/AdvancedInputDataHandling.java | 104 +- .../experiment/AdvancedOutputDataHandling.java | 104 +- .../model/experiment/ApplicationStatus.java | 497 ++++ .../ComputationalResourceScheduling.java | 273 +-- .../model/experiment/CorrectiveAction.java | 64 + .../model/experiment/DataObjectType.java | 706 ++++++ .../model/experiment/DataTransferDetails.java | 699 ++++++ .../model/experiment/ErrorCategory.java | 79 + .../airavata/model/experiment/ErrorDetails.java | 1287 ++++++++++ .../model/experiment/ExecutionState.java | 85 + .../model/experiment/ExecutionStatus.java | 509 ++++ .../airavata/model/experiment/Experiment.java | 2294 ++++++++++++++++++ .../model/experiment/ExperimentState.java | 82 + .../model/experiment/ExperimentStatus.java | 509 ++++ .../airavata/model/experiment/JobDetails.java | 960 ++++++++ .../airavata/model/experiment/JobState.java | 82 + .../airavata/model/experiment/JobStatus.java | 509 ++++ .../airavata/model/experiment/TaskDetails.java | 1904 +++++++++++++++ .../model/experiment/TransferState.java | 82 + .../model/experiment/TransferStatus.java | 509 ++++ .../model/experiment/UserConfigurationData.java | 1016 ++++++++ .../model/experiment/WorkflowNodeDetails.java | 1329 ++++++++++ .../model/experiment/WorkflowNodeState.java | 73 + .../model/experiment/WorkflowNodeStatus.java | 509 ++++ .../airavataAPI.thrift | 1 - .../experimentModel.thrift | 316 ++- .../monitoringModel.thrift | 124 - .../src/main/resources/registry-derby.sql | 376 +++ .../src/main/resources/registry-mysql.sql | 379 +++ .../test/resources/airavata-registry-derby.sql | 26 +- 31 files changed, 15004 insertions(+), 553 deletions(-) ----------------------------------------------------------------------
