Repository: airavata Updated Branches: refs/heads/master 3013e74f8 -> 67910311d
checking in data model changes to AIRAVATA-433 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/67910311 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/67910311 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/67910311 Branch: refs/heads/master Commit: 67910311d8001429e08b18481ce6cd7293c9f2e0 Parents: 3013e74 Author: Suresh Marru <[email protected]> Authored: Mon Apr 21 11:21:48 2014 -0400 Committer: Suresh Marru <[email protected]> Committed: Mon Apr 21 11:21:48 2014 -0400 ---------------------------------------------------------------------- .../workspace/experiment/ExperimentState.java | 17 +++++++++------- .../model/workspace/experiment/JobState.java | 21 +++++++++++--------- .../model/workspace/experiment/TaskState.java | 17 +++++++++------- .../workspace/experiment/TransferState.java | 21 +++++++++++--------- .../workspace/experiment/WorkflowNodeState.java | 17 +++++++++------- 5 files changed, 54 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/67910311/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java index 972e9ac..4b8a217 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java @@ -33,10 +33,11 @@ import org.apache.thrift.TEnum; SCHEDULED(2), LAUNCHED(3), EXECUTING(4), - CANCELED(5), - COMPLETED(6), - FAILED(7), - UNKNOWN(8); + CANCELING(5), + CANCELED(6), + COMPLETED(7), + FAILED(8), + UNKNOWN(9); private final int value; @@ -68,12 +69,14 @@ import org.apache.thrift.TEnum; case 4: return EXECUTING; case 5: - return CANCELED; + return CANCELING; case 6: - return COMPLETED; + return CANCELED; case 7: - return FAILED; + return COMPLETED; case 8: + return FAILED; + case 9: return UNKNOWN; default: return null; http://git-wip-us.apache.org/repos/asf/airavata/blob/67910311/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java index 3fee74d..a9227ed 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/JobState.java @@ -34,11 +34,12 @@ import org.apache.thrift.TEnum; QUEUED(3), ACTIVE(4), COMPLETE(5), - CANCELED(6), - FAILED(7), - HELD(8), - SUSPENDED(9), - UNKNOWN(10); + CANCELING(6), + CANCELED(7), + FAILED(8), + HELD(9), + SUSPENDED(10), + UNKNOWN(11); private final int value; @@ -72,14 +73,16 @@ import org.apache.thrift.TEnum; case 5: return COMPLETE; case 6: - return CANCELED; + return CANCELING; case 7: - return FAILED; + return CANCELED; case 8: - return HELD; + return FAILED; case 9: - return SUSPENDED; + return HELD; case 10: + return SUSPENDED; + case 11: return UNKNOWN; default: return null; http://git-wip-us.apache.org/repos/asf/airavata/blob/67910311/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java index 68d7a88..5057a59 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskState.java @@ -36,10 +36,11 @@ import org.apache.thrift.TEnum; OUTPUT_DATA_STAGING(5), POST_PROCESSING(6), EXECUTING(7), - CANCELED(8), - COMPLETED(9), - FAILED(10), - UNKNOWN(11); + CANCELING(8), + CANCELED(9), + COMPLETED(10), + FAILED(11), + UNKNOWN(12); private final int value; @@ -77,12 +78,14 @@ import org.apache.thrift.TEnum; case 7: return EXECUTING; case 8: - return CANCELED; + return CANCELING; case 9: - return COMPLETED; + return CANCELED; case 10: - return FAILED; + return COMPLETED; case 11: + return FAILED; + case 12: return UNKNOWN; default: return null; http://git-wip-us.apache.org/repos/asf/airavata/blob/67910311/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java index 41c10d5..dae88cf 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TransferState.java @@ -35,11 +35,12 @@ import org.apache.thrift.TEnum; COMPLETE(4), STDOUT_DOWNLOAD(5), STDERROR_DOWNLOAD(6), - CANCELED(7), - FAILED(8), - HELD(9), - SUSPENDED(10), - UNKNOWN(11); + CANCELING(7), + CANCELED(8), + FAILED(9), + HELD(10), + SUSPENDED(11), + UNKNOWN(12); private final int value; @@ -75,14 +76,16 @@ import org.apache.thrift.TEnum; case 6: return STDERROR_DOWNLOAD; case 7: - return CANCELED; + return CANCELING; case 8: - return FAILED; + return CANCELED; case 9: - return HELD; + return FAILED; case 10: - return SUSPENDED; + return HELD; case 11: + return SUSPENDED; + case 12: return UNKNOWN; default: return null; http://git-wip-us.apache.org/repos/asf/airavata/blob/67910311/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java index a20cb5b..4a23872 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java @@ -30,10 +30,11 @@ import org.apache.thrift.TEnum; @SuppressWarnings("all") public enum WorkflowNodeState implements org.apache.thrift.TEnum { INVOKED(0), EXECUTING(1), - CANCELED(2), - COMPLETED(3), - FAILED(4), - UNKNOWN(5); + CANCELING(2), + CANCELED(3), + COMPLETED(4), + FAILED(5), + UNKNOWN(6); private final int value; @@ -59,12 +60,14 @@ import org.apache.thrift.TEnum; case 1: return EXECUTING; case 2: - return CANCELED; + return CANCELING; case 3: - return COMPLETED; + return CANCELED; case 4: - return FAILED; + return COMPLETED; case 5: + return FAILED; + case 6: return UNKNOWN; default: return null;
