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 2016/02/18 16:47:00 UTC
[01/11] airavata git commit: adding deleting storage resource data
movements
Repository: airavata
Updated Branches:
refs/heads/master 685b3c208 -> ace07827d
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/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 c5ecf6c..6fdd0cd 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 c055a52..3c3ab36 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 a66ad1b..64ee7ab 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 b5e2264..285957d 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 d7bcc3c..d1f194d 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 f3c4511..bb19105 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 0393545..5158419 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 1a17bef..c366a30 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 2fcd7d6..0d2eb37 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/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 18d8450..f797f1e 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 e54f4c7..7ee190d 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 a2e9dc1..e5ea2ed 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 4b899a2..fc4f4a0 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 532313f..eb47eee 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 abefca3..12a13da 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 bdcb7b7..ebd840a 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 0570b5d..c7e12c0 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/modules/configuration/server/src/main/resources/gfac-config.yaml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/gfac-config.yaml b/modules/configuration/server/src/main/resources/gfac-config.yaml
index 900de7e..159f349 100644
--- a/modules/configuration/server/src/main/resources/gfac-config.yaml
+++ b/modules/configuration/server/src/main/resources/gfac-config.yaml
@@ -89,7 +89,7 @@ resources:
commandOutputParser: org.apache.airavata.gfac.impl.job.SlurmOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.SLURMEmailParser
resourceEmailAddresses:
- - SDSC Admin <sl...@comet-fe3.sdsc.edu> # comet
+ - slurm@comet # comet
- slurm@batch1.stampede.tacc.utexas.edu # stampede
- jobManagerType: UGE
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
index c761e5d..3a2171f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
@@ -262,4 +262,18 @@ public class StorageResourceImpl implements StorageResource {
throw new AppCatalogException(e);
}
}
+
+ @Override
+ public void removeDataMovementInterface(String storageResourceId, String dataMovementInterfaceId) throws AppCatalogException {
+ try {
+ StorageInterfaceResource resource = new StorageInterfaceResource();
+ Map<String, String> ids = new HashMap<String, String>();
+ ids.put(AppCatAbstractResource.StorageInterfaceConstants.STORAGE_RESOURCE_ID, storageResourceId);
+ ids.put(AppCatAbstractResource.StorageInterfaceConstants.DATA_MOVEMENT_ID, dataMovementInterfaceId);
+ resource.remove(ids);
+ }catch (Exception e){
+ logger.error("Error while removing data movement interface..", e);
+ throw new AppCatalogException(e);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/StorageResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/StorageResource.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/StorageResource.java
index 8579303..1696846 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/StorageResource.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/StorageResource.java
@@ -87,4 +87,6 @@ public interface StorageResource {
*/
void removeStorageResource(String resourceId) throws AppCatalogException;
+ void removeDataMovementInterface(String storageResourceId, String dataMovementInterfaceId) throws AppCatalogException;
+
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index 8e11897..198cd1a 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -2512,8 +2512,9 @@ service Airavata {
*
**/
- bool deleteDataMovementInterface(1: required security_model.AuthzToken authzToken, 2: required string computeResourceId,
- 3: required string dataMovementInterfaceId)
+ bool deleteDataMovementInterface(1: required security_model.AuthzToken authzToken, 2: required string resourceId,
+ 3: required string dataMovementInterfaceId,
+ 4: required data_movement_models.DMType dataMoveType,)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
[04/11] airavata git commit: fixing storage resource bug
Posted by ch...@apache.org.
fixing storage resource bug
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d3cf5bc6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d3cf5bc6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d3cf5bc6
Branch: refs/heads/master
Commit: d3cf5bc611724fc4f0b9037cc3ec850744c6b712
Parents: 64a3875
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Fri Feb 12 11:46:32 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Fri Feb 12 11:46:32 2016 -0500
----------------------------------------------------------------------
.../core/app/catalog/resources/StorageInterfaceResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d3cf5bc6/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java
index ef150ad..97daa4c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java
@@ -86,7 +86,7 @@ public class StorageInterfaceResource extends AppCatAbstractResource {
try {
em = AppCatalogJPAUtils.getEntityManager();
em.getTransaction().begin();
- AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_MOVEMENT_INTERFACE);
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(STORAGE_INTERFACE);
generator.setParameter(StorageInterfaceConstants.STORAGE_RESOURCE_ID, ids.get(StorageInterfaceConstants.STORAGE_RESOURCE_ID));
generator.setParameter(StorageInterfaceConstants.DATA_MOVEMENT_ID, ids.get(StorageInterfaceConstants.DATA_MOVEMENT_ID));
Query q = generator.deleteQuery(em);
@@ -124,7 +124,7 @@ public class StorageInterfaceResource extends AppCatAbstractResource {
try {
em = AppCatalogJPAUtils.getEntityManager();
em.getTransaction().begin();
- AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_MOVEMENT_INTERFACE);
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(STORAGE_INTERFACE);
generator.setParameter(StorageInterfaceConstants.STORAGE_RESOURCE_ID, ids.get(StorageInterfaceConstants.STORAGE_RESOURCE_ID));
generator.setParameter(StorageInterfaceConstants.DATA_MOVEMENT_ID, ids.get(StorageInterfaceConstants.DATA_MOVEMENT_ID));
Query q = generator.selectQuery(em);
[07/11] airavata git commit: mysql previous versions does not allow
two now() functions
Posted by ch...@apache.org.
mysql previous versions does not allow two now() functions
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/614f8bbf
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/614f8bbf
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/614f8bbf
Branch: refs/heads/master
Commit: 614f8bbf5c22290d7a57f4cc11403285e3bac0b9
Parents: 24587f9
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Mon Feb 15 14:53:01 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Mon Feb 15 14:53:01 2016 -0500
----------------------------------------------------------------------
.../registry-core/src/main/resources/workflowcatalog-mysql.sql | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/614f8bbf/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql
index 5a8ef97..2cc10c6 100644
--- a/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/workflowcatalog-mysql.sql
@@ -28,7 +28,8 @@ CREATE TABLE WORKFLOW
GRAPH LONGTEXT,
IMAGE BLOB,
CREATION_TIME timestamp DEFAULT NOW(),
- UPDATE_TIME TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
+ UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+-- UPDATE_TIME TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
PRIMARY KEY (TEMPLATE_ID)
);
[11/11] airavata git commit: Merge branch 'develop'
Posted by ch...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ace07827
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ace07827
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ace07827
Branch: refs/heads/master
Commit: ace07827dec6bd3202de277274613197571c0f50
Parents: 685b3c2 fa6b4d8
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Feb 18 10:49:10 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Feb 18 10:49:10 2016 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 18 +-
.../java/org/apache/airavata/api/Airavata.java | 268 ++++++++++++++-----
.../main/resources/lib/airavata/Airavata.cpp | 193 +++++++------
.../src/main/resources/lib/airavata/Airavata.h | 37 +--
.../lib/airavata/Airavata_server.skeleton.cpp | 5 +-
.../resources/lib/Airavata/API/Airavata.php | 53 +++-
.../lib/apache/airavata/api/Airavata-remote | 8 +-
.../lib/apache/airavata/api/Airavata.py | 56 ++--
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.java | 2 +-
.../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 | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../server/src/main/resources/gfac-config.yaml | 2 +-
.../scripts/credential-store-mysql.sql | 28 +-
.../apache/airavata/gfac/core/GFacUtils.java | 2 +-
.../app/catalog/impl/StorageResourceImpl.java | 14 +
.../resources/StorageInterfaceResource.java | 4 +-
.../main/resources/workflowcatalog-mysql.sql | 3 +-
.../airavata/registry/cpi/StorageResource.java | 2 +
.../workflow/core/dag/nodes/InputNode.java | 8 +-
.../workflow/core/dag/nodes/InputNodeImpl.java | 110 +++++++-
.../workflow/core/dag/nodes/OutputNode.java | 2 +-
.../workflow/core/dag/nodes/OutputNodeImpl.java | 89 +++++-
.../workflow/core/dag/port/InputPortIml.java | 17 ++
.../workflow/core/dag/port/OutPortImpl.java | 17 ++
.../airavata/workflow/core/dag/port/Port.java | 7 +
.../core/parser/JsonWorkflowParser.java | 171 ++++++++++--
.../src/test/resources/TestWorkflow.json | 28 +-
.../airavata-apis/airavata_api.thrift | 5 +-
107 files changed, 951 insertions(+), 360 deletions(-)
----------------------------------------------------------------------
[08/11] airavata git commit: updating the credential-store-mysql.sql
Posted by ch...@apache.org.
updating the credential-store-mysql.sql
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7a345e54
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7a345e54
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7a345e54
Branch: refs/heads/master
Commit: 7a345e547487b0cf78eb1805f25bb053ad49a840
Parents: d8df3d0
Author: scnakandala <su...@gmail.com>
Authored: Tue Feb 16 16:25:34 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Feb 16 16:25:34 2016 -0500
----------------------------------------------------------------------
.../scripts/credential-store-mysql.sql | 28 +++++++++-----------
1 file changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a345e54/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql b/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
index 50d5e0f..b0e4fb9 100644
--- a/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
+++ b/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
@@ -20,23 +20,19 @@
*/
CREATE TABLE COMMUNITY_USER
(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
+ GATEWAY_ID VARCHAR(256) NOT NULL,
+ COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
+ TOKEN_ID VARCHAR(256) NOT NULL,
+ COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
+ PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
);
-
CREATE TABLE CREDENTIALS
(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- CREDENTIAL TEXT NOT NULL,
- PRIVATE_KEY TEXT NOT NULL,
- NOT_BEFORE VARCHAR(256) NOT NULL,
- NOT_AFTER VARCHAR(256) NOT NULL,
- LIFETIME MEDIUMINT NOT NULL,
- REQUESTING_PORTAL_USER_NAME VARCHAR(256) NOT NULL,
- REQUESTED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
-);
+ GATEWAY_ID VARCHAR(256) NOT NULL,
+ TOKEN_ID VARCHAR(256) NOT NULL,
+ CREDENTIAL BLOB NOT NULL,
+ PORTAL_USER_ID VARCHAR(256) NOT NULL,
+ TIME_PERSISTED TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
+ PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
+);
\ No newline at end of file
[06/11] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by ch...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/24587f9f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/24587f9f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/24587f9f
Branch: refs/heads/master
Commit: 24587f9f88172c276f354c7fb2d92f1017d180a3
Parents: 38c2c36 d3cf5bc
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Feb 12 16:51:29 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Feb 12 16:51:29 2016 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 18 +-
.../java/org/apache/airavata/api/Airavata.java | 268 ++++++++++++++-----
.../main/resources/lib/airavata/Airavata.cpp | 193 +++++++------
.../src/main/resources/lib/airavata/Airavata.h | 37 +--
.../lib/airavata/Airavata_server.skeleton.cpp | 5 +-
.../resources/lib/Airavata/API/Airavata.php | 53 +++-
.../lib/apache/airavata/api/Airavata-remote | 8 +-
.../lib/apache/airavata/api/Airavata.py | 56 ++--
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.java | 2 +-
.../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 | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../server/src/main/resources/gfac-config.yaml | 2 +-
.../gfac/core/cluster/RemoteCluster.java | 3 +
.../airavata/gfac/impl/BESRemoteCluster.java | 6 +
.../org/apache/airavata/gfac/impl/Factory.java | 30 ++-
.../airavata/gfac/impl/HPCRemoteCluster.java | 8 +-
.../airavata/gfac/impl/LocalRemoteCluster.java | 6 +
.../app/catalog/impl/StorageResourceImpl.java | 14 +
.../resources/StorageInterfaceResource.java | 4 +-
.../airavata/registry/cpi/StorageResource.java | 2 +
.../airavata-apis/airavata_api.thrift | 5 +-
100 files changed, 577 insertions(+), 305 deletions(-)
----------------------------------------------------------------------
[03/11] airavata git commit: adding deleting storage resource data
movements
Posted by ch...@apache.org.
adding deleting storage resource data movements
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/64a38753
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/64a38753
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/64a38753
Branch: refs/heads/master
Commit: 64a387537fe6234b595cb4c94f6332021ca0825b
Parents: 4515718
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Fri Feb 12 11:23:54 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Fri Feb 12 11:23:54 2016 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 18 +-
.../java/org/apache/airavata/api/Airavata.java | 268 ++++++++++++++-----
.../main/resources/lib/airavata/Airavata.cpp | 193 +++++++------
.../src/main/resources/lib/airavata/Airavata.h | 37 +--
.../lib/airavata/Airavata_server.skeleton.cpp | 5 +-
.../resources/lib/Airavata/API/Airavata.php | 53 +++-
.../lib/apache/airavata/api/Airavata-remote | 8 +-
.../lib/apache/airavata/api/Airavata.py | 56 ++--
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.java | 2 +-
.../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 | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../server/src/main/resources/gfac-config.yaml | 2 +-
.../app/catalog/impl/StorageResourceImpl.java | 14 +
.../airavata/registry/cpi/StorageResource.java | 2 +
.../airavata-apis/airavata_api.thrift | 5 +-
94 files changed, 524 insertions(+), 301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 03b4e11..8ab3466 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -3572,13 +3572,23 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public boolean deleteDataMovementInterface(AuthzToken authzToken, String computeResourceId, String dataMovementInterfaceId)
+ public boolean deleteDataMovementInterface(AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, DMType dmType)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
appCatalog = RegistryFactory.getAppCatalog();
- appCatalog.getComputeResource().removeDataMovementInterface(computeResourceId, dataMovementInterfaceId);
- logger.info("Airavata deleted data movement interface with interface id : " + dataMovementInterfaceId);
- return true;
+ switch (dmType){
+ case COMPUTE_RESOURCE:
+ appCatalog.getComputeResource().removeDataMovementInterface(resourceId, dataMovementInterfaceId);
+ logger.info("Airavata deleted data movement interface with interface id : " + dataMovementInterfaceId);
+ return true;
+ case STORAGE_RESOURCE:
+ appCatalog.getStorageResource().removeDataMovementInterface(resourceId, dataMovementInterfaceId);
+ logger.info("Airavata deleted data movement interface with interface id : " + dataMovementInterfaceId);
+ return true;
+ default:
+ logger.error("Unsupported data movement type specifies.. Please provide the correct data movement type... ");
+ return false;
+ }
} catch (AppCatalogException e) {
logger.error(dataMovementInterfaceId, "Error while deleting data movement interface...", e);
AiravataSystemException exception = new AiravataSystemException();
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index 1ad3333..d666e2f 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class Airavata {
public interface Iface {
@@ -2266,10 +2266,11 @@ public class Airavata {
*
*
* @param authzToken
- * @param computeResourceId
+ * @param resourceId
* @param dataMovementInterfaceId
+ * @param dataMoveType
*/
- public boolean deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String dataMovementInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public boolean deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
public String registerResourceJobManager(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager resourceJobManager) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
@@ -2854,7 +2855,7 @@ public class Airavata {
public void deleteJobSubmissionInterface(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String jobSubmissionInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String dataMovementInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void registerResourceJobManager(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager resourceJobManager, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -6813,18 +6814,19 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteJobSubmissionInterface failed: unknown result");
}
- public boolean deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String dataMovementInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_deleteDataMovementInterface(authzToken, computeResourceId, dataMovementInterfaceId);
+ send_deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType);
return recv_deleteDataMovementInterface();
}
- public void send_deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String dataMovementInterfaceId) throws org.apache.thrift.TException
+ public void send_deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType) throws org.apache.thrift.TException
{
deleteDataMovementInterface_args args = new deleteDataMovementInterface_args();
args.setAuthzToken(authzToken);
- args.setComputeResourceId(computeResourceId);
+ args.setResourceId(resourceId);
args.setDataMovementInterfaceId(dataMovementInterfaceId);
+ args.setDataMoveType(dataMoveType);
sendBase("deleteDataMovementInterface", args);
}
@@ -12025,30 +12027,33 @@ public class Airavata {
}
}
- public void deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String dataMovementInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void deleteDataMovementInterface(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- deleteDataMovementInterface_call method_call = new deleteDataMovementInterface_call(authzToken, computeResourceId, dataMovementInterfaceId, resultHandler, this, ___protocolFactory, ___transport);
+ deleteDataMovementInterface_call method_call = new deleteDataMovementInterface_call(authzToken, resourceId, dataMovementInterfaceId, dataMoveType, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class deleteDataMovementInterface_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
- private String computeResourceId;
+ private String resourceId;
private String dataMovementInterfaceId;
- public deleteDataMovementInterface_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String dataMovementInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ private org.apache.airavata.model.data.movement.DMType dataMoveType;
+ public deleteDataMovementInterface_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.DMType dataMoveType, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.authzToken = authzToken;
- this.computeResourceId = computeResourceId;
+ this.resourceId = resourceId;
this.dataMovementInterfaceId = dataMovementInterfaceId;
+ this.dataMoveType = dataMoveType;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteDataMovementInterface", org.apache.thrift.protocol.TMessageType.CALL, 0));
deleteDataMovementInterface_args args = new deleteDataMovementInterface_args();
args.setAuthzToken(authzToken);
- args.setComputeResourceId(computeResourceId);
+ args.setResourceId(resourceId);
args.setDataMovementInterfaceId(dataMovementInterfaceId);
+ args.setDataMoveType(dataMoveType);
args.write(prot);
prot.writeMessageEnd();
}
@@ -16641,7 +16646,7 @@ public class Airavata {
public deleteDataMovementInterface_result getResult(I iface, deleteDataMovementInterface_args args) throws org.apache.thrift.TException {
deleteDataMovementInterface_result result = new deleteDataMovementInterface_result();
try {
- result.success = iface.deleteDataMovementInterface(args.authzToken, args.computeResourceId, args.dataMovementInterfaceId);
+ result.success = iface.deleteDataMovementInterface(args.authzToken, args.resourceId, args.dataMovementInterfaceId, args.dataMoveType);
result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
@@ -25489,7 +25494,7 @@ public class Airavata {
}
public void start(I iface, deleteDataMovementInterface_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteDataMovementInterface(args.authzToken, args.computeResourceId, args.dataMovementInterfaceId,resultHandler);
+ iface.deleteDataMovementInterface(args.authzToken, args.resourceId, args.dataMovementInterfaceId, args.dataMoveType,resultHandler);
}
}
@@ -170397,8 +170402,9 @@ public class Airavata {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteDataMovementInterface_args");
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField DATA_MOVE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveType", org.apache.thrift.protocol.TType.I32, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -170407,14 +170413,24 @@ public class Airavata {
}
public org.apache.airavata.model.security.AuthzToken authzToken; // required
- public String computeResourceId; // required
+ public String resourceId; // required
public String dataMovementInterfaceId; // required
+ /**
+ *
+ * @see org.apache.airavata.model.data.movement.DMType
+ */
+ public org.apache.airavata.model.data.movement.DMType dataMoveType; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
AUTHZ_TOKEN((short)1, "authzToken"),
- COMPUTE_RESOURCE_ID((short)2, "computeResourceId"),
- DATA_MOVEMENT_INTERFACE_ID((short)3, "dataMovementInterfaceId");
+ RESOURCE_ID((short)2, "resourceId"),
+ DATA_MOVEMENT_INTERFACE_ID((short)3, "dataMovementInterfaceId"),
+ /**
+ *
+ * @see org.apache.airavata.model.data.movement.DMType
+ */
+ DATA_MOVE_TYPE((short)4, "dataMoveType");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -170431,10 +170447,12 @@ public class Airavata {
switch(fieldId) {
case 1: // AUTHZ_TOKEN
return AUTHZ_TOKEN;
- case 2: // COMPUTE_RESOURCE_ID
- return COMPUTE_RESOURCE_ID;
+ case 2: // RESOURCE_ID
+ return RESOURCE_ID;
case 3: // DATA_MOVEMENT_INTERFACE_ID
return DATA_MOVEMENT_INTERFACE_ID;
+ case 4: // DATA_MOVE_TYPE
+ return DATA_MOVE_TYPE;
default:
return null;
}
@@ -170480,10 +170498,12 @@ public class Airavata {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
- tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.DATA_MOVEMENT_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.DATA_MOVE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("dataMoveType", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.data.movement.DMType.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteDataMovementInterface_args.class, metaDataMap);
}
@@ -170493,13 +170513,15 @@ public class Airavata {
public deleteDataMovementInterface_args(
org.apache.airavata.model.security.AuthzToken authzToken,
- String computeResourceId,
- String dataMovementInterfaceId)
+ String resourceId,
+ String dataMovementInterfaceId,
+ org.apache.airavata.model.data.movement.DMType dataMoveType)
{
this();
this.authzToken = authzToken;
- this.computeResourceId = computeResourceId;
+ this.resourceId = resourceId;
this.dataMovementInterfaceId = dataMovementInterfaceId;
+ this.dataMoveType = dataMoveType;
}
/**
@@ -170509,12 +170531,15 @@ public class Airavata {
if (other.isSetAuthzToken()) {
this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
}
- if (other.isSetComputeResourceId()) {
- this.computeResourceId = other.computeResourceId;
+ if (other.isSetResourceId()) {
+ this.resourceId = other.resourceId;
}
if (other.isSetDataMovementInterfaceId()) {
this.dataMovementInterfaceId = other.dataMovementInterfaceId;
}
+ if (other.isSetDataMoveType()) {
+ this.dataMoveType = other.dataMoveType;
+ }
}
public deleteDataMovementInterface_args deepCopy() {
@@ -170524,8 +170549,9 @@ public class Airavata {
@Override
public void clear() {
this.authzToken = null;
- this.computeResourceId = null;
+ this.resourceId = null;
this.dataMovementInterfaceId = null;
+ this.dataMoveType = null;
}
public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -170552,27 +170578,27 @@ public class Airavata {
}
}
- public String getComputeResourceId() {
- return this.computeResourceId;
+ public String getResourceId() {
+ return this.resourceId;
}
- public deleteDataMovementInterface_args setComputeResourceId(String computeResourceId) {
- this.computeResourceId = computeResourceId;
+ public deleteDataMovementInterface_args setResourceId(String resourceId) {
+ this.resourceId = resourceId;
return this;
}
- public void unsetComputeResourceId() {
- this.computeResourceId = null;
+ public void unsetResourceId() {
+ this.resourceId = null;
}
- /** Returns true if field computeResourceId is set (has been assigned a value) and false otherwise */
- public boolean isSetComputeResourceId() {
- return this.computeResourceId != null;
+ /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetResourceId() {
+ return this.resourceId != null;
}
- public void setComputeResourceIdIsSet(boolean value) {
+ public void setResourceIdIsSet(boolean value) {
if (!value) {
- this.computeResourceId = null;
+ this.resourceId = null;
}
}
@@ -170600,6 +170626,38 @@ public class Airavata {
}
}
+ /**
+ *
+ * @see org.apache.airavata.model.data.movement.DMType
+ */
+ public org.apache.airavata.model.data.movement.DMType getDataMoveType() {
+ return this.dataMoveType;
+ }
+
+ /**
+ *
+ * @see org.apache.airavata.model.data.movement.DMType
+ */
+ public deleteDataMovementInterface_args setDataMoveType(org.apache.airavata.model.data.movement.DMType dataMoveType) {
+ this.dataMoveType = dataMoveType;
+ return this;
+ }
+
+ public void unsetDataMoveType() {
+ this.dataMoveType = null;
+ }
+
+ /** Returns true if field dataMoveType is set (has been assigned a value) and false otherwise */
+ public boolean isSetDataMoveType() {
+ return this.dataMoveType != null;
+ }
+
+ public void setDataMoveTypeIsSet(boolean value) {
+ if (!value) {
+ this.dataMoveType = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case AUTHZ_TOKEN:
@@ -170610,11 +170668,11 @@ public class Airavata {
}
break;
- case COMPUTE_RESOURCE_ID:
+ case RESOURCE_ID:
if (value == null) {
- unsetComputeResourceId();
+ unsetResourceId();
} else {
- setComputeResourceId((String)value);
+ setResourceId((String)value);
}
break;
@@ -170626,6 +170684,14 @@ public class Airavata {
}
break;
+ case DATA_MOVE_TYPE:
+ if (value == null) {
+ unsetDataMoveType();
+ } else {
+ setDataMoveType((org.apache.airavata.model.data.movement.DMType)value);
+ }
+ break;
+
}
}
@@ -170634,12 +170700,15 @@ public class Airavata {
case AUTHZ_TOKEN:
return getAuthzToken();
- case COMPUTE_RESOURCE_ID:
- return getComputeResourceId();
+ case RESOURCE_ID:
+ return getResourceId();
case DATA_MOVEMENT_INTERFACE_ID:
return getDataMovementInterfaceId();
+ case DATA_MOVE_TYPE:
+ return getDataMoveType();
+
}
throw new IllegalStateException();
}
@@ -170653,10 +170722,12 @@ public class Airavata {
switch (field) {
case AUTHZ_TOKEN:
return isSetAuthzToken();
- case COMPUTE_RESOURCE_ID:
- return isSetComputeResourceId();
+ case RESOURCE_ID:
+ return isSetResourceId();
case DATA_MOVEMENT_INTERFACE_ID:
return isSetDataMovementInterfaceId();
+ case DATA_MOVE_TYPE:
+ return isSetDataMoveType();
}
throw new IllegalStateException();
}
@@ -170683,12 +170754,12 @@ public class Airavata {
return false;
}
- boolean this_present_computeResourceId = true && this.isSetComputeResourceId();
- boolean that_present_computeResourceId = true && that.isSetComputeResourceId();
- if (this_present_computeResourceId || that_present_computeResourceId) {
- if (!(this_present_computeResourceId && that_present_computeResourceId))
+ boolean this_present_resourceId = true && this.isSetResourceId();
+ boolean that_present_resourceId = true && that.isSetResourceId();
+ if (this_present_resourceId || that_present_resourceId) {
+ if (!(this_present_resourceId && that_present_resourceId))
return false;
- if (!this.computeResourceId.equals(that.computeResourceId))
+ if (!this.resourceId.equals(that.resourceId))
return false;
}
@@ -170701,6 +170772,15 @@ public class Airavata {
return false;
}
+ boolean this_present_dataMoveType = true && this.isSetDataMoveType();
+ boolean that_present_dataMoveType = true && that.isSetDataMoveType();
+ if (this_present_dataMoveType || that_present_dataMoveType) {
+ if (!(this_present_dataMoveType && that_present_dataMoveType))
+ return false;
+ if (!this.dataMoveType.equals(that.dataMoveType))
+ return false;
+ }
+
return true;
}
@@ -170713,16 +170793,21 @@ public class Airavata {
if (present_authzToken)
list.add(authzToken);
- boolean present_computeResourceId = true && (isSetComputeResourceId());
- list.add(present_computeResourceId);
- if (present_computeResourceId)
- list.add(computeResourceId);
+ boolean present_resourceId = true && (isSetResourceId());
+ list.add(present_resourceId);
+ if (present_resourceId)
+ list.add(resourceId);
boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId());
list.add(present_dataMovementInterfaceId);
if (present_dataMovementInterfaceId)
list.add(dataMovementInterfaceId);
+ boolean present_dataMoveType = true && (isSetDataMoveType());
+ list.add(present_dataMoveType);
+ if (present_dataMoveType)
+ list.add(dataMoveType.getValue());
+
return list.hashCode();
}
@@ -170744,12 +170829,12 @@ public class Airavata {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId());
+ lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetComputeResourceId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.computeResourceId, other.computeResourceId);
+ if (isSetResourceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId);
if (lastComparison != 0) {
return lastComparison;
}
@@ -170764,6 +170849,16 @@ public class Airavata {
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetDataMoveType()).compareTo(other.isSetDataMoveType());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDataMoveType()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMoveType, other.dataMoveType);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -170792,11 +170887,11 @@ public class Airavata {
}
first = false;
if (!first) sb.append(", ");
- sb.append("computeResourceId:");
- if (this.computeResourceId == null) {
+ sb.append("resourceId:");
+ if (this.resourceId == null) {
sb.append("null");
} else {
- sb.append(this.computeResourceId);
+ sb.append(this.resourceId);
}
first = false;
if (!first) sb.append(", ");
@@ -170807,6 +170902,14 @@ public class Airavata {
sb.append(this.dataMovementInterfaceId);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("dataMoveType:");
+ if (this.dataMoveType == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.dataMoveType);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -170816,12 +170919,15 @@ public class Airavata {
if (authzToken == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
}
- if (computeResourceId == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'computeResourceId' was not present! Struct: " + toString());
+ if (resourceId == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString());
}
if (dataMovementInterfaceId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementInterfaceId' was not present! Struct: " + toString());
}
+ if (dataMoveType == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMoveType' was not present! Struct: " + toString());
+ }
// check for sub-struct validity
if (authzToken != null) {
authzToken.validate();
@@ -170871,10 +170977,10 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // COMPUTE_RESOURCE_ID
+ case 2: // RESOURCE_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.computeResourceId = iprot.readString();
- struct.setComputeResourceIdIsSet(true);
+ struct.resourceId = iprot.readString();
+ struct.setResourceIdIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -170887,6 +170993,14 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 4: // DATA_MOVE_TYPE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.dataMoveType = org.apache.airavata.model.data.movement.DMType.findByValue(iprot.readI32());
+ struct.setDataMoveTypeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -170907,9 +171021,9 @@ public class Airavata {
struct.authzToken.write(oprot);
oprot.writeFieldEnd();
}
- if (struct.computeResourceId != null) {
- oprot.writeFieldBegin(COMPUTE_RESOURCE_ID_FIELD_DESC);
- oprot.writeString(struct.computeResourceId);
+ if (struct.resourceId != null) {
+ oprot.writeFieldBegin(RESOURCE_ID_FIELD_DESC);
+ oprot.writeString(struct.resourceId);
oprot.writeFieldEnd();
}
if (struct.dataMovementInterfaceId != null) {
@@ -170917,6 +171031,11 @@ public class Airavata {
oprot.writeString(struct.dataMovementInterfaceId);
oprot.writeFieldEnd();
}
+ if (struct.dataMoveType != null) {
+ oprot.writeFieldBegin(DATA_MOVE_TYPE_FIELD_DESC);
+ oprot.writeI32(struct.dataMoveType.getValue());
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -170935,8 +171054,9 @@ public class Airavata {
public void write(org.apache.thrift.protocol.TProtocol prot, deleteDataMovementInterface_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
struct.authzToken.write(oprot);
- oprot.writeString(struct.computeResourceId);
+ oprot.writeString(struct.resourceId);
oprot.writeString(struct.dataMovementInterfaceId);
+ oprot.writeI32(struct.dataMoveType.getValue());
}
@Override
@@ -170945,10 +171065,12 @@ public class Airavata {
struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
struct.authzToken.read(iprot);
struct.setAuthzTokenIsSet(true);
- struct.computeResourceId = iprot.readString();
- struct.setComputeResourceIdIsSet(true);
+ struct.resourceId = iprot.readString();
+ struct.setResourceIdIsSet(true);
struct.dataMovementInterfaceId = iprot.readString();
struct.setDataMovementInterfaceIdIsSet(true);
+ struct.dataMoveType = org.apache.airavata.model.data.movement.DMType.findByValue(iprot.readI32());
+ struct.setDataMoveTypeIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index 8d4b714..f56ab9b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -33185,8 +33185,9 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
- bool isset_computeResourceId = false;
+ bool isset_resourceId = false;
bool isset_dataMovementInterfaceId = false;
+ bool isset_dataMoveType = false;
while (true)
{
@@ -33206,8 +33207,8 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->computeResourceId);
- isset_computeResourceId = true;
+ xfer += iprot->readString(this->resourceId);
+ isset_resourceId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -33220,6 +33221,16 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
xfer += iprot->skip(ftype);
}
break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast369;
+ xfer += iprot->readI32(ecast369);
+ this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast369;
+ isset_dataMoveType = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -33231,10 +33242,12 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
if (!isset_authzToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_computeResourceId)
+ if (!isset_resourceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_dataMovementInterfaceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_dataMoveType)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -33247,14 +33260,18 @@ uint32_t Airavata_deleteDataMovementInterface_args::write(::apache::thrift::prot
xfer += this->authzToken.write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->computeResourceId);
+ xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->resourceId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->dataMovementInterfaceId);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("dataMoveType", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeI32((int32_t)this->dataMoveType);
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -33274,14 +33291,18 @@ uint32_t Airavata_deleteDataMovementInterface_pargs::write(::apache::thrift::pro
xfer += (*(this->authzToken)).write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->computeResourceId)));
+ xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->resourceId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString((*(this->dataMovementInterfaceId)));
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("dataMoveType", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeI32((int32_t)(*(this->dataMoveType)));
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -37534,14 +37555,14 @@ uint32_t Airavata_getAllGatewayComputeResourcePreferences_result::read(::apache:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size369;
- ::apache::thrift::protocol::TType _etype372;
- xfer += iprot->readListBegin(_etype372, _size369);
- this->success.resize(_size369);
- uint32_t _i373;
- for (_i373 = 0; _i373 < _size369; ++_i373)
+ uint32_t _size370;
+ ::apache::thrift::protocol::TType _etype373;
+ xfer += iprot->readListBegin(_etype373, _size370);
+ this->success.resize(_size370);
+ uint32_t _i374;
+ for (_i374 = 0; _i374 < _size370; ++_i374)
{
- xfer += this->success[_i373].read(iprot);
+ xfer += this->success[_i374].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -37604,10 +37625,10 @@ uint32_t Airavata_getAllGatewayComputeResourcePreferences_result::write(::apache
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> ::const_iterator _iter374;
- for (_iter374 = this->success.begin(); _iter374 != this->success.end(); ++_iter374)
+ std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> ::const_iterator _iter375;
+ for (_iter375 = this->success.begin(); _iter375 != this->success.end(); ++_iter375)
{
- xfer += (*_iter374).write(oprot);
+ xfer += (*_iter375).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -37664,14 +37685,14 @@ uint32_t Airavata_getAllGatewayComputeResourcePreferences_presult::read(::apache
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size375;
- ::apache::thrift::protocol::TType _etype378;
- xfer += iprot->readListBegin(_etype378, _size375);
- (*(this->success)).resize(_size375);
- uint32_t _i379;
- for (_i379 = 0; _i379 < _size375; ++_i379)
+ uint32_t _size376;
+ ::apache::thrift::protocol::TType _etype379;
+ xfer += iprot->readListBegin(_etype379, _size376);
+ (*(this->success)).resize(_size376);
+ uint32_t _i380;
+ for (_i380 = 0; _i380 < _size376; ++_i380)
{
- xfer += (*(this->success))[_i379].read(iprot);
+ xfer += (*(this->success))[_i380].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -37855,14 +37876,14 @@ uint32_t Airavata_getAllGatewayStoragePreferences_result::read(::apache::thrift:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size380;
- ::apache::thrift::protocol::TType _etype383;
- xfer += iprot->readListBegin(_etype383, _size380);
- this->success.resize(_size380);
- uint32_t _i384;
- for (_i384 = 0; _i384 < _size380; ++_i384)
+ uint32_t _size381;
+ ::apache::thrift::protocol::TType _etype384;
+ xfer += iprot->readListBegin(_etype384, _size381);
+ this->success.resize(_size381);
+ uint32_t _i385;
+ for (_i385 = 0; _i385 < _size381; ++_i385)
{
- xfer += this->success[_i384].read(iprot);
+ xfer += this->success[_i385].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -37925,10 +37946,10 @@ uint32_t Airavata_getAllGatewayStoragePreferences_result::write(::apache::thrift
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> ::const_iterator _iter385;
- for (_iter385 = this->success.begin(); _iter385 != this->success.end(); ++_iter385)
+ std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> ::const_iterator _iter386;
+ for (_iter386 = this->success.begin(); _iter386 != this->success.end(); ++_iter386)
{
- xfer += (*_iter385).write(oprot);
+ xfer += (*_iter386).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -37985,14 +38006,14 @@ uint32_t Airavata_getAllGatewayStoragePreferences_presult::read(::apache::thrift
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size386;
- ::apache::thrift::protocol::TType _etype389;
- xfer += iprot->readListBegin(_etype389, _size386);
- (*(this->success)).resize(_size386);
- uint32_t _i390;
- for (_i390 = 0; _i390 < _size386; ++_i390)
+ uint32_t _size387;
+ ::apache::thrift::protocol::TType _etype390;
+ xfer += iprot->readListBegin(_etype390, _size387);
+ (*(this->success)).resize(_size387);
+ uint32_t _i391;
+ for (_i391 = 0; _i391 < _size387; ++_i391)
{
- xfer += (*(this->success))[_i390].read(iprot);
+ xfer += (*(this->success))[_i391].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -38157,14 +38178,14 @@ uint32_t Airavata_getAllGatewayResourceProfiles_result::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size391;
- ::apache::thrift::protocol::TType _etype394;
- xfer += iprot->readListBegin(_etype394, _size391);
- this->success.resize(_size391);
- uint32_t _i395;
- for (_i395 = 0; _i395 < _size391; ++_i395)
+ uint32_t _size392;
+ ::apache::thrift::protocol::TType _etype395;
+ xfer += iprot->readListBegin(_etype395, _size392);
+ this->success.resize(_size392);
+ uint32_t _i396;
+ for (_i396 = 0; _i396 < _size392; ++_i396)
{
- xfer += this->success[_i395].read(iprot);
+ xfer += this->success[_i396].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -38227,10 +38248,10 @@ uint32_t Airavata_getAllGatewayResourceProfiles_result::write(::apache::thrift::
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> ::const_iterator _iter396;
- for (_iter396 = this->success.begin(); _iter396 != this->success.end(); ++_iter396)
+ std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> ::const_iterator _iter397;
+ for (_iter397 = this->success.begin(); _iter397 != this->success.end(); ++_iter397)
{
- xfer += (*_iter396).write(oprot);
+ xfer += (*_iter397).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -38287,14 +38308,14 @@ uint32_t Airavata_getAllGatewayResourceProfiles_presult::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size397;
- ::apache::thrift::protocol::TType _etype400;
- xfer += iprot->readListBegin(_etype400, _size397);
- (*(this->success)).resize(_size397);
- uint32_t _i401;
- for (_i401 = 0; _i401 < _size397; ++_i401)
+ uint32_t _size398;
+ ::apache::thrift::protocol::TType _etype401;
+ xfer += iprot->readListBegin(_etype401, _size398);
+ (*(this->success)).resize(_size398);
+ uint32_t _i402;
+ for (_i402 = 0; _i402 < _size398; ++_i402)
{
- xfer += (*(this->success))[_i401].read(iprot);
+ xfer += (*(this->success))[_i402].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -39748,14 +39769,14 @@ uint32_t Airavata_getAllWorkflows_result::read(::apache::thrift::protocol::TProt
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size402;
- ::apache::thrift::protocol::TType _etype405;
- xfer += iprot->readListBegin(_etype405, _size402);
- this->success.resize(_size402);
- uint32_t _i406;
- for (_i406 = 0; _i406 < _size402; ++_i406)
+ uint32_t _size403;
+ ::apache::thrift::protocol::TType _etype406;
+ xfer += iprot->readListBegin(_etype406, _size403);
+ this->success.resize(_size403);
+ uint32_t _i407;
+ for (_i407 = 0; _i407 < _size403; ++_i407)
{
- xfer += iprot->readString(this->success[_i406]);
+ xfer += iprot->readString(this->success[_i407]);
}
xfer += iprot->readListEnd();
}
@@ -39818,10 +39839,10 @@ uint32_t Airavata_getAllWorkflows_result::write(::apache::thrift::protocol::TPro
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::vector<std::string> ::const_iterator _iter407;
- for (_iter407 = this->success.begin(); _iter407 != this->success.end(); ++_iter407)
+ std::vector<std::string> ::const_iterator _iter408;
+ for (_iter408 = this->success.begin(); _iter408 != this->success.end(); ++_iter408)
{
- xfer += oprot->writeString((*_iter407));
+ xfer += oprot->writeString((*_iter408));
}
xfer += oprot->writeListEnd();
}
@@ -39878,14 +39899,14 @@ uint32_t Airavata_getAllWorkflows_presult::read(::apache::thrift::protocol::TPro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size408;
- ::apache::thrift::protocol::TType _etype411;
- xfer += iprot->readListBegin(_etype411, _size408);
- (*(this->success)).resize(_size408);
- uint32_t _i412;
- for (_i412 = 0; _i412 < _size408; ++_i412)
+ uint32_t _size409;
+ ::apache::thrift::protocol::TType _etype412;
+ xfer += iprot->readListBegin(_etype412, _size409);
+ (*(this->success)).resize(_size409);
+ uint32_t _i413;
+ for (_i413 = 0; _i413 < _size409; ++_i413)
{
- xfer += iprot->readString((*(this->success))[_i412]);
+ xfer += iprot->readString((*(this->success))[_i413]);
}
xfer += iprot->readListEnd();
}
@@ -50989,21 +51010,22 @@ bool AiravataClient::recv_deleteJobSubmissionInterface()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteJobSubmissionInterface failed: unknown result");
}
-bool AiravataClient::deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId)
+bool AiravataClient::deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType)
{
- send_deleteDataMovementInterface(authzToken, computeResourceId, dataMovementInterfaceId);
+ send_deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType);
return recv_deleteDataMovementInterface();
}
-void AiravataClient::send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId)
+void AiravataClient::send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("deleteDataMovementInterface", ::apache::thrift::protocol::T_CALL, cseqid);
Airavata_deleteDataMovementInterface_pargs args;
args.authzToken = &authzToken;
- args.computeResourceId = &computeResourceId;
+ args.resourceId = &resourceId;
args.dataMovementInterfaceId = &dataMovementInterfaceId;
+ args.dataMoveType = &dataMoveType;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -60385,7 +60407,7 @@ void AiravataProcessor::process_deleteDataMovementInterface(int32_t seqid, ::apa
Airavata_deleteDataMovementInterface_result result;
try {
- result.success = iface_->deleteDataMovementInterface(args.authzToken, args.computeResourceId, args.dataMovementInterfaceId);
+ result.success = iface_->deleteDataMovementInterface(args.authzToken, args.resourceId, args.dataMovementInterfaceId, args.dataMoveType);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -73287,13 +73309,13 @@ bool AiravataConcurrentClient::recv_deleteJobSubmissionInterface(const int32_t s
} // end while(true)
}
-bool AiravataConcurrentClient::deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId)
+bool AiravataConcurrentClient::deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType)
{
- int32_t seqid = send_deleteDataMovementInterface(authzToken, computeResourceId, dataMovementInterfaceId);
+ int32_t seqid = send_deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType);
return recv_deleteDataMovementInterface(seqid);
}
-int32_t AiravataConcurrentClient::send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId)
+int32_t AiravataConcurrentClient::send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType)
{
int32_t cseqid = this->sync_.generateSeqId();
::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);
@@ -73301,8 +73323,9 @@ int32_t AiravataConcurrentClient::send_deleteDataMovementInterface(const ::apac
Airavata_deleteDataMovementInterface_pargs args;
args.authzToken = &authzToken;
- args.computeResourceId = &computeResourceId;
+ args.resourceId = &resourceId;
args.dataMovementInterfaceId = &dataMovementInterfaceId;
+ args.dataMoveType = &dataMoveType;
args.write(oprot_);
oprot_->writeMessageEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
index a8e91cc..4aa735f 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
@@ -2247,10 +2247,11 @@ class AiravataIf {
*
*
* @param authzToken
- * @param computeResourceId
+ * @param resourceId
* @param dataMovementInterfaceId
+ * @param dataMoveType
*/
- virtual bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId) = 0;
+ virtual bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) = 0;
virtual void registerResourceJobManager(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager) = 0;
virtual bool updateResourceJobManager(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceJobManagerId, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& updatedResourceJobManager) = 0;
virtual void getResourceJobManager( ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceJobManagerId) = 0;
@@ -2979,7 +2980,7 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
- bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* computeResourceId */, const std::string& /* dataMovementInterfaceId */) {
+ bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const std::string& /* dataMovementInterfaceId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */) {
bool _return = false;
return _return;
}
@@ -17964,28 +17965,33 @@ class Airavata_deleteDataMovementInterface_args {
Airavata_deleteDataMovementInterface_args(const Airavata_deleteDataMovementInterface_args&);
Airavata_deleteDataMovementInterface_args& operator=(const Airavata_deleteDataMovementInterface_args&);
- Airavata_deleteDataMovementInterface_args() : computeResourceId(), dataMovementInterfaceId() {
+ Airavata_deleteDataMovementInterface_args() : resourceId(), dataMovementInterfaceId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0) {
}
virtual ~Airavata_deleteDataMovementInterface_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
- std::string computeResourceId;
+ std::string resourceId;
std::string dataMovementInterfaceId;
+ ::apache::airavata::model::data::movement::DMType::type dataMoveType;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
- void __set_computeResourceId(const std::string& val);
+ void __set_resourceId(const std::string& val);
void __set_dataMovementInterfaceId(const std::string& val);
+ void __set_dataMoveType(const ::apache::airavata::model::data::movement::DMType::type val);
+
bool operator == (const Airavata_deleteDataMovementInterface_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
- if (!(computeResourceId == rhs.computeResourceId))
+ if (!(resourceId == rhs.resourceId))
return false;
if (!(dataMovementInterfaceId == rhs.dataMovementInterfaceId))
return false;
+ if (!(dataMoveType == rhs.dataMoveType))
+ return false;
return true;
}
bool operator != (const Airavata_deleteDataMovementInterface_args &rhs) const {
@@ -18006,8 +18012,9 @@ class Airavata_deleteDataMovementInterface_pargs {
virtual ~Airavata_deleteDataMovementInterface_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
- const std::string* computeResourceId;
+ const std::string* resourceId;
const std::string* dataMovementInterfaceId;
+ const ::apache::airavata::model::data::movement::DMType::type* dataMoveType;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -23022,8 +23029,8 @@ class AiravataClient : virtual public AiravataIf {
bool deleteJobSubmissionInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId);
void send_deleteJobSubmissionInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId);
bool recv_deleteJobSubmissionInterface();
- bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId);
- void send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId);
+ bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType);
+ void send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType);
bool recv_deleteDataMovementInterface();
void registerResourceJobManager(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager);
void send_registerResourceJobManager(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager);
@@ -24462,13 +24469,13 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->deleteJobSubmissionInterface(authzToken, computeResourceId, jobSubmissionInterfaceId);
}
- bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId) {
+ bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->deleteDataMovementInterface(authzToken, computeResourceId, dataMovementInterfaceId);
+ ifaces_[i]->deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType);
}
- return ifaces_[i]->deleteDataMovementInterface(authzToken, computeResourceId, dataMovementInterfaceId);
+ return ifaces_[i]->deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType);
}
void registerResourceJobManager(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager) {
@@ -25130,8 +25137,8 @@ class AiravataConcurrentClient : virtual public AiravataIf {
bool deleteJobSubmissionInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId);
int32_t send_deleteJobSubmissionInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId);
bool recv_deleteJobSubmissionInterface(const int32_t seqid);
- bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId);
- int32_t send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId);
+ bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType);
+ int32_t send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType);
bool recv_deleteDataMovementInterface(const int32_t seqid);
void registerResourceJobManager(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager);
int32_t send_registerResourceJobManager(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager);
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
index ee0d60d..f64fda3 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
@@ -2564,10 +2564,11 @@ class AiravataHandler : virtual public AiravataIf {
*
*
* @param authzToken
- * @param computeResourceId
+ * @param resourceId
* @param dataMovementInterfaceId
+ * @param dataMoveType
*/
- bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& dataMovementInterfaceId) {
+ bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) {
// Your implementation goes here
printf("deleteDataMovementInterface\n");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index df39f6f..25e814c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -2839,15 +2839,16 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $computeResourceId
+ * @param string $resourceId
* @param string $dataMovementInterfaceId
+ * @param int $dataMoveType
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $dataMovementInterfaceId);
+ public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager $resourceJobManager
@@ -10289,18 +10290,19 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("deleteJobSubmissionInterface failed: unknown result");
}
- public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $dataMovementInterfaceId)
+ public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType)
{
- $this->send_deleteDataMovementInterface($authzToken, $computeResourceId, $dataMovementInterfaceId);
+ $this->send_deleteDataMovementInterface($authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType);
return $this->recv_deleteDataMovementInterface();
}
- public function send_deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $dataMovementInterfaceId)
+ public function send_deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType)
{
$args = new \Airavata\API\Airavata_deleteDataMovementInterface_args();
$args->authzToken = $authzToken;
- $args->computeResourceId = $computeResourceId;
+ $args->resourceId = $resourceId;
$args->dataMovementInterfaceId = $dataMovementInterfaceId;
+ $args->dataMoveType = $dataMoveType;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -45026,11 +45028,15 @@ class Airavata_deleteDataMovementInterface_args {
/**
* @var string
*/
- public $computeResourceId = null;
+ public $resourceId = null;
/**
* @var string
*/
public $dataMovementInterfaceId = null;
+ /**
+ * @var int
+ */
+ public $dataMoveType = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -45041,25 +45047,32 @@ class Airavata_deleteDataMovementInterface_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'computeResourceId',
+ 'var' => 'resourceId',
'type' => TType::STRING,
),
3 => array(
'var' => 'dataMovementInterfaceId',
'type' => TType::STRING,
),
+ 4 => array(
+ 'var' => 'dataMoveType',
+ 'type' => TType::I32,
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['computeResourceId'])) {
- $this->computeResourceId = $vals['computeResourceId'];
+ if (isset($vals['resourceId'])) {
+ $this->resourceId = $vals['resourceId'];
}
if (isset($vals['dataMovementInterfaceId'])) {
$this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
}
+ if (isset($vals['dataMoveType'])) {
+ $this->dataMoveType = $vals['dataMoveType'];
+ }
}
}
@@ -45092,7 +45105,7 @@ class Airavata_deleteDataMovementInterface_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->computeResourceId);
+ $xfer += $input->readString($this->resourceId);
} else {
$xfer += $input->skip($ftype);
}
@@ -45104,6 +45117,13 @@ class Airavata_deleteDataMovementInterface_args {
$xfer += $input->skip($ftype);
}
break;
+ case 4:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->dataMoveType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -45125,9 +45145,9 @@ class Airavata_deleteDataMovementInterface_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->computeResourceId !== null) {
- $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->computeResourceId);
+ if ($this->resourceId !== null) {
+ $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+ $xfer += $output->writeString($this->resourceId);
$xfer += $output->writeFieldEnd();
}
if ($this->dataMovementInterfaceId !== null) {
@@ -45135,6 +45155,11 @@ class Airavata_deleteDataMovementInterface_args {
$xfer += $output->writeString($this->dataMovementInterfaceId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->dataMoveType !== null) {
+ $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 4);
+ $xfer += $output->writeI32($this->dataMoveType);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index f75c290..869a10d 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -129,7 +129,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool changeJobSubmissionPriorities(AuthzToken authzToken, jobSubmissionPriorityMap)')
print(' bool changeDataMovementPriorities(AuthzToken authzToken, dataMovementPriorityMap)')
print(' bool deleteJobSubmissionInterface(AuthzToken authzToken, string computeResourceId, string jobSubmissionInterfaceId)')
- print(' bool deleteDataMovementInterface(AuthzToken authzToken, string computeResourceId, string dataMovementInterfaceId)')
+ print(' bool deleteDataMovementInterface(AuthzToken authzToken, string resourceId, string dataMovementInterfaceId, DMType dataMoveType)')
print(' string registerResourceJobManager(AuthzToken authzToken, ResourceJobManager resourceJobManager)')
print(' bool updateResourceJobManager(AuthzToken authzToken, string resourceJobManagerId, ResourceJobManager updatedResourceJobManager)')
print(' ResourceJobManager getResourceJobManager(AuthzToken authzToken, string resourceJobManagerId)')
@@ -850,10 +850,10 @@ elif cmd == 'deleteJobSubmissionInterface':
pp.pprint(client.deleteJobSubmissionInterface(eval(args[0]),args[1],args[2],))
elif cmd == 'deleteDataMovementInterface':
- if len(args) != 3:
- print('deleteDataMovementInterface requires 3 args')
+ if len(args) != 4:
+ print('deleteDataMovementInterface requires 4 args')
sys.exit(1)
- pp.pprint(client.deleteDataMovementInterface(eval(args[0]),args[1],args[2],))
+ pp.pprint(client.deleteDataMovementInterface(eval(args[0]),args[1],args[2],eval(args[3]),))
elif cmd == 'registerResourceJobManager':
if len(args) != 2:
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index cb51ff6..54b33d6 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -2437,7 +2437,7 @@ class Iface:
"""
pass
- def deleteDataMovementInterface(self, authzToken, computeResourceId, dataMovementInterfaceId):
+ def deleteDataMovementInterface(self, authzToken, resourceId, dataMovementInterfaceId, dataMoveType):
"""
Delete a given data movement interface
@@ -2451,8 +2451,9 @@ class Iface:
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
- dataMovementInterfaceId
+ - dataMoveType
"""
pass
@@ -8937,7 +8938,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteJobSubmissionInterface failed: unknown result")
- def deleteDataMovementInterface(self, authzToken, computeResourceId, dataMovementInterfaceId):
+ def deleteDataMovementInterface(self, authzToken, resourceId, dataMovementInterfaceId, dataMoveType):
"""
Delete a given data movement interface
@@ -8951,18 +8952,20 @@ class Client(Iface):
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
- dataMovementInterfaceId
+ - dataMoveType
"""
- self.send_deleteDataMovementInterface(authzToken, computeResourceId, dataMovementInterfaceId)
+ self.send_deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType)
return self.recv_deleteDataMovementInterface()
- def send_deleteDataMovementInterface(self, authzToken, computeResourceId, dataMovementInterfaceId):
+ def send_deleteDataMovementInterface(self, authzToken, resourceId, dataMovementInterfaceId, dataMoveType):
self._oprot.writeMessageBegin('deleteDataMovementInterface', TMessageType.CALL, self._seqid)
args = deleteDataMovementInterface_args()
args.authzToken = authzToken
- args.computeResourceId = computeResourceId
+ args.resourceId = resourceId
args.dataMovementInterfaceId = dataMovementInterfaceId
+ args.dataMoveType = dataMoveType
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -14027,7 +14030,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = deleteDataMovementInterface_result()
try:
- result.success = self._handler.deleteDataMovementInterface(args.authzToken, args.computeResourceId, args.dataMovementInterfaceId)
+ result.success = self._handler.deleteDataMovementInterface(args.authzToken, args.resourceId, args.dataMovementInterfaceId, args.dataMoveType)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -38135,21 +38138,24 @@ class deleteDataMovementInterface_args:
"""
Attributes:
- authzToken
- - computeResourceId
+ - resourceId
- dataMovementInterfaceId
+ - dataMoveType
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'computeResourceId', None, None, ), # 2
+ (2, TType.STRING, 'resourceId', None, None, ), # 2
(3, TType.STRING, 'dataMovementInterfaceId', None, None, ), # 3
+ (4, TType.I32, 'dataMoveType', None, None, ), # 4
)
- def __init__(self, authzToken=None, computeResourceId=None, dataMovementInterfaceId=None,):
+ def __init__(self, authzToken=None, resourceId=None, dataMovementInterfaceId=None, dataMoveType=None,):
self.authzToken = authzToken
- self.computeResourceId = computeResourceId
+ self.resourceId = resourceId
self.dataMovementInterfaceId = dataMovementInterfaceId
+ self.dataMoveType = dataMoveType
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -38168,7 +38174,7 @@ class deleteDataMovementInterface_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.computeResourceId = iprot.readString()
+ self.resourceId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
@@ -38176,6 +38182,11 @@ class deleteDataMovementInterface_args:
self.dataMovementInterfaceId = iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.I32:
+ self.dataMoveType = iprot.readI32()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -38190,32 +38201,39 @@ class deleteDataMovementInterface_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.computeResourceId is not None:
- oprot.writeFieldBegin('computeResourceId', TType.STRING, 2)
- oprot.writeString(self.computeResourceId)
+ if self.resourceId is not None:
+ oprot.writeFieldBegin('resourceId', TType.STRING, 2)
+ oprot.writeString(self.resourceId)
oprot.writeFieldEnd()
if self.dataMovementInterfaceId is not None:
oprot.writeFieldBegin('dataMovementInterfaceId', TType.STRING, 3)
oprot.writeString(self.dataMovementInterfaceId)
oprot.writeFieldEnd()
+ if self.dataMoveType is not None:
+ oprot.writeFieldBegin('dataMoveType', TType.I32, 4)
+ oprot.writeI32(self.dataMoveType)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.computeResourceId is None:
- raise TProtocol.TProtocolException(message='Required field computeResourceId is unset!')
+ if self.resourceId is None:
+ raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
if self.dataMovementInterfaceId is None:
raise TProtocol.TProtocolException(message='Required field dataMovementInterfaceId is unset!')
+ if self.dataMoveType is None:
+ raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
return
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.computeResourceId)
+ value = (value * 31) ^ hash(self.resourceId)
value = (value * 31) ^ hash(self.dataMovementInterfaceId)
+ value = (value * 31) ^ hash(self.dataMoveType)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
index f26fd55..8c1f084 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus");
[09/11] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by ch...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2c2d63d0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2c2d63d0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2c2d63d0
Branch: refs/heads/master
Commit: 2c2d63d04deba0e4828bb08c6a176f2af44c87b7
Parents: 7a345e5 614f8bb
Author: scnakandala <su...@gmail.com>
Authored: Tue Feb 16 16:26:02 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Feb 16 16:26:02 2016 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 26 +-
.../java/org/apache/airavata/api/Airavata.java | 990 ++++++++++----
.../main/resources/lib/airavata/Airavata.cpp | 217 ++--
.../src/main/resources/lib/airavata/Airavata.h | 728 ++++++++---
.../lib/airavata/Airavata_server.skeleton.cpp | 633 ++++++---
.../lib/airavata/workflow_data_model_types.cpp | 966 +++++++++++++-
.../lib/airavata/workflow_data_model_types.h | 444 ++++++-
.../resources/lib/Airavata/API/Airavata.php | 667 +++++++---
.../main/resources/lib/Airavata/Model/Types.php | 885 ++++++++++++-
.../lib/apache/airavata/api/Airavata-remote | 14 +-
.../lib/apache/airavata/api/Airavata.py | 1224 +++++++++++++-----
.../apache/airavata/model/workflow/ttypes.py | 671 +++++++++-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../org/apache/airavata/model/Workflow.java | 1055 ---------------
.../apache/airavata/model/WorkflowModel.java | 339 ++++-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.java | 2 +-
.../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 | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../server/src/main/resources/gfac-config.yaml | 2 +-
.../gfac/core/cluster/RemoteCluster.java | 3 +
.../airavata/gfac/impl/BESRemoteCluster.java | 6 +
.../org/apache/airavata/gfac/impl/Factory.java | 30 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 8 +-
.../airavata/gfac/impl/LocalRemoteCluster.java | 6 +
.../server/OrchestratorServerHandler.java | 11 +-
.../app/catalog/impl/StorageResourceImpl.java | 14 +
.../resources/StorageInterfaceResource.java | 4 +-
.../catalog/impl/WorkflowCatalogImpl.java | 8 +-
.../utils/WorkflowCatalogThriftConversion.java | 6 +-
.../main/resources/workflowcatalog-mysql.sql | 3 +-
.../airavata/registry/cpi/StorageResource.java | 2 +
.../airavata/registry/cpi/WorkflowCatalog.java | 7 +-
modules/workflow/workflow-core/pom.xml | 5 +
.../core/SimpleWorkflowInterpreter.java | 328 -----
.../airavata/workflow/core/WorkflowBuilder.java | 21 +
.../workflow/core/WorkflowEnactmentService.java | 28 +-
.../airavata/workflow/core/WorkflowFactory.java | 1 +
.../airavata/workflow/core/WorkflowInfo.java | 87 ++
.../workflow/core/WorkflowInterpreter.java | 336 +++++
.../airavata/workflow/core/WorkflowParser.java | 46 -
.../workflow/core/dag/edge/DirectedEdge.java | 4 +
.../core/dag/nodes/ApplicationNode.java | 5 +
.../core/dag/nodes/ApplicationNodeImpl.java | 11 +
.../workflow/core/dag/nodes/InputNode.java | 8 +-
.../workflow/core/dag/nodes/InputNodeImpl.java | 110 +-
.../workflow/core/dag/nodes/OutputNode.java | 2 +-
.../workflow/core/dag/nodes/OutputNodeImpl.java | 89 +-
.../workflow/core/dag/port/InputPortIml.java | 17 +
.../workflow/core/dag/port/OutPortImpl.java | 17 +
.../airavata/workflow/core/dag/port/Port.java | 7 +
.../core/parser/JsonWorkflowParser.java | 689 +++++++++-
.../workflow/core/parser/ParserException.java | 40 +
.../workflow/core/parser/WorkflowParser.java | 47 +
.../airavata/workflow/core/WorkflowDAGTest.java | 46 -
.../core/parser/JsonWorkflowParserTest.java | 123 +-
.../src/test/resources/TestWorkflow.json | 28 +-
.../airavata-apis/airavata_api.thrift | 11 +-
134 files changed, 8163 insertions(+), 3074 deletions(-)
----------------------------------------------------------------------
[05/11] airavata git commit: Build runtime model of workflow graph
after parse the workflow description
Posted by ch...@apache.org.
Build runtime model of workflow graph after parse the workflow description
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/38c2c36e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/38c2c36e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/38c2c36e
Branch: refs/heads/master
Commit: 38c2c36e717b7d60e9dbafd6f6bc235f8f52bf9d
Parents: 11ea501
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Feb 12 16:51:16 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Feb 12 16:51:16 2016 -0500
----------------------------------------------------------------------
.../workflow/core/dag/nodes/InputNode.java | 8 +-
.../workflow/core/dag/nodes/InputNodeImpl.java | 110 +++++++++++-
.../workflow/core/dag/nodes/OutputNode.java | 2 +-
.../workflow/core/dag/nodes/OutputNodeImpl.java | 89 +++++++++-
.../workflow/core/dag/port/InputPortIml.java | 17 ++
.../workflow/core/dag/port/OutPortImpl.java | 17 ++
.../airavata/workflow/core/dag/port/Port.java | 7 +
.../core/parser/JsonWorkflowParser.java | 171 +++++++++++++++++--
.../src/test/resources/TestWorkflow.json | 28 +--
9 files changed, 410 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNode.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNode.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNode.java
index 6dec125..9d26419 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNode.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNode.java
@@ -21,10 +21,12 @@
package org.apache.airavata.workflow.core.dag.nodes;
+import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
+import org.apache.airavata.workflow.core.dag.port.InPort;
import org.apache.airavata.workflow.core.dag.port.OutPort;
-public interface InputNode extends WorkflowNode {
+public interface InputNode extends WorkflowNode , OutPort{
public InputDataObjectType getInputObject();
@@ -34,4 +36,8 @@ public interface InputNode extends WorkflowNode {
public void setOutPort(OutPort outPort);
+ public void setValue(String value);
+
+ public String getValue();
+
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java
index 59984d7..e8e46e5 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java
@@ -22,17 +22,29 @@ package org.apache.airavata.workflow.core.dag.nodes;
import org.apache.airavata.model.ComponentState;
import org.apache.airavata.model.ComponentStatus;
import org.apache.airavata.model.NodeModel;
+import org.apache.airavata.model.PortModel;
+import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
+import org.apache.airavata.model.application.io.OutputDataObjectType;
+import org.apache.airavata.workflow.core.dag.edge.Edge;
import org.apache.airavata.workflow.core.dag.port.OutPort;
+import java.util.ArrayList;
+import java.util.List;
+
public class InputNodeImpl implements InputNode {
private NodeModel nodeModel;
- private OutPort outPort;
private InputDataObjectType inputDataObjectType;
+ private PortModel portModel;
+ private List<Edge> edges = new ArrayList<>();
+ private String value;
+ private DataType dataType;
+
public InputNodeImpl(NodeModel nodeModel) {
this.nodeModel = nodeModel;
+ setPortModel(convert(nodeModel));
}
@Override
@@ -76,14 +88,42 @@ public class InputNodeImpl implements InputNode {
}
@Override
+ public void setPortModel(PortModel portModel) {
+ this.portModel = portModel;
+ }
+
+ @Override
+ public PortModel getPortModel() {
+ return portModel;
+ }
+
+ @Override
public boolean isReady() {
return (inputDataObjectType.getValue() != null && !inputDataObjectType.getValue().equals(""))
|| !inputDataObjectType.isIsRequired();
}
@Override
+ public WorkflowNode getNode() {
+ return this;
+ }
+
+ @Override
+ public void setNode(WorkflowNode workflowNode) {
+ // InputNode itself a workflowNode
+ }
+
+ @Override
public InputDataObjectType getInputObject() {
- return this.inputDataObjectType;
+ if (inputDataObjectType == null) {
+ inputDataObjectType = new InputDataObjectType(getName());
+ inputDataObjectType.setValue(getValue());
+ inputDataObjectType.setType(getDataType());
+ inputDataObjectType.setIsRequired(true);
+ inputDataObjectType.setDataStaged(true);
+ inputDataObjectType.setInputOrder(0);
+ }
+ return inputDataObjectType;
}
@Override
@@ -93,13 +133,75 @@ public class InputNodeImpl implements InputNode {
@Override
public OutPort getOutPort() {
- return this.outPort;
+ return this;
}
@Override
public void setOutPort(OutPort outPort) {
- this.outPort = outPort;
+ // InputNode is a outPort
}
+ @Override
+ public void setValue(String value) {
+ this.value = value;
+ }
+ @Override
+ public DataType getDataType() {
+ return dataType;
+ }
+
+ @Override
+ public void setDataType(DataType dataType) {
+ this.dataType = dataType;
+ }
+
+ @Override
+ public String getNodeId() {
+ return getNode().getId();
+ }
+
+ @Override
+ public String getValue() {
+ return value;
+ }
+
+ @Override
+ public void setOutputObject(OutputDataObjectType outputObject) {
+
+ }
+
+
+ @Override
+ public OutputDataObjectType getOutputObject() {
+ return convert(getInputObject());
+ }
+
+ @Override
+ public List<Edge> getEdges() {
+ return edges;
+ }
+
+ @Override
+ public void addEdge(Edge edge) {
+ edges.add(edge);
+ }
+
+ private PortModel convert(NodeModel nodeModel) {
+ PortModel portModel = new PortModel(nodeModel.getNodeId());
+ portModel.setName(nodeModel.getName());
+ portModel.setDescription(nodeModel.getDescription());
+ return portModel;
+ }
+
+ private OutputDataObjectType convert(InputDataObjectType inputObject) {
+ OutputDataObjectType output = new OutputDataObjectType(inputObject.getName());
+ output.setType(inputObject.getType());
+ output.setValue(inputObject.getValue());
+ output.setIsRequired(inputObject.isIsRequired());
+ output.setApplicationArgument(inputObject.getApplicationArgument());
+ output.setOutputStreaming(false);
+// output.setDataMovement(true);
+ return output;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNode.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNode.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNode.java
index 7378c96..6cbf231 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNode.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNode.java
@@ -24,7 +24,7 @@ package org.apache.airavata.workflow.core.dag.nodes;
import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.workflow.core.dag.port.InPort;
-public interface OutputNode extends WorkflowNode {
+public interface OutputNode extends WorkflowNode, InPort {
public OutputDataObjectType getOutputObject();
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java
index 5eada1c..d4c8780 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java
@@ -24,14 +24,21 @@ package org.apache.airavata.workflow.core.dag.nodes;
import org.apache.airavata.model.ComponentState;
import org.apache.airavata.model.ComponentStatus;
import org.apache.airavata.model.NodeModel;
+import org.apache.airavata.model.PortModel;
+import org.apache.airavata.model.application.io.DataType;
+import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
+import org.apache.airavata.workflow.core.dag.edge.Edge;
import org.apache.airavata.workflow.core.dag.port.InPort;
public class OutputNodeImpl implements OutputNode {
private NodeModel nodeModel;
private OutputDataObjectType outputDataObjectType;
- private InPort inPort;
+ private InputDataObjectType inputDataObjectType;
+ private PortModel portModel;
+ private String value;
+ private DataType dataType;
public OutputNodeImpl(NodeModel nodeModel) {
this.nodeModel = nodeModel;
@@ -53,6 +60,21 @@ public class OutputNodeImpl implements OutputNode {
}
@Override
+ public DataType getDataType() {
+ return dataType;
+ }
+
+ @Override
+ public void setDataType(DataType dataType) {
+ this.dataType = dataType;
+ }
+
+ @Override
+ public String getNodeId() {
+ return getNode().getId();
+ }
+
+ @Override
public String getName() {
return getNodeModel().getName();
}
@@ -79,9 +101,29 @@ public class OutputNodeImpl implements OutputNode {
@Override
+ public void setPortModel(PortModel portModel) {
+ this.portModel = portModel;
+ }
+
+ @Override
+ public PortModel getPortModel() {
+ return portModel;
+ }
+
+ @Override
public boolean isReady() {
- return !(inPort.getInputObject() == null || inPort.getInputObject().getValue() == null
- || inPort.getInputObject().getValue().equals(""));
+ return !(getInputObject() == null || getInputObject().getValue() == null
+ || getInputObject().getValue().equals(""));
+ }
+
+ @Override
+ public WorkflowNode getNode() {
+ return this;
+ }
+
+ @Override
+ public void setNode(WorkflowNode workflowNode) {
+ // OutputNode is a workflow Node.
}
@Override
@@ -96,13 +138,50 @@ public class OutputNodeImpl implements OutputNode {
@Override
public InPort getInPort() {
- return this.inPort;
+ return this;
}
@Override
public void setInPort(InPort inPort) {
- this.inPort = inPort;
+ // outputNode is an inPort.
}
+ @Override
+ public void setInputObject(InputDataObjectType inputObject) {
+ this.inputDataObjectType = inputObject;
+ setOutputObject(convert(inputObject));
+ }
+
+ private OutputDataObjectType convert(InputDataObjectType inputObject) {
+ OutputDataObjectType output = new OutputDataObjectType(getName());
+ output.setValue(inputObject.getValue());
+ output.setType(inputObject.getType());
+ return output;
+ }
+
+ @Override
+ public InputDataObjectType getInputObject() {
+ return inputDataObjectType;
+ }
+
+ @Override
+ public Edge getEdge() {
+ return null;
+ }
+
+ @Override
+ public void addEdge(Edge edge) {
+
+ }
+
+ @Override
+ public String getDefaultValue() {
+ return value;
+ }
+
+ @Override
+ public void setDefaultValue(String defaultValue) {
+ value = defaultValue;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/InputPortIml.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/InputPortIml.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/InputPortIml.java
index 3f5d036..8373c4b 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/InputPortIml.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/InputPortIml.java
@@ -20,6 +20,7 @@
package org.apache.airavata.workflow.core.dag.port;
import org.apache.airavata.model.PortModel;
+import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.workflow.core.dag.edge.Edge;
import org.apache.airavata.workflow.core.dag.nodes.WorkflowNode;
@@ -31,6 +32,7 @@ public class InputPortIml implements InPort {
private Edge edge;
private WorkflowNode node;
private PortModel portModel;
+ private DataType dataType;
public InputPortIml(PortModel portModel) {
this.portModel = portModel;
@@ -98,4 +100,19 @@ public class InputPortIml implements InPort {
return getPortModel().getPortId();
}
+ @Override
+ public DataType getDataType() {
+ return dataType;
+ }
+
+ @Override
+ public void setDataType(DataType dataType) {
+ this.dataType = dataType;
+ }
+
+ @Override
+ public String getNodeId() {
+ return getNode().getId();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/OutPortImpl.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/OutPortImpl.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/OutPortImpl.java
index c261279..e8c8e74 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/OutPortImpl.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/OutPortImpl.java
@@ -22,6 +22,7 @@
package org.apache.airavata.workflow.core.dag.port;
import org.apache.airavata.model.PortModel;
+import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.workflow.core.dag.edge.Edge;
import org.apache.airavata.workflow.core.dag.nodes.WorkflowNode;
@@ -36,6 +37,7 @@ public class OutPortImpl implements OutPort {
private boolean isSatisfy = false;
private WorkflowNode node;
private PortModel portModel;
+ private DataType dataType;
public OutPortImpl(PortModel portModel) {
this.portModel = portModel;
@@ -91,4 +93,19 @@ public class OutPortImpl implements OutPort {
public String getId() {
return getPortModel().getPortId();
}
+
+ @Override
+ public DataType getDataType() {
+ return dataType;
+ }
+
+ @Override
+ public void setDataType(DataType dataType) {
+ this.dataType = dataType;
+ }
+
+ @Override
+ public String getNodeId() {
+ return getNode().getId();
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/Port.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/Port.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/Port.java
index 9fda882..0b37911 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/Port.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/port/Port.java
@@ -22,6 +22,7 @@
package org.apache.airavata.workflow.core.dag.port;
import org.apache.airavata.model.PortModel;
+import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.workflow.core.dag.nodes.WorkflowNode;
public interface Port {
@@ -37,5 +38,11 @@ public interface Port {
public void setNode(WorkflowNode workflowNode);
public String getId();
+
+ public DataType getDataType();
+
+ public void setDataType(DataType dataType);
+
+ public String getNodeId();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java
index 7484f7e..37e82c0 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java
@@ -27,6 +27,7 @@ import com.google.gson.stream.JsonToken;
import org.apache.airavata.model.EdgeModel;
import org.apache.airavata.model.NodeModel;
import org.apache.airavata.model.PortModel;
+import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.workflow.core.WorkflowInfo;
import org.apache.airavata.workflow.core.dag.edge.DirectedEdge;
import org.apache.airavata.workflow.core.dag.edge.Edge;
@@ -49,8 +50,12 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
public class JsonWorkflowParser implements WorkflowParser {
@@ -110,15 +115,132 @@ public class JsonWorkflowParser implements WorkflowParser {
}
jsonReader.endObject();
- buildWorkflowDAG();
+ buildWorkflowGraph();
return workflowInfo;
}
- private void buildWorkflowDAG() {
+ private void buildWorkflowGraph() throws Exception {
// TODO construct runtime model
+ Queue<WorkflowNode> queue = new LinkedList<>();
+ queue.addAll(inputs);
+
+ Map<String, List<Link>> linkMap = getEdgesMap(links);
+ Map<String, InPort> nodeInportMap = getNodeInPortsMap(getApplicationNodes());
+ nodeInportMap.putAll(getNodeInPortMap(getOutputNodes()));
+ Set<String> processedNodes = new HashSet<>();
+
+ while (!queue.isEmpty()) {
+ WorkflowNode node = queue.poll();
+ if (processedNodes.contains(node.getId())) {
+ continue;
+ }
+
+ if (node instanceof InputNode) {
+ InputNode input = ((InputNode) node);
+ OutPort outPort = ((OutPort) node);
+ Map<String,Edge> edgeMap = addEdges(outPort, linkMap.get(outPort.getNodeId() + "," + outPort.getId()));
+
+ for (Map.Entry<String, Edge> entry : edgeMap.entrySet()) {
+ InPort inPort = nodeInportMap.get(entry.getKey());
+ if (inPort != null) {
+ inPort.addEdge(entry.getValue());
+ entry.getValue().setToPort(inPort);
+
+ queue.add(inPort.getNode());
+ }
+ }
+
+ } else if (node instanceof ApplicationNode) {
+ ApplicationNode appNode = ((ApplicationNode) node);
+ for (OutPort outPort : appNode.getOutputPorts()) {
+ outPort.setNode(appNode);
+ Map<String, Edge> edgeMap = addEdges(outPort, linkMap.get(outPort.getNodeId() + "," + outPort.getId()));
+
+ for (Map.Entry<String, Edge> entry : edgeMap.entrySet()) {
+ InPort inPort = nodeInportMap.get(entry.getKey());
+ if (inPort != null) {
+ inPort.addEdge(entry.getValue());
+ entry.getValue().setToPort(inPort);
+
+ queue.add(inPort.getNode());
+ }
+ }
+ }
+ } else if (node instanceof OutputNode) {
+ OutputNode outputNode = ((OutputNode) node);
+ InPort inPort = ((InPort) node);
+ outputNode.setInputObject(inPort.getInputObject());
+
+ }
+ // marke node as precessed node, we don't need to process it again.
+ processedNodes.add(node.getId());
+ }
+
+ }
+
+ private Map<String, InPort> getNodeInPortMap(List<OutputNode> outputNodes) {
+ Map<String, InPort> nodeInPortsMap = new HashMap<>();
+ if (outputNodes != null) {
+ for (OutputNode outputNode : outputNodes) {
+ InPort inPort = outputNode.getInPort();
+ inPort.setNode(outputNode);
+ nodeInPortsMap.put(outputNode.getId() + "," + inPort.getId(), inPort);
+ }
+ }
+ return nodeInPortsMap;
+ }
+
+ private Map<String, InPort> getNodeInPortsMap(List<ApplicationNode> applicationNodes) {
+ Map<String, InPort> nodeInPortsMap = new HashMap<>();
+ if (applicationNodes != null) {
+ for (ApplicationNode applicationNode : applicationNodes) {
+ for (InPort inPort : applicationNode.getInputPorts()) {
+ inPort.setNode(applicationNode);
+ nodeInPortsMap.put(applicationNode.getId() + "," + inPort.getId(), inPort);
+ }
+ }
+ }
+ return nodeInPortsMap;
+ }
+
+ /**
+ *
+ * @param outPort -
+ * @param links -
+ * @return key: nodeId,inportId value : link
+ */
+ private Map<String, Edge> addEdges(OutPort outPort, List<Link> links) {
+ Map<String, Edge> inPortMap = new HashMap<>();
+ if (links != null) {
+ for (Link link : links) {
+ EdgeModel edgeModel = new EdgeModel(link.getId());
+ Edge edge = new DirectedEdge(edgeModel);
+ edge.setFromPort(outPort);
+ outPort.addEdge(edge);
+ inPortMap.put(link.getTo().getNodeId() + "," + link.getTo().getPortId(), edge);
+ }
+ }
+ return inPortMap;
+ }
+
+ private Map<String, List<Link>> getEdgesMap(List<Link> links) {
+ Map<String, List<Link>> map = new HashMap<>();
+ List<Link> linkList;
+ for (Link link : links) {
+ linkList = map.get(link.from.getNodeId() + "," + link.from.getPortId());
+ if (linkList == null) {
+ linkList = new ArrayList<>();
+ }
+
+ linkList.add(link);
+ map.put(link.from.getNodeId() + "," + link.from.getPortId(), linkList);
+ }
+
+ return map;
}
+
private void readWorkflowInfo(JsonReader jsonReader) throws IOException, ParserException {
jsonReader.beginObject();
String name;
@@ -178,13 +300,15 @@ public class JsonWorkflowParser implements WorkflowParser {
} else if (name.equals(ID)) {
nodeModel.setNodeId(jsonReader.nextString());
} else if (name.equals(DATATYPE)) {
- jsonReader.skipValue();
+ inputNode.setDataType(DataType.valueOf(jsonReader.nextString()));
} else if (name.equals(DESCRIPTION)) {
nodeModel.setDescription(jsonReader.nextString());
} else if (name.equals(POSITION)) {
readPosition(jsonReader);
} else if (name.equals(NODE_ID)) {
nodeModel.setNodeId(jsonReader.nextString());
+ } else if (name.equals(DEFAULT_VALUE)) {
+ inputNode.setValue(jsonReader.nextString());
} else {
jsonReader.skipValue();
}
@@ -263,7 +387,7 @@ public class JsonWorkflowParser implements WorkflowParser {
private Link readLink(JsonReader jsonReader) throws IOException {
jsonReader.beginObject();
String name = null;
- Link link = new Link(null, null);
+ Link link = new Link();
while (jsonReader.hasNext()) {
name = jsonReader.nextName();
if (name.equals(DESCRIPTION)) {
@@ -272,6 +396,8 @@ public class JsonWorkflowParser implements WorkflowParser {
link.setFrom(readLinkHelper(jsonReader));
} else if (name.equals(TO)) {
link.setTo(readLinkHelper(jsonReader));
+ } else if (name.equals(ID)) {
+ link.setId(jsonReader.nextString());
} else {
jsonReader.skipValue();
}
@@ -288,8 +414,8 @@ public class JsonWorkflowParser implements WorkflowParser {
name = jsonReader.nextName();
if (name.equals(NODE_ID)) {
helper.setNodeId(jsonReader.nextString());
- } else if (name.equals(OUTPUT_ID)) {
- helper.setOutputId(jsonReader.nextString());
+ } else if (name.equals(OUTPUT_ID) || name.equals(INPUT_ID)) {
+ helper.setPortId(jsonReader.nextString());
} else {
jsonReader.skipValue();
}
@@ -549,17 +675,14 @@ public class JsonWorkflowParser implements WorkflowParser {
public static final String FROM = "from";
public static final String TO = "to";
public static final String OUTPUT_ID = "outputId";
+ public static final String INPUT_ID = "inputId";
class Link {
private LinkHelper from;
private LinkHelper to;
private String description;
-
- public Link(LinkHelper from, LinkHelper to) {
- this.from = from;
- this.to = to;
- }
+ private String id;
public String getDescription() {
return description;
@@ -576,11 +699,27 @@ public class JsonWorkflowParser implements WorkflowParser {
public void setTo(LinkHelper to) {
this.to = to;
}
+
+ public LinkHelper getFrom() {
+ return from;
+ }
+
+ public LinkHelper getTo() {
+ return to;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
}
class LinkHelper {
private String nodeId;
- private String outputId;
+ private String portId;
public String getNodeId() {
return nodeId;
@@ -590,12 +729,12 @@ public class JsonWorkflowParser implements WorkflowParser {
this.nodeId = nodeId;
}
- public String getOutputId() {
- return outputId;
+ public String getPortId() {
+ return portId;
}
- public void setOutputId(String outputId) {
- this.outputId = outputId;
+ public void setPortId(String portId) {
+ this.portId = portId;
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/38c2c36e/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json b/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json
index 0dd4b35..d9c3a0c 100644
--- a/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json
+++ b/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json
@@ -68,18 +68,22 @@
"nodeId" : "defaultOutputNodeId_2" }
],
"links" : [
- { "description" : "link desc",
- "from" : { "nodeId" : "" , "outputId" : "" },
- "to" : { "nodeId" : "" , "outputId" : "" }},
- { "description" : "link desc",
- "from" : { "nodeId" : "" , "outputId" : "" },
- "to" : { "nodeId" : "" , "outputId" : "" }},
- { "description" : "link desc",
- "from" : { "nodeId" : "" , "outputId" : "" },
- "to" : { "nodeId" : "" , "outputId" : "" }},
- { "description" : "link desc",
- "from" : { "nodeId" : "" , "outputId" : "" },
- "to" : { "nodeId" : "" , "outputId" : "" }}
+ { "id" : "link_1",
+ "description" : "link desc",
+ "from" : { "nodeId" : "" , "outputId" : "" },
+ "to" : { "nodeId" : "" , "inputId" : "" }},
+ { "id" : "link_2",
+ "description" : "link desc",
+ "from" : { "nodeId" : "" , "outputId" : "" },
+ "to" : { "nodeId" : "" , "inputId" : "" }},
+ { "id" : "link_3",
+ "description" : "link desc",
+ "from" : { "nodeId" : "" , "outputId" : "" },
+ "to" : { "nodeId" : "" , "inputId" : "" }},
+ { "id" : "link_4",
+ "description" : "link desc",
+ "from" : { "nodeId" : "" , "outputId" : "" },
+ "to" : { "nodeId" : "" , "inputId" : "" }}
]
}
}
[10/11] airavata git commit: fixing AIRAVATA-1892
Posted by ch...@apache.org.
fixing AIRAVATA-1892
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fa6b4d8e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fa6b4d8e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fa6b4d8e
Branch: refs/heads/master
Commit: fa6b4d8e2d2ed000c2fa3bc64045b5b7c8dcc71c
Parents: 2c2d63d
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Feb 18 10:48:07 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Feb 18 10:48:07 2016 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa6b4d8e/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 0a2d207..3a59fc5 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -780,7 +780,7 @@ public class GFacUtils {
int number = new SecureRandom().nextInt();
number = (number < 0 ? -number : number);
- tempJobFile = new File(GFacUtils.getLocalDataDir(taskContext), Integer.toString(number) +
+ tempJobFile = new File(GFacUtils.getLocalDataDir(taskContext), "job_" + Integer.toString(number) +
jobManagerConfiguration.getScriptExtension());
FileUtils.writeStringToFile(tempJobFile, scriptContent);
return tempJobFile;
[02/11] airavata git commit: adding deleting storage resource data
movements
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index 1fd0a86..9506f86 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index 6658673..ca81ec7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index b5b31dc..9c573e4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
index 58991af..e348241 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
index 3bbf0e2..d792b40 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
index 4f90002..6094749 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
index 225d9f6..2fbe521 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index f084438..257aaa3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
index 54df732..5397e49 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
index d04730d..8fb822f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
index 25a4b80..2a6c697 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
index f5882f0..8654ae5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
index 646a3b0..0393349 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
index 2770672..aae48e2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
index 10b3e39..7b6448c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
index 59a0772..74875cc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
index 6308423..a60b76e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
index ebb50b1..8e2cc40 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* the same. Example: *@*.example.com or *@example.com
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
index 845d5bd..872b71f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index 8f491e5..9318707 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
* default credential store.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
index 50afe23..5d9e8a0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* List of resource preferences for each of the registered compute resources.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
index a45eade..b757b2d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index c35418e..c41f948 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
index aa6c336..5c490be 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
index b8aadc9..6efb3e7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
index 5256129..06fb01e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ErrorModel implements org.apache.thrift.TBase<ErrorModel, ErrorModel._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
index bcc5409..ab2119c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
index 70a9300..e73157e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* during the experiment launch operation
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index 7c292ff..4bddfe0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
index 8186dd4..661f543 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
index 996adcd..f0659c6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
index f26fc17..a8a416e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
index 72a90ff..12ce83c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
index 133e785..654a28d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
index 072c6b8..8725646 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class DataResourceModel implements org.apache.thrift.TBase<DataResourceModel, DataResourceModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataResourceModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataResourceModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
index 78a77fe..4e0304e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class AiravataClientException extends TException implements org.apache.thrift.TBase<AiravataClientException, AiravataClientException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataClientException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataClientException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
index 234fed7..5fff620 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class AiravataSystemException extends TException implements org.apache.thrift.TBase<AiravataSystemException, AiravataSystemException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataSystemException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataSystemException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
index 60aa2eb..bf47b25 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the cause of the authorization failure.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
index 0171222..021603a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the authorization failure message
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
index fe4a7db..f36643c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
* key: The value passed from the client in the identifier, which was not found.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ExperimentNotFoundException extends TException implements org.apache.thrift.TBase<ExperimentNotFoundException, ExperimentNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
index 93e1ddb..347fc16 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the associated error message.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class InvalidRequestException extends TException implements org.apache.thrift.TBase<InvalidRequestException, InvalidRequestException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidRequestException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidRequestException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
index 261b25e..d1f2c4c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class LaunchValidationException extends TException implements org.apache.thrift.TBase<LaunchValidationException, LaunchValidationException._Fields>, java.io.Serializable, Cloneable, Comparable<LaunchValidationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LaunchValidationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
index 6f20575..f43093c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ProjectNotFoundException extends TException implements org.apache.thrift.TBase<ProjectNotFoundException, ProjectNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ProjectNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProjectNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
index 4fe78c7..461ea69 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class TimedOutException extends TException implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimedOutException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
index 52c26e9..8eee059 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
index be375ff..622a539 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index 4de630b..b078a44 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel, ExperimentModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
index ffca7a4..39989f6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
index b4837d9..0f33b6d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ExperimentSummaryModel implements org.apache.thrift.TBase<ExperimentSummaryModel, ExperimentSummaryModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentSummaryModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentSummaryModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
index 5091cf0..0d6b216 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class UserConfigurationDataModel implements org.apache.thrift.TBase<UserConfigurationDataModel, UserConfigurationDataModel._Fields>, java.io.Serializable, Cloneable, Comparable<UserConfigurationDataModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserConfigurationDataModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
index d62b842..484f0c1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
index 56177a9..7711d95 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<ExperimentStatusChangeEvent, ExperimentStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
index 980b477..4c501f3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class JobIdentifier implements org.apache.thrift.TBase<JobIdentifier, JobIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<JobIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
index 2bd311b..3150197 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusChangeEvent, JobStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
index 8b3717a..459f1f9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobStatusChangeRequestEvent, JobStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/64a38753/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 4ef449d..2e4339d 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 4c4dbbf..23cbbb6 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 f6bc9c2..887b4c1 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 fefa146..17586d3 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 b36b681..051e238 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 9b15ff6..ac6443b 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 883a9e9..01f1725d 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 af54a6c..c387843 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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/64a38753/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 91f853b..40a0d65 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.3)", date = "2016-02-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
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");