airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject git commit: adding generated data models - AIRAVATA-1038
Date Mon, 03 Mar 2014 15:03:40 GMT
Repository: airavata
Updated Branches:
  refs/heads/master cb2a3899f -> f75fa7ef3


adding generated data models - AIRAVATA-1038


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f75fa7ef
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f75fa7ef
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f75fa7ef

Branch: refs/heads/master
Commit: f75fa7ef3fd0012b84bc05ab006a843dfc87b5b0
Parents: cb2a389
Author: chathuri <chathuri@apache.org>
Authored: Mon Mar 3 10:03:35 2014 -0500
Committer: chathuri <chathuri@apache.org>
Committed: Mon Mar 3 10:03:35 2014 -0500

----------------------------------------------------------------------
 .../model/workspace/experiment/JobState.java    | 36 +++++++++-------
 .../workspace/experiment/TransferState.java     | 43 ++++++++++++--------
 .../experimentModel.thrift                      |  6 +--
 3 files changed, 50 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/f75fa7ef/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 58f0c06..3fee74d 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
@@ -29,14 +29,16 @@ import org.apache.thrift.TEnum;
 
 @SuppressWarnings("all") public enum JobState implements org.apache.thrift.TEnum {
   SUBMITTED(0),
-  QUEUED(1),
-  ACTIVE(2),
-  COMPLETE(3),
-  CANCELED(4),
-  FAILED(5),
-  HELD(6),
-  SUSPENDED(7),
-  UNKNOWN(8);
+  UN_SUBMITTED(1),
+  SETUP(2),
+  QUEUED(3),
+  ACTIVE(4),
+  COMPLETE(5),
+  CANCELED(6),
+  FAILED(7),
+  HELD(8),
+  SUSPENDED(9),
+  UNKNOWN(10);
 
   private final int value;
 
@@ -60,20 +62,24 @@ import org.apache.thrift.TEnum;
       case 0:
         return SUBMITTED;
       case 1:
-        return QUEUED;
+        return UN_SUBMITTED;
       case 2:
-        return ACTIVE;
+        return SETUP;
       case 3:
-        return COMPLETE;
+        return QUEUED;
       case 4:
-        return CANCELED;
+        return ACTIVE;
       case 5:
-        return FAILED;
+        return COMPLETE;
       case 6:
-        return HELD;
+        return CANCELED;
       case 7:
-        return SUSPENDED;
+        return FAILED;
       case 8:
+        return HELD;
+      case 9:
+        return SUSPENDED;
+      case 10:
         return UNKNOWN;
       default:
         return null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/f75fa7ef/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 63d750f..41c10d5 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
@@ -28,15 +28,18 @@ import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
 @SuppressWarnings("all") public enum TransferState implements org.apache.thrift.TEnum {
-  SUBMITTED(0),
-  QUEUED(1),
-  ACTIVE(2),
-  COMPLETE(3),
-  CANCELED(4),
-  FAILED(5),
-  HELD(6),
-  SUSPENDED(7),
-  UNKNOWN(8);
+  DIRECTORY_SETUP(0),
+  UPLOAD(1),
+  DOWNLOAD(2),
+  ACTIVE(3),
+  COMPLETE(4),
+  STDOUT_DOWNLOAD(5),
+  STDERROR_DOWNLOAD(6),
+  CANCELED(7),
+  FAILED(8),
+  HELD(9),
+  SUSPENDED(10),
+  UNKNOWN(11);
 
   private final int value;
 
@@ -58,22 +61,28 @@ import org.apache.thrift.TEnum;
   public static TransferState findByValue(int value) { 
     switch (value) {
       case 0:
-        return SUBMITTED;
+        return DIRECTORY_SETUP;
       case 1:
-        return QUEUED;
+        return UPLOAD;
       case 2:
-        return ACTIVE;
+        return DOWNLOAD;
       case 3:
-        return COMPLETE;
+        return ACTIVE;
       case 4:
-        return CANCELED;
+        return COMPLETE;
       case 5:
-        return FAILED;
+        return STDOUT_DOWNLOAD;
       case 6:
-        return HELD;
+        return STDERROR_DOWNLOAD;
       case 7:
-        return SUSPENDED;
+        return CANCELED;
       case 8:
+        return FAILED;
+      case 9:
+        return HELD;
+      case 10:
+        return SUSPENDED;
+      case 11:
         return UNKNOWN;
       default:
         return null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/f75fa7ef/airavata-api/thrift-interface-descriptions/experimentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
index 119ca65..7fb79ed 100644
--- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
@@ -124,13 +124,13 @@ struct JobStatus {
 }
 
 enum TransferState {
-    DIRECTORY-SETUP,
+    DIRECTORY_SETUP,
     UPLOAD,
     DOWNLOAD,
     ACTIVE,
     COMPLETE,
-    STDOUT-DOWNLOAD,
-    STDERROR-DOWNLOAD,
+    STDOUT_DOWNLOAD,
+    STDERROR_DOWNLOAD,
     CANCELED,
     FAILED,
     HELD,


Mime
View raw message