You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/03 20:48:02 UTC
[37/51] [abbrv] airavata git commit: set input data object and output
data object
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
index 6d3d8c1..0580a19 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class Message implements org.apache.thrift.TBase<Message, Message._Fields>, java.io.Serializable, Cloneable, Comparable<Message> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Message");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
index d9b86d9..93d1d8c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ProcessIdentifier implements org.apache.thrift.TBase<ProcessIdentifier, ProcessIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
index f345170..0cccbb5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ProcessStatusChangeEvent implements org.apache.thrift.TBase<ProcessStatusChangeEvent, ProcessStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
index 4ee71fc..794ee13 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ProcessStatusChangeRequestEvent implements org.apache.thrift.TBase<ProcessStatusChangeRequestEvent, ProcessStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
index e56d3aa..e077688 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ProcessSubmitEvent implements org.apache.thrift.TBase<ProcessSubmitEvent, ProcessSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessSubmitEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessSubmitEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
index c5163f5..9ed780c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ProcessTerminateEvent implements org.apache.thrift.TBase<ProcessTerminateEvent, ProcessTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessTerminateEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessTerminateEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
index d1100e6..10e47e3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, TaskIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TaskIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
index 6b56e81..665c6cc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutputChangeEvent, TaskOutputChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskOutputChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskOutputChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
index 616e396..c716df3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
index 617040d..e2702b1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<TaskStatusChangeRequestEvent, TaskStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
index 75fbb36..be5733d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
index b9ad66c..1f44542 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ComputationalResourceSchedulingModel implements org.apache.thrift.TBase<ComputationalResourceSchedulingModel, ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, Comparable<ComputationalResourceSchedulingModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
index 5c3966b..9fdd8ee 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class AuthzToken implements org.apache.thrift.TBase<AuthzToken, AuthzToken._Fields>, java.io.Serializable, Cloneable, Comparable<AuthzToken> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthzToken");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
index 20b2c46..d5bf155 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* User friendly reason on how the state is inferred.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
index 205b25f..95c5d4d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index 6ff2405..785a050 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
index 8640b59..a67e3c9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
index d8516b3..91d2a32 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel");
@@ -61,6 +61,8 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
private static final org.apache.thrift.protocol.TField TRANSFER_START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("transferStartTime", org.apache.thrift.protocol.TType.I64, (short)4);
private static final org.apache.thrift.protocol.TField TRANSFER_END_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("transferEndTime", org.apache.thrift.protocol.TType.I64, (short)5);
private static final org.apache.thrift.protocol.TField TRANSFER_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("transferRate", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField PROCESS_INPUT_FIELD_DESC = new org.apache.thrift.protocol.TField("processInput", org.apache.thrift.protocol.TType.STRUCT, (short)7);
+ private static final org.apache.thrift.protocol.TField PROCESS_OUTPUT_FIELD_DESC = new org.apache.thrift.protocol.TField("processOutput", org.apache.thrift.protocol.TType.STRUCT, (short)8);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -74,6 +76,8 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
private long transferStartTime; // optional
private long transferEndTime; // optional
private String transferRate; // optional
+ private org.apache.airavata.model.application.io.InputDataObjectType processInput; // optional
+ private org.apache.airavata.model.application.io.OutputDataObjectType processOutput; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -86,7 +90,9 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
TYPE((short)3, "type"),
TRANSFER_START_TIME((short)4, "transferStartTime"),
TRANSFER_END_TIME((short)5, "transferEndTime"),
- TRANSFER_RATE((short)6, "transferRate");
+ TRANSFER_RATE((short)6, "transferRate"),
+ PROCESS_INPUT((short)7, "processInput"),
+ PROCESS_OUTPUT((short)8, "processOutput");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -113,6 +119,10 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
return TRANSFER_END_TIME;
case 6: // TRANSFER_RATE
return TRANSFER_RATE;
+ case 7: // PROCESS_INPUT
+ return PROCESS_INPUT;
+ case 8: // PROCESS_OUTPUT
+ return PROCESS_OUTPUT;
default:
return null;
}
@@ -156,7 +166,7 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
private static final int __TRANSFERSTARTTIME_ISSET_ID = 0;
private static final int __TRANSFERENDTIME_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.TRANSFER_START_TIME,_Fields.TRANSFER_END_TIME,_Fields.TRANSFER_RATE};
+ private static final _Fields optionals[] = {_Fields.TRANSFER_START_TIME,_Fields.TRANSFER_END_TIME,_Fields.TRANSFER_RATE,_Fields.PROCESS_INPUT,_Fields.PROCESS_OUTPUT};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -172,6 +182,10 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.TRANSFER_RATE, new org.apache.thrift.meta_data.FieldMetaData("transferRate", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.PROCESS_INPUT, new org.apache.thrift.meta_data.FieldMetaData("processInput", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.application.io.InputDataObjectType.class)));
+ tmpMap.put(_Fields.PROCESS_OUTPUT, new org.apache.thrift.meta_data.FieldMetaData("processOutput", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.application.io.OutputDataObjectType.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataStagingTaskModel.class, metaDataMap);
}
@@ -209,6 +223,12 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
if (other.isSetTransferRate()) {
this.transferRate = other.transferRate;
}
+ if (other.isSetProcessInput()) {
+ this.processInput = new org.apache.airavata.model.application.io.InputDataObjectType(other.processInput);
+ }
+ if (other.isSetProcessOutput()) {
+ this.processOutput = new org.apache.airavata.model.application.io.OutputDataObjectType(other.processOutput);
+ }
}
public DataStagingTaskModel deepCopy() {
@@ -225,6 +245,8 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
setTransferEndTimeIsSet(false);
this.transferEndTime = 0;
this.transferRate = null;
+ this.processInput = null;
+ this.processOutput = null;
}
public String getSource() {
@@ -371,6 +393,52 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
}
}
+ public org.apache.airavata.model.application.io.InputDataObjectType getProcessInput() {
+ return this.processInput;
+ }
+
+ public void setProcessInput(org.apache.airavata.model.application.io.InputDataObjectType processInput) {
+ this.processInput = processInput;
+ }
+
+ public void unsetProcessInput() {
+ this.processInput = null;
+ }
+
+ /** Returns true if field processInput is set (has been assigned a value) and false otherwise */
+ public boolean isSetProcessInput() {
+ return this.processInput != null;
+ }
+
+ public void setProcessInputIsSet(boolean value) {
+ if (!value) {
+ this.processInput = null;
+ }
+ }
+
+ public org.apache.airavata.model.application.io.OutputDataObjectType getProcessOutput() {
+ return this.processOutput;
+ }
+
+ public void setProcessOutput(org.apache.airavata.model.application.io.OutputDataObjectType processOutput) {
+ this.processOutput = processOutput;
+ }
+
+ public void unsetProcessOutput() {
+ this.processOutput = null;
+ }
+
+ /** Returns true if field processOutput is set (has been assigned a value) and false otherwise */
+ public boolean isSetProcessOutput() {
+ return this.processOutput != null;
+ }
+
+ public void setProcessOutputIsSet(boolean value) {
+ if (!value) {
+ this.processOutput = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case SOURCE:
@@ -421,6 +489,22 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
}
break;
+ case PROCESS_INPUT:
+ if (value == null) {
+ unsetProcessInput();
+ } else {
+ setProcessInput((org.apache.airavata.model.application.io.InputDataObjectType)value);
+ }
+ break;
+
+ case PROCESS_OUTPUT:
+ if (value == null) {
+ unsetProcessOutput();
+ } else {
+ setProcessOutput((org.apache.airavata.model.application.io.OutputDataObjectType)value);
+ }
+ break;
+
}
}
@@ -444,6 +528,12 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
case TRANSFER_RATE:
return getTransferRate();
+ case PROCESS_INPUT:
+ return getProcessInput();
+
+ case PROCESS_OUTPUT:
+ return getProcessOutput();
+
}
throw new IllegalStateException();
}
@@ -467,6 +557,10 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
return isSetTransferEndTime();
case TRANSFER_RATE:
return isSetTransferRate();
+ case PROCESS_INPUT:
+ return isSetProcessInput();
+ case PROCESS_OUTPUT:
+ return isSetProcessOutput();
}
throw new IllegalStateException();
}
@@ -538,6 +632,24 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
return false;
}
+ boolean this_present_processInput = true && this.isSetProcessInput();
+ boolean that_present_processInput = true && that.isSetProcessInput();
+ if (this_present_processInput || that_present_processInput) {
+ if (!(this_present_processInput && that_present_processInput))
+ return false;
+ if (!this.processInput.equals(that.processInput))
+ return false;
+ }
+
+ boolean this_present_processOutput = true && this.isSetProcessOutput();
+ boolean that_present_processOutput = true && that.isSetProcessOutput();
+ if (this_present_processOutput || that_present_processOutput) {
+ if (!(this_present_processOutput && that_present_processOutput))
+ return false;
+ if (!this.processOutput.equals(that.processOutput))
+ return false;
+ }
+
return true;
}
@@ -575,6 +687,16 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
if (present_transferRate)
list.add(transferRate);
+ boolean present_processInput = true && (isSetProcessInput());
+ list.add(present_processInput);
+ if (present_processInput)
+ list.add(processInput);
+
+ boolean present_processOutput = true && (isSetProcessOutput());
+ list.add(present_processOutput);
+ if (present_processOutput)
+ list.add(processOutput);
+
return list.hashCode();
}
@@ -646,6 +768,26 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetProcessInput()).compareTo(other.isSetProcessInput());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetProcessInput()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processInput, other.processInput);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetProcessOutput()).compareTo(other.isSetProcessOutput());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetProcessOutput()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processOutput, other.processOutput);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -711,6 +853,26 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
}
first = false;
}
+ if (isSetProcessInput()) {
+ if (!first) sb.append(", ");
+ sb.append("processInput:");
+ if (this.processInput == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.processInput);
+ }
+ first = false;
+ }
+ if (isSetProcessOutput()) {
+ if (!first) sb.append(", ");
+ sb.append("processOutput:");
+ if (this.processOutput == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.processOutput);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -730,6 +892,12 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
}
// check for sub-struct validity
+ if (processInput != null) {
+ processInput.validate();
+ }
+ if (processOutput != null) {
+ processOutput.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -816,6 +984,24 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 7: // PROCESS_INPUT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.processInput = new org.apache.airavata.model.application.io.InputDataObjectType();
+ struct.processInput.read(iprot);
+ struct.setProcessInputIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // PROCESS_OUTPUT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.processOutput = new org.apache.airavata.model.application.io.OutputDataObjectType();
+ struct.processOutput.read(iprot);
+ struct.setProcessOutputIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -861,6 +1047,20 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
oprot.writeFieldEnd();
}
}
+ if (struct.processInput != null) {
+ if (struct.isSetProcessInput()) {
+ oprot.writeFieldBegin(PROCESS_INPUT_FIELD_DESC);
+ struct.processInput.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.processOutput != null) {
+ if (struct.isSetProcessOutput()) {
+ oprot.writeFieldBegin(PROCESS_OUTPUT_FIELD_DESC);
+ struct.processOutput.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -891,7 +1091,13 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
if (struct.isSetTransferRate()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetProcessInput()) {
+ optionals.set(3);
+ }
+ if (struct.isSetProcessOutput()) {
+ optionals.set(4);
+ }
+ oprot.writeBitSet(optionals, 5);
if (struct.isSetTransferStartTime()) {
oprot.writeI64(struct.transferStartTime);
}
@@ -901,6 +1107,12 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
if (struct.isSetTransferRate()) {
oprot.writeString(struct.transferRate);
}
+ if (struct.isSetProcessInput()) {
+ struct.processInput.write(oprot);
+ }
+ if (struct.isSetProcessOutput()) {
+ struct.processOutput.write(oprot);
+ }
}
@Override
@@ -912,7 +1124,7 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
struct.setDestinationIsSet(true);
struct.type = org.apache.airavata.model.task.DataStageType.findByValue(iprot.readI32());
struct.setTypeIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
+ BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
struct.transferStartTime = iprot.readI64();
struct.setTransferStartTimeIsSet(true);
@@ -925,6 +1137,16 @@ public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStaging
struct.transferRate = iprot.readString();
struct.setTransferRateIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.processInput = new org.apache.airavata.model.application.io.InputDataObjectType();
+ struct.processInput.read(iprot);
+ struct.setProcessInputIsSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.processOutput = new org.apache.airavata.model.application.io.OutputDataObjectType();
+ struct.processOutput.read(iprot);
+ struct.setProcessOutputIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index ad820e9..b5981e1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* EnvironmentSetupTaskModel: A structure holding the environment creation task details
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index a27c041..2cf858b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index 1c91104..4aa084d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index e2dc2d7..5ccb408 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* subTaskModel:
* A generic byte object for the Task developer to store internal serialized data into registry catalogs.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index 231b16f..39b454c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index b5cd2a2..9bbc875 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 81922e0..e41a65c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index be6bc9f..d51cc18 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
index d158199..becad00 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
@@ -36,8 +36,6 @@ public class ServerSettings extends ApplicationSettings {
private static final String DEFAULT_USER_PASSWORD = "default.registry.password";
private static final String DEFAULT_USER_GATEWAY = "default.registry.gateway";
private static final String LOCAL_DATA_DIR = "local.data.dir";
- private static final String REMOTE_DATA_DIR = "remote.data.dir";
- private static final String CLIENT_HOST_NAME = "client.host.name";
public static final String IP = "ip";
@@ -380,12 +378,4 @@ public class ServerSettings extends ApplicationSettings {
public static String getLocalDataLocation() {
return getSetting(LOCAL_DATA_DIR, System.getProperty("java.io.tmpdir"));
}
-
- public static String getRemoteDataLocation() throws ApplicationSettingsException {
- return getSetting(REMOTE_DATA_DIR);
- }
-
- public static String getClientHostName() throws ApplicationSettingsException {
- return getSetting(CLIENT_HOST_NAME);
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index cf36a39..cb4d93d 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -50,9 +50,6 @@ default.registry.password.hash.method=SHA
default.registry.gateway=php_reference_gateway
# this is the path used to store intermediate data, this will be removed with third party file transfer implementation.
local.data.dir=/home/airavata/experimentData/
-# FIXME : These properties need to be removed once we start saving data transfer preferences
-remote.data.dir=/var/www/portal/experimentData/
-client.host.name=gw75.iu.xsede.org
#ip=127.0.0.1
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
index 07a03c1..e213a9b 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
@@ -220,12 +220,14 @@ public class GFacEngineImpl implements GFacEngine {
status.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
processContext.setProcessStatus(status);
GFacUtils.saveAndPublishProcessStatus(processContext);
+ taskContext.setProcessInput(subTaskModel.getProcessInput());
inputDataStaging(taskContext, processContext.isRecovery());
} else {
status = new ProcessStatus(ProcessState.OUTPUT_DATA_STAGING);
status.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
processContext.setProcessStatus(status);
GFacUtils.saveAndPublishProcessStatus(processContext);
+ taskContext.setProcessOutput(subTaskModel.getProcessOutput());
outputDataStaging(taskContext, processContext.isRecovery());
}
// checkpoint
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
index b207ce8..03682e8 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
@@ -480,6 +480,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
DataStagingTaskModel submodel = new DataStagingTaskModel();
submodel.setType(DataStageType.INPUT);
submodel.setSource(processInput.getValue());
+ submodel.setProcessInput(processInput);
// We don't know destination location at this time, data staging task will set this.
// because destination is required field we set dummy destination
submodel.setDestination("dummy://temp/file/location");
@@ -507,6 +508,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
remoteOutputDir = remoteOutputDir.endsWith("/") ? remoteOutputDir : remoteOutputDir + "/";
DataStagingTaskModel submodel = new DataStagingTaskModel();
submodel.setType(DataStageType.OUPUT);
+ submodel.setProcessOutput(processOutput);
URI source = null;
try {
DataMovementProtocol dataMovementProtocol = OrchestratorUtils.getPreferredDataMovementProtocol(orchestratorContext, processModel, gatewayId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/83592fb5/thrift-interface-descriptions/airavata-api/task_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/task_model.thrift b/thrift-interface-descriptions/airavata-api/task_model.thrift
index 2eca7a5..b2897cc 100644
--- a/thrift-interface-descriptions/airavata-api/task_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/task_model.thrift
@@ -21,6 +21,7 @@
include "airavata_commons.thrift"
include "status_models.thrift"
include "compute_resource_model.thrift"
+include "application_io_models.thrift"
namespace java org.apache.airavata.model.task
namespace php Airavata.Model.Task
@@ -79,7 +80,9 @@ struct DataStagingTaskModel {
3: required DataStageType type,
4: optional i64 transferStartTime,
5: optional i64 transferEndTime,
- 6: optional string transferRate
+ 6: optional string transferRate,
+ 7: optional application_io_models.InputDataObjectType processInput,
+ 8: optional application_io_models.OutputDataObjectType processOutput
}
/**