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/08 17:43:01 UTC

[01/10] airavata git commit: update generated code and fixing compilation issues

Repository: airavata
Updated Branches:
  refs/heads/develop b4ca1eb5a -> 4c7907706


http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 d9ac26b..b4837d9 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 5629c80..5091cf0 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 8a285a2..d62b842 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 19e47e6..56177a9 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 db6d647..980b477 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 f8e8ae1..2bd311b 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 5351eb6..8b3717a 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 1c7cff4..4ef449d 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 54ca8ed..4c4dbbf 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 ba08d22..f6bc9c2 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 b31a3e8..fefa146 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 295eafc..b36b681 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 6cb3ce8..9b15ff6 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 331c487..883a9e9 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 e29f3fd..af54a6c 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 0f1afce..91f853b 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 8abd6fa..c5ecf6c 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 9ba0c30..c055a52 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 f6dfa61..a66ad1b 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 b58b053..b5e2264 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 668271a..d7bcc3c 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 3d3f1a8..f3c4511 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 65648f7..0393545 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 9812e13..1a17bef 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 f137daa..2fcd7d6 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 5f2f962..18d8450 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 27eaf94..e54f4c7 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 f435e5b..a2e9dc1 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 83f7662..4b899a2 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 dec3a3a..532313f 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 428ee9f..abefca3 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 e11ddf3..bdcb7b7 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 d709357..0570b5d 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java
index e5e1d0c..e8456e9 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.core.workflow.catalog.impl;
 
-import org.apache.airavata.model.Workflow;
+import org.apache.airavata.model.WorkflowModel;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.registry.core.workflow.catalog.resources.*;
@@ -55,7 +55,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
     }
 
     @Override
-    public Workflow getWorkflow(String workflowTemplateId) throws WorkflowCatalogException {
+    public WorkflowModel getWorkflow(String workflowTemplateId) throws WorkflowCatalogException {
         try {
             WorkflowResource resource = new WorkflowResource();
             WorkflowResource wfResource = (WorkflowResource)resource.get(workflowTemplateId);
@@ -78,7 +78,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
     }
 
     @Override
-    public String registerWorkflow(Workflow workflow, String gatewayId) throws WorkflowCatalogException {
+    public String registerWorkflow(WorkflowModel workflow, String gatewayId) throws WorkflowCatalogException {
         try {
             WorkflowResource resource = new WorkflowResource();
             resource.setWfTemplateId(WorkflowCatalogUtils.getID(workflow.getName()));
@@ -132,7 +132,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
     }
 
     @Override
-    public void updateWorkflow(String workflowTemplateId, Workflow workflow) throws WorkflowCatalogException {
+    public void updateWorkflow(String workflowTemplateId, WorkflowModel workflow) throws WorkflowCatalogException {
         try {
             WorkflowResource resource = new WorkflowResource();
             WorkflowResource existingWF = (WorkflowResource)resource.get(workflowTemplateId);

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogThriftConversion.java
index 68b42e3..82fdaa2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogThriftConversion.java
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.core.workflow.catalog.utils;
 
-import org.apache.airavata.model.Workflow;
+import org.apache.airavata.model.WorkflowModel;
 import org.apache.airavata.model.application.io.DataType;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.registry.core.workflow.catalog.resources.WorkflowCatAbstractResource;
@@ -59,8 +59,8 @@ public class WorkflowCatalogThriftConversion {
         return inputResources;
     }
 
-    public static Workflow getWorkflow (WorkflowResource resource) throws WorkflowCatalogException {
-        Workflow workflow = new Workflow();
+    public static WorkflowModel getWorkflow (WorkflowResource resource) throws WorkflowCatalogException {
+        WorkflowModel workflow = new WorkflowModel();
         workflow.setTemplateId(resource.getWfTemplateId());
         workflow.setGraph(resource.getGraph());
         workflow.setName(resource.getWfName());

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java
index ae7f839..49ae4a2 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java
@@ -22,6 +22,7 @@
 package org.apache.airavata.registry.cpi;
 
 
+import org.apache.airavata.model.WorkflowModel;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 
 import java.util.List;
@@ -30,13 +31,13 @@ public interface WorkflowCatalog {
 
     public List<String> getAllWorkflows(String gatewayId) throws WorkflowCatalogException;
 
-    public org.apache.airavata.model.Workflow getWorkflow(String workflowTemplateId) throws WorkflowCatalogException;
+    public WorkflowModel getWorkflow(String workflowTemplateId) throws WorkflowCatalogException;
 
     public void deleteWorkflow(String workflowTemplateId) throws WorkflowCatalogException;
 
-    public String registerWorkflow(org.apache.airavata.model.Workflow workflow, String gatewayId) throws WorkflowCatalogException;
+    public String registerWorkflow(WorkflowModel workflow, String gatewayId) throws WorkflowCatalogException;
 
-    public void updateWorkflow(String workflowTemplateId, org.apache.airavata.model.Workflow workflow) throws WorkflowCatalogException;
+    public void updateWorkflow(String workflowTemplateId, WorkflowModel workflow) throws WorkflowCatalogException;
 
     public String getWorkflowTemplateId(String workflowName) throws WorkflowCatalogException;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 a49564f..8e11897 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -2904,7 +2904,7 @@ service Airavata {
    *
   */
 
-  workflow_data_model.Workflow getWorkflow (1: required security_model.AuthzToken authzToken, 2: required string workflowTemplateId)
+  workflow_data_model.WorkflowModel getWorkflow (1: required security_model.AuthzToken authzToken, 2: required string workflowTemplateId)
         throws (1: airavata_errors.InvalidRequestException ire,
                 2: airavata_errors.AiravataClientException ace,
                 3: airavata_errors.AiravataSystemException ase,
@@ -2917,14 +2917,14 @@ service Airavata {
                 4: airavata_errors.AuthorizationException ae)
 
   string registerWorkflow(1: required security_model.AuthzToken authzToken, 2: required string gatewayId,
-                          3: required workflow_data_model.Workflow workflow)
+                          3: required workflow_data_model.WorkflowModel workflow)
           throws (1: airavata_errors.InvalidRequestException ire,
                   2: airavata_errors.AiravataClientException ace,
                   3: airavata_errors.AiravataSystemException ase,
                   4: airavata_errors.AuthorizationException ae)
 
   void updateWorkflow (1: required security_model.AuthzToken authzToken, 2: required string workflowTemplateId,
-                       3: required workflow_data_model.Workflow workflow)
+                       3: required workflow_data_model.WorkflowModel workflow)
           throws (1: airavata_errors.InvalidRequestException ire,
                   2: airavata_errors.AiravataClientException ace,
                   3: airavata_errors.AiravataSystemException ase,


[07/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 3fabb7d..ee0d60d 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
@@ -210,6 +210,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Get a Public Key by Providing the Token
    * 
    * @param CredStoreToken
@@ -231,6 +232,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Get all Public Keys of the Gateway
    * 
    * @param CredStoreToken
@@ -252,6 +254,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Delete a Gateway
    * 
    * @param gatewayId
@@ -272,6 +275,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Creates a Project with basic metadata.
    *    A Project is a container of experiments.
    * 
@@ -279,7 +283,7 @@ class AiravataHandler : virtual public AiravataIf {
    *    The identifier for the requested gateway.
    * 
    * @param Project
-   *    The Project Object described in the workspace_model
+   *    The Project Object described in the workspace_model.
    * 
    * 
    * 
@@ -293,6 +297,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update an Existing Project
    * 
    * @param projectId
@@ -313,14 +318,15 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Get a Project by ID
-   *    This method is to obtain a project by providing a projectId
+   *    This method is to obtain a project by providing a projectId.
    * 
    * @param projectId
-   *    projectId of the project you require
+   *    projectId of the project you require.
    * 
    * @return project
-   *    project data model will be returned
+   *    project data model will be returned.
    * 
    * 
    * 
@@ -333,15 +339,18 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Delete a Project
-   *    This method is used to delete an existing Project
+   *    This method is used to delete an existing Project.
    * 
    * @param projectId
-   *    projectId of the project you want to delete
+   *    projectId of the project you want to delete.
    * 
    * @return boolean
    *    Boolean identifier for the success or failure of the deletion operation.
    * 
+   *    NOTE: This method is not used within gateways connected with Airavata.
+   * 
    * 
    * 
    * @param authzToken
@@ -353,20 +362,21 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Get all Project by user with pagination. Results will be ordered based
-   * on creation time DESC
+   * 
+   * Get All User Projects
+   * Get all Project for the user with pagination. Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
    *    The identifier for the requested gateway.
    * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
    * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
    * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
    * 
    * 
    * 
@@ -382,19 +392,25 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Get all Project for user by project name with pagination.Results will be ordered based
-   * on creation time DESC
+   * 
+   * Search User Projects by Project Name
+   * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
-   *    The identifier for the requested gateway.
+   *    The unique identifier for the requested gateway.
+   * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
+   * 
    * @param projectName
-   *    The name of the project on which the results to be fetched
+   *    The name of the project on which the results to be fetched.
+   * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
+   * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -410,19 +426,25 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Search and get all Projects for user by project description with pagination. Results
-   * will be ordered based on creation time DESC
+   * 
+   * Search User Projects by Project Description
+   * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
-   *    The identifier for the requested gateway.
+   *    The unique identifier of the gateway making the request.
+   * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
+   * 
    * @param description
-   *    The description to be matched
+   *    The description to be matched.
+   * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
+   * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -438,19 +460,25 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Search Experiments by experiment name with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by Name
+   * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user who created the experiments.
+   * 
    * @param expName
-   *       Experiment name to be matched
+   *       Experiment name to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -466,19 +494,25 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Search Experiments by experiment name with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search By Experiment Description
+   * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param description
-   *       Experiment description to be matched
+   *       Experiment description to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -494,19 +528,25 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Search Experiments by application id with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search Experiment By the Application
+   * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param applicationId
-   *       Application id to be matched
+   *       Application id to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -522,19 +562,25 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Search Experiments by experiment status with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by Status
+   * Search all the Experiments of the given user  by experiment status with pagination. Results will be sorted based on creation time DESC
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user making the request.
+   * 
    * @param experimentState
-   *       Experiement state to be matched
+   *       Experiement state to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -550,21 +596,31 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Search Experiments by experiment creation time with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by the Creation Time
+   * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param fromTime
-   *       Start time of the experiments creation time
+   *       Start time of the experiments creation time.
+   * 
    * @param toTime
-   *       End time of the  experiement creation time
+   *       End time of the  experiement creation time.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
+   * @return ExperimentSummaryModel
+   *    List of experiments for the given search filter. Here only the Experiment summary will be returned.
+   * 
    * 
    * 
    * @param authzToken
@@ -581,19 +637,27 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Search Experiments by using multiple filter criteria with pagination. Results will be sorted
-   * based on creation time DESC
+   * Search Experiments.
+   * Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user requesting the search function.
+   * 
    * @param filters
-   *       map of multiple filter criteria.
+   *       Map of multiple filter criteria. Currenlt search filters includes Experiment Name, Description, Application, etc....
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
+   * @return ExperimentSummaryModel
+   *    List of experiments for the given search filter. Here only the Experiment summary will be returned.
+   * 
    * 
    * 
    * @param authzToken
@@ -609,13 +673,19 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Get Experiment Statisitics for the given gateway for a specific time period
+   * 
+   * Get Experiment Statistics
+   * Get Experiment Statisitics for a given gateway for a specific time period. This feature is available only for admins of a particular gateway. Gateway admin access is managed by the user roles.
+   * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the gateway making the request to fetch statistics.
+   * 
    * @param fromTime
-   *       Starting date time
+   *       Starting date time.
+   * 
    * @param toTime
-   *       Ending data time
+   *       Ending data time.
+   * 
    * 
    * 
    * @param authzToken
@@ -629,15 +699,19 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Get Experiments within project with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Get All Experiments of the Project
+   * Get Experiments within project with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param projectId
-   *       Identifier of the project
+   *       Uniqie identifier of the project.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -651,17 +725,22 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Get experiments by user with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Get All Experiments of the User
+   * Get experiments by user with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requesting gateway
+   *       Identifier of the requesting gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested end user.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -676,12 +755,17 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   *   *
+   *   * Create New Experiment
    *   * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
    *   *   but inferred from the sshKeyAuthentication header. This experiment is just a persistent place holder. The client
    *   *   has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
    *   *   registering the experiment in a persistent store.
    *   *
-   *   * @param basicExperimentMetadata
+   *   * @param gatewayId
+   *   *    The unique ID of the gateway where the experiment is been created.
+   *   *
+   *   * @param ExperimentModel
    *   *    The create experiment will require the basic experiment metadata like the name and description, intended user,
    *   *      the gateway identifer and if the experiment should be shared public by defualt. During the creation of an experiment
    *   *      the ExperimentMetadata is a required field.
@@ -721,8 +805,8 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Delete an Experiment
    * 
+   * Delete an Experiment
    * If the experiment is not already launched experiment can be deleted.
    * 
    * @param authzToken
@@ -731,7 +815,7 @@ class AiravataHandler : virtual public AiravataIf {
    *     Experiment ID of the experimnet you want to delete.
    * 
    * @return boolean
-   *     Identifier for the success or failure of the deletion operation
+   *     Identifier for the success or failure of the deletion operation.
    * 
    * 
    * 
@@ -744,12 +828,14 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   *   *
+   *   * Get Experiment
    *   * Fetch previously created experiment metadata.
    *   *
    *   * @param airavataExperimentId
-   *   *    The identifier for the requested experiment. This is returned during the create experiment step.
+   *   *    The unique identifier of the requested experiment. This ID is returned during the create experiment step.
    *   *
-   *   * @return experimentMetada
+   *   * @return ExperimentModel
    *   *   This method will return the previously stored experiment metadata.
    *   *
    *   * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -786,14 +872,17 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
+   * Get Complete Experiment Details
    * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
    * tasks -> jobs information.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
    * 
-   * @return experimentMetada
-   *   This method will return the previously stored experiment metadata.
+   * @return ExperimentModel
+   *   This method will return the previously stored experiment metadata including application input parameters, computational resource scheduling
+   *   information, special input output handling and additional quality of service parameters.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
    *    For any incorrect forming of the request itself.
@@ -828,14 +917,15 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Configure a previously created experiment with required inputs, scheduling and other quality of service
-   *   parameters. This method only updates the experiment object within the registry. The experiment has to be launched
-   *   to make it actionable by the server.
+   * 
+   * Update a Previously Created Experiment
+   * Configure the CREATED experiment with required inputs, scheduling and other quality of service parameters. This method only updates the experiment object within the registry.
+   * The experiment has to be launched to make it actionable by the server.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
    * 
-   * @param experimentConfigurationData
+   * @param ExperimentModel
    *    The configuration information of the experiment with application input parameters, computational resource scheduling
    *      information, special input output handling and additional quality of service parameters.
    * 
@@ -887,13 +977,14 @@ class AiravataHandler : virtual public AiravataIf {
 
   /**
    *  *
-   *  * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
-   *  *
-   *  * @param experimentId
+   *  * Validate experiment configuration.
+   *  * A true in general indicates, the experiment is ready to be launched.
    *  *
+   *  * @param airavataExperimentId
+   *  *    Unique identifier of the experiment (Experimnent ID) of the experiment which need to be validated.
    *  *
    *  * @return boolean
-   *  *      Identifier for the success or failure of the validation operation
+   *  *      Identifier for the success or failure of the validation operation.
    *  *
    * *
    * 
@@ -906,8 +997,12 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
-   *   notifications and intermediate and output data will be subsequently available for this experiment.
+   * 
+   * Launch a Previously Created & Configured Experiment.
+   * Airavata Server will then start processing the request and appropriate notifications and intermediate and output data will be subsequently available for this experiment.
+   * 
+   * @gatewayId
+   *    ID of the gateway which will launch the experiment.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
@@ -949,17 +1044,18 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Get Experiment Status
    * 
-   * Obtain the status os an experiment by providing the Experiment Id
+   * Obtain the status of an experiment by providing the Experiment Id
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you require the status
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you require the status.
    * 
    * @return ExperimentStatus
-   *     ExperimentStatus model with current status will be returned.
+   *     ExperimentStatus model with the current status will be returned.
    * 
    * 
    * 
@@ -972,16 +1068,17 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Get Experiment Outputs
-   * This method to be used when need to obtain outputs of a certain Experiment
+   * This method to be used when need to obtain final outputs of a certain Experiment
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you need the outputs
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you need the outputs.
    * 
    * @return list
-   *     List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+   *     List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
    * 
    * 
    * 
@@ -994,16 +1091,17 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Get Intermediate Experiment Outputs
    * This method to be used when need to obtain intermediate outputs of a certain Experiment
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you need the intermediate outputs
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you need intermediate outputs.
    * 
    * @return list
-   *     List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+   *     List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
    * 
    * 
    * 
@@ -1016,13 +1114,14 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Get Job Status for an Experiment
+   * 
+   * Get Job Statuses for an Experiment
    * This method to be used when need to get the job status of an Experiment. An experiment may have one or many jobs; there for one or many job statuses may turnup
    * 
    * @param authzToken
    * 
    * @param experiementId
-   *     Experiment ID of the experimnet you need the intermediate outputs
+   *     Experiment ID of the experimnet you need the job statuses.
    * 
    * @return JobStatus
    *     Job status (string) for all all the existing jobs for the experiment will be returned in the form of a map
@@ -1038,16 +1137,17 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Get Job Details for all the jobs within an Experiment
+   * 
+   * Get Job Details for all the jobs within an Experiment.
    * This method to be used when need to get the job details for one or many jobs of an Experiment.
    * 
    * @param authzToken
    * 
    * @param experiementId
-   *     Experiment ID of the experimnet you need job details
+   *     Experiment ID of the experimnet you need job details.
    * 
    * @return list of JobDetails
-   *     Job details
+   *     Job details.
    * 
    * 
    * 
@@ -1060,7 +1160,9 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
+   * 
+   * Clone an Existing Experiment
+   * Existing specified experiment is cloned and a new name is provided. A copy of the experiment configuration is made and is persisted with new metadata.
    *   The client has to subsequently update this configuration if needed and launch the cloned experiment.
    * 
    * @param newExperimentName
@@ -1072,7 +1174,7 @@ class AiravataHandler : virtual public AiravataIf {
    *      should be shared public by default.
    * 
    * @return
-   *   The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment.
+   *   The server-side generated.airavata.registry.core.experiment.globally unique identifier (Experiment ID) for the newly cloned experiment.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
    *    For any incorrect forming of the request itself.
@@ -1108,12 +1210,16 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Terminate a running experiment.
+   * 
+   * Terminate a running Experiment.
+   * 
+   * @gatewayId
+   *    ID of the gateway which will terminate the running Experiment.
    * 
    * @param airavataExperimentId
-   *    The identifier for the requested experiment. This is returned during the create experiment step.
+   *    The identifier of the experiment required termination. This ID is returned during the create experiment step.
    * 
-   * @return
+   * @return status
    *   This method call does not have a return value.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -1150,13 +1256,17 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Register a Application Module.
    * 
+   * @gatewayId
+   *    ID of the gateway which is registering the new Application Module.
+   * 
    * @param applicationModule
    *    Application Module Object created from the datamodel.
    * 
    * @return appModuleId
-   *   Returns a server-side generated airavata appModule globally unique identifier.
+   *   Returns the server-side generated airavata appModule globally unique identifier.
    * 
    * 
    * @param authzToken
@@ -1169,13 +1279,14 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Fetch a Application Module.
    * 
    * @param appModuleId
-   *   The identifier for the requested application module
+   *   The unique identifier of the application module required
    * 
    * @return applicationModule
-   *   Returns a application Module Object.
+   *   Returns an Application Module Object.
    * 
    * 
    * @param authzToken
@@ -1187,6 +1298,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update a Application Module.
    * 
    * @param appModuleId
@@ -1208,16 +1320,31 @@ class AiravataHandler : virtual public AiravataIf {
     printf("updateApplicationModule\n");
   }
 
+  /**
+   * 
+   * Fetch all Application Module Descriptions.
+   * 
+   * @param gatewayId
+   *    ID of the gateway which need to list all available application deployment documentation.
+   * 
+   * @return list
+   *    Returns the list of all Application Module Objects.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayId
+   */
   void getAllAppModules(std::vector< ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) {
     // Your implementation goes here
     printf("getAllAppModules\n");
   }
 
   /**
-   * Delete a Application Module.
+   * 
+   * Delete an Application Module.
    * 
    * @param appModuleId
-   *   The identifier for the requested application module to be deleted.
+   *   The identifier of the Application Module to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -1232,9 +1359,13 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Register a Application Deployment.
    * 
-   * @param applicationModule
+   * Register an Application Deployment.
+   * 
+   * @param gatewayId
+   *    ID of the gateway which is registering the new Application Deployment.
+   * 
+   * @param applicationDeployment
    *    Application Module Object created from the datamodel.
    * 
    * @return appDeploymentId
@@ -1251,6 +1382,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Fetch a Application Deployment.
    * 
    * @param appDeploymentId
@@ -1269,10 +1401,11 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Update a Application Deployment.
+   * 
+   * Update an Application Deployment.
    * 
    * @param appDeploymentId
-   *   The identifier for the requested application deployment to be updated.
+   *   The identifier of the requested application deployment to be updated.
    * 
    * @param appDeployment
    *    Application Deployment Object created from the datamodel.
@@ -1291,10 +1424,11 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Delete a Application deployment.
+   * 
+   * Delete an Application Deployment.
    * 
    * @param appDeploymentId
-   *   The identifier for the requested application deployment to be deleted.
+   *   The unique identifier of application deployment to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -1309,10 +1443,14 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Fetch all Application Deployment Descriptions.
    * 
+   * @param gatewayId
+   *    ID of the gateway which need to list all available application deployment documentation.
+   * 
    * @return list<applicationDeployment.
-   *   Returns the list of all application Deployment Objects.
+   *    Returns the list of all application Deployment Objects.
    * 
    * 
    * @param authzToken
@@ -1342,9 +1480,10 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Register a Application Interface.
    * 
-   * @param applicationModule
+   * @param applicationInterface
    *    Application Module Object created from the datamodel.
    * 
    * @return appInterfaceId
@@ -1360,20 +1499,42 @@ class AiravataHandler : virtual public AiravataIf {
     printf("registerApplicationInterface\n");
   }
 
+  /**
+   * 
+   * Clone an Application Interface.
+   * 
+   * @gatewayId
+   *    The identifier for the gateway profile to be requested
+   * 
+   * @param existingAppInterfaceID
+   *    Identifier of the existing Application interface you wich to clone.
+   * 
+   * @param newApplicationName
+   *    Name for the new application interface.
+   * 
+   * @return appInterfaceId
+   *    Returns a server-side generated globally unique identifier for the newly cloned application interface.
+   * 
+   * 
+   * @param authzToken
+   * @param existingAppInterfaceID
+   * @param newApplicationName
+   * @param gatewayId
+   */
   void cloneApplicationInterface(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& existingAppInterfaceID, const std::string& newApplicationName, const std::string& gatewayId) {
     // Your implementation goes here
     printf("cloneApplicationInterface\n");
   }
 
   /**
-   * Fetch a Application Interface.
+   * 
+   * Fetch an Application Interface.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application module
+   *   The identifier for the requested application interface.
    * 
    * @return applicationInterface
-   *   Returns a application Interface Object.
-   * 
+   *   Returns an application Interface Object.
    * 
    * 
    * @param authzToken
@@ -1385,10 +1546,11 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update a Application Interface.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application deployment to be updated.
+   *   The identifier of the requested application deployment to be updated.
    * 
    * @param appInterface
    *    Application Interface Object created from the datamodel.
@@ -1397,7 +1559,6 @@ class AiravataHandler : virtual public AiravataIf {
    *   Returns a success/failure of the update.
    * 
    * 
-   * 
    * @param authzToken
    * @param appInterfaceId
    * @param applicationInterface
@@ -1408,7 +1569,8 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Delete a Application Interface.
+   * 
+   * Delete an Application Interface.
    * 
    * @param appInterfaceId
    *   The identifier for the requested application interface to be deleted.
@@ -1417,7 +1579,6 @@ class AiravataHandler : virtual public AiravataIf {
    *   Returns a success/failure of the deletion.
    * 
    * 
-   * 
    * @param authzToken
    * @param appInterfaceId
    */
@@ -1427,11 +1588,12 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Fetch name and id of  Application Interface documents.
+   * 
+   * Fetch name and ID of  Application Interface documents.
    * 
    * 
    * @return map<applicationId, applicationInterfaceNames>
-   *   Returns a list of application interfaces with corresponsing id's
+   *   Returns a list of application interfaces with corresponsing ID's
    * 
    * 
    * @param authzToken
@@ -1443,11 +1605,12 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Fetch all Application Interface documents.
    * 
    * 
    * @return map<applicationId, applicationInterfaceNames>
-   *   Returns a list of application interfaces documents
+   *   Returns a list of application interfaces documents (Application Interface ID, name, description, Inputs and Outputs objects).
    * 
    * 
    * @param authzToken
@@ -1459,10 +1622,11 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Fetch the list of Application Inputs.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier of the application interface which need inputs to be fetched.
    * 
    * @return list<application_interface_model.InputDataObjectType>
    *   Returns a list of application inputs.
@@ -1477,10 +1641,11 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Fetch the list of Application Outputs.
+   * 
+   * Fetch list of Application Outputs.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier of the application interface which need outputs to be fetched.
    * 
    * @return list<application_interface_model.OutputDataObjectType>
    *   Returns a list of application outputs.
@@ -1495,14 +1660,15 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Fetch a list of all deployed Compute Hosts for a given application interfaces.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier for the requested application interface.
    * 
    * @return map<computeResourceId, computeResourceName>
    *   A map of registered compute resource id's and their corresponding hostnames.
-   *    Deployments of each modules listed within the interfaces will be listed.
+   *   Deployments of each modules listed within the interfaces will be listed.
    * 
    * 
    * @param authzToken
@@ -1550,6 +1716,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Fetch all registered Compute Resources.
    * 
    * @return A map of registered compute resource id's and thier corresponding hostnames.
@@ -1654,7 +1821,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * Update a Compute Resource.
+   * Update a Storage Resource.
    * 
    * @param storageResourceId
    *   The identifier for the requested compute resource to be updated.
@@ -1679,7 +1846,7 @@ class AiravataHandler : virtual public AiravataIf {
    * Delete a Storage Resource.
    * 
    * @param storageResourceId
-   *   The identifier for the requested compute resource to be deleted.
+   *   The identifier of the requested compute resource to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -1827,6 +1994,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Add a UNICORE Job Submission details to a compute resource
    *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
    * 
@@ -1854,10 +2022,13 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   *   *
    *   * This method returns UnicoreJobSubmission object
+   *   *
    *   * @param jobSubmissionInterfaceId
    *   *   The identifier of the JobSubmission Interface to be retrieved.
    *   *  @return UnicoreJobSubmission instance
+   *   *
    * *
    * 
    * @param authzToken
@@ -1869,6 +2040,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   *    *
    *    * Add a Cloud Job Submission details to a compute resource
    *    *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
    *    *
@@ -1883,6 +2055,7 @@ class AiravataHandler : virtual public AiravataIf {
    *    *
    *    * @return status
    *    *   Returns the unique job submission id.
+   *    *
    * *
    * 
    * @param authzToken
@@ -1896,6 +2069,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   *    *
    *    * This method returns cloudJobSubmission object
    *    * @param jobSubmissionInterfaceI
    *        *   The identifier of the JobSubmission Interface to be retrieved.
@@ -1911,6 +2085,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update the given SSH Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -1933,6 +2108,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update the cloud Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -1955,6 +2131,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update the UNIOCRE Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -1978,6 +2155,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Add a Local data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2010,6 +2188,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update the given Local data movement details
    * 
    * @param dataMovementInterfaceId
@@ -2033,7 +2212,8 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   * This method returns local datamovement object
+   * 
+   * This method returns local datamovement object.
    * 
    * @param dataMovementId
    *   The identifier of the datamovement Interface to be retrieved.
@@ -2051,6 +2231,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Add a SCP data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2079,6 +2260,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update the given scp data movement details
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2120,6 +2302,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Add a UNICORE data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2148,6 +2331,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Update a selected UNICORE data movement details
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2172,6 +2356,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * This method returns UNICORE datamovement object
    * 
    * @param dataMovementId
@@ -2190,6 +2375,7 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
+   * 
    * Add a GridFTP data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2453,7 +2639,7 @@ class AiravataHandler : virtual public AiravataIf {
    * Fetch the given Gateway Resource Profile.
    * 
    * @param gatewayID
-   *   The identifier for the requested gateway resource
+   *   The identifier for the requested gateway resource.
    * 
    * @return gatewayResourceProfile
    *    Gateway Resource Profile Object.
@@ -2534,12 +2720,35 @@ class AiravataHandler : virtual public AiravataIf {
     printf("addGatewayComputeResourcePreference\n");
   }
 
+  /**
+   * Add a Storage Resource Preference to a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be added.
+   * 
+   * @param storageResourceId
+   *   Preferences related to a particular compute resource
+   * 
+   * @param computeResourcePreference
+   *   The ComputeResourcePreference object to be added to the resource profile.
+   * 
+   * @return status
+   *   Returns a success/failure of the addition. If a profile already exists, this operation will fail.
+   *    Instead an update should be used.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   * @param storageResourceId
+   * @param storagePreference
+   */
   bool addGatewayStoragePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) {
     // Your implementation goes here
     printf("addGatewayStoragePreference\n");
   }
 
   /**
+   * 
    * Fetch a Compute Resource Preference of a registered gateway profile.
    * 
    * @param gatewayID
@@ -2561,12 +2770,31 @@ class AiravataHandler : virtual public AiravataIf {
     printf("getGatewayComputeResourcePreference\n");
   }
 
+  /**
+   * 
+   * Fetch a Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to request to fetch the particular storage resource preference.
+   * 
+   * @param storageResourceId
+   *   Identifier of the Stprage Preference required to be fetched.
+   * 
+   * @return StoragePreference
+   *   Returns the StoragePreference object.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   * @param storageResourceId
+   */
   void getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageResourceId) {
     // Your implementation goes here
     printf("getGatewayStoragePreference\n");
   }
 
   /**
+   * 
    * Fetch all Compute Resource Preferences of a registered gateway profile.
    * 
    * @param gatewayID
@@ -2584,13 +2812,31 @@ class AiravataHandler : virtual public AiravataIf {
     printf("getAllGatewayComputeResourcePreferences\n");
   }
 
+  /**
+   * Fetch all Storage Resource Preferences of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier for the gateway profile to be requested
+   * 
+   * @return StoragePreference
+   *   Returns the StoragePreference object.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   */
   void getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) {
     // Your implementation goes here
     printf("getAllGatewayStoragePreferences\n");
   }
 
   /**
-   * Fetch all gateway profiles registered
+   * 
+   * Fetch all Gateway Profiles registered
+   * 
+   * @return GatewayResourceProfile
+   *   Returns all the GatewayResourcePrifle list object.
+   * 
    * 
    * 
    * @param authzToken
@@ -2626,6 +2872,27 @@ class AiravataHandler : virtual public AiravataIf {
     printf("updateGatewayComputeResourcePreference\n");
   }
 
+  /**
+   * Update a Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be updated.
+   * 
+   * @param storageId
+   *   The Storage resource identifier of the one that you want to update
+   * 
+   * @param storagePreference
+   *   The storagePreference object to be updated to the resource profile.
+   * 
+   * @return status
+   *   Returns a success/failure of the updation.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   * @param storageId
+   * @param storagePreference
+   */
   bool updateGatewayStoragePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const  ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) {
     // Your implementation goes here
     printf("updateGatewayStoragePreference\n");
@@ -2653,17 +2920,58 @@ class AiravataHandler : virtual public AiravataIf {
     printf("deleteGatewayComputeResourcePreference\n");
   }
 
+  /**
+   * Delete the Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be deleted.
+   * 
+   * @param storageId
+   *   ID of the storage preference you want to delete.
+   * 
+   * @return status
+   *   Returns a success/failure of the deletion.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   * @param storageId
+   */
   bool deleteGatewayStoragePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId) {
     // Your implementation goes here
     printf("deleteGatewayStoragePreference\n");
   }
 
+  /**
+   * Delete the Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be deleted.
+   * 
+   * @param storageId
+   *   ID of the storage preference you want to delete.
+   * 
+   * @return status
+   *   Returns a success/failure of the deletion.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayId
+   */
   void getAllWorkflows(std::vector<std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) {
     // Your implementation goes here
     printf("getAllWorkflows\n");
   }
 
-  void getWorkflow( ::Workflow& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) {
+  /**
+   * 
+   * API Methods Related for Work-Flow Submission Features.
+   * 
+   * 
+   * @param authzToken
+   * @param workflowTemplateId
+   */
+  void getWorkflow( ::WorkflowModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) {
     // Your implementation goes here
     printf("getWorkflow\n");
   }
@@ -2673,12 +2981,12 @@ class AiravataHandler : virtual public AiravataIf {
     printf("deleteWorkflow\n");
   }
 
-  void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow) {
+  void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow) {
     // Your implementation goes here
     printf("registerWorkflow\n");
   }
 
-  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow) {
+  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow) {
     // Your implementation goes here
     printf("updateWorkflow\n");
   }
@@ -2694,7 +3002,9 @@ class AiravataHandler : virtual public AiravataIf {
   }
 
   /**
-   *  * Data Manager Related API Methods
+   *  *
+   *  * Data Manager Related API Methods.
+   *  *
    * *
    * 
    * @param authzToken

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp
index 6c8c6cc..b87ae6d 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.cpp
@@ -30,40 +30,92 @@
 
 
 
+int _kWorkflowStateValues[] = {
+  WorkflowState::CREATED,
+  WorkflowState::STARTED,
+  WorkflowState::EXECUTING,
+  WorkflowState::COMPLETED,
+  WorkflowState::FAILED,
+  WorkflowState::CANCELLING,
+  WorkflowState::CANCELED
+};
+const char* _kWorkflowStateNames[] = {
+  "CREATED",
+  "STARTED",
+  "EXECUTING",
+  "COMPLETED",
+  "FAILED",
+  "CANCELLING",
+  "CANCELED"
+};
+const std::map<int, const char*> _WorkflowState_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kWorkflowStateValues, _kWorkflowStateNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
-Workflow::~Workflow() throw() {
+int _kComponentStateValues[] = {
+  ComponentState::CREATED,
+  ComponentState::WAITING,
+  ComponentState::READY,
+  ComponentState::RUNNING,
+  ComponentState::COMPLETED,
+  ComponentState::FAILED,
+  ComponentState::CANCELED
+};
+const char* _kComponentStateNames[] = {
+  "CREATED",
+  "WAITING",
+  "READY",
+  "RUNNING",
+  "COMPLETED",
+  "FAILED",
+  "CANCELED"
+};
+const std::map<int, const char*> _ComponentState_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kComponentStateValues, _kComponentStateNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+
+WorkflowModel::~WorkflowModel() throw() {
 }
 
 
-void Workflow::__set_templateId(const std::string& val) {
+void WorkflowModel::__set_templateId(const std::string& val) {
   this->templateId = val;
 }
 
-void Workflow::__set_name(const std::string& val) {
+void WorkflowModel::__set_name(const std::string& val) {
   this->name = val;
 }
 
-void Workflow::__set_graph(const std::string& val) {
+void WorkflowModel::__set_graph(const std::string& val) {
   this->graph = val;
-__isset.graph = true;
 }
 
-void Workflow::__set_image(const std::string& val) {
+void WorkflowModel::__set_gatewayId(const std::string& val) {
+  this->gatewayId = val;
+}
+
+void WorkflowModel::__set_createdUser(const std::string& val) {
+  this->createdUser = val;
+}
+
+void WorkflowModel::__set_image(const std::string& val) {
   this->image = val;
 __isset.image = true;
 }
 
-void Workflow::__set_workflowInputs(const std::vector< ::apache::airavata::model::application::io::InputDataObjectType> & val) {
+void WorkflowModel::__set_workflowInputs(const std::vector< ::apache::airavata::model::application::io::InputDataObjectType> & val) {
   this->workflowInputs = val;
 __isset.workflowInputs = true;
 }
 
-void Workflow::__set_workflowOutputs(const std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & val) {
+void WorkflowModel::__set_workflowOutputs(const std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & val) {
   this->workflowOutputs = val;
 __isset.workflowOutputs = true;
 }
 
-uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) {
+void WorkflowModel::__set_creationTime(const int64_t val) {
+  this->creationTime = val;
+__isset.creationTime = true;
+}
+
+uint32_t WorkflowModel::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -77,6 +129,9 @@ uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   bool isset_templateId = false;
   bool isset_name = false;
+  bool isset_graph = false;
+  bool isset_gatewayId = false;
+  bool isset_createdUser = false;
 
   while (true)
   {
@@ -105,20 +160,36 @@ uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) {
       case 3:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->graph);
-          this->__isset.graph = true;
+          isset_graph = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 4:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->createdUser);
+          isset_createdUser = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readBinary(this->image);
           this->__isset.image = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
-      case 5:
+      case 7:
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->workflowInputs.clear();
@@ -138,7 +209,7 @@ uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) {
           xfer += iprot->skip(ftype);
         }
         break;
-      case 6:
+      case 8:
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->workflowOutputs.clear();
@@ -158,6 +229,14 @@ uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) {
           xfer += iprot->skip(ftype);
         }
         break;
+      case 9:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->creationTime);
+          this->__isset.creationTime = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -171,13 +250,19 @@ uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) {
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_name)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_graph)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_gatewayId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_createdUser)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t Workflow::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t WorkflowModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Workflow");
+  xfer += oprot->writeStructBegin("WorkflowModel");
 
   xfer += oprot->writeFieldBegin("templateId", ::apache::thrift::protocol::T_STRING, 1);
   xfer += oprot->writeString(this->templateId);
@@ -187,18 +272,25 @@ uint32_t Workflow::write(::apache::thrift::protocol::TProtocol* oprot) const {
   xfer += oprot->writeString(this->name);
   xfer += oprot->writeFieldEnd();
 
-  if (this->__isset.graph) {
-    xfer += oprot->writeFieldBegin("graph", ::apache::thrift::protocol::T_STRING, 3);
-    xfer += oprot->writeString(this->graph);
-    xfer += oprot->writeFieldEnd();
-  }
+  xfer += oprot->writeFieldBegin("graph", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->graph);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 4);
+  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("createdUser", ::apache::thrift::protocol::T_STRING, 5);
+  xfer += oprot->writeString(this->createdUser);
+  xfer += oprot->writeFieldEnd();
+
   if (this->__isset.image) {
-    xfer += oprot->writeFieldBegin("image", ::apache::thrift::protocol::T_STRING, 4);
+    xfer += oprot->writeFieldBegin("image", ::apache::thrift::protocol::T_STRING, 6);
     xfer += oprot->writeBinary(this->image);
     xfer += oprot->writeFieldEnd();
   }
   if (this->__isset.workflowInputs) {
-    xfer += oprot->writeFieldBegin("workflowInputs", ::apache::thrift::protocol::T_LIST, 5);
+    xfer += oprot->writeFieldBegin("workflowInputs", ::apache::thrift::protocol::T_LIST, 7);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->workflowInputs.size()));
       std::vector< ::apache::airavata::model::application::io::InputDataObjectType> ::const_iterator _iter10;
@@ -211,7 +303,7 @@ uint32_t Workflow::write(::apache::thrift::protocol::TProtocol* oprot) const {
     xfer += oprot->writeFieldEnd();
   }
   if (this->__isset.workflowOutputs) {
-    xfer += oprot->writeFieldBegin("workflowOutputs", ::apache::thrift::protocol::T_LIST, 6);
+    xfer += oprot->writeFieldBegin("workflowOutputs", ::apache::thrift::protocol::T_LIST, 8);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->workflowOutputs.size()));
       std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter11;
@@ -223,50 +315,868 @@ uint32_t Workflow::write(::apache::thrift::protocol::TProtocol* oprot) const {
     }
     xfer += oprot->writeFieldEnd();
   }
+  if (this->__isset.creationTime) {
+    xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 9);
+    xfer += oprot->writeI64(this->creationTime);
+    xfer += oprot->writeFieldEnd();
+  }
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
 }
 
-void swap(Workflow &a, Workflow &b) {
+void swap(WorkflowModel &a, WorkflowModel &b) {
   using ::std::swap;
   swap(a.templateId, b.templateId);
   swap(a.name, b.name);
   swap(a.graph, b.graph);
+  swap(a.gatewayId, b.gatewayId);
+  swap(a.createdUser, b.createdUser);
   swap(a.image, b.image);
   swap(a.workflowInputs, b.workflowInputs);
   swap(a.workflowOutputs, b.workflowOutputs);
+  swap(a.creationTime, b.creationTime);
   swap(a.__isset, b.__isset);
 }
 
-Workflow::Workflow(const Workflow& other12) {
+WorkflowModel::WorkflowModel(const WorkflowModel& other12) {
   templateId = other12.templateId;
   name = other12.name;
   graph = other12.graph;
+  gatewayId = other12.gatewayId;
+  createdUser = other12.createdUser;
   image = other12.image;
   workflowInputs = other12.workflowInputs;
   workflowOutputs = other12.workflowOutputs;
+  creationTime = other12.creationTime;
   __isset = other12.__isset;
 }
-Workflow& Workflow::operator=(const Workflow& other13) {
+WorkflowModel& WorkflowModel::operator=(const WorkflowModel& other13) {
   templateId = other13.templateId;
   name = other13.name;
   graph = other13.graph;
+  gatewayId = other13.gatewayId;
+  createdUser = other13.createdUser;
   image = other13.image;
   workflowInputs = other13.workflowInputs;
   workflowOutputs = other13.workflowOutputs;
+  creationTime = other13.creationTime;
   __isset = other13.__isset;
   return *this;
 }
-void Workflow::printTo(std::ostream& out) const {
+void WorkflowModel::printTo(std::ostream& out) const {
   using ::apache::thrift::to_string;
-  out << "Workflow(";
+  out << "WorkflowModel(";
   out << "templateId=" << to_string(templateId);
   out << ", " << "name=" << to_string(name);
-  out << ", " << "graph="; (__isset.graph ? (out << to_string(graph)) : (out << "<null>"));
+  out << ", " << "graph=" << to_string(graph);
+  out << ", " << "gatewayId=" << to_string(gatewayId);
+  out << ", " << "createdUser=" << to_string(createdUser);
   out << ", " << "image="; (__isset.image ? (out << to_string(image)) : (out << "<null>"));
   out << ", " << "workflowInputs="; (__isset.workflowInputs ? (out << to_string(workflowInputs)) : (out << "<null>"));
   out << ", " << "workflowOutputs="; (__isset.workflowOutputs ? (out << to_string(workflowOutputs)) : (out << "<null>"));
+  out << ", " << "creationTime="; (__isset.creationTime ? (out << to_string(creationTime)) : (out << "<null>"));
+  out << ")";
+}
+
+
+ComponentStatus::~ComponentStatus() throw() {
+}
+
+
+void ComponentStatus::__set_state(const ComponentState::type val) {
+  this->state = val;
+}
+
+void ComponentStatus::__set_reason(const std::string& val) {
+  this->reason = val;
+__isset.reason = true;
+}
+
+void ComponentStatus::__set_timeofStateChange(const int64_t val) {
+  this->timeofStateChange = val;
+__isset.timeofStateChange = true;
+}
+
+uint32_t ComponentStatus::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_state = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast14;
+          xfer += iprot->readI32(ecast14);
+          this->state = (ComponentState::type)ecast14;
+          isset_state = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->reason);
+          this->__isset.reason = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->timeofStateChange);
+          this->__isset.timeofStateChange = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_state)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+uint32_t ComponentStatus::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("ComponentStatus");
+
+  xfer += oprot->writeFieldBegin("state", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32((int32_t)this->state);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.reason) {
+    xfer += oprot->writeFieldBegin("reason", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeString(this->reason);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.timeofStateChange) {
+    xfer += oprot->writeFieldBegin("timeofStateChange", ::apache::thrift::protocol::T_I64, 3);
+    xfer += oprot->writeI64(this->timeofStateChange);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+void swap(ComponentStatus &a, ComponentStatus &b) {
+  using ::std::swap;
+  swap(a.state, b.state);
+  swap(a.reason, b.reason);
+  swap(a.timeofStateChange, b.timeofStateChange);
+  swap(a.__isset, b.__isset);
+}
+
+ComponentStatus::ComponentStatus(const ComponentStatus& other15) {
+  state = other15.state;
+  reason = other15.reason;
+  timeofStateChange = other15.timeofStateChange;
+  __isset = other15.__isset;
+}
+ComponentStatus& ComponentStatus::operator=(const ComponentStatus& other16) {
+  state = other16.state;
+  reason = other16.reason;
+  timeofStateChange = other16.timeofStateChange;
+  __isset = other16.__isset;
+  return *this;
+}
+void ComponentStatus::printTo(std::ostream& out) const {
+  using ::apache::thrift::to_string;
+  out << "ComponentStatus(";
+  out << "state=" << to_string(state);
+  out << ", " << "reason="; (__isset.reason ? (out << to_string(reason)) : (out << "<null>"));
+  out << ", " << "timeofStateChange="; (__isset.timeofStateChange ? (out << to_string(timeofStateChange)) : (out << "<null>"));
+  out << ")";
+}
+
+
+WorkflowStatus::~WorkflowStatus() throw() {
+}
+
+
+void WorkflowStatus::__set_state(const WorkflowState::type val) {
+  this->state = val;
+}
+
+void WorkflowStatus::__set_timeOfStateChange(const int64_t val) {
+  this->timeOfStateChange = val;
+__isset.timeOfStateChange = true;
+}
+
+void WorkflowStatus::__set_reason(const std::string& val) {
+  this->reason = val;
+__isset.reason = true;
+}
+
+uint32_t WorkflowStatus::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_state = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast17;
+          xfer += iprot->readI32(ecast17);
+          this->state = (WorkflowState::type)ecast17;
+          isset_state = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->timeOfStateChange);
+          this->__isset.timeOfStateChange = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->reason);
+          this->__isset.reason = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_state)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+uint32_t WorkflowStatus::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("WorkflowStatus");
+
+  xfer += oprot->writeFieldBegin("state", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32((int32_t)this->state);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.timeOfStateChange) {
+    xfer += oprot->writeFieldBegin("timeOfStateChange", ::apache::thrift::protocol::T_I64, 2);
+    xfer += oprot->writeI64(this->timeOfStateChange);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.reason) {
+    xfer += oprot->writeFieldBegin("reason", ::apache::thrift::protocol::T_STRING, 3);
+    xfer += oprot->writeString(this->reason);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+void swap(WorkflowStatus &a, WorkflowStatus &b) {
+  using ::std::swap;
+  swap(a.state, b.state);
+  swap(a.timeOfStateChange, b.timeOfStateChange);
+  swap(a.reason, b.reason);
+  swap(a.__isset, b.__isset);
+}
+
+WorkflowStatus::WorkflowStatus(const WorkflowStatus& other18) {
+  state = other18.state;
+  timeOfStateChange = other18.timeOfStateChange;
+  reason = other18.reason;
+  __isset = other18.__isset;
+}
+WorkflowStatus& WorkflowStatus::operator=(const WorkflowStatus& other19) {
+  state = other19.state;
+  timeOfStateChange = other19.timeOfStateChange;
+  reason = other19.reason;
+  __isset = other19.__isset;
+  return *this;
+}
+void WorkflowStatus::printTo(std::ostream& out) const {
+  using ::apache::thrift::to_string;
+  out << "WorkflowStatus(";
+  out << "state=" << to_string(state);
+  out << ", " << "timeOfStateChange="; (__isset.timeOfStateChange ? (out << to_string(timeOfStateChange)) : (out << "<null>"));
+  out << ", " << "reason="; (__isset.reason ? (out << to_string(reason)) : (out << "<null>"));
+  out << ")";
+}
+
+
+EdgeModel::~EdgeModel() throw() {
+}
+
+
+void EdgeModel::__set_edgeId(const std::string& val) {
+  this->edgeId = val;
+}
+
+void EdgeModel::__set_name(const std::string& val) {
+  this->name = val;
+__isset.name = true;
+}
+
+void EdgeModel::__set_status(const ComponentStatus& val) {
+  this->status = val;
+__isset.status = true;
+}
+
+void EdgeModel::__set_description(const std::string& val) {
+  this->description = val;
+__isset.description = true;
+}
+
+uint32_t EdgeModel::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_edgeId = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->edgeId);
+          isset_edgeId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->name);
+          this->__isset.name = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->status.read(iprot);
+          this->__isset.status = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->description);
+          this->__isset.description = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_edgeId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+uint32_t EdgeModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("EdgeModel");
+
+  xfer += oprot->writeFieldBegin("edgeId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->edgeId);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.name) {
+    xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeString(this->name);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.status) {
+    xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->status.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.description) {
+    xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 4);
+    xfer += oprot->writeString(this->description);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+void swap(EdgeModel &a, EdgeModel &b) {
+  using ::std::swap;
+  swap(a.edgeId, b.edgeId);
+  swap(a.name, b.name);
+  swap(a.status, b.status);
+  swap(a.description, b.description);
+  swap(a.__isset, b.__isset);
+}
+
+EdgeModel::EdgeModel(const EdgeModel& other20) {
+  edgeId = other20.edgeId;
+  name = other20.name;
+  status = other20.status;
+  description = other20.description;
+  __isset = other20.__isset;
+}
+EdgeModel& EdgeModel::operator=(const EdgeModel& other21) {
+  edgeId = other21.edgeId;
+  name = other21.name;
+  status = other21.status;
+  description = other21.description;
+  __isset = other21.__isset;
+  return *this;
+}
+void EdgeModel::printTo(std::ostream& out) const {
+  using ::apache::thrift::to_string;
+  out << "EdgeModel(";
+  out << "edgeId=" << to_string(edgeId);
+  out << ", " << "name="; (__isset.name ? (out << to_string(name)) : (out << "<null>"));
+  out << ", " << "status="; (__isset.status ? (out << to_string(status)) : (out << "<null>"));
+  out << ", " << "description="; (__isset.description ? (out << to_string(description)) : (out << "<null>"));
+  out << ")";
+}
+
+
+PortModel::~PortModel() throw() {
+}
+
+
+void PortModel::__set_portId(const std::string& val) {
+  this->portId = val;
+}
+
+void PortModel::__set_name(const std::string& val) {
+  this->name = val;
+__isset.name = true;
+}
+
+void PortModel::__set_status(const ComponentStatus& val) {
+  this->status = val;
+__isset.status = true;
+}
+
+void PortModel::__set_value(const std::string& val) {
+  this->value = val;
+__isset.value = true;
+}
+
+void PortModel::__set_description(const std::string& val) {
+  this->description = val;
+__isset.description = true;
+}
+
+uint32_t PortModel::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_portId = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->portId);
+          isset_portId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->name);
+          this->__isset.name = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->status.read(iprot);
+          this->__isset.status = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->value);
+          this->__isset.value = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->description);
+          this->__isset.description = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_portId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+uint32_t PortModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("PortModel");
+
+  xfer += oprot->writeFieldBegin("portId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->portId);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.name) {
+    xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeString(this->name);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.status) {
+    xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->status.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.value) {
+    xfer += oprot->writeFieldBegin("value", ::apache::thrift::protocol::T_STRING, 4);
+    xfer += oprot->writeString(this->value);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.description) {
+    xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 5);
+    xfer += oprot->writeString(this->description);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+void swap(PortModel &a, PortModel &b) {
+  using ::std::swap;
+  swap(a.portId, b.portId);
+  swap(a.name, b.name);
+  swap(a.status, b.status);
+  swap(a.value, b.value);
+  swap(a.description, b.description);
+  swap(a.__isset, b.__isset);
+}
+
+PortModel::PortModel(const PortModel& other22) {
+  portId = other22.portId;
+  name = other22.name;
+  status = other22.status;
+  value = other22.value;
+  description = other22.description;
+  __isset = other22.__isset;
+}
+PortModel& PortModel::operator=(const PortModel& other23) {
+  portId = other23.portId;
+  name = other23.name;
+  status = other23.status;
+  value = other23.value;
+  description = other23.description;
+  __isset = other23.__isset;
+  return *this;
+}
+void PortModel::printTo(std::ostream& out) const {
+  using ::apache::thrift::to_string;
+  out << "PortModel(";
+  out << "portId=" << to_string(portId);
+  out << ", " << "name="; (__isset.name ? (out << to_string(name)) : (out << "<null>"));
+  out << ", " << "status="; (__isset.status ? (out << to_string(status)) : (out << "<null>"));
+  out << ", " << "value="; (__isset.value ? (out << to_string(value)) : (out << "<null>"));
+  out << ", " << "description="; (__isset.description ? (out << to_string(description)) : (out << "<null>"));
+  out << ")";
+}
+
+
+NodeModel::~NodeModel() throw() {
+}
+
+
+void NodeModel::__set_nodeId(const std::string& val) {
+  this->nodeId = val;
+}
+
+void NodeModel::__set_name(const std::string& val) {
+  this->name = val;
+__isset.name = true;
+}
+
+void NodeModel::__set_applicationId(const std::string& val) {
+  this->applicationId = val;
+__isset.applicationId = true;
+}
+
+void NodeModel::__set_applicationName(const std::string& val) {
+  this->applicationName = val;
+__isset.applicationName = true;
+}
+
+void NodeModel::__set_status(const ComponentStatus& val) {
+  this->status = val;
+__isset.status = true;
+}
+
+void NodeModel::__set_description(const std::string& val) {
+  this->description = val;
+__isset.description = true;
+}
+
+uint32_t NodeModel::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_nodeId = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->nodeId);
+          isset_nodeId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->name);
+          this->__isset.name = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->applicationId);
+          this->__isset.applicationId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->applicationName);
+          this->__isset.applicationName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->status.read(iprot);
+          this->__isset.status = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->description);
+          this->__isset.description = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_nodeId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+uint32_t NodeModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
+  uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("NodeModel");
+
+  xfer += oprot->writeFieldBegin("nodeId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->nodeId);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.name) {
+    xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeString(this->name);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.applicationId) {
+    xfer += oprot->writeFieldBegin("applicationId", ::apache::thrift::protocol::T_STRING, 3);
+    xfer += oprot->writeString(this->applicationId);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.applicationName) {
+    xfer += oprot->writeFieldBegin("applicationName", ::apache::thrift::protocol::T_STRING, 4);
+    xfer += oprot->writeString(this->applicationName);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.status) {
+    xfer += oprot->writeFieldBegin("status", ::apache::thrift::protocol::T_STRUCT, 5);
+    xfer += this->status.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.description) {
+    xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 6);
+    xfer += oprot->writeString(this->description);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+void swap(NodeModel &a, NodeModel &b) {
+  using ::std::swap;
+  swap(a.nodeId, b.nodeId);
+  swap(a.name, b.name);
+  swap(a.applicationId, b.applicationId);
+  swap(a.applicationName, b.applicationName);
+  swap(a.status, b.status);
+  swap(a.description, b.description);
+  swap(a.__isset, b.__isset);
+}
+
+NodeModel::NodeModel(const NodeModel& other24) {
+  nodeId = other24.nodeId;
+  name = other24.name;
+  applicationId = other24.applicationId;
+  applicationName = other24.applicationName;
+  status = other24.status;
+  description = other24.description;
+  __isset = other24.__isset;
+}
+NodeModel& NodeModel::operator=(const NodeModel& other25) {
+  nodeId = other25.nodeId;
+  name = other25.name;
+  applicationId = other25.applicationId;
+  applicationName = other25.applicationName;
+  status = other25.status;
+  description = other25.description;
+  __isset = other25.__isset;
+  return *this;
+}
+void NodeModel::printTo(std::ostream& out) const {
+  using ::apache::thrift::to_string;
+  out << "NodeModel(";
+  out << "nodeId=" << to_string(nodeId);
+  out << ", " << "name="; (__isset.name ? (out << to_string(name)) : (out << "<null>"));
+  out << ", " << "applicationId="; (__isset.applicationId ? (out << to_string(applicationId)) : (out << "<null>"));
+  out << ", " << "applicationName="; (__isset.applicationName ? (out << to_string(applicationName)) : (out << "<null>"));
+  out << ", " << "status="; (__isset.status ? (out << to_string(status)) : (out << "<null>"));
+  out << ", " << "description="; (__isset.description ? (out << to_string(description)) : (out << "<null>"));
   out << ")";
 }
 


[06/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h
index 9ef1ada..831bc02 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflow_data_model_types.h
@@ -38,33 +38,74 @@
 
 
 
-class Workflow;
+struct WorkflowState {
+  enum type {
+    CREATED = 0,
+    STARTED = 1,
+    EXECUTING = 2,
+    COMPLETED = 3,
+    FAILED = 4,
+    CANCELLING = 5,
+    CANCELED = 6
+  };
+};
+
+extern const std::map<int, const char*> _WorkflowState_VALUES_TO_NAMES;
+
+struct ComponentState {
+  enum type {
+    CREATED = 0,
+    WAITING = 1,
+    READY = 2,
+    RUNNING = 3,
+    COMPLETED = 4,
+    FAILED = 5,
+    CANCELED = 6
+  };
+};
+
+extern const std::map<int, const char*> _ComponentState_VALUES_TO_NAMES;
+
+class WorkflowModel;
+
+class ComponentStatus;
 
-typedef struct _Workflow__isset {
-  _Workflow__isset() : graph(false), image(false), workflowInputs(false), workflowOutputs(false) {}
-  bool graph :1;
+class WorkflowStatus;
+
+class EdgeModel;
+
+class PortModel;
+
+class NodeModel;
+
+typedef struct _WorkflowModel__isset {
+  _WorkflowModel__isset() : image(false), workflowInputs(false), workflowOutputs(false), creationTime(false) {}
   bool image :1;
   bool workflowInputs :1;
   bool workflowOutputs :1;
-} _Workflow__isset;
+  bool creationTime :1;
+} _WorkflowModel__isset;
 
-class Workflow {
+class WorkflowModel {
  public:
 
-  Workflow(const Workflow&);
-  Workflow& operator=(const Workflow&);
-  Workflow() : templateId("DO_NOT_SET_AT_CLIENTS"), name(), graph(), image() {
+  WorkflowModel(const WorkflowModel&);
+  WorkflowModel& operator=(const WorkflowModel&);
+  WorkflowModel() : templateId("DO_NOT_SET_AT_CLIENTS"), name(), graph(), gatewayId(), createdUser(), image(), creationTime(0) {
   }
 
-  virtual ~Workflow() throw();
+  virtual ~WorkflowModel() throw();
   std::string templateId;
   std::string name;
   std::string graph;
+  std::string gatewayId;
+  std::string createdUser;
   std::string image;
   std::vector< ::apache::airavata::model::application::io::InputDataObjectType>  workflowInputs;
   std::vector< ::apache::airavata::model::application::io::OutputDataObjectType>  workflowOutputs;
+  int64_t creationTime;
 
-  _Workflow__isset __isset;
+  _WorkflowModel__isset __isset;
 
   void __set_templateId(const std::string& val);
 
@@ -72,21 +113,29 @@ class Workflow {
 
   void __set_graph(const std::string& val);
 
+  void __set_gatewayId(const std::string& val);
+
+  void __set_createdUser(const std::string& val);
+
   void __set_image(const std::string& val);
 
   void __set_workflowInputs(const std::vector< ::apache::airavata::model::application::io::InputDataObjectType> & val);
 
   void __set_workflowOutputs(const std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & val);
 
-  bool operator == (const Workflow & rhs) const
+  void __set_creationTime(const int64_t val);
+
+  bool operator == (const WorkflowModel & rhs) const
   {
     if (!(templateId == rhs.templateId))
       return false;
     if (!(name == rhs.name))
       return false;
-    if (__isset.graph != rhs.__isset.graph)
+    if (!(graph == rhs.graph))
       return false;
-    else if (__isset.graph && !(graph == rhs.graph))
+    if (!(gatewayId == rhs.gatewayId))
+      return false;
+    if (!(createdUser == rhs.createdUser))
       return false;
     if (__isset.image != rhs.__isset.image)
       return false;
@@ -100,13 +149,372 @@ class Workflow {
       return false;
     else if (__isset.workflowOutputs && !(workflowOutputs == rhs.workflowOutputs))
       return false;
+    if (__isset.creationTime != rhs.__isset.creationTime)
+      return false;
+    else if (__isset.creationTime && !(creationTime == rhs.creationTime))
+      return false;
+    return true;
+  }
+  bool operator != (const WorkflowModel &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const WorkflowModel & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+  virtual void printTo(std::ostream& out) const;
+};
+
+void swap(WorkflowModel &a, WorkflowModel &b);
+
+inline std::ostream& operator<<(std::ostream& out, const WorkflowModel& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
+typedef struct _ComponentStatus__isset {
+  _ComponentStatus__isset() : reason(false), timeofStateChange(false) {}
+  bool reason :1;
+  bool timeofStateChange :1;
+} _ComponentStatus__isset;
+
+class ComponentStatus {
+ public:
+
+  ComponentStatus(const ComponentStatus&);
+  ComponentStatus& operator=(const ComponentStatus&);
+  ComponentStatus() : state((ComponentState::type)0), reason(), timeofStateChange(0) {
+    state = (ComponentState::type)0;
+
+  }
+
+  virtual ~ComponentStatus() throw();
+  ComponentState::type state;
+  std::string reason;
+  int64_t timeofStateChange;
+
+  _ComponentStatus__isset __isset;
+
+  void __set_state(const ComponentState::type val);
+
+  void __set_reason(const std::string& val);
+
+  void __set_timeofStateChange(const int64_t val);
+
+  bool operator == (const ComponentStatus & rhs) const
+  {
+    if (!(state == rhs.state))
+      return false;
+    if (__isset.reason != rhs.__isset.reason)
+      return false;
+    else if (__isset.reason && !(reason == rhs.reason))
+      return false;
+    if (__isset.timeofStateChange != rhs.__isset.timeofStateChange)
+      return false;
+    else if (__isset.timeofStateChange && !(timeofStateChange == rhs.timeofStateChange))
+      return false;
+    return true;
+  }
+  bool operator != (const ComponentStatus &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const ComponentStatus & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+  virtual void printTo(std::ostream& out) const;
+};
+
+void swap(ComponentStatus &a, ComponentStatus &b);
+
+inline std::ostream& operator<<(std::ostream& out, const ComponentStatus& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
+typedef struct _WorkflowStatus__isset {
+  _WorkflowStatus__isset() : timeOfStateChange(false), reason(false) {}
+  bool timeOfStateChange :1;
+  bool reason :1;
+} _WorkflowStatus__isset;
+
+class WorkflowStatus {
+ public:
+
+  WorkflowStatus(const WorkflowStatus&);
+  WorkflowStatus& operator=(const WorkflowStatus&);
+  WorkflowStatus() : state((WorkflowState::type)0), timeOfStateChange(0), reason() {
+  }
+
+  virtual ~WorkflowStatus() throw();
+  WorkflowState::type state;
+  int64_t timeOfStateChange;
+  std::string reason;
+
+  _WorkflowStatus__isset __isset;
+
+  void __set_state(const WorkflowState::type val);
+
+  void __set_timeOfStateChange(const int64_t val);
+
+  void __set_reason(const std::string& val);
+
+  bool operator == (const WorkflowStatus & rhs) const
+  {
+    if (!(state == rhs.state))
+      return false;
+    if (__isset.timeOfStateChange != rhs.__isset.timeOfStateChange)
+      return false;
+    else if (__isset.timeOfStateChange && !(timeOfStateChange == rhs.timeOfStateChange))
+      return false;
+    if (__isset.reason != rhs.__isset.reason)
+      return false;
+    else if (__isset.reason && !(reason == rhs.reason))
+      return false;
+    return true;
+  }
+  bool operator != (const WorkflowStatus &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const WorkflowStatus & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+  virtual void printTo(std::ostream& out) const;
+};
+
+void swap(WorkflowStatus &a, WorkflowStatus &b);
+
+inline std::ostream& operator<<(std::ostream& out, const WorkflowStatus& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
+typedef struct _EdgeModel__isset {
+  _EdgeModel__isset() : name(false), status(false), description(false) {}
+  bool name :1;
+  bool status :1;
+  bool description :1;
+} _EdgeModel__isset;
+
+class EdgeModel {
+ public:
+
+  EdgeModel(const EdgeModel&);
+  EdgeModel& operator=(const EdgeModel&);
+  EdgeModel() : edgeId("DO_NOT_SET_AT_CLIENTS"), name(), description() {
+  }
+
+  virtual ~EdgeModel() throw();
+  std::string edgeId;
+  std::string name;
+  ComponentStatus status;
+  std::string description;
+
+  _EdgeModel__isset __isset;
+
+  void __set_edgeId(const std::string& val);
+
+  void __set_name(const std::string& val);
+
+  void __set_status(const ComponentStatus& val);
+
+  void __set_description(const std::string& val);
+
+  bool operator == (const EdgeModel & rhs) const
+  {
+    if (!(edgeId == rhs.edgeId))
+      return false;
+    if (__isset.name != rhs.__isset.name)
+      return false;
+    else if (__isset.name && !(name == rhs.name))
+      return false;
+    if (__isset.status != rhs.__isset.status)
+      return false;
+    else if (__isset.status && !(status == rhs.status))
+      return false;
+    if (__isset.description != rhs.__isset.description)
+      return false;
+    else if (__isset.description && !(description == rhs.description))
+      return false;
+    return true;
+  }
+  bool operator != (const EdgeModel &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const EdgeModel & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+  virtual void printTo(std::ostream& out) const;
+};
+
+void swap(EdgeModel &a, EdgeModel &b);
+
+inline std::ostream& operator<<(std::ostream& out, const EdgeModel& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
+typedef struct _PortModel__isset {
+  _PortModel__isset() : name(false), status(false), value(false), description(false) {}
+  bool name :1;
+  bool status :1;
+  bool value :1;
+  bool description :1;
+} _PortModel__isset;
+
+class PortModel {
+ public:
+
+  PortModel(const PortModel&);
+  PortModel& operator=(const PortModel&);
+  PortModel() : portId("DO_NOT_SET_AT_CLIENTS"), name(), value(), description() {
+  }
+
+  virtual ~PortModel() throw();
+  std::string portId;
+  std::string name;
+  ComponentStatus status;
+  std::string value;
+  std::string description;
+
+  _PortModel__isset __isset;
+
+  void __set_portId(const std::string& val);
+
+  void __set_name(const std::string& val);
+
+  void __set_status(const ComponentStatus& val);
+
+  void __set_value(const std::string& val);
+
+  void __set_description(const std::string& val);
+
+  bool operator == (const PortModel & rhs) const
+  {
+    if (!(portId == rhs.portId))
+      return false;
+    if (__isset.name != rhs.__isset.name)
+      return false;
+    else if (__isset.name && !(name == rhs.name))
+      return false;
+    if (__isset.status != rhs.__isset.status)
+      return false;
+    else if (__isset.status && !(status == rhs.status))
+      return false;
+    if (__isset.value != rhs.__isset.value)
+      return false;
+    else if (__isset.value && !(value == rhs.value))
+      return false;
+    if (__isset.description != rhs.__isset.description)
+      return false;
+    else if (__isset.description && !(description == rhs.description))
+      return false;
+    return true;
+  }
+  bool operator != (const PortModel &rhs) const {
+    return !(*this == rhs);
+  }
+
+  bool operator < (const PortModel & ) const;
+
+  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+  virtual void printTo(std::ostream& out) const;
+};
+
+void swap(PortModel &a, PortModel &b);
+
+inline std::ostream& operator<<(std::ostream& out, const PortModel& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
+typedef struct _NodeModel__isset {
+  _NodeModel__isset() : name(false), applicationId(false), applicationName(false), status(false), description(false) {}
+  bool name :1;
+  bool applicationId :1;
+  bool applicationName :1;
+  bool status :1;
+  bool description :1;
+} _NodeModel__isset;
+
+class NodeModel {
+ public:
+
+  NodeModel(const NodeModel&);
+  NodeModel& operator=(const NodeModel&);
+  NodeModel() : nodeId("DO_NOT_SET_AT_CLIENTS"), name(), applicationId(), applicationName(), description() {
+  }
+
+  virtual ~NodeModel() throw();
+  std::string nodeId;
+  std::string name;
+  std::string applicationId;
+  std::string applicationName;
+  ComponentStatus status;
+  std::string description;
+
+  _NodeModel__isset __isset;
+
+  void __set_nodeId(const std::string& val);
+
+  void __set_name(const std::string& val);
+
+  void __set_applicationId(const std::string& val);
+
+  void __set_applicationName(const std::string& val);
+
+  void __set_status(const ComponentStatus& val);
+
+  void __set_description(const std::string& val);
+
+  bool operator == (const NodeModel & rhs) const
+  {
+    if (!(nodeId == rhs.nodeId))
+      return false;
+    if (__isset.name != rhs.__isset.name)
+      return false;
+    else if (__isset.name && !(name == rhs.name))
+      return false;
+    if (__isset.applicationId != rhs.__isset.applicationId)
+      return false;
+    else if (__isset.applicationId && !(applicationId == rhs.applicationId))
+      return false;
+    if (__isset.applicationName != rhs.__isset.applicationName)
+      return false;
+    else if (__isset.applicationName && !(applicationName == rhs.applicationName))
+      return false;
+    if (__isset.status != rhs.__isset.status)
+      return false;
+    else if (__isset.status && !(status == rhs.status))
+      return false;
+    if (__isset.description != rhs.__isset.description)
+      return false;
+    else if (__isset.description && !(description == rhs.description))
+      return false;
     return true;
   }
-  bool operator != (const Workflow &rhs) const {
+  bool operator != (const NodeModel &rhs) const {
     return !(*this == rhs);
   }
 
-  bool operator < (const Workflow & ) const;
+  bool operator < (const NodeModel & ) const;
 
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -114,9 +522,9 @@ class Workflow {
   virtual void printTo(std::ostream& out) const;
 };
 
-void swap(Workflow &a, Workflow &b);
+void swap(NodeModel &a, NodeModel &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Workflow& obj)
+inline std::ostream& operator<<(std::ostream& out, const NodeModel& obj)
 {
   obj.printTo(out);
   return out;

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 8529b1a..df39f6f 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
@@ -194,6 +194,7 @@ interface AiravataIf {
    */
   public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId);
   /**
+   * 
    * Get a Public Key by Providing the Token
    * 
    * @param CredStoreToken
@@ -215,6 +216,7 @@ interface AiravataIf {
    */
   public function getAllUserSSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $userName);
   /**
+   * 
    * Get all Public Keys of the Gateway
    * 
    * @param CredStoreToken
@@ -236,6 +238,7 @@ interface AiravataIf {
    */
   public function getAllGatewaySSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
   /**
+   * 
    * Delete a Gateway
    * 
    * @param gatewayId
@@ -256,6 +259,7 @@ interface AiravataIf {
    */
   public function deleteSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId);
   /**
+   * 
    * Creates a Project with basic metadata.
    *    A Project is a container of experiments.
    * 
@@ -263,7 +267,7 @@ interface AiravataIf {
    *    The identifier for the requested gateway.
    * 
    * @param Project
-   *    The Project Object described in the workspace_model
+   *    The Project Object described in the workspace_model.
    * 
    * 
    * 
@@ -278,6 +282,7 @@ interface AiravataIf {
    */
   public function createProject(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workspace\Project $project);
   /**
+   * 
    * Update an Existing Project
    * 
    * @param projectId
@@ -299,14 +304,15 @@ interface AiravataIf {
    */
   public function updateProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, \Airavata\Model\Workspace\Project $updatedProject);
   /**
+   * 
    * Get a Project by ID
-   *    This method is to obtain a project by providing a projectId
+   *    This method is to obtain a project by providing a projectId.
    * 
    * @param projectId
-   *    projectId of the project you require
+   *    projectId of the project you require.
    * 
    * @return project
-   *    project data model will be returned
+   *    project data model will be returned.
    * 
    * 
    * 
@@ -321,15 +327,18 @@ interface AiravataIf {
    */
   public function getProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId);
   /**
+   * 
    * Delete a Project
-   *    This method is used to delete an existing Project
+   *    This method is used to delete an existing Project.
    * 
    * @param projectId
-   *    projectId of the project you want to delete
+   *    projectId of the project you want to delete.
    * 
    * @return boolean
    *    Boolean identifier for the success or failure of the deletion operation.
    * 
+   *    NOTE: This method is not used within gateways connected with Airavata.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -343,20 +352,21 @@ interface AiravataIf {
    */
   public function deleteProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId);
   /**
-   * Get all Project by user with pagination. Results will be ordered based
-   * on creation time DESC
+   * 
+   * Get All User Projects
+   * Get all Project for the user with pagination. Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
    *    The identifier for the requested gateway.
    * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
    * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
    * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
    * 
    * 
    * 
@@ -373,19 +383,25 @@ interface AiravataIf {
    */
   public function getUserProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
   /**
-   * Get all Project for user by project name with pagination.Results will be ordered based
-   * on creation time DESC
+   * 
+   * Search User Projects by Project Name
+   * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
-   *    The identifier for the requested gateway.
+   *    The unique identifier for the requested gateway.
+   * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
+   * 
    * @param projectName
-   *    The name of the project on which the results to be fetched
+   *    The name of the project on which the results to be fetched.
+   * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
+   * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -402,19 +418,25 @@ interface AiravataIf {
    */
   public function searchProjectsByProjectName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset);
   /**
-   * Search and get all Projects for user by project description with pagination. Results
-   * will be ordered based on creation time DESC
+   * 
+   * Search User Projects by Project Description
+   * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
-   *    The identifier for the requested gateway.
+   *    The unique identifier of the gateway making the request.
+   * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
+   * 
    * @param description
-   *    The description to be matched
+   *    The description to be matched.
+   * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
+   * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -431,19 +453,25 @@ interface AiravataIf {
    */
   public function searchProjectsByProjectDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
   /**
-   * Search Experiments by experiment name with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by Name
+   * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user who created the experiments.
+   * 
    * @param expName
-   *       Experiment name to be matched
+   *       Experiment name to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -460,19 +488,25 @@ interface AiravataIf {
    */
   public function searchExperimentsByName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset);
   /**
-   * Search Experiments by experiment name with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search By Experiment Description
+   * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param description
-   *       Experiment description to be matched
+   *       Experiment description to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -489,19 +523,25 @@ interface AiravataIf {
    */
   public function searchExperimentsByDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
   /**
-   * Search Experiments by application id with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search Experiment By the Application
+   * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param applicationId
-   *       Application id to be matched
+   *       Application id to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -518,19 +558,25 @@ interface AiravataIf {
    */
   public function searchExperimentsByApplication(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset);
   /**
-   * Search Experiments by experiment status with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by Status
+   * Search all the Experiments of the given user  by experiment status with pagination. Results will be sorted based on creation time DESC
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user making the request.
+   * 
    * @param experimentState
-   *       Experiement state to be matched
+   *       Experiement state to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -547,21 +593,31 @@ interface AiravataIf {
    */
   public function searchExperimentsByStatus(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset);
   /**
-   * Search Experiments by experiment creation time with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by the Creation Time
+   * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param fromTime
-   *       Start time of the experiments creation time
+   *       Start time of the experiments creation time.
+   * 
    * @param toTime
-   *       End time of the  experiement creation time
+   *       End time of the  experiement creation time.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
+   * @return ExperimentSummaryModel
+   *    List of experiments for the given search filter. Here only the Experiment summary will be returned.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -579,19 +635,27 @@ interface AiravataIf {
    */
   public function searchExperimentsByCreationTime(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset);
   /**
-   * Search Experiments by using multiple filter criteria with pagination. Results will be sorted
-   * based on creation time DESC
+   * Search Experiments.
+   * Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user requesting the search function.
+   * 
    * @param filters
-   *       map of multiple filter criteria.
+   *       Map of multiple filter criteria. Currenlt search filters includes Experiment Name, Description, Application, etc....
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
+   * @return ExperimentSummaryModel
+   *    List of experiments for the given search filter. Here only the Experiment summary will be returned.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -608,13 +672,19 @@ interface AiravataIf {
    */
   public function searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset);
   /**
-   * Get Experiment Statisitics for the given gateway for a specific time period
+   * 
+   * Get Experiment Statistics
+   * Get Experiment Statisitics for a given gateway for a specific time period. This feature is available only for admins of a particular gateway. Gateway admin access is managed by the user roles.
+   * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the gateway making the request to fetch statistics.
+   * 
    * @param fromTime
-   *       Starting date time
+   *       Starting date time.
+   * 
    * @param toTime
-   *       Ending data time
+   *       Ending data time.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -629,15 +699,19 @@ interface AiravataIf {
    */
   public function getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime);
   /**
-   * Get Experiments within project with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Get All Experiments of the Project
+   * Get Experiments within project with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param projectId
-   *       Identifier of the project
+   *       Uniqie identifier of the project.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -653,17 +727,22 @@ interface AiravataIf {
    */
   public function getExperimentsInProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset);
   /**
-   * Get experiments by user with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Get All Experiments of the User
+   * Get experiments by user with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requesting gateway
+   *       Identifier of the requesting gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested end user.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -679,12 +758,17 @@ interface AiravataIf {
    */
   public function getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
   /**
+   *   *
+   *   * Create New Experiment
    *   * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
    *   *   but inferred from the sshKeyAuthentication header. This experiment is just a persistent place holder. The client
    *   *   has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
    *   *   registering the experiment in a persistent store.
    *   *
-   *   * @param basicExperimentMetadata
+   *   * @param gatewayId
+   *   *    The unique ID of the gateway where the experiment is been created.
+   *   *
+   *   * @param ExperimentModel
    *   *    The create experiment will require the basic experiment metadata like the name and description, intended user,
    *   *      the gateway identifer and if the experiment should be shared public by defualt. During the creation of an experiment
    *   *      the ExperimentMetadata is a required field.
@@ -725,8 +809,8 @@ interface AiravataIf {
    */
   public function createExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment);
   /**
-   * Delete an Experiment
    * 
+   * Delete an Experiment
    * If the experiment is not already launched experiment can be deleted.
    * 
    * @param authzToken
@@ -735,7 +819,7 @@ interface AiravataIf {
    *     Experiment ID of the experimnet you want to delete.
    * 
    * @return boolean
-   *     Identifier for the success or failure of the deletion operation
+   *     Identifier for the success or failure of the deletion operation.
    * 
    * 
    * 
@@ -749,12 +833,14 @@ interface AiravataIf {
    */
   public function deleteExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $experimentId);
   /**
+   *   *
+   *   * Get Experiment
    *   * Fetch previously created experiment metadata.
    *   *
    *   * @param airavataExperimentId
-   *   *    The identifier for the requested experiment. This is returned during the create experiment step.
+   *   *    The unique identifier of the requested experiment. This ID is returned during the create experiment step.
    *   *
-   *   * @return experimentMetada
+   *   * @return ExperimentModel
    *   *   This method will return the previously stored experiment metadata.
    *   *
    *   * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -807,14 +893,17 @@ interface AiravataIf {
    */
   public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
   /**
+   * 
+   * Get Complete Experiment Details
    * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
    * tasks -> jobs information.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
    * 
-   * @return experimentMetada
-   *   This method will return the previously stored experiment metadata.
+   * @return ExperimentModel
+   *   This method will return the previously stored experiment metadata including application input parameters, computational resource scheduling
+   *   information, special input output handling and additional quality of service parameters.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
    *    For any incorrect forming of the request itself.
@@ -865,14 +954,15 @@ interface AiravataIf {
    */
   public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
   /**
-   * Configure a previously created experiment with required inputs, scheduling and other quality of service
-   *   parameters. This method only updates the experiment object within the registry. The experiment has to be launched
-   *   to make it actionable by the server.
+   * 
+   * Update a Previously Created Experiment
+   * Configure the CREATED experiment with required inputs, scheduling and other quality of service parameters. This method only updates the experiment object within the registry.
+   * The experiment has to be launched to make it actionable by the server.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
    * 
-   * @param experimentConfigurationData
+   * @param ExperimentModel
    *    The configuration information of the experiment with application input parameters, computational resource scheduling
    *      information, special input output handling and additional quality of service parameters.
    * 
@@ -929,13 +1019,14 @@ interface AiravataIf {
   public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling);
   /**
    *  *
-   *  * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
-   *  *
-   *  * @param experimentId
+   *  * Validate experiment configuration.
+   *  * A true in general indicates, the experiment is ready to be launched.
    *  *
+   *  * @param airavataExperimentId
+   *  *    Unique identifier of the experiment (Experimnent ID) of the experiment which need to be validated.
    *  *
    *  * @return boolean
-   *  *      Identifier for the success or failure of the validation operation
+   *  *      Identifier for the success or failure of the validation operation.
    *  *
    * *
    * 
@@ -950,8 +1041,12 @@ interface AiravataIf {
    */
   public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
   /**
-   * Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
-   *   notifications and intermediate and output data will be subsequently available for this experiment.
+   * 
+   * Launch a Previously Created & Configured Experiment.
+   * Airavata Server will then start processing the request and appropriate notifications and intermediate and output data will be subsequently available for this experiment.
+   * 
+   * @gatewayId
+   *    ID of the gateway which will launch the experiment.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
@@ -994,17 +1089,18 @@ interface AiravataIf {
    */
   public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId);
   /**
+   * 
    * Get Experiment Status
    * 
-   * Obtain the status os an experiment by providing the Experiment Id
+   * Obtain the status of an experiment by providing the Experiment Id
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you require the status
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you require the status.
    * 
    * @return ExperimentStatus
-   *     ExperimentStatus model with current status will be returned.
+   *     ExperimentStatus model with the current status will be returned.
    * 
    * 
    * 
@@ -1030,16 +1126,17 @@ interface AiravataIf {
    */
   public function getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
   /**
+   * 
    * Get Experiment Outputs
-   * This method to be used when need to obtain outputs of a certain Experiment
+   * This method to be used when need to obtain final outputs of a certain Experiment
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you need the outputs
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you need the outputs.
    * 
    * @return list
-   *     List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+   *     List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
    * 
    * 
    * 
@@ -1054,16 +1151,17 @@ interface AiravataIf {
    */
   public function getExperimentOutputs(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
   /**
+   * 
    * Get Intermediate Experiment Outputs
    * This method to be used when need to obtain intermediate outputs of a certain Experiment
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you need the intermediate outputs
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you need intermediate outputs.
    * 
    * @return list
-   *     List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+   *     List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
    * 
    * 
    * 
@@ -1078,13 +1176,14 @@ interface AiravataIf {
    */
   public function getIntermediateOutputs(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
   /**
-   * Get Job Status for an Experiment
+   * 
+   * Get Job Statuses for an Experiment
    * This method to be used when need to get the job status of an Experiment. An experiment may have one or many jobs; there for one or many job statuses may turnup
    * 
    * @param authzToken
    * 
    * @param experiementId
-   *     Experiment ID of the experimnet you need the intermediate outputs
+   *     Experiment ID of the experimnet you need the job statuses.
    * 
    * @return JobStatus
    *     Job status (string) for all all the existing jobs for the experiment will be returned in the form of a map
@@ -1102,16 +1201,17 @@ interface AiravataIf {
    */
   public function getJobStatuses(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
   /**
-   * Get Job Details for all the jobs within an Experiment
+   * 
+   * Get Job Details for all the jobs within an Experiment.
    * This method to be used when need to get the job details for one or many jobs of an Experiment.
    * 
    * @param authzToken
    * 
    * @param experiementId
-   *     Experiment ID of the experimnet you need job details
+   *     Experiment ID of the experimnet you need job details.
    * 
    * @return list of JobDetails
-   *     Job details
+   *     Job details.
    * 
    * 
    * 
@@ -1126,7 +1226,9 @@ interface AiravataIf {
    */
   public function getJobDetails(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
   /**
-   * Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
+   * 
+   * Clone an Existing Experiment
+   * Existing specified experiment is cloned and a new name is provided. A copy of the experiment configuration is made and is persisted with new metadata.
    *   The client has to subsequently update this configuration if needed and launch the cloned experiment.
    * 
    * @param newExperimentName
@@ -1138,7 +1240,7 @@ interface AiravataIf {
    *      should be shared public by default.
    * 
    * @return
-   *   The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment.
+   *   The server-side generated.airavata.registry.core.experiment.globally unique identifier (Experiment ID) for the newly cloned experiment.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
    *    For any incorrect forming of the request itself.
@@ -1176,12 +1278,16 @@ interface AiravataIf {
    */
   public function cloneExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $existingExperimentID, $newExperimentName);
   /**
-   * Terminate a running experiment.
+   * 
+   * Terminate a running Experiment.
+   * 
+   * @gatewayId
+   *    ID of the gateway which will terminate the running Experiment.
    * 
    * @param airavataExperimentId
-   *    The identifier for the requested experiment. This is returned during the create experiment step.
+   *    The identifier of the experiment required termination. This ID is returned during the create experiment step.
    * 
-   * @return
+   * @return status
    *   This method call does not have a return value.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -1219,13 +1325,17 @@ interface AiravataIf {
    */
   public function terminateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId);
   /**
+   * 
    * Register a Application Module.
    * 
+   * @gatewayId
+   *    ID of the gateway which is registering the new Application Module.
+   * 
    * @param applicationModule
    *    Application Module Object created from the datamodel.
    * 
    * @return appModuleId
-   *   Returns a server-side generated airavata appModule globally unique identifier.
+   *   Returns the server-side generated airavata appModule globally unique identifier.
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1239,13 +1349,14 @@ interface AiravataIf {
    */
   public function registerApplicationModule(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule $applicationModule);
   /**
+   * 
    * Fetch a Application Module.
    * 
    * @param appModuleId
-   *   The identifier for the requested application module
+   *   The unique identifier of the application module required
    * 
    * @return applicationModule
-   *   Returns a application Module Object.
+   *   Returns an Application Module Object.
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1271,6 +1382,7 @@ interface AiravataIf {
    */
   public function getApplicationModule(\Airavata\Model\Security\AuthzToken $authzToken, $appModuleId);
   /**
+   * 
    * Update a Application Module.
    * 
    * @param appModuleId
@@ -1294,6 +1406,16 @@ interface AiravataIf {
    */
   public function updateApplicationModule(\Airavata\Model\Security\AuthzToken $authzToken, $appModuleId, \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule $applicationModule);
   /**
+   * 
+   * Fetch all Application Module Descriptions.
+   * 
+   * @param gatewayId
+   *    ID of the gateway which need to list all available application deployment documentation.
+   * 
+   * @return list
+   *    Returns the list of all Application Module Objects.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayId
    * @return \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule[]
@@ -1304,10 +1426,11 @@ interface AiravataIf {
    */
   public function getAllAppModules(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
   /**
-   * Delete a Application Module.
+   * 
+   * Delete an Application Module.
    * 
    * @param appModuleId
-   *   The identifier for the requested application module to be deleted.
+   *   The identifier of the Application Module to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -1323,9 +1446,13 @@ interface AiravataIf {
    */
   public function deleteApplicationModule(\Airavata\Model\Security\AuthzToken $authzToken, $appModuleId);
   /**
-   * Register a Application Deployment.
    * 
-   * @param applicationModule
+   * Register an Application Deployment.
+   * 
+   * @param gatewayId
+   *    ID of the gateway which is registering the new Application Deployment.
+   * 
+   * @param applicationDeployment
    *    Application Module Object created from the datamodel.
    * 
    * @return appDeploymentId
@@ -1343,6 +1470,7 @@ interface AiravataIf {
    */
   public function registerApplicationDeployment(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription $applicationDeployment);
   /**
+   * 
    * Fetch a Application Deployment.
    * 
    * @param appDeploymentId
@@ -1386,10 +1514,11 @@ interface AiravataIf {
    */
   public function getApplicationDeployment(\Airavata\Model\Security\AuthzToken $authzToken, $appDeploymentId);
   /**
-   * Update a Application Deployment.
+   * 
+   * Update an Application Deployment.
    * 
    * @param appDeploymentId
-   *   The identifier for the requested application deployment to be updated.
+   *   The identifier of the requested application deployment to be updated.
    * 
    * @param appDeployment
    *    Application Deployment Object created from the datamodel.
@@ -1409,10 +1538,11 @@ interface AiravataIf {
    */
   public function updateApplicationDeployment(\Airavata\Model\Security\AuthzToken $authzToken, $appDeploymentId, \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription $applicationDeployment);
   /**
-   * Delete a Application deployment.
+   * 
+   * Delete an Application Deployment.
    * 
    * @param appDeploymentId
-   *   The identifier for the requested application deployment to be deleted.
+   *   The unique identifier of application deployment to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -1428,10 +1558,14 @@ interface AiravataIf {
    */
   public function deleteApplicationDeployment(\Airavata\Model\Security\AuthzToken $authzToken, $appDeploymentId);
   /**
+   * 
    * Fetch all Application Deployment Descriptions.
    * 
+   * @param gatewayId
+   *    ID of the gateway which need to list all available application deployment documentation.
+   * 
    * @return list<applicationDeployment.
-   *   Returns the list of all application Deployment Objects.
+   *    Returns the list of all application Deployment Objects.
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1463,9 +1597,10 @@ interface AiravataIf {
    */
   public function getAppModuleDeployedResources(\Airavata\Model\Security\AuthzToken $authzToken, $appModuleId);
   /**
+   * 
    * Register a Application Interface.
    * 
-   * @param applicationModule
+   * @param applicationInterface
    *    Application Module Object created from the datamodel.
    * 
    * @return appInterfaceId
@@ -1483,6 +1618,22 @@ interface AiravataIf {
    */
   public function registerApplicationInterface(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription $applicationInterface);
   /**
+   * 
+   * Clone an Application Interface.
+   * 
+   * @gatewayId
+   *    The identifier for the gateway profile to be requested
+   * 
+   * @param existingAppInterfaceID
+   *    Identifier of the existing Application interface you wich to clone.
+   * 
+   * @param newApplicationName
+   *    Name for the new application interface.
+   * 
+   * @return appInterfaceId
+   *    Returns a server-side generated globally unique identifier for the newly cloned application interface.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $existingAppInterfaceID
    * @param string $newApplicationName
@@ -1495,14 +1646,14 @@ interface AiravataIf {
    */
   public function cloneApplicationInterface(\Airavata\Model\Security\AuthzToken $authzToken, $existingAppInterfaceID, $newApplicationName, $gatewayId);
   /**
-   * Fetch a Application Interface.
+   * 
+   * Fetch an Application Interface.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application module
+   *   The identifier for the requested application interface.
    * 
    * @return applicationInterface
-   *   Returns a application Interface Object.
-   * 
+   *   Returns an application Interface Object.
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1526,10 +1677,11 @@ interface AiravataIf {
    */
   public function getApplicationInterface(\Airavata\Model\Security\AuthzToken $authzToken, $appInterfaceId);
   /**
+   * 
    * Update a Application Interface.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application deployment to be updated.
+   *   The identifier of the requested application deployment to be updated.
    * 
    * @param appInterface
    *    Application Interface Object created from the datamodel.
@@ -1538,7 +1690,6 @@ interface AiravataIf {
    *   Returns a success/failure of the update.
    * 
    * 
-   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $appInterfaceId
    * @param \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription $applicationInterface
@@ -1550,7 +1701,8 @@ interface AiravataIf {
    */
   public function updateApplicationInterface(\Airavata\Model\Security\AuthzToken $authzToken, $appInterfaceId, \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription $applicationInterface);
   /**
-   * Delete a Application Interface.
+   * 
+   * Delete an Application Interface.
    * 
    * @param appInterfaceId
    *   The identifier for the requested application interface to be deleted.
@@ -1559,7 +1711,6 @@ interface AiravataIf {
    *   Returns a success/failure of the deletion.
    * 
    * 
-   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $appInterfaceId
    * @return bool
@@ -1570,11 +1721,12 @@ interface AiravataIf {
    */
   public function deleteApplicationInterface(\Airavata\Model\Security\AuthzToken $authzToken, $appInterfaceId);
   /**
-   * Fetch name and id of  Application Interface documents.
+   * 
+   * Fetch name and ID of  Application Interface documents.
    * 
    * 
    * @return map<applicationId, applicationInterfaceNames>
-   *   Returns a list of application interfaces with corresponsing id's
+   *   Returns a list of application interfaces with corresponsing ID's
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1587,11 +1739,12 @@ interface AiravataIf {
    */
   public function getAllApplicationInterfaceNames(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
   /**
+   * 
    * Fetch all Application Interface documents.
    * 
    * 
    * @return map<applicationId, applicationInterfaceNames>
-   *   Returns a list of application interfaces documents
+   *   Returns a list of application interfaces documents (Application Interface ID, name, description, Inputs and Outputs objects).
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1604,10 +1757,11 @@ interface AiravataIf {
    */
   public function getAllApplicationInterfaces(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
   /**
+   * 
    * Fetch the list of Application Inputs.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier of the application interface which need inputs to be fetched.
    * 
    * @return list<application_interface_model.InputDataObjectType>
    *   Returns a list of application inputs.
@@ -1623,10 +1777,11 @@ interface AiravataIf {
    */
   public function getApplicationInputs(\Airavata\Model\Security\AuthzToken $authzToken, $appInterfaceId);
   /**
-   * Fetch the list of Application Outputs.
+   * 
+   * Fetch list of Application Outputs.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier of the application interface which need outputs to be fetched.
    * 
    * @return list<application_interface_model.OutputDataObjectType>
    *   Returns a list of application outputs.
@@ -1642,14 +1797,15 @@ interface AiravataIf {
    */
   public function getApplicationOutputs(\Airavata\Model\Security\AuthzToken $authzToken, $appInterfaceId);
   /**
+   * 
    * Fetch a list of all deployed Compute Hosts for a given application interfaces.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier for the requested application interface.
    * 
    * @return map<computeResourceId, computeResourceName>
    *   A map of registered compute resource id's and their corresponding hostnames.
-   *    Deployments of each modules listed within the interfaces will be listed.
+   *   Deployments of each modules listed within the interfaces will be listed.
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1727,6 +1883,7 @@ interface AiravataIf {
    */
   public function getComputeResource(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId);
   /**
+   * 
    * Fetch all registered Compute Resources.
    * 
    * @return A map of registered compute resource id's and thier corresponding hostnames.
@@ -1852,7 +2009,7 @@ interface AiravataIf {
    */
   public function getAllStorageResourceNames(\Airavata\Model\Security\AuthzToken $authzToken);
   /**
-   * Update a Compute Resource.
+   * Update a Storage Resource.
    * 
    * @param storageResourceId
    *   The identifier for the requested compute resource to be updated.
@@ -1878,7 +2035,7 @@ interface AiravataIf {
    * Delete a Storage Resource.
    * 
    * @param storageResourceId
-   *   The identifier for the requested compute resource to be deleted.
+   *   The identifier of the requested compute resource to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -2054,6 +2211,7 @@ interface AiravataIf {
    */
   public function getSSHJobSubmission(\Airavata\Model\Security\AuthzToken $authzToken, $jobSubmissionId);
   /**
+   * 
    * Add a UNICORE Job Submission details to a compute resource
    *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
    * 
@@ -2082,10 +2240,13 @@ interface AiravataIf {
    */
   public function addUNICOREJobSubmissionDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission $unicoreJobSubmission);
   /**
+   *   *
    *   * This method returns UnicoreJobSubmission object
+   *   *
    *   * @param jobSubmissionInterfaceId
    *   *   The identifier of the JobSubmission Interface to be retrieved.
    *   *  @return UnicoreJobSubmission instance
+   *   *
    * *
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -2104,6 +2265,7 @@ interface AiravataIf {
    */
   public function getUnicoreJobSubmission(\Airavata\Model\Security\AuthzToken $authzToken, $jobSubmissionId);
   /**
+   *    *
    *    * Add a Cloud Job Submission details to a compute resource
    *    *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
    *    *
@@ -2118,6 +2280,7 @@ interface AiravataIf {
    *    *
    *    * @return status
    *    *   Returns the unique job submission id.
+   *    *
    * *
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -2132,6 +2295,7 @@ interface AiravataIf {
    */
   public function addCloudJobSubmissionDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\CloudJobSubmission $cloudSubmission);
   /**
+   *    *
    *    * This method returns cloudJobSubmission object
    *    * @param jobSubmissionInterfaceI
    *        *   The identifier of the JobSubmission Interface to be retrieved.
@@ -2151,6 +2315,7 @@ interface AiravataIf {
    */
   public function getCloudJobSubmission(\Airavata\Model\Security\AuthzToken $authzToken, $jobSubmissionId);
   /**
+   * 
    * Update the given SSH Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -2174,6 +2339,7 @@ interface AiravataIf {
    */
   public function updateSSHJobSubmissionDetails(\Airavata\Model\Security\AuthzToken $authzToken, $jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SSHJobSubmission $sshJobSubmission);
   /**
+   * 
    * Update the cloud Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -2197,6 +2363,7 @@ interface AiravataIf {
    */
   public function updateCloudJobSubmissionDetails(\Airavata\Model\Security\AuthzToken $authzToken, $jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\CloudJobSubmission $sshJobSubmission);
   /**
+   * 
    * Update the UNIOCRE Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -2221,6 +2388,7 @@ interface AiravataIf {
    */
   public function updateUnicoreJobSubmissionDetails(\Airavata\Model\Security\AuthzToken $authzToken, $jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission $unicoreJobSubmission);
   /**
+   * 
    * Add a Local data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2254,6 +2422,7 @@ interface AiravataIf {
    */
   public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
   /**
+   * 
    * Update the given Local data movement details
    * 
    * @param dataMovementInterfaceId
@@ -2278,7 +2447,8 @@ interface AiravataIf {
    */
   public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
   /**
-   * This method returns local datamovement object
+   * 
+   * This method returns local datamovement object.
    * 
    * @param dataMovementId
    *   The identifier of the datamovement Interface to be retrieved.
@@ -2304,6 +2474,7 @@ interface AiravataIf {
    */
   public function getLocalDataMovement(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementId);
   /**
+   * 
    * Add a SCP data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2333,6 +2504,7 @@ interface AiravataIf {
    */
   public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
   /**
+   * 
    * Update the given scp data movement details
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2383,6 +2555,7 @@ interface AiravataIf {
    */
   public function getSCPDataMovement(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementId);
   /**
+   * 
    * Add a UNICORE data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2412,6 +2585,7 @@ interface AiravataIf {
    */
   public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
   /**
+   * 
    * Update a selected UNICORE data movement details
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2437,6 +2611,7 @@ interface AiravataIf {
    */
   public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
   /**
+   * 
    * This method returns UNICORE datamovement object
    * 
    * @param dataMovementId
@@ -2460,6 +2635,7 @@ interface AiravataIf {
    */
   public function getUnicoreDataMovement(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementId);
   /**
+   * 
    * Add a GridFTP data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2777,7 +2953,7 @@ interface AiravataIf {
    * Fetch the given Gateway Resource Profile.
    * 
    * @param gatewayID
-   *   The identifier for the requested gateway resource
+   *   The identifier for the requested gateway resource.
    * 
    * @return gatewayResourceProfile
    *    Gateway Resource Profile Object.
@@ -2874,6 +3050,22 @@ interface AiravataIf {
    */
   public function addGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId, \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference $computeResourcePreference);
   /**
+   * Add a Storage Resource Preference to a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be added.
+   * 
+   * @param storageResourceId
+   *   Preferences related to a particular compute resource
+   * 
+   * @param computeResourcePreference
+   *   The ComputeResourcePreference object to be added to the resource profile.
+   * 
+   * @return status
+   *   Returns a success/failure of the addition. If a profile already exists, this operation will fail.
+   *    Instead an update should be used.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
    * @param string $storageResourceId
@@ -2886,6 +3078,7 @@ interface AiravataIf {
    */
   public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
   /**
+   * 
    * Fetch a Compute Resource Preference of a registered gateway profile.
    * 
    * @param gatewayID
@@ -2941,6 +3134,19 @@ interface AiravataIf {
    */
   public function getGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId);
   /**
+   * 
+   * Fetch a Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to request to fetch the particular storage resource preference.
+   * 
+   * @param storageResourceId
+   *   Identifier of the Stprage Preference required to be fetched.
+   * 
+   * @return StoragePreference
+   *   Returns the StoragePreference object.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
    * @param string $storageResourceId
@@ -2952,6 +3158,7 @@ interface AiravataIf {
    */
   public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId);
   /**
+   * 
    * Fetch all Compute Resource Preferences of a registered gateway profile.
    * 
    * @param gatewayID
@@ -2971,6 +3178,15 @@ interface AiravataIf {
    */
   public function getAllGatewayComputeResourcePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID);
   /**
+   * Fetch all Storage Resource Preferences of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier for the gateway profile to be requested
+   * 
+   * @return StoragePreference
+   *   Returns the StoragePreference object.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
    * @return \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
@@ -2981,7 +3197,12 @@ interface AiravataIf {
    */
   public function getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID);
   /**
-   * Fetch all gateway profiles registered
+   * 
+   * Fetch all Gateway Profiles registered
+   * 
+   * @return GatewayResourceProfile
+   *   Returns all the GatewayResourcePrifle list object.
+   * 
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -3020,6 +3241,21 @@ interface AiravataIf {
    */
   public function updateGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId, \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference $computeResourcePreference);
   /**
+   * Update a Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be updated.
+   * 
+   * @param storageId
+   *   The Storage resource identifier of the one that you want to update
+   * 
+   * @param storagePreference
+   *   The storagePreference object to be updated to the resource profile.
+   * 
+   * @return status
+   *   Returns a success/failure of the updation.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
    * @param string $storageId
@@ -3055,6 +3291,18 @@ interface AiravataIf {
    */
   public function deleteGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId);
   /**
+   * Delete the Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be deleted.
+   * 
+   * @param storageId
+   *   ID of the storage preference you want to delete.
+   * 
+   * @return status
+   *   Returns a success/failure of the deletion.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
    * @param string $storageId
@@ -3066,6 +3314,18 @@ interface AiravataIf {
    */
   public function deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId);
   /**
+   * Delete the Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be deleted.
+   * 
+   * @param storageId
+   *   ID of the storage preference you want to delete.
+   * 
+   * @return status
+   *   Returns a success/failure of the deletion.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayId
    * @return string[]
@@ -3076,9 +3336,13 @@ interface AiravataIf {
    */
   public function getAllWorkflows(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
   /**
+   * 
+   * API Methods Related for Work-Flow Submission Features.
+   * 
+   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $workflowTemplateId
-   * @return \Airavata\Model\Workflow
+   * @return \Airavata\Model\WorkflowModel
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
@@ -3097,24 +3361,24 @@ interface AiravataIf {
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayId
-   * @param \Airavata\Model\Workflow $workflow
+   * @param \Airavata\Model\WorkflowModel $workflow
    * @return string
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function registerWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workflow $workflow);
+  public function registerWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\WorkflowModel $workflow);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $workflowTemplateId
-   * @param \Airavata\Model\Workflow $workflow
+   * @param \Airavata\Model\WorkflowModel $workflow
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function updateWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $workflowTemplateId, \Airavata\Model\Workflow $workflow);
+  public function updateWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $workflowTemplateId, \Airavata\Model\WorkflowModel $workflow);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $workflowName
@@ -3136,7 +3400,9 @@ interface AiravataIf {
    */
   public function isWorkflowExistWithName(\Airavata\Model\Security\AuthzToken $authzToken, $workflowName);
   /**
-   *  * Data Manager Related API Methods
+   *  *
+   *  * Data Manager Related API Methods.
+   *  *
    * *
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -11571,13 +11837,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     return;
   }
 
-  public function registerWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workflow $workflow)
+  public function registerWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\WorkflowModel $workflow)
   {
     $this->send_registerWorkflow($authzToken, $gatewayId, $workflow);
     return $this->recv_registerWorkflow();
   }
 
-  public function send_registerWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workflow $workflow)
+  public function send_registerWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\WorkflowModel $workflow)
   {
     $args = new \Airavata\API\Airavata_registerWorkflow_args();
     $args->authzToken = $authzToken;
@@ -11636,13 +11902,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("registerWorkflow failed: unknown result");
   }
 
-  public function updateWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $workflowTemplateId, \Airavata\Model\Workflow $workflow)
+  public function updateWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $workflowTemplateId, \Airavata\Model\WorkflowModel $workflow)
   {
     $this->send_updateWorkflow($authzToken, $workflowTemplateId, $workflow);
     $this->recv_updateWorkflow();
   }
 
-  public function send_updateWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $workflowTemplateId, \Airavata\Model\Workflow $workflow)
+  public function send_updateWorkflow(\Airavata\Model\Security\AuthzToken $authzToken, $workflowTemplateId, \Airavata\Model\WorkflowModel $workflow)
   {
     $args = new \Airavata\API\Airavata_updateWorkflow_args();
     $args->authzToken = $authzToken;
@@ -51488,7 +51754,7 @@ class Airavata_getWorkflow_result {
   static $_TSPEC;
 
   /**
-   * @var \Airavata\Model\Workflow
+   * @var \Airavata\Model\WorkflowModel
    */
   public $success = null;
   /**
@@ -51514,7 +51780,7 @@ class Airavata_getWorkflow_result {
         0 => array(
           'var' => 'success',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\Workflow',
+          'class' => '\Airavata\Model\WorkflowModel',
           ),
         1 => array(
           'var' => 'ire',
@@ -51578,7 +51844,7 @@ class Airavata_getWorkflow_result {
       {
         case 0:
           if ($ftype == TType::STRUCT) {
-            $this->success = new \Airavata\Model\Workflow();
+            $this->success = new \Airavata\Model\WorkflowModel();
             $xfer += $this->success->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -51931,7 +52197,7 @@ class Airavata_registerWorkflow_args {
    */
   public $gatewayId = null;
   /**
-   * @var \Airavata\Model\Workflow
+   * @var \Airavata\Model\WorkflowModel
    */
   public $workflow = null;
 
@@ -51950,7 +52216,7 @@ class Airavata_registerWorkflow_args {
         3 => array(
           'var' => 'workflow',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\Workflow',
+          'class' => '\Airavata\Model\WorkflowModel',
           ),
         );
     }
@@ -52003,7 +52269,7 @@ class Airavata_registerWorkflow_args {
           break;
         case 3:
           if ($ftype == TType::STRUCT) {
-            $this->workflow = new \Airavata\Model\Workflow();
+            $this->workflow = new \Airavata\Model\WorkflowModel();
             $xfer += $this->workflow->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -52237,7 +52503,7 @@ class Airavata_updateWorkflow_args {
    */
   public $workflowTemplateId = null;
   /**
-   * @var \Airavata\Model\Workflow
+   * @var \Airavata\Model\WorkflowModel
    */
   public $workflow = null;
 
@@ -52256,7 +52522,7 @@ class Airavata_updateWorkflow_args {
         3 => array(
           'var' => 'workflow',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\Workflow',
+          'class' => '\Airavata\Model\WorkflowModel',
           ),
         );
     }
@@ -52309,7 +52575,7 @@ class Airavata_updateWorkflow_args {
           break;
         case 3:
           if ($ftype == TType::STRUCT) {
-            $this->workflow = new \Airavata\Model\Workflow();
+            $this->workflow = new \Airavata\Model\WorkflowModel();
             $xfer += $this->workflow->read($input);
           } else {
             $xfer += $input->skip($ftype);


[04/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 de97d8f..cb51ff6 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
@@ -182,6 +182,7 @@ class Iface:
 
   def getAllUserSSHPubKeys(self, authzToken, userName):
     """
+
     Get a Public Key by Providing the Token
 
     @param CredStoreToken
@@ -202,6 +203,7 @@ class Iface:
 
   def getAllGatewaySSHPubKeys(self, authzToken, gatewayId):
     """
+
     Get all Public Keys of the Gateway
 
     @param CredStoreToken
@@ -222,6 +224,7 @@ class Iface:
 
   def deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
     """
+
     Delete a Gateway
 
     @param gatewayId
@@ -241,6 +244,7 @@ class Iface:
 
   def createProject(self, authzToken, gatewayId, project):
     """
+
     Creates a Project with basic metadata.
        A Project is a container of experiments.
 
@@ -248,7 +252,7 @@ class Iface:
        The identifier for the requested gateway.
 
     @param Project
-       The Project Object described in the workspace_model
+       The Project Object described in the workspace_model.
 
 
 
@@ -261,6 +265,7 @@ class Iface:
 
   def updateProject(self, authzToken, projectId, updatedProject):
     """
+
     Update an Existing Project
 
     @param projectId
@@ -280,14 +285,15 @@ class Iface:
 
   def getProject(self, authzToken, projectId):
     """
+
     Get a Project by ID
-       This method is to obtain a project by providing a projectId
+       This method is to obtain a project by providing a projectId.
 
     @param projectId
-       projectId of the project you require
+       projectId of the project you require.
 
     @return project
-       project data model will be returned
+       project data model will be returned.
 
 
 
@@ -299,15 +305,18 @@ class Iface:
 
   def deleteProject(self, authzToken, projectId):
     """
+
     Delete a Project
-       This method is used to delete an existing Project
+       This method is used to delete an existing Project.
 
     @param projectId
-       projectId of the project you want to delete
+       projectId of the project you want to delete.
 
     @return boolean
        Boolean identifier for the success or failure of the deletion operation.
 
+       NOTE: This method is not used within gateways connected with Airavata.
+
 
 
     Parameters:
@@ -318,20 +327,21 @@ class Iface:
 
   def getUserProjects(self, authzToken, gatewayId, userName, limit, offset):
     """
-    Get all Project by user with pagination. Results will be ordered based
-    on creation time DESC
+
+    Get All User Projects
+    Get all Project for the user with pagination. Results will be ordered based on creation time DESC.
 
     @param gatewayId
        The identifier for the requested gateway.
 
     @param userName
-       The identifier of the user
+       The identifier of the user.
 
     @param limit
-       The amount results to be fetched
+       The amount results to be fetched.
 
     @param offset
-       The starting point of the results to be fetched
+       The starting point of the results to be fetched.
 
 
 
@@ -346,19 +356,25 @@ class Iface:
 
   def searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
     """
-    Get all Project for user by project name with pagination.Results will be ordered based
-    on creation time DESC
+
+    Search User Projects by Project Name
+    Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
 
     @param gatewayId
-       The identifier for the requested gateway.
+       The unique identifier for the requested gateway.
+
     @param userName
-       The identifier of the user
+       The identifier of the user.
+
     @param projectName
-       The name of the project on which the results to be fetched
+       The name of the project on which the results to be fetched.
+
     @param limit
-       The amount results to be fetched
+       The amount results to be fetched.
+
     @param offset
-       The starting point of the results to be fetched
+       The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -373,19 +389,25 @@ class Iface:
 
   def searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
     """
-    Search and get all Projects for user by project description with pagination. Results
-    will be ordered based on creation time DESC
+
+    Search User Projects by Project Description
+    Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
 
     @param gatewayId
-       The identifier for the requested gateway.
+       The unique identifier of the gateway making the request.
+
     @param userName
-       The identifier of the user
+       The identifier of the user.
+
     @param description
-       The description to be matched
+       The description to be matched.
+
     @param limit
-       The amount results to be fetched
+       The amount results to be fetched.
+
     @param offset
-       The starting point of the results to be fetched
+       The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -400,19 +422,25 @@ class Iface:
 
   def searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
     """
-    Search Experiments by experiment name with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search User Experiments by Name
+    Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the user who created the experiments.
+
     @param expName
-          Experiment name to be matched
+          Experiment name to be matched.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -427,19 +455,25 @@ class Iface:
 
   def searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
     """
-    Search Experiments by experiment name with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search By Experiment Description
+    Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the requested user.
+
     @param description
-          Experiment description to be matched
+          Experiment description to be matched.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -454,19 +488,25 @@ class Iface:
 
   def searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
     """
-    Search Experiments by application id with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search Experiment By the Application
+    Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the requested user.
+
     @param applicationId
-          Application id to be matched
+          Application id to be matched.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -481,19 +521,25 @@ class Iface:
 
   def searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
     """
-    Search Experiments by experiment status with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search User Experiments by Status
+    Search all the Experiments of the given user  by experiment status with pagination. Results will be sorted based on creation time DESC
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the user making the request.
+
     @param experimentState
-          Experiement state to be matched
+          Experiement state to be matched.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -508,21 +554,31 @@ class Iface:
 
   def searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
     """
-    Search Experiments by experiment creation time with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search User Experiments by the Creation Time
+    This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the requested user.
+
     @param fromTime
-          Start time of the experiments creation time
+          Start time of the experiments creation time.
+
     @param toTime
-          End time of the  experiement creation time
+          End time of the  experiement creation time.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
+    @return ExperimentSummaryModel
+       List of experiments for the given search filter. Here only the Experiment summary will be returned.
+
 
 
     Parameters:
@@ -538,19 +594,27 @@ class Iface:
 
   def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
     """
-    Search Experiments by using multiple filter criteria with pagination. Results will be sorted
-    based on creation time DESC
+    Search Experiments.
+    Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requested gateway
+          Identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the user requesting the search function.
+
     @param filters
-          map of multiple filter criteria.
+          Map of multiple filter criteria. Currenlt search filters includes Experiment Name, Description, Application, etc....
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
+    @return ExperimentSummaryModel
+       List of experiments for the given search filter. Here only the Experiment summary will be returned.
+
 
 
     Parameters:
@@ -565,13 +629,19 @@ class Iface:
 
   def getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
     """
-    Get Experiment Statisitics for the given gateway for a specific time period
+
+    Get Experiment Statistics
+    Get Experiment Statisitics for a given gateway for a specific time period. This feature is available only for admins of a particular gateway. Gateway admin access is managed by the user roles.
+
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the gateway making the request to fetch statistics.
+
     @param fromTime
-          Starting date time
+          Starting date time.
+
     @param toTime
-          Ending data time
+          Ending data time.
+
 
 
     Parameters:
@@ -584,15 +654,19 @@ class Iface:
 
   def getExperimentsInProject(self, authzToken, projectId, limit, offset):
     """
-    Get Experiments within project with pagination. Results will be sorted
-    based on creation time DESC
+
+    Get All Experiments of the Project
+    Get Experiments within project with pagination. Results will be sorted based on creation time DESC.
 
     @param projectId
-          Identifier of the project
+          Uniqie identifier of the project.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -605,17 +679,22 @@ class Iface:
 
   def getUserExperiments(self, authzToken, gatewayId, userName, limit, offset):
     """
-    Get experiments by user with pagination. Results will be sorted
-    based on creation time DESC
+
+    Get All Experiments of the User
+    Get experiments by user with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requesting gateway
+          Identifier of the requesting gateway.
+
     @param userName
-          Username of the requested user
+          Username of the requested end user.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -629,12 +708,17 @@ class Iface:
 
   def createExperiment(self, authzToken, gatewayId, experiment):
     """
+      *
+      * Create New Experiment
       * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
       *   but inferred from the sshKeyAuthentication header. This experiment is just a persistent place holder. The client
       *   has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
       *   registering the experiment in a persistent store.
       *
-      * @param basicExperimentMetadata
+      * @param gatewayId
+      *    The unique ID of the gateway where the experiment is been created.
+      *
+      * @param ExperimentModel
       *    The create experiment will require the basic experiment metadata like the name and description, intended user,
       *      the gateway identifer and if the experiment should be shared public by defualt. During the creation of an experiment
       *      the ExperimentMetadata is a required field.
@@ -673,8 +757,8 @@ class Iface:
 
   def deleteExperiment(self, authzToken, experimentId):
     """
-    Delete an Experiment
 
+    Delete an Experiment
     If the experiment is not already launched experiment can be deleted.
 
     @param authzToken
@@ -683,7 +767,7 @@ class Iface:
         Experiment ID of the experimnet you want to delete.
 
     @return boolean
-        Identifier for the success or failure of the deletion operation
+        Identifier for the success or failure of the deletion operation.
 
 
 
@@ -695,12 +779,14 @@ class Iface:
 
   def getExperiment(self, authzToken, airavataExperimentId):
     """
+      *
+      * Get Experiment
       * Fetch previously created experiment metadata.
       *
       * @param airavataExperimentId
-      *    The identifier for the requested experiment. This is returned during the create experiment step.
+      *    The unique identifier of the requested experiment. This ID is returned during the create experiment step.
       *
-      * @return experimentMetada
+      * @return ExperimentModel
       *   This method will return the previously stored experiment metadata.
       *
       * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -736,14 +822,17 @@ class Iface:
 
   def getDetailedExperimentTree(self, authzToken, airavataExperimentId):
     """
+
+    Get Complete Experiment Details
     Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
     tasks -> jobs information.
 
     @param airavataExperimentId
        The identifier for the requested experiment. This is returned during the create experiment step.
 
-    @return experimentMetada
-      This method will return the previously stored experiment metadata.
+    @return ExperimentModel
+      This method will return the previously stored experiment metadata including application input parameters, computational resource scheduling
+      information, special input output handling and additional quality of service parameters.
 
     @throws org.apache.airavata.model.error.InvalidRequestException
        For any incorrect forming of the request itself.
@@ -777,14 +866,15 @@ class Iface:
 
   def updateExperiment(self, authzToken, airavataExperimentId, experiment):
     """
-    Configure a previously created experiment with required inputs, scheduling and other quality of service
-      parameters. This method only updates the experiment object within the registry. The experiment has to be launched
-      to make it actionable by the server.
+
+    Update a Previously Created Experiment
+    Configure the CREATED experiment with required inputs, scheduling and other quality of service parameters. This method only updates the experiment object within the registry.
+    The experiment has to be launched to make it actionable by the server.
 
     @param airavataExperimentId
        The identifier for the requested experiment. This is returned during the create experiment step.
 
-    @param experimentConfigurationData
+    @param ExperimentModel
        The configuration information of the experiment with application input parameters, computational resource scheduling
          information, special input output handling and additional quality of service parameters.
 
@@ -843,13 +933,14 @@ class Iface:
   def validateExperiment(self, authzToken, airavataExperimentId):
     """
      *
-     * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
-     *
-     * @param experimentId
+     * Validate experiment configuration.
+     * A true in general indicates, the experiment is ready to be launched.
      *
+     * @param airavataExperimentId
+     *    Unique identifier of the experiment (Experimnent ID) of the experiment which need to be validated.
      *
      * @return boolean
-     *      Identifier for the success or failure of the validation operation
+     *      Identifier for the success or failure of the validation operation.
      *
     *
 
@@ -861,8 +952,12 @@ class Iface:
 
   def launchExperiment(self, authzToken, airavataExperimentId, gatewayId):
     """
-    Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
-      notifications and intermediate and output data will be subsequently available for this experiment.
+
+    Launch a Previously Created & Configured Experiment.
+    Airavata Server will then start processing the request and appropriate notifications and intermediate and output data will be subsequently available for this experiment.
+
+    @gatewayId
+       ID of the gateway which will launch the experiment.
 
     @param airavataExperimentId
        The identifier for the requested experiment. This is returned during the create experiment step.
@@ -903,17 +998,18 @@ class Iface:
 
   def getExperimentStatus(self, authzToken, airavataExperimentId):
     """
+
     Get Experiment Status
 
-    Obtain the status os an experiment by providing the Experiment Id
+    Obtain the status of an experiment by providing the Experiment Id
 
     @param authzToken
 
-    @param experiementId
-        Experiment ID of the experimnet you require the status
+    @param airavataExperimentId
+        Experiment ID of the experimnet you require the status.
 
     @return ExperimentStatus
-        ExperimentStatus model with current status will be returned.
+        ExperimentStatus model with the current status will be returned.
 
 
 
@@ -925,16 +1021,17 @@ class Iface:
 
   def getExperimentOutputs(self, authzToken, airavataExperimentId):
     """
+
     Get Experiment Outputs
-    This method to be used when need to obtain outputs of a certain Experiment
+    This method to be used when need to obtain final outputs of a certain Experiment
 
     @param authzToken
 
-    @param experiementId
-        Experiment ID of the experimnet you need the outputs
+    @param airavataExperimentId
+        Experiment ID of the experimnet you need the outputs.
 
     @return list
-        List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+        List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
 
 
 
@@ -946,16 +1043,17 @@ class Iface:
 
   def getIntermediateOutputs(self, authzToken, airavataExperimentId):
     """
+
     Get Intermediate Experiment Outputs
     This method to be used when need to obtain intermediate outputs of a certain Experiment
 
     @param authzToken
 
-    @param experiementId
-        Experiment ID of the experimnet you need the intermediate outputs
+    @param airavataExperimentId
+        Experiment ID of the experimnet you need intermediate outputs.
 
     @return list
-        List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+        List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
 
 
 
@@ -967,13 +1065,14 @@ class Iface:
 
   def getJobStatuses(self, authzToken, airavataExperimentId):
     """
-    Get Job Status for an Experiment
+
+    Get Job Statuses for an Experiment
     This method to be used when need to get the job status of an Experiment. An experiment may have one or many jobs; there for one or many job statuses may turnup
 
     @param authzToken
 
     @param experiementId
-        Experiment ID of the experimnet you need the intermediate outputs
+        Experiment ID of the experimnet you need the job statuses.
 
     @return JobStatus
         Job status (string) for all all the existing jobs for the experiment will be returned in the form of a map
@@ -988,16 +1087,17 @@ class Iface:
 
   def getJobDetails(self, authzToken, airavataExperimentId):
     """
-    Get Job Details for all the jobs within an Experiment
+
+    Get Job Details for all the jobs within an Experiment.
     This method to be used when need to get the job details for one or many jobs of an Experiment.
 
     @param authzToken
 
     @param experiementId
-        Experiment ID of the experimnet you need job details
+        Experiment ID of the experimnet you need job details.
 
     @return list of JobDetails
-        Job details
+        Job details.
 
 
 
@@ -1009,7 +1109,9 @@ class Iface:
 
   def cloneExperiment(self, authzToken, existingExperimentID, newExperimentName):
     """
-    Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
+
+    Clone an Existing Experiment
+    Existing specified experiment is cloned and a new name is provided. A copy of the experiment configuration is made and is persisted with new metadata.
       The client has to subsequently update this configuration if needed and launch the cloned experiment.
 
     @param newExperimentName
@@ -1021,7 +1123,7 @@ class Iface:
          should be shared public by default.
 
     @return
-      The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment.
+      The server-side generated.airavata.registry.core.experiment.globally unique identifier (Experiment ID) for the newly cloned experiment.
 
     @throws org.apache.airavata.model.error.InvalidRequestException
        For any incorrect forming of the request itself.
@@ -1056,12 +1158,16 @@ class Iface:
 
   def terminateExperiment(self, authzToken, airavataExperimentId, gatewayId):
     """
-    Terminate a running experiment.
+
+    Terminate a running Experiment.
+
+    @gatewayId
+       ID of the gateway which will terminate the running Experiment.
 
     @param airavataExperimentId
-       The identifier for the requested experiment. This is returned during the create experiment step.
+       The identifier of the experiment required termination. This ID is returned during the create experiment step.
 
-    @return
+    @return status
       This method call does not have a return value.
 
     @throws org.apache.airavata.model.error.InvalidRequestException
@@ -1097,13 +1203,17 @@ class Iface:
 
   def registerApplicationModule(self, authzToken, gatewayId, applicationModule):
     """
+
     Register a Application Module.
 
+    @gatewayId
+       ID of the gateway which is registering the new Application Module.
+
     @param applicationModule
        Application Module Object created from the datamodel.
 
     @return appModuleId
-      Returns a server-side generated airavata appModule globally unique identifier.
+      Returns the server-side generated airavata appModule globally unique identifier.
 
 
     Parameters:
@@ -1115,13 +1225,14 @@ class Iface:
 
   def getApplicationModule(self, authzToken, appModuleId):
     """
+
     Fetch a Application Module.
 
     @param appModuleId
-      The identifier for the requested application module
+      The unique identifier of the application module required
 
     @return applicationModule
-      Returns a application Module Object.
+      Returns an Application Module Object.
 
 
     Parameters:
@@ -1132,6 +1243,7 @@ class Iface:
 
   def updateApplicationModule(self, authzToken, appModuleId, applicationModule):
     """
+
     Update a Application Module.
 
     @param appModuleId
@@ -1153,6 +1265,16 @@ class Iface:
 
   def getAllAppModules(self, authzToken, gatewayId):
     """
+
+    Fetch all Application Module Descriptions.
+
+    @param gatewayId
+       ID of the gateway which need to list all available application deployment documentation.
+
+    @return list
+       Returns the list of all Application Module Objects.
+
+
     Parameters:
      - authzToken
      - gatewayId
@@ -1161,10 +1283,11 @@ class Iface:
 
   def deleteApplicationModule(self, authzToken, appModuleId):
     """
-    Delete a Application Module.
+
+    Delete an Application Module.
 
     @param appModuleId
-      The identifier for the requested application module to be deleted.
+      The identifier of the Application Module to be deleted.
 
     @return status
       Returns a success/failure of the deletion.
@@ -1178,9 +1301,13 @@ class Iface:
 
   def registerApplicationDeployment(self, authzToken, gatewayId, applicationDeployment):
     """
-    Register a Application Deployment.
 
-    @param applicationModule
+    Register an Application Deployment.
+
+    @param gatewayId
+       ID of the gateway which is registering the new Application Deployment.
+
+    @param applicationDeployment
        Application Module Object created from the datamodel.
 
     @return appDeploymentId
@@ -1196,6 +1323,7 @@ class Iface:
 
   def getApplicationDeployment(self, authzToken, appDeploymentId):
     """
+
     Fetch a Application Deployment.
 
     @param appDeploymentId
@@ -1213,10 +1341,11 @@ class Iface:
 
   def updateApplicationDeployment(self, authzToken, appDeploymentId, applicationDeployment):
     """
-    Update a Application Deployment.
+
+    Update an Application Deployment.
 
     @param appDeploymentId
-      The identifier for the requested application deployment to be updated.
+      The identifier of the requested application deployment to be updated.
 
     @param appDeployment
        Application Deployment Object created from the datamodel.
@@ -1234,10 +1363,11 @@ class Iface:
 
   def deleteApplicationDeployment(self, authzToken, appDeploymentId):
     """
-    Delete a Application deployment.
+
+    Delete an Application Deployment.
 
     @param appDeploymentId
-      The identifier for the requested application deployment to be deleted.
+      The unique identifier of application deployment to be deleted.
 
     @return status
       Returns a success/failure of the deletion.
@@ -1251,10 +1381,14 @@ class Iface:
 
   def getAllApplicationDeployments(self, authzToken, gatewayId):
     """
+
     Fetch all Application Deployment Descriptions.
 
+    @param gatewayId
+       ID of the gateway which need to list all available application deployment documentation.
+
     @return list<applicationDeployment.
-      Returns the list of all application Deployment Objects.
+       Returns the list of all application Deployment Objects.
 
 
     Parameters:
@@ -1282,9 +1416,10 @@ class Iface:
 
   def registerApplicationInterface(self, authzToken, gatewayId, applicationInterface):
     """
+
     Register a Application Interface.
 
-    @param applicationModule
+    @param applicationInterface
        Application Module Object created from the datamodel.
 
     @return appInterfaceId
@@ -1300,6 +1435,22 @@ class Iface:
 
   def cloneApplicationInterface(self, authzToken, existingAppInterfaceID, newApplicationName, gatewayId):
     """
+
+    Clone an Application Interface.
+
+    @gatewayId
+       The identifier for the gateway profile to be requested
+
+    @param existingAppInterfaceID
+       Identifier of the existing Application interface you wich to clone.
+
+    @param newApplicationName
+       Name for the new application interface.
+
+    @return appInterfaceId
+       Returns a server-side generated globally unique identifier for the newly cloned application interface.
+
+
     Parameters:
      - authzToken
      - existingAppInterfaceID
@@ -1310,14 +1461,14 @@ class Iface:
 
   def getApplicationInterface(self, authzToken, appInterfaceId):
     """
-    Fetch a Application Interface.
+
+    Fetch an Application Interface.
 
     @param appInterfaceId
-      The identifier for the requested application module
+      The identifier for the requested application interface.
 
     @return applicationInterface
-      Returns a application Interface Object.
-
+      Returns an application Interface Object.
 
 
     Parameters:
@@ -1328,10 +1479,11 @@ class Iface:
 
   def updateApplicationInterface(self, authzToken, appInterfaceId, applicationInterface):
     """
+
     Update a Application Interface.
 
     @param appInterfaceId
-      The identifier for the requested application deployment to be updated.
+      The identifier of the requested application deployment to be updated.
 
     @param appInterface
        Application Interface Object created from the datamodel.
@@ -1340,7 +1492,6 @@ class Iface:
       Returns a success/failure of the update.
 
 
-
     Parameters:
      - authzToken
      - appInterfaceId
@@ -1350,7 +1501,8 @@ class Iface:
 
   def deleteApplicationInterface(self, authzToken, appInterfaceId):
     """
-    Delete a Application Interface.
+
+    Delete an Application Interface.
 
     @param appInterfaceId
       The identifier for the requested application interface to be deleted.
@@ -1359,7 +1511,6 @@ class Iface:
       Returns a success/failure of the deletion.
 
 
-
     Parameters:
      - authzToken
      - appInterfaceId
@@ -1368,11 +1519,12 @@ class Iface:
 
   def getAllApplicationInterfaceNames(self, authzToken, gatewayId):
     """
-    Fetch name and id of  Application Interface documents.
+
+    Fetch name and ID of  Application Interface documents.
 
 
     @return map<applicationId, applicationInterfaceNames>
-      Returns a list of application interfaces with corresponsing id's
+      Returns a list of application interfaces with corresponsing ID's
 
 
     Parameters:
@@ -1383,11 +1535,12 @@ class Iface:
 
   def getAllApplicationInterfaces(self, authzToken, gatewayId):
     """
+
     Fetch all Application Interface documents.
 
 
     @return map<applicationId, applicationInterfaceNames>
-      Returns a list of application interfaces documents
+      Returns a list of application interfaces documents (Application Interface ID, name, description, Inputs and Outputs objects).
 
 
     Parameters:
@@ -1398,10 +1551,11 @@ class Iface:
 
   def getApplicationInputs(self, authzToken, appInterfaceId):
     """
+
     Fetch the list of Application Inputs.
 
     @param appInterfaceId
-      The identifier for the requested application interface
+      The identifier of the application interface which need inputs to be fetched.
 
     @return list<application_interface_model.InputDataObjectType>
       Returns a list of application inputs.
@@ -1415,10 +1569,11 @@ class Iface:
 
   def getApplicationOutputs(self, authzToken, appInterfaceId):
     """
-    Fetch the list of Application Outputs.
+
+    Fetch list of Application Outputs.
 
     @param appInterfaceId
-      The identifier for the requested application interface
+      The identifier of the application interface which need outputs to be fetched.
 
     @return list<application_interface_model.OutputDataObjectType>
       Returns a list of application outputs.
@@ -1432,14 +1587,15 @@ class Iface:
 
   def getAvailableAppInterfaceComputeResources(self, authzToken, appInterfaceId):
     """
+
     Fetch a list of all deployed Compute Hosts for a given application interfaces.
 
     @param appInterfaceId
-      The identifier for the requested application interface
+      The identifier for the requested application interface.
 
     @return map<computeResourceId, computeResourceName>
       A map of registered compute resource id's and their corresponding hostnames.
-       Deployments of each modules listed within the interfaces will be listed.
+      Deployments of each modules listed within the interfaces will be listed.
 
 
     Parameters:
@@ -1484,6 +1640,7 @@ class Iface:
 
   def getAllComputeResourceNames(self, authzToken):
     """
+
     Fetch all registered Compute Resources.
 
     @return A map of registered compute resource id's and thier corresponding hostnames.
@@ -1582,7 +1739,7 @@ class Iface:
 
   def updateStorageResource(self, authzToken, storageResourceId, storageResourceDescription):
     """
-    Update a Compute Resource.
+    Update a Storage Resource.
 
     @param storageResourceId
       The identifier for the requested compute resource to be updated.
@@ -1606,7 +1763,7 @@ class Iface:
     Delete a Storage Resource.
 
     @param storageResourceId
-      The identifier for the requested compute resource to be deleted.
+      The identifier of the requested compute resource to be deleted.
 
     @return status
       Returns a success/failure of the deletion.
@@ -1747,6 +1904,7 @@ class Iface:
 
   def addUNICOREJobSubmissionDetails(self, authzToken, computeResourceId, priorityOrder, unicoreJobSubmission):
     """
+
     Add a UNICORE Job Submission details to a compute resource
      App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
 
@@ -1773,10 +1931,13 @@ class Iface:
 
   def getUnicoreJobSubmission(self, authzToken, jobSubmissionId):
     """
+      *
       * This method returns UnicoreJobSubmission object
+      *
       * @param jobSubmissionInterfaceId
       *   The identifier of the JobSubmission Interface to be retrieved.
       *  @return UnicoreJobSubmission instance
+      *
     *
 
     Parameters:
@@ -1787,6 +1948,7 @@ class Iface:
 
   def addCloudJobSubmissionDetails(self, authzToken, computeResourceId, priorityOrder, cloudSubmission):
     """
+       *
        * Add a Cloud Job Submission details to a compute resource
        *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
        *
@@ -1801,6 +1963,7 @@ class Iface:
        *
        * @return status
        *   Returns the unique job submission id.
+       *
     *
 
     Parameters:
@@ -1813,6 +1976,7 @@ class Iface:
 
   def getCloudJobSubmission(self, authzToken, jobSubmissionId):
     """
+       *
        * This method returns cloudJobSubmission object
        * @param jobSubmissionInterfaceI
            *   The identifier of the JobSubmission Interface to be retrieved.
@@ -1827,6 +1991,7 @@ class Iface:
 
   def updateSSHJobSubmissionDetails(self, authzToken, jobSubmissionInterfaceId, sshJobSubmission):
     """
+
     Update the given SSH Job Submission details
 
     @param jobSubmissionInterfaceId
@@ -1848,6 +2013,7 @@ class Iface:
 
   def updateCloudJobSubmissionDetails(self, authzToken, jobSubmissionInterfaceId, sshJobSubmission):
     """
+
     Update the cloud Job Submission details
 
     @param jobSubmissionInterfaceId
@@ -1869,6 +2035,7 @@ class Iface:
 
   def updateUnicoreJobSubmissionDetails(self, authzToken, jobSubmissionInterfaceId, unicoreJobSubmission):
     """
+
     Update the UNIOCRE Job Submission details
 
     @param jobSubmissionInterfaceId
@@ -1891,6 +2058,7 @@ class Iface:
 
   def addLocalDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement):
     """
+
     Add a Local data movement details to a compute resource
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -1922,6 +2090,7 @@ class Iface:
 
   def updateLocalDataMovementDetails(self, authzToken, dataMovementInterfaceId, localDataMovement):
     """
+
     Update the given Local data movement details
 
     @param dataMovementInterfaceId
@@ -1944,7 +2113,8 @@ class Iface:
 
   def getLocalDataMovement(self, authzToken, dataMovementId):
     """
-    This method returns local datamovement object
+
+    This method returns local datamovement object.
 
     @param dataMovementId
       The identifier of the datamovement Interface to be retrieved.
@@ -1961,6 +2131,7 @@ class Iface:
 
   def addSCPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement):
     """
+
     Add a SCP data movement details to a compute resource
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -1988,6 +2159,7 @@ class Iface:
 
   def updateSCPDataMovementDetails(self, authzToken, dataMovementInterfaceId, scpDataMovement):
     """
+
     Update the given scp data movement details
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -2027,6 +2199,7 @@ class Iface:
 
   def addUnicoreDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement):
     """
+
     Add a UNICORE data movement details to a compute resource
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -2054,6 +2227,7 @@ class Iface:
 
   def updateUnicoreDataMovementDetails(self, authzToken, dataMovementInterfaceId, unicoreDataMovement):
     """
+
     Update a selected UNICORE data movement details
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -2077,6 +2251,7 @@ class Iface:
 
   def getUnicoreDataMovement(self, authzToken, dataMovementId):
     """
+
     This method returns UNICORE datamovement object
 
     @param dataMovementId
@@ -2094,6 +2269,7 @@ class Iface:
 
   def addGridFTPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement):
     """
+
     Add a GridFTP data movement details to a compute resource
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -2359,7 +2535,7 @@ class Iface:
     Fetch the given Gateway Resource Profile.
 
     @param gatewayID
-      The identifier for the requested gateway resource
+      The identifier for the requested gateway resource.
 
     @return gatewayResourceProfile
        Gateway Resource Profile Object.
@@ -2437,6 +2613,22 @@ class Iface:
 
   def addGatewayStoragePreference(self, authzToken, gatewayID, storageResourceId, storagePreference):
     """
+    Add a Storage Resource Preference to a registered gateway profile.
+
+    @param gatewayID
+      The identifier of the gateway profile to be added.
+
+    @param storageResourceId
+      Preferences related to a particular compute resource
+
+    @param computeResourcePreference
+      The ComputeResourcePreference object to be added to the resource profile.
+
+    @return status
+      Returns a success/failure of the addition. If a profile already exists, this operation will fail.
+       Instead an update should be used.
+
+
     Parameters:
      - authzToken
      - gatewayID
@@ -2447,6 +2639,7 @@ class Iface:
 
   def getGatewayComputeResourcePreference(self, authzToken, gatewayID, computeResourceId):
     """
+
     Fetch a Compute Resource Preference of a registered gateway profile.
 
     @param gatewayID
@@ -2468,6 +2661,19 @@ class Iface:
 
   def getGatewayStoragePreference(self, authzToken, gatewayID, storageResourceId):
     """
+
+    Fetch a Storage Resource Preference of a registered gateway profile.
+
+    @param gatewayID
+      The identifier of the gateway profile to request to fetch the particular storage resource preference.
+
+    @param storageResourceId
+      Identifier of the Stprage Preference required to be fetched.
+
+    @return StoragePreference
+      Returns the StoragePreference object.
+
+
     Parameters:
      - authzToken
      - gatewayID
@@ -2477,6 +2683,7 @@ class Iface:
 
   def getAllGatewayComputeResourcePreferences(self, authzToken, gatewayID):
     """
+
     Fetch all Compute Resource Preferences of a registered gateway profile.
 
     @param gatewayID
@@ -2494,6 +2701,15 @@ class Iface:
 
   def getAllGatewayStoragePreferences(self, authzToken, gatewayID):
     """
+    Fetch all Storage Resource Preferences of a registered gateway profile.
+
+    @param gatewayID
+      The identifier for the gateway profile to be requested
+
+    @return StoragePreference
+      Returns the StoragePreference object.
+
+
     Parameters:
      - authzToken
      - gatewayID
@@ -2502,7 +2718,12 @@ class Iface:
 
   def getAllGatewayResourceProfiles(self, authzToken):
     """
-    Fetch all gateway profiles registered
+
+    Fetch all Gateway Profiles registered
+
+    @return GatewayResourceProfile
+      Returns all the GatewayResourcePrifle list object.
+
 
 
     Parameters:
@@ -2537,6 +2758,21 @@ class Iface:
 
   def updateGatewayStoragePreference(self, authzToken, gatewayID, storageId, storagePreference):
     """
+    Update a Storage Resource Preference of a registered gateway profile.
+
+    @param gatewayID
+      The identifier of the gateway profile to be updated.
+
+    @param storageId
+      The Storage resource identifier of the one that you want to update
+
+    @param storagePreference
+      The storagePreference object to be updated to the resource profile.
+
+    @return status
+      Returns a success/failure of the updation.
+
+
     Parameters:
      - authzToken
      - gatewayID
@@ -2568,6 +2804,18 @@ class Iface:
 
   def deleteGatewayStoragePreference(self, authzToken, gatewayID, storageId):
     """
+    Delete the Storage Resource Preference of a registered gateway profile.
+
+    @param gatewayID
+      The identifier of the gateway profile to be deleted.
+
+    @param storageId
+      ID of the storage preference you want to delete.
+
+    @return status
+      Returns a success/failure of the deletion.
+
+
     Parameters:
      - authzToken
      - gatewayID
@@ -2577,6 +2825,18 @@ class Iface:
 
   def getAllWorkflows(self, authzToken, gatewayId):
     """
+    Delete the Storage Resource Preference of a registered gateway profile.
+
+    @param gatewayID
+      The identifier of the gateway profile to be deleted.
+
+    @param storageId
+      ID of the storage preference you want to delete.
+
+    @return status
+      Returns a success/failure of the deletion.
+
+
     Parameters:
      - authzToken
      - gatewayId
@@ -2585,6 +2845,10 @@ class Iface:
 
   def getWorkflow(self, authzToken, workflowTemplateId):
     """
+
+    API Methods Related for Work-Flow Submission Features.
+
+
     Parameters:
      - authzToken
      - workflowTemplateId
@@ -2635,7 +2899,9 @@ class Iface:
 
   def registerDataResource(self, authzToken, dataResourceModel):
     """
-     * Data Manager Related API Methods
+     *
+     * Data Manager Related API Methods.
+     *
     *
 
     Parameters:
@@ -3152,6 +3418,7 @@ class Client(Iface):
 
   def getAllUserSSHPubKeys(self, authzToken, userName):
     """
+
     Get a Public Key by Providing the Token
 
     @param CredStoreToken
@@ -3203,6 +3470,7 @@ class Client(Iface):
 
   def getAllGatewaySSHPubKeys(self, authzToken, gatewayId):
     """
+
     Get all Public Keys of the Gateway
 
     @param CredStoreToken
@@ -3254,6 +3522,7 @@ class Client(Iface):
 
   def deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
     """
+
     Delete a Gateway
 
     @param gatewayId
@@ -3305,6 +3574,7 @@ class Client(Iface):
 
   def createProject(self, authzToken, gatewayId, project):
     """
+
     Creates a Project with basic metadata.
        A Project is a container of experiments.
 
@@ -3312,7 +3582,7 @@ class Client(Iface):
        The identifier for the requested gateway.
 
     @param Project
-       The Project Object described in the workspace_model
+       The Project Object described in the workspace_model.
 
 
 
@@ -3359,6 +3629,7 @@ class Client(Iface):
 
   def updateProject(self, authzToken, projectId, updatedProject):
     """
+
     Update an Existing Project
 
     @param projectId
@@ -3412,14 +3683,15 @@ class Client(Iface):
 
   def getProject(self, authzToken, projectId):
     """
+
     Get a Project by ID
-       This method is to obtain a project by providing a projectId
+       This method is to obtain a project by providing a projectId.
 
     @param projectId
-       projectId of the project you require
+       projectId of the project you require.
 
     @return project
-       project data model will be returned
+       project data model will be returned.
 
 
 
@@ -3466,15 +3738,18 @@ class Client(Iface):
 
   def deleteProject(self, authzToken, projectId):
     """
+
     Delete a Project
-       This method is used to delete an existing Project
+       This method is used to delete an existing Project.
 
     @param projectId
-       projectId of the project you want to delete
+       projectId of the project you want to delete.
 
     @return boolean
        Boolean identifier for the success or failure of the deletion operation.
 
+       NOTE: This method is not used within gateways connected with Airavata.
+
 
 
     Parameters:
@@ -3520,20 +3795,21 @@ class Client(Iface):
 
   def getUserProjects(self, authzToken, gatewayId, userName, limit, offset):
     """
-    Get all Project by user with pagination. Results will be ordered based
-    on creation time DESC
+
+    Get All User Projects
+    Get all Project for the user with pagination. Results will be ordered based on creation time DESC.
 
     @param gatewayId
        The identifier for the requested gateway.
 
     @param userName
-       The identifier of the user
+       The identifier of the user.
 
     @param limit
-       The amount results to be fetched
+       The amount results to be fetched.
 
     @param offset
-       The starting point of the results to be fetched
+       The starting point of the results to be fetched.
 
 
 
@@ -3584,19 +3860,25 @@ class Client(Iface):
 
   def searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
     """
-    Get all Project for user by project name with pagination.Results will be ordered based
-    on creation time DESC
+
+    Search User Projects by Project Name
+    Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
 
     @param gatewayId
-       The identifier for the requested gateway.
+       The unique identifier for the requested gateway.
+
     @param userName
-       The identifier of the user
+       The identifier of the user.
+
     @param projectName
-       The name of the project on which the results to be fetched
+       The name of the project on which the results to be fetched.
+
     @param limit
-       The amount results to be fetched
+       The amount results to be fetched.
+
     @param offset
-       The starting point of the results to be fetched
+       The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -3648,19 +3930,25 @@ class Client(Iface):
 
   def searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
     """
-    Search and get all Projects for user by project description with pagination. Results
-    will be ordered based on creation time DESC
+
+    Search User Projects by Project Description
+    Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
 
     @param gatewayId
-       The identifier for the requested gateway.
+       The unique identifier of the gateway making the request.
+
     @param userName
-       The identifier of the user
+       The identifier of the user.
+
     @param description
-       The description to be matched
+       The description to be matched.
+
     @param limit
-       The amount results to be fetched
+       The amount results to be fetched.
+
     @param offset
-       The starting point of the results to be fetched
+       The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -3712,19 +4000,25 @@ class Client(Iface):
 
   def searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
     """
-    Search Experiments by experiment name with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search User Experiments by Name
+    Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the user who created the experiments.
+
     @param expName
-          Experiment name to be matched
+          Experiment name to be matched.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -3776,19 +4070,25 @@ class Client(Iface):
 
   def searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
     """
-    Search Experiments by experiment name with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search By Experiment Description
+    Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the requested user.
+
     @param description
-          Experiment description to be matched
+          Experiment description to be matched.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -3840,19 +4140,25 @@ class Client(Iface):
 
   def searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
     """
-    Search Experiments by application id with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search Experiment By the Application
+    Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the requested user.
+
     @param applicationId
-          Application id to be matched
+          Application id to be matched.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -3904,19 +4210,25 @@ class Client(Iface):
 
   def searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
     """
-    Search Experiments by experiment status with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search User Experiments by Status
+    Search all the Experiments of the given user  by experiment status with pagination. Results will be sorted based on creation time DESC
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the user making the request.
+
     @param experimentState
-          Experiement state to be matched
+          Experiement state to be matched.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -3968,21 +4280,31 @@ class Client(Iface):
 
   def searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
     """
-    Search Experiments by experiment creation time with pagination. Results will be sorted
-    based on creation time DESC
+
+    Search User Experiments by the Creation Time
+    This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the requested user.
+
     @param fromTime
-          Start time of the experiments creation time
+          Start time of the experiments creation time.
+
     @param toTime
-          End time of the  experiement creation time
+          End time of the  experiement creation time.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
+    @return ExperimentSummaryModel
+       List of experiments for the given search filter. Here only the Experiment summary will be returned.
+
 
 
     Parameters:
@@ -4036,19 +4358,27 @@ class Client(Iface):
 
   def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
     """
-    Search Experiments by using multiple filter criteria with pagination. Results will be sorted
-    based on creation time DESC
+    Search Experiments.
+    Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requested gateway
+          Identifier of the requested gateway.
+
     @param userName
-          Username of the requested user
+          Username of the user requesting the search function.
+
     @param filters
-          map of multiple filter criteria.
+          Map of multiple filter criteria. Currenlt search filters includes Experiment Name, Description, Application, etc....
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
+    @return ExperimentSummaryModel
+       List of experiments for the given search filter. Here only the Experiment summary will be returned.
+
 
 
     Parameters:
@@ -4100,13 +4430,19 @@ class Client(Iface):
 
   def getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
     """
-    Get Experiment Statisitics for the given gateway for a specific time period
+
+    Get Experiment Statistics
+    Get Experiment Statisitics for a given gateway for a specific time period. This feature is available only for admins of a particular gateway. Gateway admin access is managed by the user roles.
+
     @param gatewayId
-          Identifier of the requested gateway
+          Unique identifier of the gateway making the request to fetch statistics.
+
     @param fromTime
-          Starting date time
+          Starting date time.
+
     @param toTime
-          Ending data time
+          Ending data time.
+
 
 
     Parameters:
@@ -4154,15 +4490,19 @@ class Client(Iface):
 
   def getExperimentsInProject(self, authzToken, projectId, limit, offset):
     """
-    Get Experiments within project with pagination. Results will be sorted
-    based on creation time DESC
+
+    Get All Experiments of the Project
+    Get Experiments within project with pagination. Results will be sorted based on creation time DESC.
 
     @param projectId
-          Identifier of the project
+          Uniqie identifier of the project.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -4212,17 +4552,22 @@ class Client(Iface):
 
   def getUserExperiments(self, authzToken, gatewayId, userName, limit, offset):
     """
-    Get experiments by user with pagination. Results will be sorted
-    based on creation time DESC
+
+    Get All Experiments of the User
+    Get experiments by user with pagination. Results will be sorted based on creation time DESC.
 
     @param gatewayId
-          Identifier of the requesting gateway
+          Identifier of the requesting gateway.
+
     @param userName
-          Username of the requested user
+          Username of the requested end user.
+
     @param limit
-          Amount of results to be fetched
+          Amount of results to be fetched.
+
     @param offset
-          The starting point of the results to be fetched
+          The starting point of the results to be fetched.
+
 
 
     Parameters:
@@ -4272,12 +4617,17 @@ class Client(Iface):
 
   def createExperiment(self, authzToken, gatewayId, experiment):
     """
+      *
+      * Create New Experiment
       * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
       *   but inferred from the sshKeyAuthentication header. This experiment is just a persistent place holder. The client
       *   has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
       *   registering the experiment in a persistent store.
       *
-      * @param basicExperimentMetadata
+      * @param gatewayId
+      *    The unique ID of the gateway where the experiment is been created.
+      *
+      * @param ExperimentModel
       *    The create experiment will require the basic experiment metadata like the name and description, intended user,
       *      the gateway identifer and if the experiment should be shared public by defualt. During the creation of an experiment
       *      the ExperimentMetadata is a required field.
@@ -4350,8 +4700,8 @@ class Client(Iface):
 
   def deleteExperiment(self, authzToken, experimentId):
     """
-    Delete an Experiment
 
+    Delete an Experiment
     If the experiment is not already launched experiment can be deleted.
 
     @param authzToken
@@ -4360,7 +4710,7 @@ class Client(Iface):
         Experiment ID of the experimnet you want to delete.
 
     @return boolean
-        Identifier for the success or failure of the deletion operation
+        Identifier for the success or failure of the deletion operation.
 
 
 
@@ -4405,12 +4755,14 @@ class Client(Iface):
 
   def getExperiment(self, authzToken, airavataExperimentId):
     """
+      *
+      * Get Experiment
       * Fetch previously created experiment metadata.
       *
       * @param airavataExperimentId
-      *    The identifier for the requested experiment. This is returned during the create experiment step.
+      *    The unique identifier of the requested experiment. This ID is returned during the create experiment step.
       *
-      * @return experimentMetada
+      * @return ExperimentModel
       *   This method will return the previously stored experiment metadata.
       *
       * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -4481,14 +4833,17 @@ class Client(Iface):
 
   def getDetailedExperimentTree(self, authzToken, airavataExperimentId):
     """
+
+    Get Complete Experiment Details
     Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
     tasks -> jobs information.
 
     @param airavataExperimentId
        The identifier for the requested experiment. This is returned during the create experiment step.
 
-    @return experimentMetada
-      This method will return the previously stored experiment metadata.
+    @return ExperimentModel
+      This method will return the previously stored experiment metadata including application input parameters, computational resource scheduling
+      information, special input output handling and additional quality of service parameters.
 
     @throws org.apache.airavata.model.error.InvalidRequestException
        For any incorrect forming of the request itself.
@@ -4557,14 +4912,15 @@ class Client(Iface):
 
   def updateExperiment(self, authzToken, airavataExperimentId, experiment):
     """
-    Configure a previously created experiment with required inputs, scheduling and other quality of service
-      parameters. This method only updates the experiment object within the registry. The experiment has to be launched
-      to make it actionable by the server.
+
+    Update a Previously Created Experiment
+    Configure the CREATED experiment with required inputs, scheduling and other quality of service parameters. This method only updates the experiment object within the registry.
+    The experiment has to be launched to make it actionable by the server.
 
     @param airavataExperimentId
        The identifier for the requested experiment. This is returned during the create experiment step.
 
-    @param experimentConfigurationData
+    @param ExperimentModel
        The configuration information of the experiment with application input parameters, computational resource scheduling
          information, special input output handling and additional quality of service parameters.
 
@@ -4709,13 +5065,14 @@ class Client(Iface):
   def validateExperiment(self, authzToken, airavataExperimentId):
     """
      *
-     * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
-     *
-     * @param experimentId
+     * Validate experiment configuration.
+     * A true in general indicates, the experiment is ready to be launched.
      *
+     * @param airavataExperimentId
+     *    Unique identifier of the experiment (Experimnent ID) of the experiment which need to be validated.
      *
      * @return boolean
-     *      Identifier for the success or failure of the validation operation
+     *      Identifier for the success or failure of the validation operation.
      *
     *
 
@@ -4762,8 +5119,12 @@ class Client(Iface):
 
   def launchExperiment(self, authzToken, airavataExperimentId, gatewayId):
     """
-    Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
-      notifications and intermediate and output data will be subsequently available for this experiment.
+
+    Launch a Previously Created & Configured Experiment.
+    Airavata Server will then start processing the request and appropriate notifications and intermediate and output data will be subsequently available for this experiment.
+
+    @gatewayId
+       ID of the gateway which will launch the experiment.
 
     @param airavataExperimentId
        The identifier for the requested experiment. This is returned during the create experiment step.
@@ -4838,17 +5199,18 @@ class Client(Iface):
 
   def getExperimentStatus(self, authzToken, airavataExperimentId):
     """
+
     Get Experiment Status
 
-    Obtain the status os an experiment by providing the Experiment Id
+    Obtain the status of an experiment by providing the Experiment Id
 
     @param authzToken
 
-    @param experiementId
-        Experiment ID of the experimnet you require the status
+    @param airavataExperimentId
+        Experiment ID of the experimnet you require the status.
 
     @return ExperimentStatus
-        ExperimentStatus model with current status will be returned.
+        ExperimentStatus model with the current status will be returned.
 
 
 
@@ -4895,16 +5257,17 @@ class Client(Iface):
 
   def getExperimentOutputs(self, authzToken, airavataExperimentId):
     """
+
     Get Experiment Outputs
-    This method to be used when need to obtain outputs of a certain Experiment
+    This method to be used when need to obtain final outputs of a certain Experiment
 
     @param authzToken
 
-    @param experiementId
-        Experiment ID of the experimnet you need the outputs
+    @param airavataExperimentId
+        Experiment ID of the experimnet you need the outputs.
 
     @return list
-        List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+        List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
 
 
 
@@ -4951,16 +5314,17 @@ class Client(Iface):
 
   def getIntermediateOutputs(self, authzToken, airavataExperimentId):
     """
+
     Get Intermediate Experiment Outputs
     This method to be used when need to obtain intermediate outputs of a certain Experiment
 
     @param authzToken
 
-    @param experiementId
-        Experiment ID of the experimnet you need the intermediate outputs
+    @param airavataExperimentId
+        Experiment ID of the experimnet you need intermediate outputs.
 
     @return list
-        List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+        List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
 
 
 
@@ -5007,13 +5371,14 @@ class Client(Iface):
 
   def getJobStatuses(self, authzToken, airavataExperimentId):
     """
-    Get Job Status for an Experiment
+
+    Get Job Statuses for an Experiment
     This method to be used when need to get the job status of an Experiment. An experiment may have one or many jobs; there for one or many job statuses may turnup
 
     @param authzToken
 
     @param experiementId
-        Experiment ID of the experimnet you need the intermediate outputs
+        Experiment ID of the experimnet you need the job statuses.
 
     @return JobStatus
         Job status (string) for all all the existing jobs for the experiment will be returned in the form of a map
@@ -5063,16 +5428,17 @@ class Client(Iface):
 
   def getJobDetails(self, authzToken, airavataExperimentId):
     """
-    Get Job Details for all the jobs within an Experiment
+
+    Get Job Details for all the jobs within an Experiment.
     This method to be used when need to get the job details for one or many jobs of an Experiment.
 
     @param authzToken
 
     @param experiementId
-        Experiment ID of the experimnet you need job details
+        Experiment ID of the experimnet you need job details.
 
     @return list of JobDetails
-        Job details
+        Job details.
 
 
 
@@ -5119,7 +5485,9 @@ class Client(Iface):
 
   def cloneExperiment(self, authzToken, existingExperimentID, newExperimentName):
     """
-    Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
+
+    Clone an Existing Experiment
+    Existing specified experiment is cloned and a new name is provided. A copy of the experiment configuration is made and is persisted with new metadata.
       The client has to subsequently update this configuration if needed and launch the cloned experiment.
 
     @param newExperimentName
@@ -5131,7 +5499,7 @@ class Client(Iface):
          should be shared public by default.
 
     @return
-      The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment.
+      The server-side generated.airavata.registry.core.experiment.globally unique identifier (Experiment ID) for the newly cloned experiment.
 
     @throws org.apache.airavata.model.error.InvalidRequestException
        For any incorrect forming of the request itself.
@@ -5202,12 +5570,16 @@ class Client(Iface):
 
   def terminateExperiment(self, authzToken, airavataExperimentId, gatewayId):
     """
-    Terminate a running experiment.
+
+    Terminate a running Experiment.
+
+    @gatewayId
+       ID of the gateway which will terminate the running Experiment.
 
     @param airavataExperimentId
-       The identifier for the requested experiment. This is returned during the create experiment step.
+       The identifier of the experiment required termination. This ID is returned during the create experiment step.
 
-    @return
+    @return status
       This method call does not have a return value.
 
     @throws org.apache.airavata.model.error.InvalidRequestException
@@ -5277,13 +5649,17 @@ class Client(Iface):
 
   def registerApplicationModule(self, authzToken, gatewayId, applicationModule):
     """
+
     Register a Application Module.
 
+    @gatewayId
+       ID of the gateway which is registering the new Application Module.
+
     @param applicationModule
        Application Module Object created from the datamodel.
 
     @return appModuleId
-      Returns a server-side generated airavata appModule globally unique identifier.
+      Returns the server-side generated airavata appModule globally unique identifier.
 
 
     Parameters:
@@ -5329,13 +5705,14 @@ class Client(Iface):
 
   def getApplicationModule(self, authzToken, appModuleId):
     """
+
     Fetch a Application Module.
 
     @param appModuleId
-      The identifier for the requested application module
+      The unique identifier of the application module required
 
     @return applicationModule
-      Returns a application Module Object.
+      Returns an Application Module Object.
 
 
     Parameters:
@@ -5379,6 +5756,7 @@ class Client(Iface):
 
   def updateApplicationModule(self, authzToken, appModuleId, applicationModule):
     """
+
     Update a Application Module.
 
     @param appModuleId
@@ -5434,6 +5812,16 @@ class Client(Iface):
 
   def getAllAppModules(self, authzToken, gatewayId):
     """
+
+    Fetch all Application Module Descriptions.
+
+    @param gatewayId
+       ID of the gateway which need to list all available application deployment documentation.
+
+    @return list
+       Returns the list of all Application Module Objects.
+
+
     Parameters:
      - authzToken
      - gatewayId
@@ -5475,10 +5863,11 @@ class Client(Iface):
 
   def deleteApplicationModule(self, authzToken, appModuleId):
     """
-    Delete a Application Module.
+
+    Delete an Application Module.
 
     @param appModuleId
-      The identifier for the requested application module to be deleted.
+      The identifier of the Application Module to be deleted.
 
     @return status
       Returns a success/failure of the deletion.
@@ -5525,9 +5914,13 @@ class Client(Iface):
 
   def registerApplicationDeployment(self, authzToken, gatewayId, applicationDeployment):
     """
-    Register a Application Deployment.
 
-    @param applicationModule
+    Register an Application Deployment.
+
+    @param gatewayId
+       ID of the gateway which is registering the new Application Deployment.
+
+    @param applicationDeployment
        Application Module Object created from the datamodel.
 
     @return appDeploymentId
@@ -5577,6 +5970,7 @@ class Client(Iface):
 
   def getApplicationDeployment(self, authzToken, appDeploymentId):
     """
+
     Fetch a Application Deployment.
 
     @param appDeploymentId
@@ -5627,10 +6021,11 @@ class Client(Iface):
 
   def updateApplicationDeployment(self, authzToken, appDeploymentId, applicationDeployment):
     """
-    Update a Application Deployment.
+
+    Update an Application Deployment.
 
     @param appDeploymentId
-      The identifier for the requested application deployment to be updated.
+      The identifier of the requested application deployment to be updated.
 
     @param appDeployment
        Application Deployment Object created from the datamodel.
@@ -5682,10 +6077,11 @@ class Client(Iface):
 
   def deleteApplicationDeployment(self, authzToken, appDeploymentId):
     """
-    Delete a Application deployment.
+
+    Delete an Application Deployment.
 
     @param appDeploymentId
-      The identifier for the requested application deployment to be deleted.
+      The unique identifier of application deployment to be deleted.
 
     @return status
       Returns a success/failure of the deletion.
@@ -5732,10 +6128,14 @@ class Client(Iface):
 
   def getAllApplicationDeployments(self, authzToken, gatewayId):
     """
+
     Fetch all Application Deployment Descriptions.
 
+    @param gatewayId
+       ID of the gateway which need to list all available application deployment documentation.
+
     @return list<applicationDeployment.
-      Returns the list of all application Deployment Objects.
+       Returns the list of all application Deployment Objects.
 
 
     Parameters:
@@ -5829,9 +6229,10 @@ class Client(Iface):
 
   def registerApplicationInterface(self, authzToken, gatewayId, applicationInterface):
     """
+
     Register a Application Interface.
 
-    @param applicationModule
+    @param applicationInterface
        Application Module Object created from the datamodel.
 
     @return appInterfaceId
@@ -5881,6 +6282,22 @@ class Client(Iface):
 
   def cloneApplicationInterface(self, authzToken, existingAppInterfaceID, newApplicationName, gatewayId):
     """
+
+    Clone an Application Interface.
+
+    @gatewayId
+       The identifier for the gateway profile to be requested
+
+    @param existingAppInterfaceID
+       Identifier of the existing Application interface you wich to clone.
+
+    @param newApplicationName
+       Name for the new application interface.
+
+    @return appInterfaceId
+       Returns a server-side generated globally unique identifier for the newly cloned application interface.
+
+
     Parameters:
      - authzToken
      - existingAppInterfaceID
@@ -5926,14 +6343,14 @@ class Client(Iface):
 
   def getApplicationInterface(self, authzToken, appInterfaceId):
     """
-    Fetch a Application Interface.
+
+    Fetch an Application Interface.
 
     @param appInterfaceId
-      The identifier for the requested application module
+      The identifier for the requested application interface.
 
     @return applicationInterface
-      Returns a application Interface Object.
-
+      Returns an application Interface Object.
 
 
     Parameters:
@@ -5977,10 +6394,11 @@ class Client(Iface):
 
   def updateApplicationInterface(self, authzToken, appInterfaceId, applicationInterface):
     """
+
     Update a Application Interface.
 
     @param appInterfaceId
-      The identifier for the requested application deployment to be updated.
+      The identifier of the requested application deployment to be updated.
 
     @param appInterface
        Application Interface Object created from the datamodel.
@@ -5989,7 +6407,6 @@ class Client(Iface):
       Returns a success/failure of the update.
 
 
-
     Parameters:
      - authzToken
      - appInterfaceId
@@ -6033,7 +6450,8 @@ class Client(Iface):
 
   def deleteApplicationInterface(self, authzToken, appInterfaceId):
     """
-    Delete a Application Interface.
+
+    Delete an Application Interface.
 
     @param appInterfaceId
       The identifier for the requested application interface to be deleted.
@@ -6042,7 +6460,6 @@ class Client(Iface):
       Returns a success/failure of the deletion.
 
 
-
     Parameters:
      - authzToken
      - appInterfaceId
@@ -6084,11 +6501,12 @@ class Client(Iface):
 
   def getAllApplicationInterfaceNames(self, authzToken, gatewayId):
     """
-    Fetch name and id of  Application Interface documents.
+
+    Fetch name and ID of  Application Interface documents.
 
 
     @return map<applicationId, applicationInterfaceNames>
-      Returns a list of application interfaces with corresponsing id's
+      Returns a list of application interfaces with corresponsing ID's
 
 
     Parameters:
@@ -6132,11 +6550,12 @@ class Client(Iface):
 
   def getAllApplicationInterfaces(self, authzToken, gatewayId):
     """
+
     Fetch all Application Interface documents.
 
 
     @return map<applicationId, applicationInterfaceNames>
-      Returns a list of application interfaces documents
+      Returns a list of application interfaces documents (Application Interface ID, name, description, Inputs and Outputs objects).
 
 
     Parameters:
@@ -6180,10 +6599,11 @@ class Client(Iface):
 
   def getApplicationInputs(self, authzToken, appInterfaceId):
     """
+
     Fetch the list of Application Inputs.
 
     @param appInterfaceId
-      The identifier for the requested application interface
+      The identifier of the application interface which need inputs to be fetched.
 
     @return list<application_interface_model.InputDataObjectType>
       Returns a list of application inputs.
@@ -6230,10 +6650,11 @@ class Client(Iface):
 
   def getApplicationOutputs(self, authzToken, appInterfaceId):
     """
-    Fetch the list of Application Outputs.
+
+    Fetch list of Application Outputs.
 
     @param appInterfaceId
-      The identifier for the requested application interface
+      The identifier of the application interface which need outputs to be fetched.
 
     @return list<application_interface_model.OutputDataObjectType>
       Returns a list of application outputs.
@@ -6280,14 +6701,15 @@ class Client(Iface):
 
   def getAvailableAppInterfaceComputeResources(self, authzToken, appInterfaceId):
     """
+
     Fetch a list of all deployed Compute Hosts for a given application interfaces.
 
     @param appInterfaceId
-      The identifier for the requested application interface
+      The identifier for the requested application interface.
 
     @return map<computeResourceId, computeResourceName>
       A map of registered compute resource id's and their corresponding hostnames.
-       Deployments of each modules listed within the interfaces will be listed.
+      Deployments of each modules listed within the interfaces will be listed.
 
 
     Parameters:
@@ -6431,6 +6853,7 @@ class Client(Iface):
 
   def getAllComputeResourceNames(self, authzToken):
     """
+
     Fetch all registered Compute Resources.
 
     @return A map of registered compute resource id's and thier corresponding hostnames.
@@ -6726,7 +7149,7 @@ class Client(Iface):
 
   def updateStorageResource(self, authzToken, storageResourceId, storageResourceDescription):
     """
-    Update a Compute Resource.
+    Update a Storage Resource.
 
     @param storageResourceId
       The identifier for the requested compute resource to be updated.
@@ -6784,7 +7207,7 @@ class Client(Iface):
     Delete a Storage Resource.
 
     @param storageResourceId
-      The identifier for the requested compute resource to be deleted.
+      The identifier of the requested compute resource to be deleted.
 
     @return status
       Returns a success/failure of the deletion.
@@ -7163,6 +7586,7 @@ class Client(Iface):
 
   def addUNICOREJobSubmissionDetails(self, authzToken, computeResourceId, priorityOrder, unicoreJobSubmission):
     """
+
     Add a UNICORE Job Submission details to a compute resource
      App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
 
@@ -7224,10 +7648,13 @@ class Client(Iface):
 
   def getUnicoreJobSubmission(self, authzToken, jobSubmissionId):
     """
+      *
       * This method returns UnicoreJobSubmission object
+      *
       * @param jobSubmissionInterfaceId
       *   The identifier of the JobSubmission Interface to be retrieved.
       *  @return UnicoreJobSubmission instance
+      *
     *
 
     Parameters:
@@ -7271,6 +7698,7 @@ class Client(Iface):
 
   def addCloudJobSubmissionDetails(self, authzToken, computeResourceId, priorityOrder, cloudSubmission):
     """
+       *
        * Add a Cloud Job Submission details to a compute resource
        *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
        *
@@ -7285,6 +7713,7 @@ class Client(Iface):
        *
        * @return status
        *   Returns the unique job submission id.
+       *
     *
 
     Parameters:
@@ -7332,6 +7761,7 @@ class Client(Iface):
 
   def getCloudJobSubmission(self, authzToken, jobSubmissionId):
     """
+       *
        * This method returns cloudJobSubmission object
        * @param jobSubmissionInterfaceI
            *   The identifier of the JobSubmission Interface to be retrieved.
@@ -7379,6 +7809,7 @@ class Client(Iface):
 
   def updateSSHJobSubmissionDetails(self, authzToken, jobSubmissionInterfaceId, sshJobSubmission):
     """
+
     Update the given SSH Job Submission details
 
     @param jobSubmissionInterfaceId
@@ -7434,6 +7865,7 @@ class Client(Iface):
 
   def updateCloudJobSubmissionDetails(self, authzToken, jobSubmissionInterfaceId, sshJobSubmission):
     """
+
     Update the cloud Job Submission details
 
     @param jobSubmissionInterfaceId
@@ -7489,6 +7921,7 @@ class Client(Iface):
 
   def updateUnicoreJobSubmissionDetails(self, authzToken, jobSubmissionInterfaceId, unicoreJobSubmission):
     """
+
     Update the UNIOCRE Job Submission details
 
     @param jobSubmissionInterfaceId
@@ -7545,6 +7978,7 @@ class Client(Iface):
 
   def addLocalDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement):
     """
+
     Add a Local data movement details to a compute resource
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -7612,6 +8046,7 @@ class Client(Iface):
 
   def updateLocalDataMovementDetails(self, authzToken, dataMovementInterfaceId, localDataMovement):
     """
+
     Update the given Local data movement details
 
     @param dataMovementInterfaceId
@@ -7668,7 +8103,8 @@ class Client(Iface):
 
   def getLocalDataMovement(self, authzToken, dataMovementId):
     """
-    This method returns local datamovement object
+
+    This method returns local datamovement object.
 
     @param dataMovementId
       The identifier of the datamovement Interface to be retrieved.
@@ -7718,6 +8154,7 @@ class Client(Iface):
 
   def addSCPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement):
     """
+
     Add a SCP data movement details to a compute resource
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -7781,6 +8218,7 @@ class Client(Iface):
 
   def updateSCPDataMovementDetails(self, authzToken, dataMovementInterfaceId, scpDataMovement):
     """
+
     Update the given scp data movement details
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -7887,6 +8325,7 @@ class Client(Iface):
 
   def addUnicoreDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement):
     """
+
     Add a UNICORE data movement details to a compute resource
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -7950,6 +8389,7 @@ class Client(Iface):
 
   def updateUnicoreDataMovementDetails(self, authzToken, dataMovementInterfaceId, unicoreDataMovement):
     """
+
     Update a selected UNICORE data movement details
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -8007,6 +8447,7 @@ class Client(Iface):
 
   def getUnicoreDataMovement(self, authzToken, dataMovementId):
     """
+
     This method returns UNICORE datamovement object
 
     @param dataMovementId
@@ -8057,6 +8498,7 @@ class Client(Iface):
 
   def addGridFTPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement):
     """
+
     Add a GridFTP data movement details to a compute resource
      App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
 
@@ -8827,7 +9269,7 @@ class Client(Iface):
     Fetch the given Gateway Resource Profile.
 
     @param gatewayID
-      The identifier for the requested gateway resource
+      The identifier for the requested gateway resource.
 
     @return gatewayResourceProfile
        Gateway Resource Profile Object.
@@ -9040,6 +9482,22 @@ class Client(Iface):
 
   def addGatewayStoragePreference(self, authzToken, gatewayID, storageResourceId, storagePreference):
     """
+    Add a Storage Resource Preference to a registered gateway profile.
+
+    @param gatewayID
+      The identifier of the gateway profile to be added.
+
+    @param storageResourceId
+      Preferences related to a particular compute resource
+
+    @param computeResourcePreference
+      The ComputeResourcePreference object to be added to the resource profile.
+
+    @return status
+      Returns a success/failure of the addition. If a profile already exists, this operation will fail.
+       Instead an update should be used.
+
+
     Parameters:
      - authzToken
      - gatewayID
@@ -9085,6 +9543,7 @@ class Client(Iface):
 
   def getGatewayComputeResourcePreference(self, authzToken, gatewayID, computeResourceId):
     """
+
     Fetch a Compute Resource Preference of a registered gateway profile.
 
     @param gatewayID
@@ -9140,6 +9599,19 @@ class Client(Iface):
 
   def getGatewayStoragePreference(self, authzToken, gatewayID, storageResourceId):
     """
+
+    Fetch a Storage Resource Preference of a registered gateway profile.
+
+    @param gatewayID
+      The identifier of the gateway profile to request to fetch the particular storage resource preference.
+
+    @pa

<TRUNCATED>

[03/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py
index 8aa21e7..a18a061 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py
@@ -19,16 +19,77 @@ except:
   fastbinary = None
 
 
+class WorkflowState:
+  CREATED = 0
+  STARTED = 1
+  EXECUTING = 2
+  COMPLETED = 3
+  FAILED = 4
+  CANCELLING = 5
+  CANCELED = 6
 
-class Workflow:
+  _VALUES_TO_NAMES = {
+    0: "CREATED",
+    1: "STARTED",
+    2: "EXECUTING",
+    3: "COMPLETED",
+    4: "FAILED",
+    5: "CANCELLING",
+    6: "CANCELED",
+  }
+
+  _NAMES_TO_VALUES = {
+    "CREATED": 0,
+    "STARTED": 1,
+    "EXECUTING": 2,
+    "COMPLETED": 3,
+    "FAILED": 4,
+    "CANCELLING": 5,
+    "CANCELED": 6,
+  }
+
+class ComponentState:
+  CREATED = 0
+  WAITING = 1
+  READY = 2
+  RUNNING = 3
+  COMPLETED = 4
+  FAILED = 5
+  CANCELED = 6
+
+  _VALUES_TO_NAMES = {
+    0: "CREATED",
+    1: "WAITING",
+    2: "READY",
+    3: "RUNNING",
+    4: "COMPLETED",
+    5: "FAILED",
+    6: "CANCELED",
+  }
+
+  _NAMES_TO_VALUES = {
+    "CREATED": 0,
+    "WAITING": 1,
+    "READY": 2,
+    "RUNNING": 3,
+    "COMPLETED": 4,
+    "FAILED": 5,
+    "CANCELED": 6,
+  }
+
+
+class WorkflowModel:
   """
   Attributes:
    - templateId
    - name
    - graph
+   - gatewayId
+   - createdUser
    - image
    - workflowInputs
    - workflowOutputs
+   - creationTime
   """
 
   thrift_spec = (
@@ -36,18 +97,24 @@ class Workflow:
     (1, TType.STRING, 'templateId', None, "DO_NOT_SET_AT_CLIENTS", ), # 1
     (2, TType.STRING, 'name', None, None, ), # 2
     (3, TType.STRING, 'graph', None, None, ), # 3
-    (4, TType.STRING, 'image', None, None, ), # 4
-    (5, TType.LIST, 'workflowInputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 5
-    (6, TType.LIST, 'workflowOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 6
+    (4, TType.STRING, 'gatewayId', None, None, ), # 4
+    (5, TType.STRING, 'createdUser', None, None, ), # 5
+    (6, TType.STRING, 'image', None, None, ), # 6
+    (7, TType.LIST, 'workflowInputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 7
+    (8, TType.LIST, 'workflowOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 8
+    (9, TType.I64, 'creationTime', None, None, ), # 9
   )
 
-  def __init__(self, templateId=thrift_spec[1][4], name=None, graph=None, image=None, workflowInputs=None, workflowOutputs=None,):
+  def __init__(self, templateId=thrift_spec[1][4], name=None, graph=None, gatewayId=None, createdUser=None, image=None, workflowInputs=None, workflowOutputs=None, creationTime=None,):
     self.templateId = templateId
     self.name = name
     self.graph = graph
+    self.gatewayId = gatewayId
+    self.createdUser = createdUser
     self.image = image
     self.workflowInputs = workflowInputs
     self.workflowOutputs = workflowOutputs
+    self.creationTime = creationTime
 
   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:
@@ -75,10 +142,20 @@ class Workflow:
           iprot.skip(ftype)
       elif fid == 4:
         if ftype == TType.STRING:
-          self.image = iprot.readString()
+          self.gatewayId = iprot.readString()
         else:
           iprot.skip(ftype)
       elif fid == 5:
+        if ftype == TType.STRING:
+          self.createdUser = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 6:
+        if ftype == TType.STRING:
+          self.image = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 7:
         if ftype == TType.LIST:
           self.workflowInputs = []
           (_etype3, _size0) = iprot.readListBegin()
@@ -89,7 +166,7 @@ class Workflow:
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
-      elif fid == 6:
+      elif fid == 8:
         if ftype == TType.LIST:
           self.workflowOutputs = []
           (_etype9, _size6) = iprot.readListBegin()
@@ -100,6 +177,11 @@ class Workflow:
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
+      elif fid == 9:
+        if ftype == TType.I64:
+          self.creationTime = iprot.readI64()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -109,7 +191,7 @@ class Workflow:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('Workflow')
+    oprot.writeStructBegin('WorkflowModel')
     if self.templateId is not None:
       oprot.writeFieldBegin('templateId', TType.STRING, 1)
       oprot.writeString(self.templateId)
@@ -122,24 +204,36 @@ class Workflow:
       oprot.writeFieldBegin('graph', TType.STRING, 3)
       oprot.writeString(self.graph)
       oprot.writeFieldEnd()
+    if self.gatewayId is not None:
+      oprot.writeFieldBegin('gatewayId', TType.STRING, 4)
+      oprot.writeString(self.gatewayId)
+      oprot.writeFieldEnd()
+    if self.createdUser is not None:
+      oprot.writeFieldBegin('createdUser', TType.STRING, 5)
+      oprot.writeString(self.createdUser)
+      oprot.writeFieldEnd()
     if self.image is not None:
-      oprot.writeFieldBegin('image', TType.STRING, 4)
+      oprot.writeFieldBegin('image', TType.STRING, 6)
       oprot.writeString(self.image)
       oprot.writeFieldEnd()
     if self.workflowInputs is not None:
-      oprot.writeFieldBegin('workflowInputs', TType.LIST, 5)
+      oprot.writeFieldBegin('workflowInputs', TType.LIST, 7)
       oprot.writeListBegin(TType.STRUCT, len(self.workflowInputs))
       for iter12 in self.workflowInputs:
         iter12.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.workflowOutputs is not None:
-      oprot.writeFieldBegin('workflowOutputs', TType.LIST, 6)
+      oprot.writeFieldBegin('workflowOutputs', TType.LIST, 8)
       oprot.writeListBegin(TType.STRUCT, len(self.workflowOutputs))
       for iter13 in self.workflowOutputs:
         iter13.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
+    if self.creationTime is not None:
+      oprot.writeFieldBegin('creationTime', TType.I64, 9)
+      oprot.writeI64(self.creationTime)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -148,6 +242,12 @@ class Workflow:
       raise TProtocol.TProtocolException(message='Required field templateId is unset!')
     if self.name is None:
       raise TProtocol.TProtocolException(message='Required field name is unset!')
+    if self.graph is None:
+      raise TProtocol.TProtocolException(message='Required field graph is unset!')
+    if self.gatewayId is None:
+      raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
+    if self.createdUser is None:
+      raise TProtocol.TProtocolException(message='Required field createdUser is unset!')
     return
 
 
@@ -156,9 +256,558 @@ class Workflow:
     value = (value * 31) ^ hash(self.templateId)
     value = (value * 31) ^ hash(self.name)
     value = (value * 31) ^ hash(self.graph)
+    value = (value * 31) ^ hash(self.gatewayId)
+    value = (value * 31) ^ hash(self.createdUser)
     value = (value * 31) ^ hash(self.image)
     value = (value * 31) ^ hash(self.workflowInputs)
     value = (value * 31) ^ hash(self.workflowOutputs)
+    value = (value * 31) ^ hash(self.creationTime)
+    return value
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class ComponentStatus:
+  """
+  Attributes:
+   - state
+   - reason
+   - timeofStateChange
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.I32, 'state', None,     0, ), # 1
+    (2, TType.STRING, 'reason', None, None, ), # 2
+    (3, TType.I64, 'timeofStateChange', None, None, ), # 3
+  )
+
+  def __init__(self, state=thrift_spec[1][4], reason=None, timeofStateChange=None,):
+    self.state = state
+    self.reason = reason
+    self.timeofStateChange = timeofStateChange
+
+  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:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.I32:
+          self.state = iprot.readI32()
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.reason = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.I64:
+          self.timeofStateChange = iprot.readI64()
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('ComponentStatus')
+    if self.state is not None:
+      oprot.writeFieldBegin('state', TType.I32, 1)
+      oprot.writeI32(self.state)
+      oprot.writeFieldEnd()
+    if self.reason is not None:
+      oprot.writeFieldBegin('reason', TType.STRING, 2)
+      oprot.writeString(self.reason)
+      oprot.writeFieldEnd()
+    if self.timeofStateChange is not None:
+      oprot.writeFieldBegin('timeofStateChange', TType.I64, 3)
+      oprot.writeI64(self.timeofStateChange)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    if self.state is None:
+      raise TProtocol.TProtocolException(message='Required field state is unset!')
+    return
+
+
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.state)
+    value = (value * 31) ^ hash(self.reason)
+    value = (value * 31) ^ hash(self.timeofStateChange)
+    return value
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class WorkflowStatus:
+  """
+  Attributes:
+   - state
+   - timeOfStateChange
+   - reason
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.I32, 'state', None, None, ), # 1
+    (2, TType.I64, 'timeOfStateChange', None, None, ), # 2
+    (3, TType.STRING, 'reason', None, None, ), # 3
+  )
+
+  def __init__(self, state=None, timeOfStateChange=None, reason=None,):
+    self.state = state
+    self.timeOfStateChange = timeOfStateChange
+    self.reason = reason
+
+  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:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.I32:
+          self.state = iprot.readI32()
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I64:
+          self.timeOfStateChange = iprot.readI64()
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRING:
+          self.reason = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('WorkflowStatus')
+    if self.state is not None:
+      oprot.writeFieldBegin('state', TType.I32, 1)
+      oprot.writeI32(self.state)
+      oprot.writeFieldEnd()
+    if self.timeOfStateChange is not None:
+      oprot.writeFieldBegin('timeOfStateChange', TType.I64, 2)
+      oprot.writeI64(self.timeOfStateChange)
+      oprot.writeFieldEnd()
+    if self.reason is not None:
+      oprot.writeFieldBegin('reason', TType.STRING, 3)
+      oprot.writeString(self.reason)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    if self.state is None:
+      raise TProtocol.TProtocolException(message='Required field state is unset!')
+    return
+
+
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.state)
+    value = (value * 31) ^ hash(self.timeOfStateChange)
+    value = (value * 31) ^ hash(self.reason)
+    return value
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class EdgeModel:
+  """
+  Attributes:
+   - edgeId
+   - name
+   - status
+   - description
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'edgeId', None, "DO_NOT_SET_AT_CLIENTS", ), # 1
+    (2, TType.STRING, 'name', None, None, ), # 2
+    (3, TType.STRUCT, 'status', (ComponentStatus, ComponentStatus.thrift_spec), None, ), # 3
+    (4, TType.STRING, 'description', None, None, ), # 4
+  )
+
+  def __init__(self, edgeId=thrift_spec[1][4], name=None, status=None, description=None,):
+    self.edgeId = edgeId
+    self.name = name
+    self.status = status
+    self.description = description
+
+  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:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.edgeId = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.name = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRUCT:
+          self.status = ComponentStatus()
+          self.status.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.STRING:
+          self.description = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('EdgeModel')
+    if self.edgeId is not None:
+      oprot.writeFieldBegin('edgeId', TType.STRING, 1)
+      oprot.writeString(self.edgeId)
+      oprot.writeFieldEnd()
+    if self.name is not None:
+      oprot.writeFieldBegin('name', TType.STRING, 2)
+      oprot.writeString(self.name)
+      oprot.writeFieldEnd()
+    if self.status is not None:
+      oprot.writeFieldBegin('status', TType.STRUCT, 3)
+      self.status.write(oprot)
+      oprot.writeFieldEnd()
+    if self.description is not None:
+      oprot.writeFieldBegin('description', TType.STRING, 4)
+      oprot.writeString(self.description)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    if self.edgeId is None:
+      raise TProtocol.TProtocolException(message='Required field edgeId is unset!')
+    return
+
+
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.edgeId)
+    value = (value * 31) ^ hash(self.name)
+    value = (value * 31) ^ hash(self.status)
+    value = (value * 31) ^ hash(self.description)
+    return value
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class PortModel:
+  """
+  Attributes:
+   - portId
+   - name
+   - status
+   - value
+   - description
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'portId', None, "DO_NOT_SET_AT_CLIENTS", ), # 1
+    (2, TType.STRING, 'name', None, None, ), # 2
+    (3, TType.STRUCT, 'status', (ComponentStatus, ComponentStatus.thrift_spec), None, ), # 3
+    (4, TType.STRING, 'value', None, None, ), # 4
+    (5, TType.STRING, 'description', None, None, ), # 5
+  )
+
+  def __init__(self, portId=thrift_spec[1][4], name=None, status=None, value=None, description=None,):
+    self.portId = portId
+    self.name = name
+    self.status = status
+    self.value = value
+    self.description = description
+
+  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:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.portId = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.name = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRUCT:
+          self.status = ComponentStatus()
+          self.status.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.STRING:
+          self.value = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 5:
+        if ftype == TType.STRING:
+          self.description = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('PortModel')
+    if self.portId is not None:
+      oprot.writeFieldBegin('portId', TType.STRING, 1)
+      oprot.writeString(self.portId)
+      oprot.writeFieldEnd()
+    if self.name is not None:
+      oprot.writeFieldBegin('name', TType.STRING, 2)
+      oprot.writeString(self.name)
+      oprot.writeFieldEnd()
+    if self.status is not None:
+      oprot.writeFieldBegin('status', TType.STRUCT, 3)
+      self.status.write(oprot)
+      oprot.writeFieldEnd()
+    if self.value is not None:
+      oprot.writeFieldBegin('value', TType.STRING, 4)
+      oprot.writeString(self.value)
+      oprot.writeFieldEnd()
+    if self.description is not None:
+      oprot.writeFieldBegin('description', TType.STRING, 5)
+      oprot.writeString(self.description)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    if self.portId is None:
+      raise TProtocol.TProtocolException(message='Required field portId is unset!')
+    return
+
+
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.portId)
+    value = (value * 31) ^ hash(self.name)
+    value = (value * 31) ^ hash(self.status)
+    value = (value * 31) ^ hash(self.value)
+    value = (value * 31) ^ hash(self.description)
+    return value
+
+  def __repr__(self):
+    L = ['%s=%r' % (key, value)
+      for key, value in self.__dict__.iteritems()]
+    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+  def __eq__(self, other):
+    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+  def __ne__(self, other):
+    return not (self == other)
+
+class NodeModel:
+  """
+  Attributes:
+   - nodeId
+   - name
+   - applicationId
+   - applicationName
+   - status
+   - description
+  """
+
+  thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'nodeId', None, "DO_NOT_SET_AT_CLIENTS", ), # 1
+    (2, TType.STRING, 'name', None, None, ), # 2
+    (3, TType.STRING, 'applicationId', None, None, ), # 3
+    (4, TType.STRING, 'applicationName', None, None, ), # 4
+    (5, TType.STRUCT, 'status', (ComponentStatus, ComponentStatus.thrift_spec), None, ), # 5
+    (6, TType.STRING, 'description', None, None, ), # 6
+  )
+
+  def __init__(self, nodeId=thrift_spec[1][4], name=None, applicationId=None, applicationName=None, status=None, description=None,):
+    self.nodeId = nodeId
+    self.name = name
+    self.applicationId = applicationId
+    self.applicationName = applicationName
+    self.status = status
+    self.description = description
+
+  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:
+      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+      return
+    iprot.readStructBegin()
+    while True:
+      (fname, ftype, fid) = iprot.readFieldBegin()
+      if ftype == TType.STOP:
+        break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.nodeId = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.name = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRING:
+          self.applicationId = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.STRING:
+          self.applicationName = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 5:
+        if ftype == TType.STRUCT:
+          self.status = ComponentStatus()
+          self.status.read(iprot)
+        else:
+          iprot.skip(ftype)
+      elif fid == 6:
+        if ftype == TType.STRING:
+          self.description = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      else:
+        iprot.skip(ftype)
+      iprot.readFieldEnd()
+    iprot.readStructEnd()
+
+  def write(self, oprot):
+    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+      return
+    oprot.writeStructBegin('NodeModel')
+    if self.nodeId is not None:
+      oprot.writeFieldBegin('nodeId', TType.STRING, 1)
+      oprot.writeString(self.nodeId)
+      oprot.writeFieldEnd()
+    if self.name is not None:
+      oprot.writeFieldBegin('name', TType.STRING, 2)
+      oprot.writeString(self.name)
+      oprot.writeFieldEnd()
+    if self.applicationId is not None:
+      oprot.writeFieldBegin('applicationId', TType.STRING, 3)
+      oprot.writeString(self.applicationId)
+      oprot.writeFieldEnd()
+    if self.applicationName is not None:
+      oprot.writeFieldBegin('applicationName', TType.STRING, 4)
+      oprot.writeString(self.applicationName)
+      oprot.writeFieldEnd()
+    if self.status is not None:
+      oprot.writeFieldBegin('status', TType.STRUCT, 5)
+      self.status.write(oprot)
+      oprot.writeFieldEnd()
+    if self.description is not None:
+      oprot.writeFieldBegin('description', TType.STRING, 6)
+      oprot.writeString(self.description)
+      oprot.writeFieldEnd()
+    oprot.writeFieldStop()
+    oprot.writeStructEnd()
+
+  def validate(self):
+    if self.nodeId is None:
+      raise TProtocol.TProtocolException(message='Required field nodeId is unset!')
+    return
+
+
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.nodeId)
+    value = (value * 31) ^ hash(self.name)
+    value = (value * 31) ^ hash(self.applicationId)
+    value = (value * 31) ^ hash(self.applicationName)
+    value = (value * 31) ^ hash(self.status)
+    value = (value * 31) ^ hash(self.description)
     return value
 
   def __repr__(self):

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 020d395..f26fd55 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 c71df88..1fd0a86 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 e01c8d2..6658673 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 41cf054..b5b31dc 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
deleted file mode 100644
index 3460f9c..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
+++ /dev/null
@@ -1,1055 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-15")
-public class Workflow implements org.apache.thrift.TBase<Workflow, Workflow._Fields>, java.io.Serializable, Cloneable, Comparable<Workflow> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Workflow");
-
-  private static final org.apache.thrift.protocol.TField TEMPLATE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("templateId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField GRAPH_FIELD_DESC = new org.apache.thrift.protocol.TField("graph", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField IMAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("image", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField WORKFLOW_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowInputs", org.apache.thrift.protocol.TType.LIST, (short)5);
-  private static final org.apache.thrift.protocol.TField WORKFLOW_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowOutputs", org.apache.thrift.protocol.TType.LIST, (short)6);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new WorkflowStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new WorkflowTupleSchemeFactory());
-  }
-
-  private String templateId; // required
-  private String name; // required
-  private String graph; // optional
-  private ByteBuffer image; // optional
-  private List<org.apache.airavata.model.application.io.InputDataObjectType> workflowInputs; // optional
-  private List<org.apache.airavata.model.application.io.OutputDataObjectType> workflowOutputs; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    TEMPLATE_ID((short)1, "templateId"),
-    NAME((short)2, "name"),
-    GRAPH((short)3, "graph"),
-    IMAGE((short)4, "image"),
-    WORKFLOW_INPUTS((short)5, "workflowInputs"),
-    WORKFLOW_OUTPUTS((short)6, "workflowOutputs");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // TEMPLATE_ID
-          return TEMPLATE_ID;
-        case 2: // NAME
-          return NAME;
-        case 3: // GRAPH
-          return GRAPH;
-        case 4: // IMAGE
-          return IMAGE;
-        case 5: // WORKFLOW_INPUTS
-          return WORKFLOW_INPUTS;
-        case 6: // WORKFLOW_OUTPUTS
-          return WORKFLOW_OUTPUTS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final _Fields optionals[] = {_Fields.GRAPH,_Fields.IMAGE,_Fields.WORKFLOW_INPUTS,_Fields.WORKFLOW_OUTPUTS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.TEMPLATE_ID, new org.apache.thrift.meta_data.FieldMetaData("templateId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.GRAPH, new org.apache.thrift.meta_data.FieldMetaData("graph", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.IMAGE, new org.apache.thrift.meta_data.FieldMetaData("image", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.WORKFLOW_INPUTS, new org.apache.thrift.meta_data.FieldMetaData("workflowInputs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.application.io.InputDataObjectType.class))));
-    tmpMap.put(_Fields.WORKFLOW_OUTPUTS, new org.apache.thrift.meta_data.FieldMetaData("workflowOutputs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.application.io.OutputDataObjectType.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Workflow.class, metaDataMap);
-  }
-
-  public Workflow() {
-    this.templateId = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public Workflow(
-    String templateId,
-    String name)
-  {
-    this();
-    this.templateId = templateId;
-    this.name = name;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public Workflow(Workflow other) {
-    if (other.isSetTemplateId()) {
-      this.templateId = other.templateId;
-    }
-    if (other.isSetName()) {
-      this.name = other.name;
-    }
-    if (other.isSetGraph()) {
-      this.graph = other.graph;
-    }
-    if (other.isSetImage()) {
-      this.image = org.apache.thrift.TBaseHelper.copyBinary(other.image);
-    }
-    if (other.isSetWorkflowInputs()) {
-      List<org.apache.airavata.model.application.io.InputDataObjectType> __this__workflowInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(other.workflowInputs.size());
-      for (org.apache.airavata.model.application.io.InputDataObjectType other_element : other.workflowInputs) {
-        __this__workflowInputs.add(new org.apache.airavata.model.application.io.InputDataObjectType(other_element));
-      }
-      this.workflowInputs = __this__workflowInputs;
-    }
-    if (other.isSetWorkflowOutputs()) {
-      List<org.apache.airavata.model.application.io.OutputDataObjectType> __this__workflowOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(other.workflowOutputs.size());
-      for (org.apache.airavata.model.application.io.OutputDataObjectType other_element : other.workflowOutputs) {
-        __this__workflowOutputs.add(new org.apache.airavata.model.application.io.OutputDataObjectType(other_element));
-      }
-      this.workflowOutputs = __this__workflowOutputs;
-    }
-  }
-
-  public Workflow deepCopy() {
-    return new Workflow(this);
-  }
-
-  @Override
-  public void clear() {
-    this.templateId = "DO_NOT_SET_AT_CLIENTS";
-
-    this.name = null;
-    this.graph = null;
-    this.image = null;
-    this.workflowInputs = null;
-    this.workflowOutputs = null;
-  }
-
-  public String getTemplateId() {
-    return this.templateId;
-  }
-
-  public void setTemplateId(String templateId) {
-    this.templateId = templateId;
-  }
-
-  public void unsetTemplateId() {
-    this.templateId = null;
-  }
-
-  /** Returns true if field templateId is set (has been assigned a value) and false otherwise */
-  public boolean isSetTemplateId() {
-    return this.templateId != null;
-  }
-
-  public void setTemplateIdIsSet(boolean value) {
-    if (!value) {
-      this.templateId = null;
-    }
-  }
-
-  public String getName() {
-    return this.name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public void unsetName() {
-    this.name = null;
-  }
-
-  /** Returns true if field name is set (has been assigned a value) and false otherwise */
-  public boolean isSetName() {
-    return this.name != null;
-  }
-
-  public void setNameIsSet(boolean value) {
-    if (!value) {
-      this.name = null;
-    }
-  }
-
-  public String getGraph() {
-    return this.graph;
-  }
-
-  public void setGraph(String graph) {
-    this.graph = graph;
-  }
-
-  public void unsetGraph() {
-    this.graph = null;
-  }
-
-  /** Returns true if field graph is set (has been assigned a value) and false otherwise */
-  public boolean isSetGraph() {
-    return this.graph != null;
-  }
-
-  public void setGraphIsSet(boolean value) {
-    if (!value) {
-      this.graph = null;
-    }
-  }
-
-  public byte[] getImage() {
-    setImage(org.apache.thrift.TBaseHelper.rightSize(image));
-    return image == null ? null : image.array();
-  }
-
-  public ByteBuffer bufferForImage() {
-    return org.apache.thrift.TBaseHelper.copyBinary(image);
-  }
-
-  public void setImage(byte[] image) {
-    this.image = image == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(image, image.length));
-  }
-
-  public void setImage(ByteBuffer image) {
-    this.image = org.apache.thrift.TBaseHelper.copyBinary(image);
-  }
-
-  public void unsetImage() {
-    this.image = null;
-  }
-
-  /** Returns true if field image is set (has been assigned a value) and false otherwise */
-  public boolean isSetImage() {
-    return this.image != null;
-  }
-
-  public void setImageIsSet(boolean value) {
-    if (!value) {
-      this.image = null;
-    }
-  }
-
-  public int getWorkflowInputsSize() {
-    return (this.workflowInputs == null) ? 0 : this.workflowInputs.size();
-  }
-
-  public java.util.Iterator<org.apache.airavata.model.application.io.InputDataObjectType> getWorkflowInputsIterator() {
-    return (this.workflowInputs == null) ? null : this.workflowInputs.iterator();
-  }
-
-  public void addToWorkflowInputs(org.apache.airavata.model.application.io.InputDataObjectType elem) {
-    if (this.workflowInputs == null) {
-      this.workflowInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>();
-    }
-    this.workflowInputs.add(elem);
-  }
-
-  public List<org.apache.airavata.model.application.io.InputDataObjectType> getWorkflowInputs() {
-    return this.workflowInputs;
-  }
-
-  public void setWorkflowInputs(List<org.apache.airavata.model.application.io.InputDataObjectType> workflowInputs) {
-    this.workflowInputs = workflowInputs;
-  }
-
-  public void unsetWorkflowInputs() {
-    this.workflowInputs = null;
-  }
-
-  /** Returns true if field workflowInputs is set (has been assigned a value) and false otherwise */
-  public boolean isSetWorkflowInputs() {
-    return this.workflowInputs != null;
-  }
-
-  public void setWorkflowInputsIsSet(boolean value) {
-    if (!value) {
-      this.workflowInputs = null;
-    }
-  }
-
-  public int getWorkflowOutputsSize() {
-    return (this.workflowOutputs == null) ? 0 : this.workflowOutputs.size();
-  }
-
-  public java.util.Iterator<org.apache.airavata.model.application.io.OutputDataObjectType> getWorkflowOutputsIterator() {
-    return (this.workflowOutputs == null) ? null : this.workflowOutputs.iterator();
-  }
-
-  public void addToWorkflowOutputs(org.apache.airavata.model.application.io.OutputDataObjectType elem) {
-    if (this.workflowOutputs == null) {
-      this.workflowOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>();
-    }
-    this.workflowOutputs.add(elem);
-  }
-
-  public List<org.apache.airavata.model.application.io.OutputDataObjectType> getWorkflowOutputs() {
-    return this.workflowOutputs;
-  }
-
-  public void setWorkflowOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType> workflowOutputs) {
-    this.workflowOutputs = workflowOutputs;
-  }
-
-  public void unsetWorkflowOutputs() {
-    this.workflowOutputs = null;
-  }
-
-  /** Returns true if field workflowOutputs is set (has been assigned a value) and false otherwise */
-  public boolean isSetWorkflowOutputs() {
-    return this.workflowOutputs != null;
-  }
-
-  public void setWorkflowOutputsIsSet(boolean value) {
-    if (!value) {
-      this.workflowOutputs = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case TEMPLATE_ID:
-      if (value == null) {
-        unsetTemplateId();
-      } else {
-        setTemplateId((String)value);
-      }
-      break;
-
-    case NAME:
-      if (value == null) {
-        unsetName();
-      } else {
-        setName((String)value);
-      }
-      break;
-
-    case GRAPH:
-      if (value == null) {
-        unsetGraph();
-      } else {
-        setGraph((String)value);
-      }
-      break;
-
-    case IMAGE:
-      if (value == null) {
-        unsetImage();
-      } else {
-        setImage((ByteBuffer)value);
-      }
-      break;
-
-    case WORKFLOW_INPUTS:
-      if (value == null) {
-        unsetWorkflowInputs();
-      } else {
-        setWorkflowInputs((List<org.apache.airavata.model.application.io.InputDataObjectType>)value);
-      }
-      break;
-
-    case WORKFLOW_OUTPUTS:
-      if (value == null) {
-        unsetWorkflowOutputs();
-      } else {
-        setWorkflowOutputs((List<org.apache.airavata.model.application.io.OutputDataObjectType>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case TEMPLATE_ID:
-      return getTemplateId();
-
-    case NAME:
-      return getName();
-
-    case GRAPH:
-      return getGraph();
-
-    case IMAGE:
-      return getImage();
-
-    case WORKFLOW_INPUTS:
-      return getWorkflowInputs();
-
-    case WORKFLOW_OUTPUTS:
-      return getWorkflowOutputs();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case TEMPLATE_ID:
-      return isSetTemplateId();
-    case NAME:
-      return isSetName();
-    case GRAPH:
-      return isSetGraph();
-    case IMAGE:
-      return isSetImage();
-    case WORKFLOW_INPUTS:
-      return isSetWorkflowInputs();
-    case WORKFLOW_OUTPUTS:
-      return isSetWorkflowOutputs();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof Workflow)
-      return this.equals((Workflow)that);
-    return false;
-  }
-
-  public boolean equals(Workflow that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_templateId = true && this.isSetTemplateId();
-    boolean that_present_templateId = true && that.isSetTemplateId();
-    if (this_present_templateId || that_present_templateId) {
-      if (!(this_present_templateId && that_present_templateId))
-        return false;
-      if (!this.templateId.equals(that.templateId))
-        return false;
-    }
-
-    boolean this_present_name = true && this.isSetName();
-    boolean that_present_name = true && that.isSetName();
-    if (this_present_name || that_present_name) {
-      if (!(this_present_name && that_present_name))
-        return false;
-      if (!this.name.equals(that.name))
-        return false;
-    }
-
-    boolean this_present_graph = true && this.isSetGraph();
-    boolean that_present_graph = true && that.isSetGraph();
-    if (this_present_graph || that_present_graph) {
-      if (!(this_present_graph && that_present_graph))
-        return false;
-      if (!this.graph.equals(that.graph))
-        return false;
-    }
-
-    boolean this_present_image = true && this.isSetImage();
-    boolean that_present_image = true && that.isSetImage();
-    if (this_present_image || that_present_image) {
-      if (!(this_present_image && that_present_image))
-        return false;
-      if (!this.image.equals(that.image))
-        return false;
-    }
-
-    boolean this_present_workflowInputs = true && this.isSetWorkflowInputs();
-    boolean that_present_workflowInputs = true && that.isSetWorkflowInputs();
-    if (this_present_workflowInputs || that_present_workflowInputs) {
-      if (!(this_present_workflowInputs && that_present_workflowInputs))
-        return false;
-      if (!this.workflowInputs.equals(that.workflowInputs))
-        return false;
-    }
-
-    boolean this_present_workflowOutputs = true && this.isSetWorkflowOutputs();
-    boolean that_present_workflowOutputs = true && that.isSetWorkflowOutputs();
-    if (this_present_workflowOutputs || that_present_workflowOutputs) {
-      if (!(this_present_workflowOutputs && that_present_workflowOutputs))
-        return false;
-      if (!this.workflowOutputs.equals(that.workflowOutputs))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_templateId = true && (isSetTemplateId());
-    list.add(present_templateId);
-    if (present_templateId)
-      list.add(templateId);
-
-    boolean present_name = true && (isSetName());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
-
-    boolean present_graph = true && (isSetGraph());
-    list.add(present_graph);
-    if (present_graph)
-      list.add(graph);
-
-    boolean present_image = true && (isSetImage());
-    list.add(present_image);
-    if (present_image)
-      list.add(image);
-
-    boolean present_workflowInputs = true && (isSetWorkflowInputs());
-    list.add(present_workflowInputs);
-    if (present_workflowInputs)
-      list.add(workflowInputs);
-
-    boolean present_workflowOutputs = true && (isSetWorkflowOutputs());
-    list.add(present_workflowOutputs);
-    if (present_workflowOutputs)
-      list.add(workflowOutputs);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(Workflow other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetTemplateId()).compareTo(other.isSetTemplateId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetTemplateId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.templateId, other.templateId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetGraph()).compareTo(other.isSetGraph());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGraph()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.graph, other.graph);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetImage()).compareTo(other.isSetImage());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetImage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.image, other.image);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetWorkflowInputs()).compareTo(other.isSetWorkflowInputs());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetWorkflowInputs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowInputs, other.workflowInputs);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetWorkflowOutputs()).compareTo(other.isSetWorkflowOutputs());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetWorkflowOutputs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowOutputs, other.workflowOutputs);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Workflow(");
-    boolean first = true;
-
-    sb.append("templateId:");
-    if (this.templateId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.templateId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("name:");
-    if (this.name == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.name);
-    }
-    first = false;
-    if (isSetGraph()) {
-      if (!first) sb.append(", ");
-      sb.append("graph:");
-      if (this.graph == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.graph);
-      }
-      first = false;
-    }
-    if (isSetImage()) {
-      if (!first) sb.append(", ");
-      sb.append("image:");
-      if (this.image == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.image, sb);
-      }
-      first = false;
-    }
-    if (isSetWorkflowInputs()) {
-      if (!first) sb.append(", ");
-      sb.append("workflowInputs:");
-      if (this.workflowInputs == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.workflowInputs);
-      }
-      first = false;
-    }
-    if (isSetWorkflowOutputs()) {
-      if (!first) sb.append(", ");
-      sb.append("workflowOutputs:");
-      if (this.workflowOutputs == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.workflowOutputs);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetTemplateId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'templateId' is unset! Struct:" + toString());
-    }
-
-    if (!isSetName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class WorkflowStandardSchemeFactory implements SchemeFactory {
-    public WorkflowStandardScheme getScheme() {
-      return new WorkflowStandardScheme();
-    }
-  }
-
-  private static class WorkflowStandardScheme extends StandardScheme<Workflow> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, Workflow struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // TEMPLATE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.templateId = iprot.readString();
-              struct.setTemplateIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // GRAPH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.graph = iprot.readString();
-              struct.setGraphIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // IMAGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.image = iprot.readBinary();
-              struct.setImageIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // WORKFLOW_INPUTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.workflowInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list0.size);
-                org.apache.airavata.model.application.io.InputDataObjectType _elem1;
-                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
-                {
-                  _elem1 = new org.apache.airavata.model.application.io.InputDataObjectType();
-                  _elem1.read(iprot);
-                  struct.workflowInputs.add(_elem1);
-                }
-                iprot.readListEnd();
-              }
-              struct.setWorkflowInputsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // WORKFLOW_OUTPUTS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
-                struct.workflowOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list3.size);
-                org.apache.airavata.model.application.io.OutputDataObjectType _elem4;
-                for (int _i5 = 0; _i5 < _list3.size; ++_i5)
-                {
-                  _elem4 = new org.apache.airavata.model.application.io.OutputDataObjectType();
-                  _elem4.read(iprot);
-                  struct.workflowOutputs.add(_elem4);
-                }
-                iprot.readListEnd();
-              }
-              struct.setWorkflowOutputsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, Workflow struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.templateId != null) {
-        oprot.writeFieldBegin(TEMPLATE_ID_FIELD_DESC);
-        oprot.writeString(struct.templateId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.name != null) {
-        oprot.writeFieldBegin(NAME_FIELD_DESC);
-        oprot.writeString(struct.name);
-        oprot.writeFieldEnd();
-      }
-      if (struct.graph != null) {
-        if (struct.isSetGraph()) {
-          oprot.writeFieldBegin(GRAPH_FIELD_DESC);
-          oprot.writeString(struct.graph);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.image != null) {
-        if (struct.isSetImage()) {
-          oprot.writeFieldBegin(IMAGE_FIELD_DESC);
-          oprot.writeBinary(struct.image);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.workflowInputs != null) {
-        if (struct.isSetWorkflowInputs()) {
-          oprot.writeFieldBegin(WORKFLOW_INPUTS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.workflowInputs.size()));
-            for (org.apache.airavata.model.application.io.InputDataObjectType _iter6 : struct.workflowInputs)
-            {
-              _iter6.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.workflowOutputs != null) {
-        if (struct.isSetWorkflowOutputs()) {
-          oprot.writeFieldBegin(WORKFLOW_OUTPUTS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.workflowOutputs.size()));
-            for (org.apache.airavata.model.application.io.OutputDataObjectType _iter7 : struct.workflowOutputs)
-            {
-              _iter7.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class WorkflowTupleSchemeFactory implements SchemeFactory {
-    public WorkflowTupleScheme getScheme() {
-      return new WorkflowTupleScheme();
-    }
-  }
-
-  private static class WorkflowTupleScheme extends TupleScheme<Workflow> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, Workflow struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.templateId);
-      oprot.writeString(struct.name);
-      BitSet optionals = new BitSet();
-      if (struct.isSetGraph()) {
-        optionals.set(0);
-      }
-      if (struct.isSetImage()) {
-        optionals.set(1);
-      }
-      if (struct.isSetWorkflowInputs()) {
-        optionals.set(2);
-      }
-      if (struct.isSetWorkflowOutputs()) {
-        optionals.set(3);
-      }
-      oprot.writeBitSet(optionals, 4);
-      if (struct.isSetGraph()) {
-        oprot.writeString(struct.graph);
-      }
-      if (struct.isSetImage()) {
-        oprot.writeBinary(struct.image);
-      }
-      if (struct.isSetWorkflowInputs()) {
-        {
-          oprot.writeI32(struct.workflowInputs.size());
-          for (org.apache.airavata.model.application.io.InputDataObjectType _iter8 : struct.workflowInputs)
-          {
-            _iter8.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetWorkflowOutputs()) {
-        {
-          oprot.writeI32(struct.workflowOutputs.size());
-          for (org.apache.airavata.model.application.io.OutputDataObjectType _iter9 : struct.workflowOutputs)
-          {
-            _iter9.write(oprot);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, Workflow struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.templateId = iprot.readString();
-      struct.setTemplateIdIsSet(true);
-      struct.name = iprot.readString();
-      struct.setNameIsSet(true);
-      BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.graph = iprot.readString();
-        struct.setGraphIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.image = iprot.readBinary();
-        struct.setImageIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.workflowInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list10.size);
-          org.apache.airavata.model.application.io.InputDataObjectType _elem11;
-          for (int _i12 = 0; _i12 < _list10.size; ++_i12)
-          {
-            _elem11 = new org.apache.airavata.model.application.io.InputDataObjectType();
-            _elem11.read(iprot);
-            struct.workflowInputs.add(_elem11);
-          }
-        }
-        struct.setWorkflowInputsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.workflowOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list13.size);
-          org.apache.airavata.model.application.io.OutputDataObjectType _elem14;
-          for (int _i15 = 0; _i15 < _list13.size; ++_i15)
-          {
-            _elem14 = new org.apache.airavata.model.application.io.OutputDataObjectType();
-            _elem14.read(iprot);
-            struct.workflowOutputs.add(_elem14);
-          }
-        }
-        struct.setWorkflowOutputsIsSet(true);
-      }
-    }
-  }
-
-}
-


[08/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 1c6b7e7..8d4b714 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
@@ -52566,7 +52566,7 @@ void AiravataClient::recv_getAllWorkflows(std::vector<std::string> & _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllWorkflows failed: unknown result");
 }
 
-void AiravataClient::getWorkflow( ::Workflow& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId)
+void AiravataClient::getWorkflow( ::WorkflowModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId)
 {
   send_getWorkflow(authzToken, workflowTemplateId);
   recv_getWorkflow(_return);
@@ -52587,7 +52587,7 @@ void AiravataClient::send_getWorkflow(const  ::apache::airavata::model::security
   oprot_->getTransport()->flush();
 }
 
-void AiravataClient::recv_getWorkflow( ::Workflow& _return)
+void AiravataClient::recv_getWorkflow( ::WorkflowModel& _return)
 {
 
   int32_t rseqid = 0;
@@ -52703,13 +52703,13 @@ void AiravataClient::recv_deleteWorkflow()
   return;
 }
 
-void AiravataClient::registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow)
+void AiravataClient::registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow)
 {
   send_registerWorkflow(authzToken, gatewayId, workflow);
   recv_registerWorkflow(_return);
 }
 
-void AiravataClient::send_registerWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow)
+void AiravataClient::send_registerWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("registerWorkflow", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -52775,13 +52775,13 @@ void AiravataClient::recv_registerWorkflow(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "registerWorkflow failed: unknown result");
 }
 
-void AiravataClient::updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow)
+void AiravataClient::updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow)
 {
   send_updateWorkflow(authzToken, workflowTemplateId, workflow);
   recv_updateWorkflow();
 }
 
-void AiravataClient::send_updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow)
+void AiravataClient::send_updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateWorkflow", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -75524,7 +75524,7 @@ void AiravataConcurrentClient::recv_getAllWorkflows(std::vector<std::string> & _
   } // end while(true)
 }
 
-void AiravataConcurrentClient::getWorkflow( ::Workflow& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId)
+void AiravataConcurrentClient::getWorkflow( ::WorkflowModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId)
 {
   int32_t seqid = send_getWorkflow(authzToken, workflowTemplateId);
   recv_getWorkflow(_return, seqid);
@@ -75549,7 +75549,7 @@ int32_t AiravataConcurrentClient::send_getWorkflow(const  ::apache::airavata::mo
   return cseqid;
 }
 
-void AiravataConcurrentClient::recv_getWorkflow( ::Workflow& _return, const int32_t seqid)
+void AiravataConcurrentClient::recv_getWorkflow( ::WorkflowModel& _return, const int32_t seqid)
 {
 
   int32_t rseqid = 0;
@@ -75720,13 +75720,13 @@ void AiravataConcurrentClient::recv_deleteWorkflow(const int32_t seqid)
   } // end while(true)
 }
 
-void AiravataConcurrentClient::registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow)
+void AiravataConcurrentClient::registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow)
 {
   int32_t seqid = send_registerWorkflow(authzToken, gatewayId, workflow);
   recv_registerWorkflow(_return, seqid);
 }
 
-int32_t AiravataConcurrentClient::send_registerWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow)
+int32_t AiravataConcurrentClient::send_registerWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow)
 {
   int32_t cseqid = this->sync_.generateSeqId();
   ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);
@@ -75822,13 +75822,13 @@ void AiravataConcurrentClient::recv_registerWorkflow(std::string& _return, const
   } // end while(true)
 }
 
-void AiravataConcurrentClient::updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow)
+void AiravataConcurrentClient::updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow)
 {
   int32_t seqid = send_updateWorkflow(authzToken, workflowTemplateId, workflow);
   recv_updateWorkflow(seqid);
 }
 
-int32_t AiravataConcurrentClient::send_updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow)
+int32_t AiravataConcurrentClient::send_updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow)
 {
   int32_t cseqid = this->sync_.generateSeqId();
   ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 76b51e5..a8e91cc 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
@@ -183,6 +183,7 @@ class AiravataIf {
   virtual void getSSHPubKey(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken, const std::string& gatewayId) = 0;
 
   /**
+   * 
    * Get a Public Key by Providing the Token
    * 
    * @param CredStoreToken
@@ -201,6 +202,7 @@ class AiravataIf {
   virtual void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) = 0;
 
   /**
+   * 
    * Get all Public Keys of the Gateway
    * 
    * @param CredStoreToken
@@ -219,6 +221,7 @@ class AiravataIf {
   virtual void getAllGatewaySSHPubKeys(std::map<std::string, std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) = 0;
 
   /**
+   * 
    * Delete a Gateway
    * 
    * @param gatewayId
@@ -236,6 +239,7 @@ class AiravataIf {
   virtual bool deleteSSHPubKey(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken, const std::string& gatewayId) = 0;
 
   /**
+   * 
    * Creates a Project with basic metadata.
    *    A Project is a container of experiments.
    * 
@@ -243,7 +247,7 @@ class AiravataIf {
    *    The identifier for the requested gateway.
    * 
    * @param Project
-   *    The Project Object described in the workspace_model
+   *    The Project Object described in the workspace_model.
    * 
    * 
    * 
@@ -254,6 +258,7 @@ class AiravataIf {
   virtual void createProject(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::apache::airavata::model::workspace::Project& project) = 0;
 
   /**
+   * 
    * Update an Existing Project
    * 
    * @param projectId
@@ -271,14 +276,15 @@ class AiravataIf {
   virtual void updateProject(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId, const  ::apache::airavata::model::workspace::Project& updatedProject) = 0;
 
   /**
+   * 
    * Get a Project by ID
-   *    This method is to obtain a project by providing a projectId
+   *    This method is to obtain a project by providing a projectId.
    * 
    * @param projectId
-   *    projectId of the project you require
+   *    projectId of the project you require.
    * 
    * @return project
-   *    project data model will be returned
+   *    project data model will be returned.
    * 
    * 
    * 
@@ -288,15 +294,18 @@ class AiravataIf {
   virtual void getProject( ::apache::airavata::model::workspace::Project& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId) = 0;
 
   /**
+   * 
    * Delete a Project
-   *    This method is used to delete an existing Project
+   *    This method is used to delete an existing Project.
    * 
    * @param projectId
-   *    projectId of the project you want to delete
+   *    projectId of the project you want to delete.
    * 
    * @return boolean
    *    Boolean identifier for the success or failure of the deletion operation.
    * 
+   *    NOTE: This method is not used within gateways connected with Airavata.
+   * 
    * 
    * 
    * @param authzToken
@@ -305,20 +314,21 @@ class AiravataIf {
   virtual bool deleteProject(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId) = 0;
 
   /**
-   * Get all Project by user with pagination. Results will be ordered based
-   * on creation time DESC
+   * 
+   * Get All User Projects
+   * Get all Project for the user with pagination. Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
    *    The identifier for the requested gateway.
    * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
    * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
    * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
    * 
    * 
    * 
@@ -331,19 +341,25 @@ class AiravataIf {
   virtual void getUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Get all Project for user by project name with pagination.Results will be ordered based
-   * on creation time DESC
+   * 
+   * Search User Projects by Project Name
+   * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
-   *    The identifier for the requested gateway.
+   *    The unique identifier for the requested gateway.
+   * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
+   * 
    * @param projectName
-   *    The name of the project on which the results to be fetched
+   *    The name of the project on which the results to be fetched.
+   * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
+   * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -356,19 +372,25 @@ class AiravataIf {
   virtual void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& projectName, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Search and get all Projects for user by project description with pagination. Results
-   * will be ordered based on creation time DESC
+   * 
+   * Search User Projects by Project Description
+   * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
    * 
    * @param gatewayId
-   *    The identifier for the requested gateway.
+   *    The unique identifier of the gateway making the request.
+   * 
    * @param userName
-   *    The identifier of the user
+   *    The identifier of the user.
+   * 
    * @param description
-   *    The description to be matched
+   *    The description to be matched.
+   * 
    * @param limit
-   *    The amount results to be fetched
+   *    The amount results to be fetched.
+   * 
    * @param offset
-   *    The starting point of the results to be fetched
+   *    The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -381,19 +403,25 @@ class AiravataIf {
   virtual void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Search Experiments by experiment name with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by Name
+   * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user who created the experiments.
+   * 
    * @param expName
-   *       Experiment name to be matched
+   *       Experiment name to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -406,19 +434,25 @@ class AiravataIf {
   virtual void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Search Experiments by experiment name with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search By Experiment Description
+   * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param description
-   *       Experiment description to be matched
+   *       Experiment description to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -431,19 +465,25 @@ class AiravataIf {
   virtual void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Search Experiments by application id with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search Experiment By the Application
+   * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param applicationId
-   *       Application id to be matched
+   *       Application id to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -456,19 +496,25 @@ class AiravataIf {
   virtual void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Search Experiments by experiment status with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by Status
+   * Search all the Experiments of the given user  by experiment status with pagination. Results will be sorted based on creation time DESC
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user making the request.
+   * 
    * @param experimentState
-   *       Experiement state to be matched
+   *       Experiement state to be matched.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -481,21 +527,31 @@ class AiravataIf {
   virtual void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const  ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Search Experiments by experiment creation time with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Search User Experiments by the Creation Time
+   * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested user.
+   * 
    * @param fromTime
-   *       Start time of the experiments creation time
+   *       Start time of the experiments creation time.
+   * 
    * @param toTime
-   *       End time of the  experiement creation time
+   *       End time of the  experiement creation time.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
+   * @return ExperimentSummaryModel
+   *    List of experiments for the given search filter. Here only the Experiment summary will be returned.
+   * 
    * 
    * 
    * @param authzToken
@@ -509,19 +565,27 @@ class AiravataIf {
   virtual void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Search Experiments by using multiple filter criteria with pagination. Results will be sorted
-   * based on creation time DESC
+   * Search Experiments.
+   * Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Identifier of the requested gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the user requesting the search function.
+   * 
    * @param filters
-   *       map of multiple filter criteria.
+   *       Map of multiple filter criteria. Currenlt search filters includes Experiment Name, Description, Application, etc....
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
+   * @return ExperimentSummaryModel
+   *    List of experiments for the given search filter. Here only the Experiment summary will be returned.
+   * 
    * 
    * 
    * @param authzToken
@@ -534,13 +598,19 @@ class AiravataIf {
   virtual void searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Get Experiment Statisitics for the given gateway for a specific time period
+   * 
+   * Get Experiment Statistics
+   * Get Experiment Statisitics for a given gateway for a specific time period. This feature is available only for admins of a particular gateway. Gateway admin access is managed by the user roles.
+   * 
    * @param gatewayId
-   *       Identifier of the requested gateway
+   *       Unique identifier of the gateway making the request to fetch statistics.
+   * 
    * @param fromTime
-   *       Starting date time
+   *       Starting date time.
+   * 
    * @param toTime
-   *       Ending data time
+   *       Ending data time.
+   * 
    * 
    * 
    * @param authzToken
@@ -551,15 +621,19 @@ class AiravataIf {
   virtual void getExperimentStatistics( ::apache::airavata::model::experiment::ExperimentStatistics& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int64_t fromTime, const int64_t toTime) = 0;
 
   /**
-   * Get Experiments within project with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Get All Experiments of the Project
+   * Get Experiments within project with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param projectId
-   *       Identifier of the project
+   *       Uniqie identifier of the project.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -570,17 +644,22 @@ class AiravataIf {
   virtual void getExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId, const int32_t limit, const int32_t offset) = 0;
 
   /**
-   * Get experiments by user with pagination. Results will be sorted
-   * based on creation time DESC
+   * 
+   * Get All Experiments of the User
+   * Get experiments by user with pagination. Results will be sorted based on creation time DESC.
    * 
    * @param gatewayId
-   *       Identifier of the requesting gateway
+   *       Identifier of the requesting gateway.
+   * 
    * @param userName
-   *       Username of the requested user
+   *       Username of the requested end user.
+   * 
    * @param limit
-   *       Amount of results to be fetched
+   *       Amount of results to be fetched.
+   * 
    * @param offset
-   *       The starting point of the results to be fetched
+   *       The starting point of the results to be fetched.
+   * 
    * 
    * 
    * @param authzToken
@@ -592,12 +671,17 @@ class AiravataIf {
   virtual void getUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) = 0;
 
   /**
+   *   *
+   *   * Create New Experiment
    *   * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
    *   *   but inferred from the sshKeyAuthentication header. This experiment is just a persistent place holder. The client
    *   *   has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
    *   *   registering the experiment in a persistent store.
    *   *
-   *   * @param basicExperimentMetadata
+   *   * @param gatewayId
+   *   *    The unique ID of the gateway where the experiment is been created.
+   *   *
+   *   * @param ExperimentModel
    *   *    The create experiment will require the basic experiment metadata like the name and description, intended user,
    *   *      the gateway identifer and if the experiment should be shared public by defualt. During the creation of an experiment
    *   *      the ExperimentMetadata is a required field.
@@ -634,8 +718,8 @@ class AiravataIf {
   virtual void createExperiment(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::apache::airavata::model::experiment::ExperimentModel& experiment) = 0;
 
   /**
-   * Delete an Experiment
    * 
+   * Delete an Experiment
    * If the experiment is not already launched experiment can be deleted.
    * 
    * @param authzToken
@@ -644,7 +728,7 @@ class AiravataIf {
    *     Experiment ID of the experimnet you want to delete.
    * 
    * @return boolean
-   *     Identifier for the success or failure of the deletion operation
+   *     Identifier for the success or failure of the deletion operation.
    * 
    * 
    * 
@@ -654,12 +738,14 @@ class AiravataIf {
   virtual bool deleteExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& experimentId) = 0;
 
   /**
+   *   *
+   *   * Get Experiment
    *   * Fetch previously created experiment metadata.
    *   *
    *   * @param airavataExperimentId
-   *   *    The identifier for the requested experiment. This is returned during the create experiment step.
+   *   *    The unique identifier of the requested experiment. This ID is returned during the create experiment step.
    *   *
-   *   * @return experimentMetada
+   *   * @return ExperimentModel
    *   *   This method will return the previously stored experiment metadata.
    *   *
    *   * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -693,14 +779,17 @@ class AiravataIf {
   virtual void getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
 
   /**
+   * 
+   * Get Complete Experiment Details
    * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
    * tasks -> jobs information.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
    * 
-   * @return experimentMetada
-   *   This method will return the previously stored experiment metadata.
+   * @return ExperimentModel
+   *   This method will return the previously stored experiment metadata including application input parameters, computational resource scheduling
+   *   information, special input output handling and additional quality of service parameters.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
    *    For any incorrect forming of the request itself.
@@ -732,14 +821,15 @@ class AiravataIf {
   virtual void getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
 
   /**
-   * Configure a previously created experiment with required inputs, scheduling and other quality of service
-   *   parameters. This method only updates the experiment object within the registry. The experiment has to be launched
-   *   to make it actionable by the server.
+   * 
+   * Update a Previously Created Experiment
+   * Configure the CREATED experiment with required inputs, scheduling and other quality of service parameters. This method only updates the experiment object within the registry.
+   * The experiment has to be launched to make it actionable by the server.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
    * 
-   * @param experimentConfigurationData
+   * @param ExperimentModel
    *    The configuration information of the experiment with application input parameters, computational resource scheduling
    *      information, special input output handling and additional quality of service parameters.
    * 
@@ -780,13 +870,14 @@ class AiravataIf {
 
   /**
    *  *
-   *  * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
-   *  *
-   *  * @param experimentId
+   *  * Validate experiment configuration.
+   *  * A true in general indicates, the experiment is ready to be launched.
    *  *
+   *  * @param airavataExperimentId
+   *  *    Unique identifier of the experiment (Experimnent ID) of the experiment which need to be validated.
    *  *
    *  * @return boolean
-   *  *      Identifier for the success or failure of the validation operation
+   *  *      Identifier for the success or failure of the validation operation.
    *  *
    * *
    * 
@@ -796,8 +887,12 @@ class AiravataIf {
   virtual bool validateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
 
   /**
-   * Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
-   *   notifications and intermediate and output data will be subsequently available for this experiment.
+   * 
+   * Launch a Previously Created & Configured Experiment.
+   * Airavata Server will then start processing the request and appropriate notifications and intermediate and output data will be subsequently available for this experiment.
+   * 
+   * @gatewayId
+   *    ID of the gateway which will launch the experiment.
    * 
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
@@ -836,17 +931,18 @@ class AiravataIf {
   virtual void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId) = 0;
 
   /**
+   * 
    * Get Experiment Status
    * 
-   * Obtain the status os an experiment by providing the Experiment Id
+   * Obtain the status of an experiment by providing the Experiment Id
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you require the status
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you require the status.
    * 
    * @return ExperimentStatus
-   *     ExperimentStatus model with current status will be returned.
+   *     ExperimentStatus model with the current status will be returned.
    * 
    * 
    * 
@@ -856,16 +952,17 @@ class AiravataIf {
   virtual void getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
 
   /**
+   * 
    * Get Experiment Outputs
-   * This method to be used when need to obtain outputs of a certain Experiment
+   * This method to be used when need to obtain final outputs of a certain Experiment
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you need the outputs
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you need the outputs.
    * 
    * @return list
-   *     List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+   *     List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
    * 
    * 
    * 
@@ -875,16 +972,17 @@ class AiravataIf {
   virtual void getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
 
   /**
+   * 
    * Get Intermediate Experiment Outputs
    * This method to be used when need to obtain intermediate outputs of a certain Experiment
    * 
    * @param authzToken
    * 
-   * @param experiementId
-   *     Experiment ID of the experimnet you need the intermediate outputs
+   * @param airavataExperimentId
+   *     Experiment ID of the experimnet you need intermediate outputs.
    * 
    * @return list
-   *     List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+   *     List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
    * 
    * 
    * 
@@ -894,13 +992,14 @@ class AiravataIf {
   virtual void getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
 
   /**
-   * Get Job Status for an Experiment
+   * 
+   * Get Job Statuses for an Experiment
    * This method to be used when need to get the job status of an Experiment. An experiment may have one or many jobs; there for one or many job statuses may turnup
    * 
    * @param authzToken
    * 
    * @param experiementId
-   *     Experiment ID of the experimnet you need the intermediate outputs
+   *     Experiment ID of the experimnet you need the job statuses.
    * 
    * @return JobStatus
    *     Job status (string) for all all the existing jobs for the experiment will be returned in the form of a map
@@ -913,16 +1012,17 @@ class AiravataIf {
   virtual void getJobStatuses(std::map<std::string,  ::apache::airavata::model::status::JobStatus> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
 
   /**
-   * Get Job Details for all the jobs within an Experiment
+   * 
+   * Get Job Details for all the jobs within an Experiment.
    * This method to be used when need to get the job details for one or many jobs of an Experiment.
    * 
    * @param authzToken
    * 
    * @param experiementId
-   *     Experiment ID of the experimnet you need job details
+   *     Experiment ID of the experimnet you need job details.
    * 
    * @return list of JobDetails
-   *     Job details
+   *     Job details.
    * 
    * 
    * 
@@ -932,7 +1032,9 @@ class AiravataIf {
   virtual void getJobDetails(std::vector< ::apache::airavata::model::job::JobModel> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
 
   /**
-   * Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
+   * 
+   * Clone an Existing Experiment
+   * Existing specified experiment is cloned and a new name is provided. A copy of the experiment configuration is made and is persisted with new metadata.
    *   The client has to subsequently update this configuration if needed and launch the cloned experiment.
    * 
    * @param newExperimentName
@@ -944,7 +1046,7 @@ class AiravataIf {
    *      should be shared public by default.
    * 
    * @return
-   *   The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment.
+   *   The server-side generated.airavata.registry.core.experiment.globally unique identifier (Experiment ID) for the newly cloned experiment.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
    *    For any incorrect forming of the request itself.
@@ -977,12 +1079,16 @@ class AiravataIf {
   virtual void cloneExperiment(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& existingExperimentID, const std::string& newExperimentName) = 0;
 
   /**
-   * Terminate a running experiment.
+   * 
+   * Terminate a running Experiment.
+   * 
+   * @gatewayId
+   *    ID of the gateway which will terminate the running Experiment.
    * 
    * @param airavataExperimentId
-   *    The identifier for the requested experiment. This is returned during the create experiment step.
+   *    The identifier of the experiment required termination. This ID is returned during the create experiment step.
    * 
-   * @return
+   * @return status
    *   This method call does not have a return value.
    * 
    * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -1016,13 +1122,17 @@ class AiravataIf {
   virtual void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId) = 0;
 
   /**
+   * 
    * Register a Application Module.
    * 
+   * @gatewayId
+   *    ID of the gateway which is registering the new Application Module.
+   * 
    * @param applicationModule
    *    Application Module Object created from the datamodel.
    * 
    * @return appModuleId
-   *   Returns a server-side generated airavata appModule globally unique identifier.
+   *   Returns the server-side generated airavata appModule globally unique identifier.
    * 
    * 
    * @param authzToken
@@ -1032,13 +1142,14 @@ class AiravataIf {
   virtual void registerApplicationModule(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule) = 0;
 
   /**
+   * 
    * Fetch a Application Module.
    * 
    * @param appModuleId
-   *   The identifier for the requested application module
+   *   The unique identifier of the application module required
    * 
    * @return applicationModule
-   *   Returns a application Module Object.
+   *   Returns an Application Module Object.
    * 
    * 
    * @param authzToken
@@ -1047,6 +1158,7 @@ class AiravataIf {
   virtual void getApplicationModule( ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appModuleId) = 0;
 
   /**
+   * 
    * Update a Application Module.
    * 
    * @param appModuleId
@@ -1064,13 +1176,29 @@ class AiravataIf {
    * @param applicationModule
    */
   virtual bool updateApplicationModule(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appModuleId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule) = 0;
+
+  /**
+   * 
+   * Fetch all Application Module Descriptions.
+   * 
+   * @param gatewayId
+   *    ID of the gateway which need to list all available application deployment documentation.
+   * 
+   * @return list
+   *    Returns the list of all Application Module Objects.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayId
+   */
   virtual void getAllAppModules(std::vector< ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) = 0;
 
   /**
-   * Delete a Application Module.
+   * 
+   * Delete an Application Module.
    * 
    * @param appModuleId
-   *   The identifier for the requested application module to be deleted.
+   *   The identifier of the Application Module to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -1082,9 +1210,13 @@ class AiravataIf {
   virtual bool deleteApplicationModule(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appModuleId) = 0;
 
   /**
-   * Register a Application Deployment.
    * 
-   * @param applicationModule
+   * Register an Application Deployment.
+   * 
+   * @param gatewayId
+   *    ID of the gateway which is registering the new Application Deployment.
+   * 
+   * @param applicationDeployment
    *    Application Module Object created from the datamodel.
    * 
    * @return appDeploymentId
@@ -1098,6 +1230,7 @@ class AiravataIf {
   virtual void registerApplicationDeployment(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment) = 0;
 
   /**
+   * 
    * Fetch a Application Deployment.
    * 
    * @param appDeploymentId
@@ -1113,10 +1246,11 @@ class AiravataIf {
   virtual void getApplicationDeployment( ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appDeploymentId) = 0;
 
   /**
-   * Update a Application Deployment.
+   * 
+   * Update an Application Deployment.
    * 
    * @param appDeploymentId
-   *   The identifier for the requested application deployment to be updated.
+   *   The identifier of the requested application deployment to be updated.
    * 
    * @param appDeployment
    *    Application Deployment Object created from the datamodel.
@@ -1132,10 +1266,11 @@ class AiravataIf {
   virtual bool updateApplicationDeployment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appDeploymentId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription& applicationDeployment) = 0;
 
   /**
-   * Delete a Application deployment.
+   * 
+   * Delete an Application Deployment.
    * 
    * @param appDeploymentId
-   *   The identifier for the requested application deployment to be deleted.
+   *   The unique identifier of application deployment to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -1147,10 +1282,14 @@ class AiravataIf {
   virtual bool deleteApplicationDeployment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appDeploymentId) = 0;
 
   /**
+   * 
    * Fetch all Application Deployment Descriptions.
    * 
+   * @param gatewayId
+   *    ID of the gateway which need to list all available application deployment documentation.
+   * 
    * @return list<applicationDeployment.
-   *   Returns the list of all application Deployment Objects.
+   *    Returns the list of all application Deployment Objects.
    * 
    * 
    * @param authzToken
@@ -1174,9 +1313,10 @@ class AiravataIf {
   virtual void getAppModuleDeployedResources(std::vector<std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appModuleId) = 0;
 
   /**
+   * 
    * Register a Application Interface.
    * 
-   * @param applicationModule
+   * @param applicationInterface
    *    Application Module Object created from the datamodel.
    * 
    * @return appInterfaceId
@@ -1188,17 +1328,40 @@ class AiravataIf {
    * @param applicationInterface
    */
   virtual void registerApplicationInterface(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface) = 0;
+
+  /**
+   * 
+   * Clone an Application Interface.
+   * 
+   * @gatewayId
+   *    The identifier for the gateway profile to be requested
+   * 
+   * @param existingAppInterfaceID
+   *    Identifier of the existing Application interface you wich to clone.
+   * 
+   * @param newApplicationName
+   *    Name for the new application interface.
+   * 
+   * @return appInterfaceId
+   *    Returns a server-side generated globally unique identifier for the newly cloned application interface.
+   * 
+   * 
+   * @param authzToken
+   * @param existingAppInterfaceID
+   * @param newApplicationName
+   * @param gatewayId
+   */
   virtual void cloneApplicationInterface(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& existingAppInterfaceID, const std::string& newApplicationName, const std::string& gatewayId) = 0;
 
   /**
-   * Fetch a Application Interface.
+   * 
+   * Fetch an Application Interface.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application module
+   *   The identifier for the requested application interface.
    * 
    * @return applicationInterface
-   *   Returns a application Interface Object.
-   * 
+   *   Returns an application Interface Object.
    * 
    * 
    * @param authzToken
@@ -1207,10 +1370,11 @@ class AiravataIf {
   virtual void getApplicationInterface( ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appInterfaceId) = 0;
 
   /**
+   * 
    * Update a Application Interface.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application deployment to be updated.
+   *   The identifier of the requested application deployment to be updated.
    * 
    * @param appInterface
    *    Application Interface Object created from the datamodel.
@@ -1219,7 +1383,6 @@ class AiravataIf {
    *   Returns a success/failure of the update.
    * 
    * 
-   * 
    * @param authzToken
    * @param appInterfaceId
    * @param applicationInterface
@@ -1227,7 +1390,8 @@ class AiravataIf {
   virtual bool updateApplicationInterface(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appInterfaceId, const  ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription& applicationInterface) = 0;
 
   /**
-   * Delete a Application Interface.
+   * 
+   * Delete an Application Interface.
    * 
    * @param appInterfaceId
    *   The identifier for the requested application interface to be deleted.
@@ -1236,18 +1400,18 @@ class AiravataIf {
    *   Returns a success/failure of the deletion.
    * 
    * 
-   * 
    * @param authzToken
    * @param appInterfaceId
    */
   virtual bool deleteApplicationInterface(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appInterfaceId) = 0;
 
   /**
-   * Fetch name and id of  Application Interface documents.
+   * 
+   * Fetch name and ID of  Application Interface documents.
    * 
    * 
    * @return map<applicationId, applicationInterfaceNames>
-   *   Returns a list of application interfaces with corresponsing id's
+   *   Returns a list of application interfaces with corresponsing ID's
    * 
    * 
    * @param authzToken
@@ -1256,11 +1420,12 @@ class AiravataIf {
   virtual void getAllApplicationInterfaceNames(std::map<std::string, std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) = 0;
 
   /**
+   * 
    * Fetch all Application Interface documents.
    * 
    * 
    * @return map<applicationId, applicationInterfaceNames>
-   *   Returns a list of application interfaces documents
+   *   Returns a list of application interfaces documents (Application Interface ID, name, description, Inputs and Outputs objects).
    * 
    * 
    * @param authzToken
@@ -1269,10 +1434,11 @@ class AiravataIf {
   virtual void getAllApplicationInterfaces(std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) = 0;
 
   /**
+   * 
    * Fetch the list of Application Inputs.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier of the application interface which need inputs to be fetched.
    * 
    * @return list<application_interface_model.InputDataObjectType>
    *   Returns a list of application inputs.
@@ -1284,10 +1450,11 @@ class AiravataIf {
   virtual void getApplicationInputs(std::vector< ::apache::airavata::model::application::io::InputDataObjectType> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appInterfaceId) = 0;
 
   /**
-   * Fetch the list of Application Outputs.
+   * 
+   * Fetch list of Application Outputs.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier of the application interface which need outputs to be fetched.
    * 
    * @return list<application_interface_model.OutputDataObjectType>
    *   Returns a list of application outputs.
@@ -1299,14 +1466,15 @@ class AiravataIf {
   virtual void getApplicationOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& appInterfaceId) = 0;
 
   /**
+   * 
    * Fetch a list of all deployed Compute Hosts for a given application interfaces.
    * 
    * @param appInterfaceId
-   *   The identifier for the requested application interface
+   *   The identifier for the requested application interface.
    * 
    * @return map<computeResourceId, computeResourceName>
    *   A map of registered compute resource id's and their corresponding hostnames.
-   *    Deployments of each modules listed within the interfaces will be listed.
+   *   Deployments of each modules listed within the interfaces will be listed.
    * 
    * 
    * @param authzToken
@@ -1345,6 +1513,7 @@ class AiravataIf {
   virtual void getComputeResource( ::apache::airavata::model::appcatalog::computeresource::ComputeResourceDescription& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId) = 0;
 
   /**
+   * 
    * Fetch all registered Compute Resources.
    * 
    * @return A map of registered compute resource id's and thier corresponding hostnames.
@@ -1431,7 +1600,7 @@ class AiravataIf {
   virtual void getAllStorageResourceNames(std::map<std::string, std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken) = 0;
 
   /**
-   * Update a Compute Resource.
+   * Update a Storage Resource.
    * 
    * @param storageResourceId
    *   The identifier for the requested compute resource to be updated.
@@ -1453,7 +1622,7 @@ class AiravataIf {
    * Delete a Storage Resource.
    * 
    * @param storageResourceId
-   *   The identifier for the requested compute resource to be deleted.
+   *   The identifier of the requested compute resource to be deleted.
    * 
    * @return status
    *   Returns a success/failure of the deletion.
@@ -1580,6 +1749,7 @@ class AiravataIf {
   virtual void getSSHJobSubmission( ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionId) = 0;
 
   /**
+   * 
    * Add a UNICORE Job Submission details to a compute resource
    *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
    * 
@@ -1604,10 +1774,13 @@ class AiravataIf {
   virtual void addUNICOREJobSubmissionDetails(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission) = 0;
 
   /**
+   *   *
    *   * This method returns UnicoreJobSubmission object
+   *   *
    *   * @param jobSubmissionInterfaceId
    *   *   The identifier of the JobSubmission Interface to be retrieved.
    *   *  @return UnicoreJobSubmission instance
+   *   *
    * *
    * 
    * @param authzToken
@@ -1616,6 +1789,7 @@ class AiravataIf {
   virtual void getUnicoreJobSubmission( ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionId) = 0;
 
   /**
+   *    *
    *    * Add a Cloud Job Submission details to a compute resource
    *    *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
    *    *
@@ -1630,6 +1804,7 @@ class AiravataIf {
    *    *
    *    * @return status
    *    *   Returns the unique job submission id.
+   *    *
    * *
    * 
    * @param authzToken
@@ -1640,6 +1815,7 @@ class AiravataIf {
   virtual void addCloudJobSubmissionDetails(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::CloudJobSubmission& cloudSubmission) = 0;
 
   /**
+   *    *
    *    * This method returns cloudJobSubmission object
    *    * @param jobSubmissionInterfaceI
    *        *   The identifier of the JobSubmission Interface to be retrieved.
@@ -1652,6 +1828,7 @@ class AiravataIf {
   virtual void getCloudJobSubmission( ::apache::airavata::model::appcatalog::computeresource::CloudJobSubmission& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionId) = 0;
 
   /**
+   * 
    * Update the given SSH Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -1671,6 +1848,7 @@ class AiravataIf {
   virtual bool updateSSHJobSubmissionDetails(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission) = 0;
 
   /**
+   * 
    * Update the cloud Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -1690,6 +1868,7 @@ class AiravataIf {
   virtual bool updateCloudJobSubmissionDetails(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::CloudJobSubmission& sshJobSubmission) = 0;
 
   /**
+   * 
    * Update the UNIOCRE Job Submission details
    * 
    * @param jobSubmissionInterfaceId
@@ -1710,6 +1889,7 @@ class AiravataIf {
   virtual bool updateUnicoreJobSubmissionDetails(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission) = 0;
 
   /**
+   * 
    * Add a Local data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -1739,6 +1919,7 @@ class AiravataIf {
   virtual void addLocalDataMovementDetails(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const  ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const  ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement) = 0;
 
   /**
+   * 
    * Update the given Local data movement details
    * 
    * @param dataMovementInterfaceId
@@ -1759,7 +1940,8 @@ class AiravataIf {
   virtual bool updateLocalDataMovementDetails(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement) = 0;
 
   /**
-   * This method returns local datamovement object
+   * 
+   * This method returns local datamovement object.
    * 
    * @param dataMovementId
    *   The identifier of the datamovement Interface to be retrieved.
@@ -1774,6 +1956,7 @@ class AiravataIf {
   virtual void getLocalDataMovement( ::apache::airavata::model::data::movement::LOCALDataMovement& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId) = 0;
 
   /**
+   * 
    * Add a SCP data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -1799,6 +1982,7 @@ class AiravataIf {
   virtual void addSCPDataMovementDetails(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const  ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const  ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement) = 0;
 
   /**
+   * 
    * Update the given scp data movement details
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -1834,6 +2018,7 @@ class AiravataIf {
   virtual void getSCPDataMovement( ::apache::airavata::model::data::movement::SCPDataMovement& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId) = 0;
 
   /**
+   * 
    * Add a UNICORE data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -1859,6 +2044,7 @@ class AiravataIf {
   virtual void addUnicoreDataMovementDetails(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const  ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const  ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement) = 0;
 
   /**
+   * 
    * Update a selected UNICORE data movement details
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -1880,6 +2066,7 @@ class AiravataIf {
   virtual bool updateUnicoreDataMovementDetails(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement) = 0;
 
   /**
+   * 
    * This method returns UNICORE datamovement object
    * 
    * @param dataMovementId
@@ -1895,6 +2082,7 @@ class AiravataIf {
   virtual void getUnicoreDataMovement( ::apache::airavata::model::data::movement::UnicoreDataMovement& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId) = 0;
 
   /**
+   * 
    * Add a GridFTP data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
    * 
@@ -2109,7 +2297,7 @@ class AiravataIf {
    * Fetch the given Gateway Resource Profile.
    * 
    * @param gatewayID
-   *   The identifier for the requested gateway resource
+   *   The identifier for the requested gateway resource.
    * 
    * @return gatewayResourceProfile
    *    Gateway Resource Profile Object.
@@ -2177,9 +2365,33 @@ class AiravataIf {
    * @param computeResourcePreference
    */
   virtual bool addGatewayComputeResourcePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference) = 0;
+
+  /**
+   * Add a Storage Resource Preference to a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be added.
+   * 
+   * @param storageResourceId
+   *   Preferences related to a particular compute resource
+   * 
+   * @param computeResourcePreference
+   *   The ComputeResourcePreference object to be added to the resource profile.
+   * 
+   * @return status
+   *   Returns a success/failure of the addition. If a profile already exists, this operation will fail.
+   *    Instead an update should be used.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   * @param storageResourceId
+   * @param storagePreference
+   */
   virtual bool addGatewayStoragePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) = 0;
 
   /**
+   * 
    * Fetch a Compute Resource Preference of a registered gateway profile.
    * 
    * @param gatewayID
@@ -2197,9 +2409,29 @@ class AiravataIf {
    * @param computeResourceId
    */
   virtual void getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId) = 0;
+
+  /**
+   * 
+   * Fetch a Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to request to fetch the particular storage resource preference.
+   * 
+   * @param storageResourceId
+   *   Identifier of the Stprage Preference required to be fetched.
+   * 
+   * @return StoragePreference
+   *   Returns the StoragePreference object.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   * @param storageResourceId
+   */
   virtual void getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageResourceId) = 0;
 
   /**
+   * 
    * Fetch all Compute Resource Preferences of a registered gateway profile.
    * 
    * @param gatewayID
@@ -2213,10 +2445,29 @@ class AiravataIf {
    * @param gatewayID
    */
   virtual void getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) = 0;
+
+  /**
+   * Fetch all Storage Resource Preferences of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier for the gateway profile to be requested
+   * 
+   * @return StoragePreference
+   *   Returns the StoragePreference object.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   */
   virtual void getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) = 0;
 
   /**
-   * Fetch all gateway profiles registered
+   * 
+   * Fetch all Gateway Profiles registered
+   * 
+   * @return GatewayResourceProfile
+   *   Returns all the GatewayResourcePrifle list object.
+   * 
    * 
    * 
    * @param authzToken
@@ -2245,6 +2496,28 @@ class AiravataIf {
    * @param computeResourcePreference
    */
   virtual bool updateGatewayComputeResourcePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const  ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference) = 0;
+
+  /**
+   * Update a Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be updated.
+   * 
+   * @param storageId
+   *   The Storage resource identifier of the one that you want to update
+   * 
+   * @param storagePreference
+   *   The storagePreference object to be updated to the resource profile.
+   * 
+   * @return status
+   *   Returns a success/failure of the updation.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   * @param storageId
+   * @param storagePreference
+   */
   virtual bool updateGatewayStoragePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const  ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) = 0;
 
   /**
@@ -2265,17 +2538,63 @@ class AiravataIf {
    * @param computeResourceId
    */
   virtual bool deleteGatewayComputeResourcePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId) = 0;
+
+  /**
+   * Delete the Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be deleted.
+   * 
+   * @param storageId
+   *   ID of the storage preference you want to delete.
+   * 
+   * @return status
+   *   Returns a success/failure of the deletion.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayID
+   * @param storageId
+   */
   virtual bool deleteGatewayStoragePreference(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId) = 0;
+
+  /**
+   * Delete the Storage Resource Preference of a registered gateway profile.
+   * 
+   * @param gatewayID
+   *   The identifier of the gateway profile to be deleted.
+   * 
+   * @param storageId
+   *   ID of the storage preference you want to delete.
+   * 
+   * @return status
+   *   Returns a success/failure of the deletion.
+   * 
+   * 
+   * @param authzToken
+   * @param gatewayId
+   */
   virtual void getAllWorkflows(std::vector<std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) = 0;
-  virtual void getWorkflow( ::Workflow& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) = 0;
+
+  /**
+   * 
+   * API Methods Related for Work-Flow Submission Features.
+   * 
+   * 
+   * @param authzToken
+   * @param workflowTemplateId
+   */
+  virtual void getWorkflow( ::WorkflowModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) = 0;
   virtual void deleteWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) = 0;
-  virtual void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow) = 0;
-  virtual void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow) = 0;
+  virtual void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow) = 0;
+  virtual void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow) = 0;
   virtual void getWorkflowTemplateId(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName) = 0;
   virtual bool isWorkflowExistWithName(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName) = 0;
 
   /**
-   *  * Data Manager Related API Methods
+   *  *
+   *  * Data Manager Related API Methods.
+   *  *
    * *
    * 
    * @param authzToken
@@ -2738,16 +3057,16 @@ class AiravataNull : virtual public AiravataIf {
   void getAllWorkflows(std::vector<std::string> & /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */) {
     return;
   }
-  void getWorkflow( ::Workflow& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* workflowTemplateId */) {
+  void getWorkflow( ::WorkflowModel& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* workflowTemplateId */) {
     return;
   }
   void deleteWorkflow(const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* workflowTemplateId */) {
     return;
   }
-  void registerWorkflow(std::string& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const  ::Workflow& /* workflow */) {
+  void registerWorkflow(std::string& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const  ::WorkflowModel& /* workflow */) {
     return;
   }
-  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* workflowTemplateId */, const  ::Workflow& /* workflow */) {
+  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* workflowTemplateId */, const  ::WorkflowModel& /* workflow */) {
     return;
   }
   void getWorkflowTemplateId(std::string& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* workflowName */) {
@@ -20788,7 +21107,7 @@ class Airavata_getWorkflow_result {
   }
 
   virtual ~Airavata_getWorkflow_result() throw();
-   ::Workflow success;
+   ::WorkflowModel success;
    ::apache::airavata::api::error::InvalidRequestException ire;
    ::apache::airavata::api::error::AiravataClientException ace;
    ::apache::airavata::api::error::AiravataSystemException ase;
@@ -20796,7 +21115,7 @@ class Airavata_getWorkflow_result {
 
   _Airavata_getWorkflow_result__isset __isset;
 
-  void __set_success(const  ::Workflow& val);
+  void __set_success(const  ::WorkflowModel& val);
 
   void __set_ire(const  ::apache::airavata::api::error::InvalidRequestException& val);
 
@@ -20845,7 +21164,7 @@ class Airavata_getWorkflow_presult {
 
 
   virtual ~Airavata_getWorkflow_presult() throw();
-   ::Workflow* success;
+   ::WorkflowModel* success;
    ::apache::airavata::api::error::InvalidRequestException ire;
    ::apache::airavata::api::error::AiravataClientException ace;
    ::apache::airavata::api::error::AiravataSystemException ase;
@@ -20997,13 +21316,13 @@ class Airavata_registerWorkflow_args {
   virtual ~Airavata_registerWorkflow_args() throw();
    ::apache::airavata::model::security::AuthzToken authzToken;
   std::string gatewayId;
-   ::Workflow workflow;
+   ::WorkflowModel workflow;
 
   void __set_authzToken(const  ::apache::airavata::model::security::AuthzToken& val);
 
   void __set_gatewayId(const std::string& val);
 
-  void __set_workflow(const  ::Workflow& val);
+  void __set_workflow(const  ::WorkflowModel& val);
 
   bool operator == (const Airavata_registerWorkflow_args & rhs) const
   {
@@ -21034,7 +21353,7 @@ class Airavata_registerWorkflow_pargs {
   virtual ~Airavata_registerWorkflow_pargs() throw();
   const  ::apache::airavata::model::security::AuthzToken* authzToken;
   const std::string* gatewayId;
-  const  ::Workflow* workflow;
+  const  ::WorkflowModel* workflow;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -21139,13 +21458,13 @@ class Airavata_updateWorkflow_args {
   virtual ~Airavata_updateWorkflow_args() throw();
    ::apache::airavata::model::security::AuthzToken authzToken;
   std::string workflowTemplateId;
-   ::Workflow workflow;
+   ::WorkflowModel workflow;
 
   void __set_authzToken(const  ::apache::airavata::model::security::AuthzToken& val);
 
   void __set_workflowTemplateId(const std::string& val);
 
-  void __set_workflow(const  ::Workflow& val);
+  void __set_workflow(const  ::WorkflowModel& val);
 
   bool operator == (const Airavata_updateWorkflow_args & rhs) const
   {
@@ -21176,7 +21495,7 @@ class Airavata_updateWorkflow_pargs {
   virtual ~Airavata_updateWorkflow_pargs() throw();
   const  ::apache::airavata::model::security::AuthzToken* authzToken;
   const std::string* workflowTemplateId;
-  const  ::Workflow* workflow;
+  const  ::WorkflowModel* workflow;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -22769,17 +23088,17 @@ class AiravataClient : virtual public AiravataIf {
   void getAllWorkflows(std::vector<std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
   void send_getAllWorkflows(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
   void recv_getAllWorkflows(std::vector<std::string> & _return);
-  void getWorkflow( ::Workflow& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
+  void getWorkflow( ::WorkflowModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
   void send_getWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
-  void recv_getWorkflow( ::Workflow& _return);
+  void recv_getWorkflow( ::WorkflowModel& _return);
   void deleteWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
   void send_deleteWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
   void recv_deleteWorkflow();
-  void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow);
-  void send_registerWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow);
+  void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow);
+  void send_registerWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow);
   void recv_registerWorkflow(std::string& _return);
-  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow);
-  void send_updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow);
+  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow);
+  void send_updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow);
   void recv_updateWorkflow();
   void getWorkflowTemplateId(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName);
   void send_getWorkflowTemplateId(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName);
@@ -24351,7 +24670,7 @@ class AiravataMultiface : virtual public AiravataIf {
     return;
   }
 
-  void getWorkflow( ::Workflow& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) {
+  void getWorkflow( ::WorkflowModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
@@ -24370,7 +24689,7 @@ class AiravataMultiface : virtual public AiravataIf {
     ifaces_[i]->deleteWorkflow(authzToken, workflowTemplateId);
   }
 
-  void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow) {
+  void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
@@ -24380,7 +24699,7 @@ class AiravataMultiface : virtual public AiravataIf {
     return;
   }
 
-  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow) {
+  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
@@ -24877,17 +25196,17 @@ class AiravataConcurrentClient : virtual public AiravataIf {
   void getAllWorkflows(std::vector<std::string> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
   int32_t send_getAllWorkflows(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
   void recv_getAllWorkflows(std::vector<std::string> & _return, const int32_t seqid);
-  void getWorkflow( ::Workflow& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
+  void getWorkflow( ::WorkflowModel& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
   int32_t send_getWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
-  void recv_getWorkflow( ::Workflow& _return, const int32_t seqid);
+  void recv_getWorkflow( ::WorkflowModel& _return, const int32_t seqid);
   void deleteWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
   int32_t send_deleteWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId);
   void recv_deleteWorkflow(const int32_t seqid);
-  void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow);
-  int32_t send_registerWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::Workflow& workflow);
+  void registerWorkflow(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow);
+  int32_t send_registerWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::WorkflowModel& workflow);
   void recv_registerWorkflow(std::string& _return, const int32_t seqid);
-  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow);
-  int32_t send_updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::Workflow& workflow);
+  void updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow);
+  int32_t send_updateWorkflow(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const  ::WorkflowModel& workflow);
   void recv_updateWorkflow(const int32_t seqid);
   void getWorkflowTemplateId(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName);
   int32_t send_getWorkflowTemplateId(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName);


[09/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 3deb9d1..1ad3333 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-01-15")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 public class Airavata {
 
   public interface Iface {
@@ -200,6 +200,7 @@ public class Airavata {
     public String getSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, String airavataCredStoreToken, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
 
     /**
+     * 
      * Get a Public Key by Providing the Token
      * 
      * @param CredStoreToken
@@ -218,6 +219,7 @@ public class Airavata {
     public Map<String,String> getAllUserSSHPubKeys(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
 
     /**
+     * 
      * Get all Public Keys of the Gateway
      * 
      * @param CredStoreToken
@@ -236,6 +238,7 @@ public class Airavata {
     public Map<String,String> getAllGatewaySSHPubKeys(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
 
     /**
+     * 
      * Delete a Gateway
      * 
      * @param gatewayId
@@ -253,6 +256,7 @@ public class Airavata {
     public boolean deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, String airavataCredStoreToken, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
 
     /**
+     * 
      * Creates a Project with basic metadata.
      *    A Project is a container of experiments.
      * 
@@ -260,7 +264,7 @@ public class Airavata {
      *    The identifier for the requested gateway.
      * 
      * @param Project
-     *    The Project Object described in the workspace_model
+     *    The Project Object described in the workspace_model.
      * 
      * 
      * 
@@ -271,6 +275,7 @@ public class Airavata {
     public String createProject(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.workspace.Project project) 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;
 
     /**
+     * 
      * Update an Existing Project
      * 
      * @param projectId
@@ -288,14 +293,15 @@ public class Airavata {
     public void updateProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, org.apache.airavata.model.workspace.Project updatedProject) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
+     * 
      * Get a Project by ID
-     *    This method is to obtain a project by providing a projectId
+     *    This method is to obtain a project by providing a projectId.
      * 
      * @param projectId
-     *    projectId of the project you require
+     *    projectId of the project you require.
      * 
      * @return project
-     *    project data model will be returned
+     *    project data model will be returned.
      * 
      * 
      * 
@@ -305,15 +311,18 @@ public class Airavata {
     public org.apache.airavata.model.workspace.Project getProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
+     * 
      * Delete a Project
-     *    This method is used to delete an existing Project
+     *    This method is used to delete an existing Project.
      * 
      * @param projectId
-     *    projectId of the project you want to delete
+     *    projectId of the project you want to delete.
      * 
      * @return boolean
      *    Boolean identifier for the success or failure of the deletion operation.
      * 
+     *    NOTE: This method is not used within gateways connected with Airavata.
+     * 
      * 
      * 
      * @param authzToken
@@ -322,20 +331,21 @@ public class Airavata {
     public boolean deleteProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
-     * Get all Project by user with pagination. Results will be ordered based
-     * on creation time DESC
+     * 
+     * Get All User Projects
+     * Get all Project for the user with pagination. Results will be ordered based on creation time DESC.
      * 
      * @param gatewayId
      *    The identifier for the requested gateway.
      * 
      * @param userName
-     *    The identifier of the user
+     *    The identifier of the user.
      * 
      * @param limit
-     *    The amount results to be fetched
+     *    The amount results to be fetched.
      * 
      * @param offset
-     *    The starting point of the results to be fetched
+     *    The starting point of the results to be fetched.
      * 
      * 
      * 
@@ -348,19 +358,25 @@ public class Airavata {
     public List<org.apache.airavata.model.workspace.Project> getUserProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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;
 
     /**
-     * Get all Project for user by project name with pagination.Results will be ordered based
-     * on creation time DESC
+     * 
+     * Search User Projects by Project Name
+     * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
      * 
      * @param gatewayId
-     *    The identifier for the requested gateway.
+     *    The unique identifier for the requested gateway.
+     * 
      * @param userName
-     *    The identifier of the user
+     *    The identifier of the user.
+     * 
      * @param projectName
-     *    The name of the project on which the results to be fetched
+     *    The name of the project on which the results to be fetched.
+     * 
      * @param limit
-     *    The amount results to be fetched
+     *    The amount results to be fetched.
+     * 
      * @param offset
-     *    The starting point of the results to be fetched
+     *    The starting point of the results to be fetched.
+     * 
      * 
      * 
      * @param authzToken
@@ -373,19 +389,25 @@ public class Airavata {
     public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset) 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;
 
     /**
-     * Search and get all Projects for user by project description with pagination. Results
-     * will be ordered based on creation time DESC
+     * 
+     * Search User Projects by Project Description
+     * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
      * 
      * @param gatewayId
-     *    The identifier for the requested gateway.
+     *    The unique identifier of the gateway making the request.
+     * 
      * @param userName
-     *    The identifier of the user
+     *    The identifier of the user.
+     * 
      * @param description
-     *    The description to be matched
+     *    The description to be matched.
+     * 
      * @param limit
-     *    The amount results to be fetched
+     *    The amount results to be fetched.
+     * 
      * @param offset
-     *    The starting point of the results to be fetched
+     *    The starting point of the results to be fetched.
+     * 
      * 
      * 
      * @param authzToken
@@ -398,19 +420,25 @@ public class Airavata {
     public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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;
 
     /**
-     * Search Experiments by experiment name with pagination. Results will be sorted
-     * based on creation time DESC
+     * 
+     * Search User Experiments by Name
+     * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
      * 
      * @param gatewayId
-     *       Identifier of the requested gateway
+     *       Unique identifier of the requested gateway.
+     * 
      * @param userName
-     *       Username of the requested user
+     *       Username of the user who created the experiments.
+     * 
      * @param expName
-     *       Experiment name to be matched
+     *       Experiment name to be matched.
+     * 
      * @param limit
-     *       Amount of results to be fetched
+     *       Amount of results to be fetched.
+     * 
      * @param offset
-     *       The starting point of the results to be fetched
+     *       The starting point of the results to be fetched.
+     * 
      * 
      * 
      * @param authzToken
@@ -423,19 +451,25 @@ public class Airavata {
     public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset) 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;
 
     /**
-     * Search Experiments by experiment name with pagination. Results will be sorted
-     * based on creation time DESC
+     * 
+     * Search By Experiment Description
+     * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
      * 
      * @param gatewayId
-     *       Identifier of the requested gateway
+     *       Unique identifier of the requested gateway.
+     * 
      * @param userName
-     *       Username of the requested user
+     *       Username of the requested user.
+     * 
      * @param description
-     *       Experiment description to be matched
+     *       Experiment description to be matched.
+     * 
      * @param limit
-     *       Amount of results to be fetched
+     *       Amount of results to be fetched.
+     * 
      * @param offset
-     *       The starting point of the results to be fetched
+     *       The starting point of the results to be fetched.
+     * 
      * 
      * 
      * @param authzToken
@@ -448,19 +482,25 @@ public class Airavata {
     public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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;
 
     /**
-     * Search Experiments by application id with pagination. Results will be sorted
-     * based on creation time DESC
+     * 
+     * Search Experiment By the Application
+     * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
      * 
      * @param gatewayId
-     *       Identifier of the requested gateway
+     *       Unique identifier of the requested gateway.
+     * 
      * @param userName
-     *       Username of the requested user
+     *       Username of the requested user.
+     * 
      * @param applicationId
-     *       Application id to be matched
+     *       Application id to be matched.
+     * 
      * @param limit
-     *       Amount of results to be fetched
+     *       Amount of results to be fetched.
+     * 
      * @param offset
-     *       The starting point of the results to be fetched
+     *       The starting point of the results to be fetched.
+     * 
      * 
      * 
      * @param authzToken
@@ -473,19 +513,25 @@ public class Airavata {
     public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByApplication(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset) 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;
 
     /**
-     * Search Experiments by experiment status with pagination. Results will be sorted
-     * based on creation time DESC
+     * 
+     * Search User Experiments by Status
+     * Search all the Experiments of the given user  by experiment status with pagination. Results will be sorted based on creation time DESC
      * 
      * @param gatewayId
-     *       Identifier of the requested gateway
+     *       Unique identifier of the requested gateway.
+     * 
      * @param userName
-     *       Username of the requested user
+     *       Username of the user making the request.
+     * 
      * @param experimentState
-     *       Experiement state to be matched
+     *       Experiement state to be matched.
+     * 
      * @param limit
-     *       Amount of results to be fetched
+     *       Amount of results to be fetched.
+     * 
      * @param offset
-     *       The starting point of the results to be fetched
+     *       The starting point of the results to be fetched.
+     * 
      * 
      * 
      * @param authzToken
@@ -498,21 +544,31 @@ public class Airavata {
     public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByStatus(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset) 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;
 
     /**
-     * Search Experiments by experiment creation time with pagination. Results will be sorted
-     * based on creation time DESC
+     * 
+     * Search User Experiments by the Creation Time
+     * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
      * 
      * @param gatewayId
-     *       Identifier of the requested gateway
+     *       Unique identifier of the requested gateway.
+     * 
      * @param userName
-     *       Username of the requested user
+     *       Username of the requested user.
+     * 
      * @param fromTime
-     *       Start time of the experiments creation time
+     *       Start time of the experiments creation time.
+     * 
      * @param toTime
-     *       End time of the  experiement creation time
+     *       End time of the  experiement creation time.
+     * 
      * @param limit
-     *       Amount of results to be fetched
+     *       Amount of results to be fetched.
+     * 
      * @param offset
-     *       The starting point of the results to be fetched
+     *       The starting point of the results to be fetched.
+     * 
+     * @return ExperimentSummaryModel
+     *    List of experiments for the given search filter. Here only the Experiment summary will be returned.
+     * 
      * 
      * 
      * @param authzToken
@@ -526,19 +582,27 @@ public class Airavata {
     public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByCreationTime(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset) 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;
 
     /**
-     * Search Experiments by using multiple filter criteria with pagination. Results will be sorted
-     * based on creation time DESC
+     * Search Experiments.
+     * Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
      * 
      * @param gatewayId
-     *       Identifier of the requested gateway
+     *       Identifier of the requested gateway.
+     * 
      * @param userName
-     *       Username of the requested user
+     *       Username of the user requesting the search function.
+     * 
      * @param filters
-     *       map of multiple filter criteria.
+     *       Map of multiple filter criteria. Currenlt search filters includes Experiment Name, Description, Application, etc....
+     * 
      * @param limit
-     *       Amount of results to be fetched
+     *       Amount of results to be fetched.
+     * 
      * @param offset
-     *       The starting point of the results to be fetched
+     *       The starting point of the results to be fetched.
+     * 
+     * @return ExperimentSummaryModel
+     *    List of experiments for the given search filter. Here only the Experiment summary will be returned.
+     * 
      * 
      * 
      * @param authzToken
@@ -551,13 +615,19 @@ public class Airavata {
     public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ExperimentSearchFields,String> filters, int limit, int offset) 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;
 
     /**
-     * Get Experiment Statisitics for the given gateway for a specific time period
+     * 
+     * Get Experiment Statistics
+     * Get Experiment Statisitics for a given gateway for a specific time period. This feature is available only for admins of a particular gateway. Gateway admin access is managed by the user roles.
+     * 
      * @param gatewayId
-     *       Identifier of the requested gateway
+     *       Unique identifier of the gateway making the request to fetch statistics.
+     * 
      * @param fromTime
-     *       Starting date time
+     *       Starting date time.
+     * 
      * @param toTime
-     *       Ending data time
+     *       Ending data time.
+     * 
      * 
      * 
      * @param authzToken
@@ -568,15 +638,19 @@ public class Airavata {
     public org.apache.airavata.model.experiment.ExperimentStatistics getExperimentStatistics(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, long fromTime, long toTime) 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;
 
     /**
-     * Get Experiments within project with pagination. Results will be sorted
-     * based on creation time DESC
+     * 
+     * Get All Experiments of the Project
+     * Get Experiments within project with pagination. Results will be sorted based on creation time DESC.
      * 
      * @param projectId
-     *       Identifier of the project
+     *       Uniqie identifier of the project.
+     * 
      * @param limit
-     *       Amount of results to be fetched
+     *       Amount of results to be fetched.
+     * 
      * @param offset
-     *       The starting point of the results to be fetched
+     *       The starting point of the results to be fetched.
+     * 
      * 
      * 
      * @param authzToken
@@ -587,17 +661,22 @@ public class Airavata {
     public List<org.apache.airavata.model.experiment.ExperimentModel> getExperimentsInProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, int limit, int offset) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
-     * Get experiments by user with pagination. Results will be sorted
-     * based on creation time DESC
+     * 
+     * Get All Experiments of the User
+     * Get experiments by user with pagination. Results will be sorted based on creation time DESC.
      * 
      * @param gatewayId
-     *       Identifier of the requesting gateway
+     *       Identifier of the requesting gateway.
+     * 
      * @param userName
-     *       Username of the requested user
+     *       Username of the requested end user.
+     * 
      * @param limit
-     *       Amount of results to be fetched
+     *       Amount of results to be fetched.
+     * 
      * @param offset
-     *       The starting point of the results to be fetched
+     *       The starting point of the results to be fetched.
+     * 
      * 
      * 
      * @param authzToken
@@ -609,12 +688,17 @@ public class Airavata {
     public List<org.apache.airavata.model.experiment.ExperimentModel> getUserExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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;
 
     /**
+     *   *
+     *   * Create New Experiment
      *   * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
      *   *   but inferred from the sshKeyAuthentication header. This experiment is just a persistent place holder. The client
      *   *   has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
      *   *   registering the experiment in a persistent store.
      *   *
-     *   * @param basicExperimentMetadata
+     *   * @param gatewayId
+     *   *    The unique ID of the gateway where the experiment is been created.
+     *   *
+     *   * @param ExperimentModel
      *   *    The create experiment will require the basic experiment metadata like the name and description, intended user,
      *   *      the gateway identifer and if the experiment should be shared public by defualt. During the creation of an experiment
      *   *      the ExperimentMetadata is a required field.
@@ -651,8 +735,8 @@ public class Airavata {
     public String createExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.experiment.ExperimentModel experiment) 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;
 
     /**
-     * Delete an Experiment
      * 
+     * Delete an Experiment
      * If the experiment is not already launched experiment can be deleted.
      * 
      * @param authzToken
@@ -661,7 +745,7 @@ public class Airavata {
      *     Experiment ID of the experimnet you want to delete.
      * 
      * @return boolean
-     *     Identifier for the success or failure of the deletion operation
+     *     Identifier for the success or failure of the deletion operation.
      * 
      * 
      * 
@@ -671,12 +755,14 @@ public class Airavata {
     public boolean deleteExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String experimentId) 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;
 
     /**
+     *   *
+     *   * Get Experiment
      *   * Fetch previously created experiment metadata.
      *   *
      *   * @param airavataExperimentId
-     *   *    The identifier for the requested experiment. This is returned during the create experiment step.
+     *   *    The unique identifier of the requested experiment. This ID is returned during the create experiment step.
      *   *
-     *   * @return experimentMetada
+     *   * @return ExperimentModel
      *   *   This method will return the previously stored experiment metadata.
      *   *
      *   * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -710,14 +796,17 @@ public class Airavata {
     public org.apache.airavata.model.experiment.ExperimentModel getExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
+     * 
+     * Get Complete Experiment Details
      * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
      * tasks -> jobs information.
      * 
      * @param airavataExperimentId
      *    The identifier for the requested experiment. This is returned during the create experiment step.
      * 
-     * @return experimentMetada
-     *   This method will return the previously stored experiment metadata.
+     * @return ExperimentModel
+     *   This method will return the previously stored experiment metadata including application input parameters, computational resource scheduling
+     *   information, special input output handling and additional quality of service parameters.
      * 
      * @throws org.apache.airavata.model.error.InvalidRequestException
      *    For any incorrect forming of the request itself.
@@ -749,14 +838,15 @@ public class Airavata {
     public org.apache.airavata.model.experiment.ExperimentModel getDetailedExperimentTree(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
-     * Configure a previously created experiment with required inputs, scheduling and other quality of service
-     *   parameters. This method only updates the experiment object within the registry. The experiment has to be launched
-     *   to make it actionable by the server.
+     * 
+     * Update a Previously Created Experiment
+     * Configure the CREATED experiment with required inputs, scheduling and other quality of service parameters. This method only updates the experiment object within the registry.
+     * The experiment has to be launched to make it actionable by the server.
      * 
      * @param airavataExperimentId
      *    The identifier for the requested experiment. This is returned during the create experiment step.
      * 
-     * @param experimentConfigurationData
+     * @param ExperimentModel
      *    The configuration information of the experiment with application input parameters, computational resource scheduling
      *      information, special input output handling and additional quality of service parameters.
      * 
@@ -799,13 +889,14 @@ public class Airavata {
 
     /**
      *  *
-     *  * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
-     *  *
-     *  * @param experimentId
+     *  * Validate experiment configuration.
+     *  * A true in general indicates, the experiment is ready to be launched.
      *  *
+     *  * @param airavataExperimentId
+     *  *    Unique identifier of the experiment (Experimnent ID) of the experiment which need to be validated.
      *  *
      *  * @return boolean
-     *  *      Identifier for the success or failure of the validation operation
+     *  *      Identifier for the success or failure of the validation operation.
      *  *
      * *
      * 
@@ -815,8 +906,12 @@ public class Airavata {
     public boolean validateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
-     * Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
-     *   notifications and intermediate and output data will be subsequently available for this experiment.
+     * 
+     * Launch a Previously Created & Configured Experiment.
+     * Airavata Server will then start processing the request and appropriate notifications and intermediate and output data will be subsequently available for this experiment.
+     * 
+     * @gatewayId
+     *    ID of the gateway which will launch the experiment.
      * 
      * @param airavataExperimentId
      *    The identifier for the requested experiment. This is returned during the create experiment step.
@@ -855,17 +950,18 @@ public class Airavata {
     public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
+     * 
      * Get Experiment Status
      * 
-     * Obtain the status os an experiment by providing the Experiment Id
+     * Obtain the status of an experiment by providing the Experiment Id
      * 
      * @param authzToken
      * 
-     * @param experiementId
-     *     Experiment ID of the experimnet you require the status
+     * @param airavataExperimentId
+     *     Experiment ID of the experimnet you require the status.
      * 
      * @return ExperimentStatus
-     *     ExperimentStatus model with current status will be returned.
+     *     ExperimentStatus model with the current status will be returned.
      * 
      * 
      * 
@@ -875,16 +971,17 @@ public class Airavata {
     public org.apache.airavata.model.status.ExperimentStatus getExperimentStatus(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
+     * 
      * Get Experiment Outputs
-     * This method to be used when need to obtain outputs of a certain Experiment
+     * This method to be used when need to obtain final outputs of a certain Experiment
      * 
      * @param authzToken
      * 
-     * @param experiementId
-     *     Experiment ID of the experimnet you need the outputs
+     * @param airavataExperimentId
+     *     Experiment ID of the experimnet you need the outputs.
      * 
      * @return list
-     *     List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+     *     List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
      * 
      * 
      * 
@@ -894,16 +991,17 @@ public class Airavata {
     public List<org.apache.airavata.model.application.io.OutputDataObjectType> getExperimentOutputs(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
+     * 
      * Get Intermediate Experiment Outputs
      * This method to be used when need to obtain intermediate outputs of a certain Experiment
      * 
      * @param authzToken
      * 
-     * @param experiementId
-     *     Experiment ID of the experimnet you need the intermediate outputs
+     * @param airavataExperimentId
+     *     Experiment ID of the experimnet you need intermediate outputs.
      * 
      * @return list
-     *     List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+     *     List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment.
      * 
      * 
      * 
@@ -913,13 +1011,14 @@ public class Airavata {
     public List<org.apache.airavata.model.application.io.OutputDataObjectType> getIntermediateOutputs(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
-     * Get Job Status for an Experiment
+     * 
+     * Get Job Statuses for an Experiment
      * This method to be used when need to get the job status of an Experiment. An experiment may have one or many jobs; there for one or many job statuses may turnup
      * 
      * @param authzToken
      * 
      * @param experiementId
-     *     Experiment ID of the experimnet you need the intermediate outputs
+     *     Experiment ID of the experimnet you need the job statuses.
      * 
      * @return JobStatus
      *     Job status (string) for all all the existing jobs for the experiment will be returned in the form of a map
@@ -932,16 +1031,17 @@ public class Airavata {
     public Map<String,org.apache.airavata.model.status.JobStatus> getJobStatuses(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
-     * Get Job Details for all the jobs within an Experiment
+     * 
+     * Get Job Details for all the jobs within an Experiment.
      * This method to be used when need to get the job details for one or many jobs of an Experiment.
      * 
      * @param authzToken
      * 
      * @param experiementId
-     *     Experiment ID of the experimnet you need job details
+     *     Experiment ID of the experimnet you need job details.
      * 
      * @return list of JobDetails
-     *     Job details
+     *     Job details.
      * 
      * 
      * 
@@ -951,7 +1051,9 @@ public class Airavata {
     public List<org.apache.airavata.model.job.JobModel> getJobDetails(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
-     * Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
+     * 
+     * Clone an Existing Experiment
+     * Existing specified experiment is cloned and a new name is provided. A copy of the experiment configuration is made and is persisted with new metadata.
      *   The client has to subsequently update this configuration if needed and launch the cloned experiment.
      * 
      * @param newExperimentName
@@ -963,7 +1065,7 @@ public class Airavata {
      *      should be shared public by default.
      * 
      * @return
-     *   The server-side generated.airavata.registry.core.experiment.globally unique identifier for the newly cloned experiment.
+     *   The server-side generated.airavata.registry.core.experiment.globally unique identifier (Experiment ID) for the newly cloned experiment.
      * 
      * @throws org.apache.airavata.model.error.InvalidRequestException
      *    For any incorrect forming of the request itself.
@@ -996,12 +1098,16 @@ public class Airavata {
     public String cloneExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String existingExperimentID, String newExperimentName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
-     * Terminate a running experiment.
+     * 
+     * Terminate a running Experiment.
+     * 
+     * @gatewayId
+     *    ID of the gateway which will terminate the running Experiment.
      * 
      * @param airavataExperimentId
-     *    The identifier for the requested experiment. This is returned during the create experiment step.
+     *    The identifier of the experiment required termination. This ID is returned during the create experiment step.
      * 
-     * @return
+     * @return status
      *   This method call does not have a return value.
      * 
      * @throws org.apache.airavata.model.error.InvalidRequestException
@@ -1035,13 +1141,17 @@ public class Airavata {
     public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
+     * 
      * Register a Application Module.
      * 
+     * @gatewayId
+     *    ID of the gateway which is registering the new Application Module.
+     * 
      * @param applicationModule
      *    Application Module Object created from the datamodel.
      * 
      * @return appModuleId
-     *   Returns a server-side generated airavata appModule globally unique identifier.
+     *   Returns the server-side generated airavata appModule globally unique identifier.
      * 
      * 
      * @param authzToken
@@ -1051,13 +1161,14 @@ public class Airavata {
     public String registerApplicationModule(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule) 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;
 
     /**
+     * 
      * Fetch a Application Module.
      * 
      * @param appModuleId
-     *   The identifier for the requested application module
+     *   The unique identifier of the application module required
      * 
      * @return applicationModule
-     *   Returns a application Module Object.
+     *   Returns an Application Module Object.
      * 
      * 
      * @param authzToken
@@ -1066,6 +1177,7 @@ public class Airavata {
     public org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule getApplicationModule(org.apache.airavata.model.security.AuthzToken authzToken, String appModuleId) 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;
 
     /**
+     * 
      * Update a Application Module.
      * 
      * @param appModuleId
@@ -1084,13 +1196,28 @@ public class Airavata {
      */
     public boolean updateApplicationModule(org.apache.airavata.model.security.AuthzToken authzToken, String appModuleId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule) 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;
 
+    /**
+     * 
+     * Fetch all Application Module Descriptions.
+     * 
+     * @param gatewayId
+     *    ID of the gateway which need to list all available application deployment documentation.
+     * 
+     * @return list
+     *    Returns the list of all Application Module Objects.
+     * 
+     * 
+     * @param authzToken
+     * @param gatewayId
+     */
     public List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> getAllAppModules(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) 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;
 
     /**
-     * Delete a Application Module.
+     * 
+     * Delete an Application Module.
      * 
      * @param appModuleId
-     *   The identifier for the requested application module to be deleted.
+     *   The identifier of the Application Module to be deleted.
      * 
      * @return status
      *   Returns a success/failure of the deletion.
@@ -1102,9 +1229,13 @@ public class Airavata {
     public boolean deleteApplicationModule(org.apache.airavata.model.security.AuthzToken authzToken, String appModuleId) 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;
 
     /**
-     * Register a Application Deployment.
      * 
-     * @param applicationModule
+     * Register an Application Deployment.
+     * 
+     * @param gatewayId
+     *    ID of the gateway which is registering the new Application Deployment.
+     * 
+     * @param applicationDeployment
      *    Application Module Object created from the datamodel.
      * 
      * @return appDeploymentId
@@ -1118,6 +1249,7 @@ public class Airavata {
     public String registerApplicationDeployment(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription applicationDeployment) 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;
 
     /**
+     * 
      * Fetch a Application Deployment.
      * 
      * @param appDeploymentId
@@ -1133,10 +1265,11 @@ public class Airavata {
     public org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription getApplicationDeployment(org.apache.airavata.model.security.AuthzToken authzToken, String appDeploymentId) 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;
 
     /**
-     * Update a Application Deployment.
+     * 
+     * Update an Application Deployment.
      * 
      * @param appDeploymentId
-     *   The identifier for the requested application deployment to be updated.
+     *   The identifier of the requested application deployment to be updated.
      * 
      * @param appDeployment
      *    Application Deployment Object created from the datamodel.
@@ -1152,10 +1285,11 @@ public class Airavata {
     public boolean updateApplicationDeployment(org.apache.airavata.model.security.AuthzToken authzToken, String appDeploymentId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription applicationDeployment) 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;
 
     /**
-     * Delete a Application deployment.
+     * 
+     * Delete an Application Deployment.
      * 
      * @param appDeploymentId
-     *   The identifier for the requested application deployment to be deleted.
+     *   The unique identifier of application deployment to be deleted.
      * 
      * @return status
      *   Returns a success/failure of the deletion.
@@ -1167,10 +1301,14 @@ public class Airavata {
     public boolean deleteApplicationDeployment(org.apache.airavata.model.security.AuthzToken authzToken, String appDeploymentId) 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;
 
     /**
+     * 
      * Fetch all Application Deployment Descriptions.
      * 
+     * @param gatewayId
+     *    ID of the gateway which need to list all available application deployment documentation.
+     * 
      * @return list<applicationDeployment.
-     *   Returns the list of all application Deployment Objects.
+     *    Returns the list of all application Deployment Objects.
      * 
      * 
      * @param authzToken
@@ -1194,9 +1332,10 @@ public class Airavata {
     public List<String> getAppModuleDeployedResources(org.apache.airavata.model.security.AuthzToken authzToken, String appModuleId) 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;
 
     /**
+     * 
      * Register a Application Interface.
      * 
-     * @param applicationModule
+     * @param applicationInterface
      *    Application Module Object created from the datamodel.
      * 
      * @return appInterfaceId
@@ -1209,17 +1348,39 @@ public class Airavata {
      */
     public String registerApplicationInterface(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription applicationInterface) 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;
 
+    /**
+     * 
+     * Clone an Application Interface.
+     * 
+     * @gatewayId
+     *    The identifier for the gateway profile to be requested
+     * 
+     * @param existingAppInterfaceID
+     *    Identifier of the existing Application interface you wich to clone.
+     * 
+     * @param newApplicationName
+     *    Name for the new application interface.
+     * 
+     * @return appInterfaceId
+     *    Returns a server-side generated globally unique identifier for the newly cloned application interface.
+     * 
+     * 
+     * @param authzToken
+     * @param existingAppInterfaceID
+     * @param newApplicationName
+     * @param gatewayId
+     */
     public String cloneApplicationInterface(org.apache.airavata.model.security.AuthzToken authzToken, String existingAppInterfaceID, String newApplicationName, String gatewayId) 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;
 
     /**
-     * Fetch a Application Interface.
+     * 
+     * Fetch an Application Interface.
      * 
      * @param appInterfaceId
-     *   The identifier for the requested application module
+     *   The identifier for the requested application interface.
      * 
      * @return applicationInterface
-     *   Returns a application Interface Object.
-     * 
+     *   Returns an application Interface Object.
      * 
      * 
      * @param authzToken
@@ -1228,10 +1389,11 @@ public class Airavata {
     public org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription getApplicationInterface(org.apache.airavata.model.security.AuthzToken authzToken, String appInterfaceId) 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;
 
     /**
+     * 
      * Update a Application Interface.
      * 
      * @param appInterfaceId
-     *   The identifier for the requested application deployment to be updated.
+     *   The identifier of the requested application deployment to be updated.
      * 
      * @param appInterface
      *    Application Interface Object created from the datamodel.
@@ -1240,7 +1402,6 @@ public class Airavata {
      *   Returns a success/failure of the update.
      * 
      * 
-     * 
      * @param authzToken
      * @param appInterfaceId
      * @param applicationInterface
@@ -1248,7 +1409,8 @@ public class Airavata {
     public boolean updateApplicationInterface(org.apache.airavata.model.security.AuthzToken authzToken, String appInterfaceId, org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription applicationInterface) 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;
 
     /**
-     * Delete a Application Interface.
+     * 
+     * Delete an Application Interface.
      * 
      * @param appInterfaceId
      *   The identifier for the requested application interface to be deleted.
@@ -1257,18 +1419,18 @@ public class Airavata {
      *   Returns a success/failure of the deletion.
      * 
      * 
-     * 
      * @param authzToken
      * @param appInterfaceId
      */
     public boolean deleteApplicationInterface(org.apache.airavata.model.security.AuthzToken authzToken, String appInterfaceId) 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;
 
     /**
-     * Fetch name and id of  Application Interface documents.
+     * 
+     * Fetch name and ID of  Application Interface documents.
      * 
      * 
      * @return map<applicationId, applicationInterfaceNames>
-     *   Returns a list of application interfaces with corresponsing id's
+     *   Returns a list of application interfaces with corresponsing ID's
      * 
      * 
      * @param authzToken
@@ -1277,11 +1439,12 @@ public class Airavata {
     public Map<String,String> getAllApplicationInterfaceNames(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) 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;
 
     /**
+     * 
      * Fetch all Application Interface documents.
      * 
      * 
      * @return map<applicationId, applicationInterfaceNames>
-     *   Returns a list of application interfaces documents
+     *   Returns a list of application interfaces documents (Application Interface ID, name, description, Inputs and Outputs objects).
      * 
      * 
      * @param authzToken
@@ -1290,10 +1453,11 @@ public class Airavata {
     public List<org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription> getAllApplicationInterfaces(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) 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;
 
     /**
+     * 
      * Fetch the list of Application Inputs.
      * 
      * @param appInterfaceId
-     *   The identifier for the requested application interface
+     *   The identifier of the application interface which need inputs to be fetched.
      * 
      * @return list<application_interface_model.InputDataObjectType>
      *   Returns a list of application inputs.
@@ -1305,10 +1469,11 @@ public class Airavata {
     public List<org.apache.airavata.model.application.io.InputDataObjectType> getApplicationInputs(org.apache.airavata.model.security.AuthzToken authzToken, String appInterfaceId) 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;
 
     /**
-     * Fetch the list of Application Outputs.
+     * 
+     * Fetch list of Application Outputs.
      * 
      * @param appInterfaceId
-     *   The identifier for the requested application interface
+     *   The identifier of the application interface which need outputs to be fetched.
      * 
      * @return list<application_interface_model.OutputDataObjectType>
      *   Returns a list of application outputs.
@@ -1320,14 +1485,15 @@ public class Airavata {
     public List<org.apache.airavata.model.application.io.OutputDataObjectType> getApplicationOutputs(org.apache.airavata.model.security.AuthzToken authzToken, String appInterfaceId) 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;
 
     /**
+     * 
      * Fetch a list of all deployed Compute Hosts for a given application interfaces.
      * 
      * @param appInterfaceId
-     *   The identifier for the requested application interface
+     *   The identifier for the requested application interface.
      * 
      * @return map<computeResourceId, computeResourceName>
      *   A map of registered compute resource id's and their corresponding hostnames.
-     *    Deployments of each modules listed within the interfaces will be listed.
+     *   Deployments of each modules listed within the interfaces will be listed.
      * 
      * 
      * @param authzToken
@@ -1366,6 +1532,7 @@ public class Airavata {
     public org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription getComputeResource(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId) 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;
 
     /**
+     * 
      * Fetch all registered Compute Resources.
      * 
      * @return A map of registered compute resource id's and thier corresponding hostnames.
@@ -1452,7 +1619,7 @@ public class Airavata {
     public Map<String,String> getAllStorageResourceNames(org.apache.airavata.model.security.AuthzToken authzToken) 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;
 
     /**
-     * Update a Compute Resource.
+     * Update a Storage Resource.
      * 
      * @param storageResourceId
      *   The identifier for the requested compute resource to be updated.
@@ -1474,7 +1641,7 @@ public class Airavata {
      * Delete a Storage Resource.
      * 
      * @param storageResourceId
-     *   The identifier for the requested compute resource to be deleted.
+     *   The identifier of the requested compute resource to be deleted.
      * 
      * @return status
      *   Returns a success/failure of the deletion.
@@ -1601,6 +1768,7 @@ public class Airavata {
     public org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission getSSHJobSubmission(org.apache.airavata.model.security.AuthzToken authzToken, String jobSubmissionId) 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;
 
     /**
+     * 
      * Add a UNICORE Job Submission details to a compute resource
      *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
      * 
@@ -1625,10 +1793,13 @@ public class Airavata {
     public String addUNICOREJobSubmissionDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission) 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;
 
     /**
+     *   *
      *   * This method returns UnicoreJobSubmission object
+     *   *
      *   * @param jobSubmissionInterfaceId
      *   *   The identifier of the JobSubmission Interface to be retrieved.
      *   *  @return UnicoreJobSubmission instance
+     *   *
      * *
      * 
      * @param authzToken
@@ -1637,6 +1808,7 @@ public class Airavata {
     public org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission getUnicoreJobSubmission(org.apache.airavata.model.security.AuthzToken authzToken, String jobSubmissionId) 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;
 
     /**
+     *    *
      *    * Add a Cloud Job Submission details to a compute resource
      *    *  App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
      *    *
@@ -1651,6 +1823,7 @@ public class Airavata {
      *    *
      *    * @return status
      *    *   Returns the unique job submission id.
+     *    *
      * *
      * 
      * @param authzToken
@@ -1661,6 +1834,7 @@ public class Airavata {
     public String addCloudJobSubmissionDetails(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission cloudSubmission) 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;
 
     /**
+     *    *
      *    * This method returns cloudJobSubmission object
      *    * @param jobSubmissionInterfaceI
      *        *   The identifier of the JobSubmission Interface to be retrieved.
@@ -1673,6 +1847,7 @@ public class Airavata {
     public org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission getCloudJobSubmission(org.apache.airavata.model.security.AuthzToken authzToken, String jobSubmissionId) 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;
 
     /**
+     * 
      * Update the given SSH Job Submission details
      * 
      * @param jobSubmissionInterfaceId
@@ -1692,6 +1867,7 @@ public class Airavata {
     public boolean updateSSHJobSubmissionDetails(org.apache.airavata.model.security.AuthzToken authzToken, String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission sshJobSubmission) 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;
 
     /**
+     * 
      * Update the cloud Job Submission details
      * 
      * @param jobSubmissionInterfaceId
@@ -1711,6 +1887,7 @@ public class Airavata {
     public boolean updateCloudJobSubmissionDetails(org.apache.airavata.model.security.AuthzToken authzToken, String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission sshJobSubmission) 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;
 
     /**
+     * 
      * Update the UNIOCRE Job Submission details
      * 
      * @param jobSubmissionInterfaceId
@@ -1731,6 +1908,7 @@ public class Airavata {
     public boolean updateUnicoreJobSubmissionDetails(org.apache.airavata.model.security.AuthzToken authzToken, String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission) 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;
 
     /**
+     * 
      * Add a Local data movement details to a compute resource
      *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
      * 
@@ -1760,6 +1938,7 @@ public class Airavata {
     public String addLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) 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;
 
     /**
+     * 
      * Update the given Local data movement details
      * 
      * @param dataMovementInterfaceId
@@ -1780,7 +1959,8 @@ public class Airavata {
     public boolean updateLocalDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.LOCALDataMovement localDataMovement) 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;
 
     /**
-     * This method returns local datamovement object
+     * 
+     * This method returns local datamovement object.
      * 
      * @param dataMovementId
      *   The identifier of the datamovement Interface to be retrieved.
@@ -1795,6 +1975,7 @@ public class Airavata {
     public org.apache.airavata.model.data.movement.LOCALDataMovement getLocalDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId) 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;
 
     /**
+     * 
      * Add a SCP data movement details to a compute resource
      *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
      * 
@@ -1820,6 +2001,7 @@ public class Airavata {
     public String addSCPDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.SCPDataMovement scpDataMovement) 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;
 
     /**
+     * 
      * Update the given scp data movement details
      *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
      * 
@@ -1855,6 +2037,7 @@ public class Airavata {
     public org.apache.airavata.model.data.movement.SCPDataMovement getSCPDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId) 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;
 
     /**
+     * 
      * Add a UNICORE data movement details to a compute resource
      *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
      * 
@@ -1880,6 +2063,7 @@ public class Airavata {
     public String addUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.data.movement.DMType dataMoveType, int priorityOrder, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) 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;
 
     /**
+     * 
      * Update a selected UNICORE data movement details
      *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
      * 
@@ -1901,6 +2085,7 @@ public class Airavata {
     public boolean updateUnicoreDataMovementDetails(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementInterfaceId, org.apache.airavata.model.data.movement.UnicoreDataMovement unicoreDataMovement) 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;
 
     /**
+     * 
      * This method returns UNICORE datamovement object
      * 
      * @param dataMovementId
@@ -1916,6 +2101,7 @@ public class Airavata {
     public org.apache.airavata.model.data.movement.UnicoreDataMovement getUnicoreDataMovement(org.apache.airavata.model.security.AuthzToken authzToken, String dataMovementId) 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;
 
     /**
+     * 
      * Add a GridFTP data movement details to a compute resource
      *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
      * 
@@ -2134,7 +2320,7 @@ public class Airavata {
      * Fetch the given Gateway Resource Profile.
      * 
      * @param gatewayID
-     *   The identifier for the requested gateway resource
+     *   The identifier for the requested gateway resource.
      * 
      * @return gatewayResourceProfile
      *    Gateway Resource Profile Object.
@@ -2203,9 +2389,32 @@ public class Airavata {
      */
     public boolean addGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference) 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;
 
+    /**
+     * Add a Storage Resource Preference to a registered gateway profile.
+     * 
+     * @param gatewayID
+     *   The identifier of the gateway profile to be added.
+     * 
+     * @param storageResourceId
+     *   Preferences related to a particular compute resource
+     * 
+     * @param computeResourcePreference
+     *   The ComputeResourcePreference object to be added to the resource profile.
+     * 
+     * @return status
+     *   Returns a success/failure of the addition. If a profile already exists, this operation will fail.
+     *    Instead an update should be used.
+     * 
+     * 
+     * @param authzToken
+     * @param gatewayID
+     * @param storageResourceId
+     * @param storagePreference
+     */
     public boolean addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) 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;
 
     /**
+     * 
      * Fetch a Compute Resource Preference of a registered gateway profile.
      * 
      * @param gatewayID
@@ -2224,9 +2433,28 @@ public class Airavata {
      */
     public org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) 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;
 
+    /**
+     * 
+     * Fetch a Storage Resource Preference of a registered gateway profile.
+     * 
+     * @param gatewayID
+     *   The identifier of the gateway profile to request to fetch the particular storage resource preference.
+     * 
+     * @param storageResourceId
+     *   Identifier of the Stprage Preference required to be fetched.
+     * 
+     * @return StoragePreference
+     *   Returns the StoragePreference object.
+     * 
+     * 
+     * @param authzToken
+     * @param gatewayID
+     * @param storageResourceId
+     */
     public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageResourceId) 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;
 
     /**
+     * 
      * Fetch all Compute Resource Preferences of a registered gateway profile.
      * 
      * @param gatewayID
@@ -2241,10 +2469,28 @@ public class Airavata {
      */
     public List<org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference> getAllGatewayComputeResourcePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) 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;
 
+    /**
+     * Fetch all Storage Resource Preferences of a registered gateway profile.
+     * 
+     * @param gatewayID
+     *   The identifier for the gateway profile to be requested
+     * 
+     * @return StoragePreference
+     *   Returns the StoragePreference object.
+     * 
+     * 
+     * @param authzToken
+     * @param gatewayID
+     */
     public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) 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;
 
     /**
-     * Fetch all gateway profiles registered
+     * 
+     * Fetch all Gateway Profiles registered
+     * 
+     * @return GatewayResourceProfile
+     *   Returns all the GatewayResourcePrifle list object.
+     * 
      * 
      * 
      * @param authzToken
@@ -2274,6 +2520,27 @@ public class Airavata {
      */
     public boolean updateGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference) 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;
 
+    /**
+     * Update a Storage Resource Preference of a registered gateway profile.
+     * 
+     * @param gatewayID
+     *   The identifier of the gateway profile to be updated.
+     * 
+     * @param storageId
+     *   The Storage resource identifier of the one that you want to update
+     * 
+     * @param storagePreference
+     *   The storagePreference object to be updated to the resource profile.
+     * 
+     * @return status
+     *   Returns a success/failure of the updation.
+     * 
+     * 
+     * @param authzToken
+     * @param gatewayID
+     * @param storageId
+     * @param storagePreference
+     */
     public boolean updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) 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;
 
     /**
@@ -2295,24 +2562,67 @@ public class Airavata {
      */
     public boolean deleteGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) 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;
 
+    /**
+     * Delete the Storage Resource Preference of a registered gateway profile.
+     * 
+     * @param gatewayID
+     *   The identifier of the gateway profile to be deleted.
+     * 
+     * @param storageId
+     *   ID of the storage preference you want to delete.
+     * 
+     * @return status
+     *   Returns a success/failure of the deletion.
+     * 
+     * 
+     * @param authzToken
+     * @param gatewayID
+     * @param storageId
+     */
     public boolean deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId) 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;
 
+    /**
+     * Delete the Storage Resource Preference of a registered gateway profile.
+     * 
+     * @param gatewayID
+     *   The identifier of the gateway profile to be deleted.
+     * 
+     * @param storageId
+     *   ID of the storage preference you want to delete.
+     * 
+     * @return status
+     *   Returns a success/failure of the deletion.
+     * 
+     * 
+     * @param authzToken
+     * @param gatewayId
+     */
     public List<String> getAllWorkflows(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) 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 org.apache.airavata.model.Workflow getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId) 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;
+    /**
+     * 
+     * API Methods Related for Work-Flow Submission Features.
+     * 
+     * 
+     * @param authzToken
+     * @param workflowTemplateId
+     */
+    public org.apache.airavata.model.WorkflowModel getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId) 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 void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId) 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 registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.Workflow workflow) 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 registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.WorkflowModel workflow) 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 void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId, org.apache.airavata.model.Workflow workflow) 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 void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId, org.apache.airavata.model.WorkflowModel workflow) 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 getWorkflowTemplateId(org.apache.airavata.model.security.AuthzToken authzToken, String workflowName) 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 isWorkflowExistWithName(org.apache.airavata.model.security.AuthzToken authzToken, String workflowName) 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;
 
     /**
-     *  * Data Manager Related API Methods
+     *  *
+     *  * Data Manager Related API Methods.
+     *  *
      * *
      * 
      * @param authzToken
@@ -2592,9 +2902,9 @@ public class Airavata {
 
     public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.WorkflowModel workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId, org.apache.airavata.model.Workflow workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId, org.apache.airavata.model.WorkflowModel workflow, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getWorkflowTemplateId(org.apache.airavata.model.security.AuthzToken authzToken, String workflowName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
@@ -7310,7 +7620,7 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllWorkflows failed: unknown result");
     }
 
-    public org.apache.airavata.model.Workflow getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId) 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 org.apache.airavata.model.WorkflowModel getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, String workflowTemplateId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientExcepti

<TRUNCATED>

[10/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
update generated code and fixing compilation issues


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

Branch: refs/heads/develop
Commit: 4c790770685a77b1b43c7dadbea55396e983c465
Parents: b4ca1eb
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Mon Feb 8 11:45:01 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Mon Feb 8 11:45:01 2016 -0500

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |    8 +-
 .../java/org/apache/airavata/api/Airavata.java  |  724 +++++++----
 .../main/resources/lib/airavata/Airavata.cpp    |   24 +-
 .../src/main/resources/lib/airavata/Airavata.h  |  691 ++++++++---
 .../lib/airavata/Airavata_server.skeleton.cpp   |  628 +++++++---
 .../lib/airavata/workflow_data_model_types.cpp  |  966 ++++++++++++++-
 .../lib/airavata/workflow_data_model_types.h    |  444 ++++++-
 .../resources/lib/Airavata/API/Airavata.php     |  614 ++++++---
 .../main/resources/lib/Airavata/Model/Types.php |  885 ++++++++++++-
 .../lib/apache/airavata/api/Airavata-remote     |    6 +-
 .../lib/apache/airavata/api/Airavata.py         | 1168 +++++++++++++-----
 .../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 +-
 .../catalog/impl/WorkflowCatalogImpl.java       |    8 +-
 .../utils/WorkflowCatalogThriftConversion.java  |    6 +-
 .../airavata/registry/cpi/WorkflowCatalog.java  |    7 +-
 .../airavata-apis/airavata_api.thrift           |    6 +-
 99 files changed, 6116 insertions(+), 2296 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 8bf0ee1..03b4e11 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
@@ -38,7 +38,7 @@ import org.apache.airavata.data.manager.cpi.DataManagerException;
 import org.apache.airavata.messaging.core.MessageContext;
 import org.apache.airavata.messaging.core.Publisher;
 import org.apache.airavata.messaging.core.PublisherFactory;
-import org.apache.airavata.model.Workflow;
+import org.apache.airavata.model.WorkflowModel;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
@@ -4159,7 +4159,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 
 	@Override
     @SecurityCheck
-	public Workflow getWorkflow(AuthzToken authzToken, String workflowTemplateId)
+	public WorkflowModel getWorkflow(AuthzToken authzToken, String workflowTemplateId)
 			throws InvalidRequestException, AiravataClientException, AuthorizationException, AiravataSystemException, TException {
 		try {
 			return getWorkflowCatalog().getWorkflow(workflowTemplateId);
@@ -4189,7 +4189,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 
 	@Override
     @SecurityCheck
-	public String registerWorkflow(AuthzToken authzToken, String gatewayId, Workflow workflow)
+	public String registerWorkflow(AuthzToken authzToken, String gatewayId, WorkflowModel workflow)
 			throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         if (!isGatewayExistInternal(gatewayId)){
             logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -4208,7 +4208,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 
 	@Override
     @SecurityCheck
-	public void updateWorkflow(AuthzToken authzToken, String workflowTemplateId, Workflow workflow)
+	public void updateWorkflow(AuthzToken authzToken, String workflowTemplateId, WorkflowModel workflow)
 			throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
 		try {
 			getWorkflowCatalog().updateWorkflow(workflowTemplateId, workflow);


[05/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
index fe337a7..71d3e01 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
@@ -17,7 +17,45 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
 use Thrift\Exception\TApplicationException;
 
 
-class Workflow {
+final class WorkflowState {
+  const CREATED = 0;
+  const STARTED = 1;
+  const EXECUTING = 2;
+  const COMPLETED = 3;
+  const FAILED = 4;
+  const CANCELLING = 5;
+  const CANCELED = 6;
+  static public $__names = array(
+    0 => 'CREATED',
+    1 => 'STARTED',
+    2 => 'EXECUTING',
+    3 => 'COMPLETED',
+    4 => 'FAILED',
+    5 => 'CANCELLING',
+    6 => 'CANCELED',
+  );
+}
+
+final class ComponentState {
+  const CREATED = 0;
+  const WAITING = 1;
+  const READY = 2;
+  const RUNNING = 3;
+  const COMPLETED = 4;
+  const FAILED = 5;
+  const CANCELED = 6;
+  static public $__names = array(
+    0 => 'CREATED',
+    1 => 'WAITING',
+    2 => 'READY',
+    3 => 'RUNNING',
+    4 => 'COMPLETED',
+    5 => 'FAILED',
+    6 => 'CANCELED',
+  );
+}
+
+class WorkflowModel {
   static $_TSPEC;
 
   /**
@@ -35,6 +73,14 @@ class Workflow {
   /**
    * @var string
    */
+  public $gatewayId = null;
+  /**
+   * @var string
+   */
+  public $createdUser = null;
+  /**
+   * @var string
+   */
   public $image = null;
   /**
    * @var \Airavata\Model\Application\Io\InputDataObjectType[]
@@ -44,6 +90,10 @@ class Workflow {
    * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
    */
   public $workflowOutputs = null;
+  /**
+   * @var int
+   */
+  public $creationTime = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -61,10 +111,18 @@ class Workflow {
           'type' => TType::STRING,
           ),
         4 => array(
-          'var' => 'image',
+          'var' => 'gatewayId',
           'type' => TType::STRING,
           ),
         5 => array(
+          'var' => 'createdUser',
+          'type' => TType::STRING,
+          ),
+        6 => array(
+          'var' => 'image',
+          'type' => TType::STRING,
+          ),
+        7 => array(
           'var' => 'workflowInputs',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
@@ -73,7 +131,7 @@ class Workflow {
             'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
             ),
           ),
-        6 => array(
+        8 => array(
           'var' => 'workflowOutputs',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
@@ -82,6 +140,10 @@ class Workflow {
             'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
             ),
           ),
+        9 => array(
+          'var' => 'creationTime',
+          'type' => TType::I64,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -94,6 +156,12 @@ class Workflow {
       if (isset($vals['graph'])) {
         $this->graph = $vals['graph'];
       }
+      if (isset($vals['gatewayId'])) {
+        $this->gatewayId = $vals['gatewayId'];
+      }
+      if (isset($vals['createdUser'])) {
+        $this->createdUser = $vals['createdUser'];
+      }
       if (isset($vals['image'])) {
         $this->image = $vals['image'];
       }
@@ -103,11 +171,14 @@ class Workflow {
       if (isset($vals['workflowOutputs'])) {
         $this->workflowOutputs = $vals['workflowOutputs'];
       }
+      if (isset($vals['creationTime'])) {
+        $this->creationTime = $vals['creationTime'];
+      }
     }
   }
 
   public function getName() {
-    return 'Workflow';
+    return 'WorkflowModel';
   }
 
   public function read($input)
@@ -148,12 +219,26 @@ class Workflow {
           break;
         case 4:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->image);
+            $xfer += $input->readString($this->gatewayId);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 5:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->createdUser);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 6:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->image);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 7:
           if ($ftype == TType::LST) {
             $this->workflowInputs = array();
             $_size0 = 0;
@@ -171,7 +256,7 @@ class Workflow {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 6:
+        case 8:
           if ($ftype == TType::LST) {
             $this->workflowOutputs = array();
             $_size6 = 0;
@@ -189,6 +274,13 @@ class Workflow {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 9:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->creationTime);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -201,7 +293,7 @@ class Workflow {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Workflow');
+    $xfer += $output->writeStructBegin('WorkflowModel');
     if ($this->templateId !== null) {
       $xfer += $output->writeFieldBegin('templateId', TType::STRING, 1);
       $xfer += $output->writeString($this->templateId);
@@ -217,8 +309,18 @@ class Workflow {
       $xfer += $output->writeString($this->graph);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->gatewayId !== null) {
+      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 4);
+      $xfer += $output->writeString($this->gatewayId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->createdUser !== null) {
+      $xfer += $output->writeFieldBegin('createdUser', TType::STRING, 5);
+      $xfer += $output->writeString($this->createdUser);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->image !== null) {
-      $xfer += $output->writeFieldBegin('image', TType::STRING, 4);
+      $xfer += $output->writeFieldBegin('image', TType::STRING, 6);
       $xfer += $output->writeString($this->image);
       $xfer += $output->writeFieldEnd();
     }
@@ -226,7 +328,7 @@ class Workflow {
       if (!is_array($this->workflowInputs)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('workflowInputs', TType::LST, 5);
+      $xfer += $output->writeFieldBegin('workflowInputs', TType::LST, 7);
       {
         $output->writeListBegin(TType::STRUCT, count($this->workflowInputs));
         {
@@ -243,7 +345,7 @@ class Workflow {
       if (!is_array($this->workflowOutputs)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('workflowOutputs', TType::LST, 6);
+      $xfer += $output->writeFieldBegin('workflowOutputs', TType::LST, 8);
       {
         $output->writeListBegin(TType::STRUCT, count($this->workflowOutputs));
         {
@@ -256,6 +358,769 @@ class Workflow {
       }
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->creationTime !== null) {
+      $xfer += $output->writeFieldBegin('creationTime', TType::I64, 9);
+      $xfer += $output->writeI64($this->creationTime);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class ComponentStatus {
+  static $_TSPEC;
+
+  /**
+   * @var int
+   */
+  public $state =   0;
+  /**
+   * @var string
+   */
+  public $reason = null;
+  /**
+   * @var int
+   */
+  public $timeofStateChange = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'state',
+          'type' => TType::I32,
+          ),
+        2 => array(
+          'var' => 'reason',
+          'type' => TType::STRING,
+          ),
+        3 => array(
+          'var' => 'timeofStateChange',
+          'type' => TType::I64,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['state'])) {
+        $this->state = $vals['state'];
+      }
+      if (isset($vals['reason'])) {
+        $this->reason = $vals['reason'];
+      }
+      if (isset($vals['timeofStateChange'])) {
+        $this->timeofStateChange = $vals['timeofStateChange'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'ComponentStatus';
+  }
+
+  public function read($input)
+  {
+    $xfer = 0;
+    $fname = null;
+    $ftype = 0;
+    $fid = 0;
+    $xfer += $input->readStructBegin($fname);
+    while (true)
+    {
+      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+      if ($ftype == TType::STOP) {
+        break;
+      }
+      switch ($fid)
+      {
+        case 1:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->state);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->reason);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->timeofStateChange);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        default:
+          $xfer += $input->skip($ftype);
+          break;
+      }
+      $xfer += $input->readFieldEnd();
+    }
+    $xfer += $input->readStructEnd();
+    return $xfer;
+  }
+
+  public function write($output) {
+    $xfer = 0;
+    $xfer += $output->writeStructBegin('ComponentStatus');
+    if ($this->state !== null) {
+      $xfer += $output->writeFieldBegin('state', TType::I32, 1);
+      $xfer += $output->writeI32($this->state);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->reason !== null) {
+      $xfer += $output->writeFieldBegin('reason', TType::STRING, 2);
+      $xfer += $output->writeString($this->reason);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->timeofStateChange !== null) {
+      $xfer += $output->writeFieldBegin('timeofStateChange', TType::I64, 3);
+      $xfer += $output->writeI64($this->timeofStateChange);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class WorkflowStatus {
+  static $_TSPEC;
+
+  /**
+   * @var int
+   */
+  public $state = null;
+  /**
+   * @var int
+   */
+  public $timeOfStateChange = null;
+  /**
+   * @var string
+   */
+  public $reason = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'state',
+          'type' => TType::I32,
+          ),
+        2 => array(
+          'var' => 'timeOfStateChange',
+          'type' => TType::I64,
+          ),
+        3 => array(
+          'var' => 'reason',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['state'])) {
+        $this->state = $vals['state'];
+      }
+      if (isset($vals['timeOfStateChange'])) {
+        $this->timeOfStateChange = $vals['timeOfStateChange'];
+      }
+      if (isset($vals['reason'])) {
+        $this->reason = $vals['reason'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'WorkflowStatus';
+  }
+
+  public function read($input)
+  {
+    $xfer = 0;
+    $fname = null;
+    $ftype = 0;
+    $fid = 0;
+    $xfer += $input->readStructBegin($fname);
+    while (true)
+    {
+      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+      if ($ftype == TType::STOP) {
+        break;
+      }
+      switch ($fid)
+      {
+        case 1:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->state);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->timeOfStateChange);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->reason);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        default:
+          $xfer += $input->skip($ftype);
+          break;
+      }
+      $xfer += $input->readFieldEnd();
+    }
+    $xfer += $input->readStructEnd();
+    return $xfer;
+  }
+
+  public function write($output) {
+    $xfer = 0;
+    $xfer += $output->writeStructBegin('WorkflowStatus');
+    if ($this->state !== null) {
+      $xfer += $output->writeFieldBegin('state', TType::I32, 1);
+      $xfer += $output->writeI32($this->state);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->timeOfStateChange !== null) {
+      $xfer += $output->writeFieldBegin('timeOfStateChange', TType::I64, 2);
+      $xfer += $output->writeI64($this->timeOfStateChange);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->reason !== null) {
+      $xfer += $output->writeFieldBegin('reason', TType::STRING, 3);
+      $xfer += $output->writeString($this->reason);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class EdgeModel {
+  static $_TSPEC;
+
+  /**
+   * @var string
+   */
+  public $edgeId = "DO_NOT_SET_AT_CLIENTS";
+  /**
+   * @var string
+   */
+  public $name = null;
+  /**
+   * @var \Airavata\Model\ComponentStatus
+   */
+  public $status = null;
+  /**
+   * @var string
+   */
+  public $description = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'edgeId',
+          'type' => TType::STRING,
+          ),
+        2 => array(
+          'var' => 'name',
+          'type' => TType::STRING,
+          ),
+        3 => array(
+          'var' => 'status',
+          'type' => TType::STRUCT,
+          'class' => '\Airavata\Model\ComponentStatus',
+          ),
+        4 => array(
+          'var' => 'description',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['edgeId'])) {
+        $this->edgeId = $vals['edgeId'];
+      }
+      if (isset($vals['name'])) {
+        $this->name = $vals['name'];
+      }
+      if (isset($vals['status'])) {
+        $this->status = $vals['status'];
+      }
+      if (isset($vals['description'])) {
+        $this->description = $vals['description'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'EdgeModel';
+  }
+
+  public function read($input)
+  {
+    $xfer = 0;
+    $fname = null;
+    $ftype = 0;
+    $fid = 0;
+    $xfer += $input->readStructBegin($fname);
+    while (true)
+    {
+      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+      if ($ftype == TType::STOP) {
+        break;
+      }
+      switch ($fid)
+      {
+        case 1:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->edgeId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->name);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::STRUCT) {
+            $this->status = new \Airavata\Model\ComponentStatus();
+            $xfer += $this->status->read($input);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 4:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->description);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        default:
+          $xfer += $input->skip($ftype);
+          break;
+      }
+      $xfer += $input->readFieldEnd();
+    }
+    $xfer += $input->readStructEnd();
+    return $xfer;
+  }
+
+  public function write($output) {
+    $xfer = 0;
+    $xfer += $output->writeStructBegin('EdgeModel');
+    if ($this->edgeId !== null) {
+      $xfer += $output->writeFieldBegin('edgeId', TType::STRING, 1);
+      $xfer += $output->writeString($this->edgeId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->name !== null) {
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 2);
+      $xfer += $output->writeString($this->name);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->status !== null) {
+      if (!is_object($this->status)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('status', TType::STRUCT, 3);
+      $xfer += $this->status->write($output);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->description !== null) {
+      $xfer += $output->writeFieldBegin('description', TType::STRING, 4);
+      $xfer += $output->writeString($this->description);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class PortModel {
+  static $_TSPEC;
+
+  /**
+   * @var string
+   */
+  public $portId = "DO_NOT_SET_AT_CLIENTS";
+  /**
+   * @var string
+   */
+  public $name = null;
+  /**
+   * @var \Airavata\Model\ComponentStatus
+   */
+  public $status = null;
+  /**
+   * @var string
+   */
+  public $value = null;
+  /**
+   * @var string
+   */
+  public $description = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'portId',
+          'type' => TType::STRING,
+          ),
+        2 => array(
+          'var' => 'name',
+          'type' => TType::STRING,
+          ),
+        3 => array(
+          'var' => 'status',
+          'type' => TType::STRUCT,
+          'class' => '\Airavata\Model\ComponentStatus',
+          ),
+        4 => array(
+          'var' => 'value',
+          'type' => TType::STRING,
+          ),
+        5 => array(
+          'var' => 'description',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['portId'])) {
+        $this->portId = $vals['portId'];
+      }
+      if (isset($vals['name'])) {
+        $this->name = $vals['name'];
+      }
+      if (isset($vals['status'])) {
+        $this->status = $vals['status'];
+      }
+      if (isset($vals['value'])) {
+        $this->value = $vals['value'];
+      }
+      if (isset($vals['description'])) {
+        $this->description = $vals['description'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'PortModel';
+  }
+
+  public function read($input)
+  {
+    $xfer = 0;
+    $fname = null;
+    $ftype = 0;
+    $fid = 0;
+    $xfer += $input->readStructBegin($fname);
+    while (true)
+    {
+      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+      if ($ftype == TType::STOP) {
+        break;
+      }
+      switch ($fid)
+      {
+        case 1:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->portId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->name);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::STRUCT) {
+            $this->status = new \Airavata\Model\ComponentStatus();
+            $xfer += $this->status->read($input);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 4:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->value);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 5:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->description);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        default:
+          $xfer += $input->skip($ftype);
+          break;
+      }
+      $xfer += $input->readFieldEnd();
+    }
+    $xfer += $input->readStructEnd();
+    return $xfer;
+  }
+
+  public function write($output) {
+    $xfer = 0;
+    $xfer += $output->writeStructBegin('PortModel');
+    if ($this->portId !== null) {
+      $xfer += $output->writeFieldBegin('portId', TType::STRING, 1);
+      $xfer += $output->writeString($this->portId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->name !== null) {
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 2);
+      $xfer += $output->writeString($this->name);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->status !== null) {
+      if (!is_object($this->status)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('status', TType::STRUCT, 3);
+      $xfer += $this->status->write($output);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->value !== null) {
+      $xfer += $output->writeFieldBegin('value', TType::STRING, 4);
+      $xfer += $output->writeString($this->value);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->description !== null) {
+      $xfer += $output->writeFieldBegin('description', TType::STRING, 5);
+      $xfer += $output->writeString($this->description);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class NodeModel {
+  static $_TSPEC;
+
+  /**
+   * @var string
+   */
+  public $nodeId = "DO_NOT_SET_AT_CLIENTS";
+  /**
+   * @var string
+   */
+  public $name = null;
+  /**
+   * @var string
+   */
+  public $applicationId = null;
+  /**
+   * @var string
+   */
+  public $applicationName = null;
+  /**
+   * @var \Airavata\Model\ComponentStatus
+   */
+  public $status = null;
+  /**
+   * @var string
+   */
+  public $description = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'nodeId',
+          'type' => TType::STRING,
+          ),
+        2 => array(
+          'var' => 'name',
+          'type' => TType::STRING,
+          ),
+        3 => array(
+          'var' => 'applicationId',
+          'type' => TType::STRING,
+          ),
+        4 => array(
+          'var' => 'applicationName',
+          'type' => TType::STRING,
+          ),
+        5 => array(
+          'var' => 'status',
+          'type' => TType::STRUCT,
+          'class' => '\Airavata\Model\ComponentStatus',
+          ),
+        6 => array(
+          'var' => 'description',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['nodeId'])) {
+        $this->nodeId = $vals['nodeId'];
+      }
+      if (isset($vals['name'])) {
+        $this->name = $vals['name'];
+      }
+      if (isset($vals['applicationId'])) {
+        $this->applicationId = $vals['applicationId'];
+      }
+      if (isset($vals['applicationName'])) {
+        $this->applicationName = $vals['applicationName'];
+      }
+      if (isset($vals['status'])) {
+        $this->status = $vals['status'];
+      }
+      if (isset($vals['description'])) {
+        $this->description = $vals['description'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'NodeModel';
+  }
+
+  public function read($input)
+  {
+    $xfer = 0;
+    $fname = null;
+    $ftype = 0;
+    $fid = 0;
+    $xfer += $input->readStructBegin($fname);
+    while (true)
+    {
+      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+      if ($ftype == TType::STOP) {
+        break;
+      }
+      switch ($fid)
+      {
+        case 1:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->nodeId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->name);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->applicationId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 4:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->applicationName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 5:
+          if ($ftype == TType::STRUCT) {
+            $this->status = new \Airavata\Model\ComponentStatus();
+            $xfer += $this->status->read($input);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 6:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->description);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        default:
+          $xfer += $input->skip($ftype);
+          break;
+      }
+      $xfer += $input->readFieldEnd();
+    }
+    $xfer += $input->readStructEnd();
+    return $xfer;
+  }
+
+  public function write($output) {
+    $xfer = 0;
+    $xfer += $output->writeStructBegin('NodeModel');
+    if ($this->nodeId !== null) {
+      $xfer += $output->writeFieldBegin('nodeId', TType::STRING, 1);
+      $xfer += $output->writeString($this->nodeId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->name !== null) {
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 2);
+      $xfer += $output->writeString($this->name);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->applicationId !== null) {
+      $xfer += $output->writeFieldBegin('applicationId', TType::STRING, 3);
+      $xfer += $output->writeString($this->applicationId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->applicationName !== null) {
+      $xfer += $output->writeFieldBegin('applicationName', TType::STRING, 4);
+      $xfer += $output->writeString($this->applicationName);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->status !== null) {
+      if (!is_object($this->status)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('status', TType::STRUCT, 5);
+      $xfer += $this->status->write($output);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->description !== null) {
+      $xfer += $output->writeFieldBegin('description', TType::STRING, 6);
+      $xfer += $output->writeString($this->description);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 720f50c..f75c290 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
@@ -151,10 +151,10 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print('  bool deleteGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId)')
   print('  bool deleteGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string storageId)')
   print('   getAllWorkflows(AuthzToken authzToken, string gatewayId)')
-  print('  Workflow getWorkflow(AuthzToken authzToken, string workflowTemplateId)')
+  print('  WorkflowModel getWorkflow(AuthzToken authzToken, string workflowTemplateId)')
   print('  void deleteWorkflow(AuthzToken authzToken, string workflowTemplateId)')
-  print('  string registerWorkflow(AuthzToken authzToken, string gatewayId, Workflow workflow)')
-  print('  void updateWorkflow(AuthzToken authzToken, string workflowTemplateId, Workflow workflow)')
+  print('  string registerWorkflow(AuthzToken authzToken, string gatewayId, WorkflowModel workflow)')
+  print('  void updateWorkflow(AuthzToken authzToken, string workflowTemplateId, WorkflowModel workflow)')
   print('  string getWorkflowTemplateId(AuthzToken authzToken, string workflowName)')
   print('  bool isWorkflowExistWithName(AuthzToken authzToken, string workflowName)')
   print('  string registerDataResource(AuthzToken authzToken, DataResourceModel dataResourceModel)')


[02/10] airavata git commit: update generated code and fixing compilation issues

Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 4d25b93..58991af 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,16 +51,19 @@ 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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");
 
   private static final org.apache.thrift.protocol.TField TEMPLATE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("templateId", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField GRAPH_FIELD_DESC = new org.apache.thrift.protocol.TField("graph", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField IMAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("image", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField WORKFLOW_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowInputs", org.apache.thrift.protocol.TType.LIST, (short)5);
-  private static final org.apache.thrift.protocol.TField WORKFLOW_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowOutputs", org.apache.thrift.protocol.TType.LIST, (short)6);
+  private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField CREATED_USER_FIELD_DESC = new org.apache.thrift.protocol.TField("createdUser", org.apache.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.thrift.protocol.TField IMAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("image", org.apache.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.thrift.protocol.TField WORKFLOW_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowInputs", org.apache.thrift.protocol.TType.LIST, (short)7);
+  private static final org.apache.thrift.protocol.TField WORKFLOW_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowOutputs", org.apache.thrift.protocol.TType.LIST, (short)8);
+  private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)9);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -71,18 +74,24 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
   private String templateId; // required
   private String name; // required
   private String graph; // required
+  private String gatewayId; // required
+  private String createdUser; // required
   private ByteBuffer image; // optional
   private List<org.apache.airavata.model.application.io.InputDataObjectType> workflowInputs; // optional
   private List<org.apache.airavata.model.application.io.OutputDataObjectType> workflowOutputs; // optional
+  private long creationTime; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     TEMPLATE_ID((short)1, "templateId"),
     NAME((short)2, "name"),
     GRAPH((short)3, "graph"),
-    IMAGE((short)4, "image"),
-    WORKFLOW_INPUTS((short)5, "workflowInputs"),
-    WORKFLOW_OUTPUTS((short)6, "workflowOutputs");
+    GATEWAY_ID((short)4, "gatewayId"),
+    CREATED_USER((short)5, "createdUser"),
+    IMAGE((short)6, "image"),
+    WORKFLOW_INPUTS((short)7, "workflowInputs"),
+    WORKFLOW_OUTPUTS((short)8, "workflowOutputs"),
+    CREATION_TIME((short)9, "creationTime");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -103,12 +112,18 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
           return NAME;
         case 3: // GRAPH
           return GRAPH;
-        case 4: // IMAGE
+        case 4: // GATEWAY_ID
+          return GATEWAY_ID;
+        case 5: // CREATED_USER
+          return CREATED_USER;
+        case 6: // IMAGE
           return IMAGE;
-        case 5: // WORKFLOW_INPUTS
+        case 7: // WORKFLOW_INPUTS
           return WORKFLOW_INPUTS;
-        case 6: // WORKFLOW_OUTPUTS
+        case 8: // WORKFLOW_OUTPUTS
           return WORKFLOW_OUTPUTS;
+        case 9: // CREATION_TIME
+          return CREATION_TIME;
         default:
           return null;
       }
@@ -149,7 +164,9 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.IMAGE,_Fields.WORKFLOW_INPUTS,_Fields.WORKFLOW_OUTPUTS};
+  private static final int __CREATIONTIME_ISSET_ID = 0;
+  private byte __isset_bitfield = 0;
+  private static final _Fields optionals[] = {_Fields.IMAGE,_Fields.WORKFLOW_INPUTS,_Fields.WORKFLOW_OUTPUTS,_Fields.CREATION_TIME};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -159,6 +176,10 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.GRAPH, new org.apache.thrift.meta_data.FieldMetaData("graph", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.CREATED_USER, new org.apache.thrift.meta_data.FieldMetaData("createdUser", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.IMAGE, new org.apache.thrift.meta_data.FieldMetaData("image", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.WORKFLOW_INPUTS, new org.apache.thrift.meta_data.FieldMetaData("workflowInputs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -167,6 +188,8 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
     tmpMap.put(_Fields.WORKFLOW_OUTPUTS, new org.apache.thrift.meta_data.FieldMetaData("workflowOutputs", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.application.io.OutputDataObjectType.class))));
+    tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkflowModel.class, metaDataMap);
   }
@@ -179,18 +202,23 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
   public WorkflowModel(
     String templateId,
     String name,
-    String graph)
+    String graph,
+    String gatewayId,
+    String createdUser)
   {
     this();
     this.templateId = templateId;
     this.name = name;
     this.graph = graph;
+    this.gatewayId = gatewayId;
+    this.createdUser = createdUser;
   }
 
   /**
    * Performs a deep copy on <i>other</i>.
    */
   public WorkflowModel(WorkflowModel other) {
+    __isset_bitfield = other.__isset_bitfield;
     if (other.isSetTemplateId()) {
       this.templateId = other.templateId;
     }
@@ -200,6 +228,12 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
     if (other.isSetGraph()) {
       this.graph = other.graph;
     }
+    if (other.isSetGatewayId()) {
+      this.gatewayId = other.gatewayId;
+    }
+    if (other.isSetCreatedUser()) {
+      this.createdUser = other.createdUser;
+    }
     if (other.isSetImage()) {
       this.image = org.apache.thrift.TBaseHelper.copyBinary(other.image);
     }
@@ -217,6 +251,7 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       }
       this.workflowOutputs = __this__workflowOutputs;
     }
+    this.creationTime = other.creationTime;
   }
 
   public WorkflowModel deepCopy() {
@@ -229,9 +264,13 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
 
     this.name = null;
     this.graph = null;
+    this.gatewayId = null;
+    this.createdUser = null;
     this.image = null;
     this.workflowInputs = null;
     this.workflowOutputs = null;
+    setCreationTimeIsSet(false);
+    this.creationTime = 0;
   }
 
   public String getTemplateId() {
@@ -303,6 +342,52 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
     }
   }
 
+  public String getGatewayId() {
+    return this.gatewayId;
+  }
+
+  public void setGatewayId(String gatewayId) {
+    this.gatewayId = gatewayId;
+  }
+
+  public void unsetGatewayId() {
+    this.gatewayId = null;
+  }
+
+  /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayId() {
+    return this.gatewayId != null;
+  }
+
+  public void setGatewayIdIsSet(boolean value) {
+    if (!value) {
+      this.gatewayId = null;
+    }
+  }
+
+  public String getCreatedUser() {
+    return this.createdUser;
+  }
+
+  public void setCreatedUser(String createdUser) {
+    this.createdUser = createdUser;
+  }
+
+  public void unsetCreatedUser() {
+    this.createdUser = null;
+  }
+
+  /** Returns true if field createdUser is set (has been assigned a value) and false otherwise */
+  public boolean isSetCreatedUser() {
+    return this.createdUser != null;
+  }
+
+  public void setCreatedUserIsSet(boolean value) {
+    if (!value) {
+      this.createdUser = null;
+    }
+  }
+
   public byte[] getImage() {
     setImage(org.apache.thrift.TBaseHelper.rightSize(image));
     return image == null ? null : image.array();
@@ -411,6 +496,28 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
     }
   }
 
+  public long getCreationTime() {
+    return this.creationTime;
+  }
+
+  public void setCreationTime(long creationTime) {
+    this.creationTime = creationTime;
+    setCreationTimeIsSet(true);
+  }
+
+  public void unsetCreationTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+  }
+
+  /** Returns true if field creationTime is set (has been assigned a value) and false otherwise */
+  public boolean isSetCreationTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+  }
+
+  public void setCreationTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value);
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TEMPLATE_ID:
@@ -437,6 +544,22 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       }
       break;
 
+    case GATEWAY_ID:
+      if (value == null) {
+        unsetGatewayId();
+      } else {
+        setGatewayId((String)value);
+      }
+      break;
+
+    case CREATED_USER:
+      if (value == null) {
+        unsetCreatedUser();
+      } else {
+        setCreatedUser((String)value);
+      }
+      break;
+
     case IMAGE:
       if (value == null) {
         unsetImage();
@@ -461,6 +584,14 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       }
       break;
 
+    case CREATION_TIME:
+      if (value == null) {
+        unsetCreationTime();
+      } else {
+        setCreationTime((Long)value);
+      }
+      break;
+
     }
   }
 
@@ -475,6 +606,12 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
     case GRAPH:
       return getGraph();
 
+    case GATEWAY_ID:
+      return getGatewayId();
+
+    case CREATED_USER:
+      return getCreatedUser();
+
     case IMAGE:
       return getImage();
 
@@ -484,6 +621,9 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
     case WORKFLOW_OUTPUTS:
       return getWorkflowOutputs();
 
+    case CREATION_TIME:
+      return getCreationTime();
+
     }
     throw new IllegalStateException();
   }
@@ -501,12 +641,18 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       return isSetName();
     case GRAPH:
       return isSetGraph();
+    case GATEWAY_ID:
+      return isSetGatewayId();
+    case CREATED_USER:
+      return isSetCreatedUser();
     case IMAGE:
       return isSetImage();
     case WORKFLOW_INPUTS:
       return isSetWorkflowInputs();
     case WORKFLOW_OUTPUTS:
       return isSetWorkflowOutputs();
+    case CREATION_TIME:
+      return isSetCreationTime();
     }
     throw new IllegalStateException();
   }
@@ -551,6 +697,24 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
         return false;
     }
 
+    boolean this_present_gatewayId = true && this.isSetGatewayId();
+    boolean that_present_gatewayId = true && that.isSetGatewayId();
+    if (this_present_gatewayId || that_present_gatewayId) {
+      if (!(this_present_gatewayId && that_present_gatewayId))
+        return false;
+      if (!this.gatewayId.equals(that.gatewayId))
+        return false;
+    }
+
+    boolean this_present_createdUser = true && this.isSetCreatedUser();
+    boolean that_present_createdUser = true && that.isSetCreatedUser();
+    if (this_present_createdUser || that_present_createdUser) {
+      if (!(this_present_createdUser && that_present_createdUser))
+        return false;
+      if (!this.createdUser.equals(that.createdUser))
+        return false;
+    }
+
     boolean this_present_image = true && this.isSetImage();
     boolean that_present_image = true && that.isSetImage();
     if (this_present_image || that_present_image) {
@@ -578,6 +742,15 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
         return false;
     }
 
+    boolean this_present_creationTime = true && this.isSetCreationTime();
+    boolean that_present_creationTime = true && that.isSetCreationTime();
+    if (this_present_creationTime || that_present_creationTime) {
+      if (!(this_present_creationTime && that_present_creationTime))
+        return false;
+      if (this.creationTime != that.creationTime)
+        return false;
+    }
+
     return true;
   }
 
@@ -600,6 +773,16 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
     if (present_graph)
       list.add(graph);
 
+    boolean present_gatewayId = true && (isSetGatewayId());
+    list.add(present_gatewayId);
+    if (present_gatewayId)
+      list.add(gatewayId);
+
+    boolean present_createdUser = true && (isSetCreatedUser());
+    list.add(present_createdUser);
+    if (present_createdUser)
+      list.add(createdUser);
+
     boolean present_image = true && (isSetImage());
     list.add(present_image);
     if (present_image)
@@ -615,6 +798,11 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
     if (present_workflowOutputs)
       list.add(workflowOutputs);
 
+    boolean present_creationTime = true && (isSetCreationTime());
+    list.add(present_creationTime);
+    if (present_creationTime)
+      list.add(creationTime);
+
     return list.hashCode();
   }
 
@@ -656,6 +844,26 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetCreatedUser()).compareTo(other.isSetCreatedUser());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCreatedUser()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createdUser, other.createdUser);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetImage()).compareTo(other.isSetImage());
     if (lastComparison != 0) {
       return lastComparison;
@@ -686,6 +894,16 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCreationTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creationTime, other.creationTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -729,6 +947,22 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       sb.append(this.graph);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("gatewayId:");
+    if (this.gatewayId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.gatewayId);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("createdUser:");
+    if (this.createdUser == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.createdUser);
+    }
+    first = false;
     if (isSetImage()) {
       if (!first) sb.append(", ");
       sb.append("image:");
@@ -759,6 +993,12 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       }
       first = false;
     }
+    if (isSetCreationTime()) {
+      if (!first) sb.append(", ");
+      sb.append("creationTime:");
+      sb.append(this.creationTime);
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -777,6 +1017,14 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'graph' is unset! Struct:" + toString());
     }
 
+    if (!isSetGatewayId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
+    }
+
+    if (!isSetCreatedUser()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'createdUser' is unset! Struct:" + toString());
+    }
+
     // check for sub-struct validity
   }
 
@@ -790,6 +1038,8 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
 
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
     try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bitfield = 0;
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
       throw new java.io.IOException(te);
@@ -838,7 +1088,23 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // IMAGE
+          case 4: // GATEWAY_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.gatewayId = iprot.readString();
+              struct.setGatewayIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 5: // CREATED_USER
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.createdUser = iprot.readString();
+              struct.setCreatedUserIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 6: // IMAGE
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.image = iprot.readBinary();
               struct.setImageIsSet(true);
@@ -846,7 +1112,7 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 5: // WORKFLOW_INPUTS
+          case 7: // WORKFLOW_INPUTS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -865,7 +1131,7 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 6: // WORKFLOW_OUTPUTS
+          case 8: // WORKFLOW_OUTPUTS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
@@ -884,6 +1150,14 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 9: // CREATION_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.creationTime = iprot.readI64();
+              struct.setCreationTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -912,6 +1186,16 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
         oprot.writeString(struct.graph);
         oprot.writeFieldEnd();
       }
+      if (struct.gatewayId != null) {
+        oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+        oprot.writeString(struct.gatewayId);
+        oprot.writeFieldEnd();
+      }
+      if (struct.createdUser != null) {
+        oprot.writeFieldBegin(CREATED_USER_FIELD_DESC);
+        oprot.writeString(struct.createdUser);
+        oprot.writeFieldEnd();
+      }
       if (struct.image != null) {
         if (struct.isSetImage()) {
           oprot.writeFieldBegin(IMAGE_FIELD_DESC);
@@ -947,6 +1231,11 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
           oprot.writeFieldEnd();
         }
       }
+      if (struct.isSetCreationTime()) {
+        oprot.writeFieldBegin(CREATION_TIME_FIELD_DESC);
+        oprot.writeI64(struct.creationTime);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -967,6 +1256,8 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       oprot.writeString(struct.templateId);
       oprot.writeString(struct.name);
       oprot.writeString(struct.graph);
+      oprot.writeString(struct.gatewayId);
+      oprot.writeString(struct.createdUser);
       BitSet optionals = new BitSet();
       if (struct.isSetImage()) {
         optionals.set(0);
@@ -977,7 +1268,10 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       if (struct.isSetWorkflowOutputs()) {
         optionals.set(2);
       }
-      oprot.writeBitSet(optionals, 3);
+      if (struct.isSetCreationTime()) {
+        optionals.set(3);
+      }
+      oprot.writeBitSet(optionals, 4);
       if (struct.isSetImage()) {
         oprot.writeBinary(struct.image);
       }
@@ -999,6 +1293,9 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
           }
         }
       }
+      if (struct.isSetCreationTime()) {
+        oprot.writeI64(struct.creationTime);
+      }
     }
 
     @Override
@@ -1010,7 +1307,11 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
       struct.setNameIsSet(true);
       struct.graph = iprot.readString();
       struct.setGraphIsSet(true);
-      BitSet incoming = iprot.readBitSet(3);
+      struct.gatewayId = iprot.readString();
+      struct.setGatewayIdIsSet(true);
+      struct.createdUser = iprot.readString();
+      struct.setCreatedUserIsSet(true);
+      BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.image = iprot.readBinary();
         struct.setImageIsSet(true);
@@ -1043,6 +1344,10 @@ public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, Wor
         }
         struct.setWorkflowOutputsIsSet(true);
       }
+      if (incoming.get(3)) {
+        struct.creationTime = iprot.readI64();
+        struct.setCreationTimeIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/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 73734fb..3bbf0e2 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 afc2676..4f90002 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 ee692aa..225d9f6 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 83a84d2..f084438 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 bcb07f2..54df732 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 55d01e9..d04730d 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 67c7e8c..25a4b80 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 41dc771..f5882f0 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 59e1aa7..646a3b0 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 f2d5373..2770672 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 8f5223d..10b3e39 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 dc668bf..59a0772 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 4c4625c..6308423 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 9bc872b..ebb50b1 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 3f46339..845d5bd 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 ecd7e92..8f491e5 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 30618bf..50afe23 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 ecf9a19..a45eade 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 a9cff44..c35418e 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 48cdfa9..aa6c336 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 ecf9c81..b8aadc9 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 53a1033..5256129 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 d15c4f6..bcc5409 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 04af60a..70a9300 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 a5bd0e1..7c292ff 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 33db137..8186dd4 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 4a17491..996adcd 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 c7f19e0..f26fc17 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 9df1652..72a90ff 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 9b47ccf..133e785 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 99f8a4b..072c6b8 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 6f73429..78a77fe 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 e49da35..234fed7 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 b21687a..60aa2eb 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 4f59bbc..0171222 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 2ac05f6..fe4a7db 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 b627edc..93e1ddb 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 9ae7684..261b25e 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 ca66bcf..6f20575 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 825d84b..4fe78c7 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 87f946c..52c26e9 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 2316664..be375ff 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 41e3dd0..4de630b 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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/4c790770/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 959863c..ffca7a4 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-01")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-08")
 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");