You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/07/12 18:54:46 UTC
[01/11] airavata git commit: Adding extra fields to create gateway
approval workflow
Repository: airavata
Updated Branches:
refs/heads/master 714fcae8c -> 2a3b3489d
Adding extra fields to create gateway approval workflow
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9ced6738
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9ced6738
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9ced6738
Branch: refs/heads/master
Commit: 9ced67388e553a59420bfd4c637520b67b923d48
Parents: 4260622
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Jul 11 09:44:42 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Jul 11 09:44:42 2016 -0400
----------------------------------------------------------------------
.../workspace_model.thrift | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ced6738/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
index f2532dd..ebc6d4a 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
@@ -55,11 +55,24 @@ struct User {
2: optional list<Group> groupList
}
+enum GatewayApprovalStatus {
+ REQUESTED,
+ APPROVED,
+ APPROVED,
+ ACTIVE,
+ DEACTIVATED
+}
+
struct Gateway {
1: required string gatewayId,
- 2: optional string gatewayName,
- 3: optional string domain,
- 4: optional string emailAddress
+ 2: required GatewayApprovalStatus gatewayApprovalStatus,
+ 3: optional string gatewayName,
+ 4: optional string domain,
+ 5: optional string emailAddress
+ 6: optional string gatewayAcronym,
+ 7: optional string gatewayURL,
+ 8: optional string gatewayPublicAbstract,
+ 9: optional string reviewProposalDescription
}
enum NotificationPriority {
[02/11] airavata git commit: WIP
Posted by sh...@apache.org.
WIP
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f85d41ae
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f85d41ae
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f85d41ae
Branch: refs/heads/master
Commit: f85d41ae4bd96db022fff9aa0e59c2a7c4caf589
Parents: 9ced673
Author: scnakandala <su...@gmail.com>
Authored: Mon Jul 11 12:27:50 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jul 11 12:27:50 2016 -0400
----------------------------------------------------------------------
.../catalog/impl/GatewayRegistry.java | 6 +++
.../core/experiment/catalog/model/Gateway.java | 53 +++++++++++++++++++-
.../catalog/resources/GatewayResource.java | 53 ++++++++++++++++++++
3 files changed, 111 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f85d41ae/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
index 4fb29e5..eb2f221 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
@@ -52,6 +52,12 @@ public class GatewayRegistry {
resource.setGatewayName(gateway.getGatewayName());
resource.setEmailAddress(gateway.getEmailAddress());
resource.setDomain(gateway.getDomain());
+// resource.setGatewayAcronym(gateway.getG);
+//
+// gateway.setGatewayAcronym(gatewayAcronym);
+// gateway.setGatewayUrl(gatewayUrl);
+// gateway.setGatewayPublicAbstract(gatewayPublicAbstract);
+// gateway.setReviewProposalDescription(reviewProposalDescription);
resource.save();
return gateway.getGatewayId();
}catch (RegistryException e){
http://git-wip-us.apache.org/repos/asf/airavata/blob/f85d41ae/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
index bb045b8..2c301f1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
@@ -34,6 +34,11 @@ public class Gateway {
private String gatewayName;
private String domain;
private String emailAddress;
+ private String gatewayApprovalStatus;
+ private String gatewayAcronym;
+ private String gatewayUrl;
+ private String gatewayPublicAbstract;
+ private String reviewProposalDescription;
private Collection<GatewayWorker> gatewayWorkers;
private Collection<Project> projects;
@@ -74,7 +79,53 @@ public class Gateway {
this.emailAddress = emailAddress;
}
-// @Override
+ @Column(name = "GATEWAY_APPROVAL_STATUS")
+ public String getGatewayApprovalStatus() {
+ return gatewayApprovalStatus;
+ }
+
+ public void setGatewayApprovalStatus(String gatewayApprovalStatus) {
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
+ }
+
+ @Column(name = "GATEWAY_ACRONYM")
+ public String getGatewayAcronym() {
+ return gatewayAcronym;
+ }
+
+ public void setGatewayAcronym(String gatewayAcronym) {
+ this.gatewayAcronym = gatewayAcronym;
+ }
+
+ @Column(name = "GATEWAY_URL")
+ public String getGatewayUrl() {
+ return gatewayUrl;
+ }
+
+ public void setGatewayUrl(String gatewayUrl) {
+ this.gatewayUrl = gatewayUrl;
+ }
+
+ @Column(name = "GATEWAY_PUBLIC_ABSTRACT")
+ public String getGatewayPublicAbstract() {
+ return gatewayPublicAbstract;
+ }
+
+ public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
+ this.gatewayPublicAbstract = gatewayPublicAbstract;
+ }
+
+ @Column(name = "GATEWAY_REVIEW_PROPOSAL_DESCRIPTION")
+ public String getReviewProposalDescription() {
+ return reviewProposalDescription;
+ }
+
+ public void setReviewProposalDescription(String reviewProposalDescription) {
+ this.reviewProposalDescription = reviewProposalDescription;
+ }
+
+
+ // @Override
// public boolean equals(Object o) {
// if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false;
http://git-wip-us.apache.org/repos/asf/airavata/blob/f85d41ae/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index 8266543..b5faa47 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -41,6 +41,11 @@ public class GatewayResource extends AbstractExpCatResource {
private String gatewayName;
private String domain;
private String emailAddress;
+ private String gatewayApprovalStatus;
+ private String gatewayAcronym;
+ private String gatewayUrl;
+ private String gatewayPublicAbstract;
+ private String reviewProposalDescription;
public String getGatewayId() {
return gatewayId;
@@ -58,6 +63,46 @@ public class GatewayResource extends AbstractExpCatResource {
this.emailAddress = emailAddress;
}
+ public String getGatewayApprovalStatus() {
+ return gatewayApprovalStatus;
+ }
+
+ public void setGatewayApprovalStatus(String gatewayApprovalStatus) {
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
+ }
+
+ public String getGatewayAcronym() {
+ return gatewayAcronym;
+ }
+
+ public void setGatewayAcronym(String gatewayAcronym) {
+ this.gatewayAcronym = gatewayAcronym;
+ }
+
+ public String getGatewayUrl() {
+ return gatewayUrl;
+ }
+
+ public void setGatewayUrl(String gatewayUrl) {
+ this.gatewayUrl = gatewayUrl;
+ }
+
+ public String getGatewayPublicAbstract() {
+ return gatewayPublicAbstract;
+ }
+
+ public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
+ this.gatewayPublicAbstract = gatewayPublicAbstract;
+ }
+
+ public String getReviewProposalDescription() {
+ return reviewProposalDescription;
+ }
+
+ public void setReviewProposalDescription(String reviewProposalDescription) {
+ this.reviewProposalDescription = reviewProposalDescription;
+ }
+
/**
*
* @param gatewayId gateway name
@@ -332,10 +377,18 @@ public class GatewayResource extends AbstractExpCatResource {
gateway.setGatewayId(gatewayId);
gateway.setDomain(domain);
gateway.setEmailAddress(emailAddress);
+ gateway.setGatewayAcronym(gatewayAcronym);
+ gateway.setGatewayUrl(gatewayUrl);
+ gateway.setGatewayPublicAbstract(gatewayPublicAbstract);
+ gateway.setReviewProposalDescription(reviewProposalDescription);
if (existingGateway != null) {
existingGateway.setDomain(domain);
existingGateway.setGatewayName(gatewayName);
existingGateway.setEmailAddress(emailAddress);
+ existingGateway.setGatewayAcronym(gatewayAcronym);
+ existingGateway.setGatewayUrl(gatewayUrl);
+ existingGateway.setGatewayPublicAbstract(gatewayPublicAbstract);
+ existingGateway.setReviewProposalDescription(reviewProposalDescription);
em.merge(existingGateway);
} else {
em.persist(gateway);
[09/11] airavata git commit: adding more fields to the gateway Model
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 8b2fbe8..669236b 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 d8506f4..059e53a 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 141c494..231912f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 25a639b..29ec52d 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 d3d6096..de229ab 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 d572df7..ba2b876 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 648139f..0836709 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 fd28a7a..0f36407 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 baa05e5..02612c3 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 9034eb6..1736702 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 7fae4fb..9608bd8 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 043ea3b..2a171a2 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 1de24f8..87c640e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 dec2256..78417e7 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 524888d..9e95bc7 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 b27d3bc..3c129be 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
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* identityServerPwdCredToken:
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 dd0949c..e705fe0 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 c159cd3..a7ca1f2 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 7eb3f0b..31afb43 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 a02d3a6..8e31392 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 9807d44..5c5a927 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 9d81f4c..ff38771 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 57494ba..e97ffb4 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 d3066d3..b0bae82 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 b70acb9..86ba396 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 d10cf9b..2984c80 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 c0ce0fc..c66847c 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 471eb25..72a38fe 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
index 38c5056..32a9400 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class DataProductModel implements org.apache.thrift.TBase<DataProductModel, DataProductModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataProductModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataProductModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
index d163609..7bb3cb9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 40145be..c46101b 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 20e109d..85506d1 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 57d3440..8f1a226 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 5f4a333..50047ca 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 1a9761c..912487b 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 9ca3cfe..ab0d5cd 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 bb14ef8..6ef9081 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 2cb70c6..946b3f2 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 1760f95..481aea1 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 8362503..b8c2a5f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 6f1704b..878a33f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 da66e7d..b753f91 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 6230a41..2e91720 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 06fbea6..7abe9bb 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 7f5e40a..b1a8f92 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 ead501e..58c331e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 2f8f94f..f7ac2ce 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 d854bf5..67c1867 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 54a4105..50248a7 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 5faeaef..e66e973 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 8901f85..0b3e86f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 b0b3169..00c983b 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 f1e97ec..b587ff3 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 8b6da4b..18fc0f2 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 ace3c91..053d679 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 367820d..cfcf651 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 140c404..ebcb05f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 714f267..15324db 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 20fdd62..5422455 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 0ea390b..2ad8602 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 006d391..9dac288 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 5214e17..cff821e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 87a90c3..c447d7c 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 b6a4fcf..09e278a 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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");
[03/11] airavata git commit: adding more fields to the gateway Model
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 ad5d994..0443043 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 01a1932..f44a5c7 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 a46a3c6..abbbedb 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 2858048..8097b92 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 4286a11..d19c340 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 a7fc645..461b01e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 f455b3a..8fd72cb 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 ab3a5f6..0819236 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
index 0a13976..9fc5644 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class NSFDemographics implements org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, java.io.Serializable, Cloneable, Comparable<NSFDemographics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NSFDemographics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
index ff2b2cb..67e4161 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
* * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
* *
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserProfile");
@@ -112,22 +112,21 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField EMAILS_FIELD_DESC = new org.apache.thrift.protocol.TField("emails", org.apache.thrift.protocol.TType.LIST, (short)4);
private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)5);
- 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)6);
- private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orcidId", org.apache.thrift.protocol.TType.STRING, (short)7);
- private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = new org.apache.thrift.protocol.TField("phones", org.apache.thrift.protocol.TType.LIST, (short)8);
- private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("country", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", org.apache.thrift.protocol.TType.LIST, (short)10);
- private static final org.apache.thrift.protocol.TField HOME_ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("homeOrganization", org.apache.thrift.protocol.TType.STRING, (short)11);
- private static final org.apache.thrift.protocol.TField ORGINATION_AFFILIATION_FIELD_DESC = new org.apache.thrift.protocol.TField("orginationAffiliation", org.apache.thrift.protocol.TType.STRING, (short)12);
- private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.STRING, (short)13);
- private static final org.apache.thrift.protocol.TField LAST_ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastAccessTime", org.apache.thrift.protocol.TType.STRING, (short)14);
- private static final org.apache.thrift.protocol.TField VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", org.apache.thrift.protocol.TType.STRING, (short)15);
- private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("State", org.apache.thrift.protocol.TType.I32, (short)16);
- private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("comments", org.apache.thrift.protocol.TType.STRING, (short)17);
- private static final org.apache.thrift.protocol.TField LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", org.apache.thrift.protocol.TType.LIST, (short)18);
- private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("gpgKey", org.apache.thrift.protocol.TType.STRING, (short)19);
- private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeZone", org.apache.thrift.protocol.TType.STRING, (short)20);
- private static final org.apache.thrift.protocol.TField NSF_DEMOGRAPHICS_FIELD_DESC = new org.apache.thrift.protocol.TField("nsfDemographics", org.apache.thrift.protocol.TType.STRUCT, (short)21);
+ private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orcidId", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = new org.apache.thrift.protocol.TField("phones", org.apache.thrift.protocol.TType.LIST, (short)7);
+ private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("country", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", org.apache.thrift.protocol.TType.LIST, (short)9);
+ private static final org.apache.thrift.protocol.TField HOME_ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("homeOrganization", org.apache.thrift.protocol.TType.STRING, (short)10);
+ private static final org.apache.thrift.protocol.TField ORGINATION_AFFILIATION_FIELD_DESC = new org.apache.thrift.protocol.TField("orginationAffiliation", org.apache.thrift.protocol.TType.STRING, (short)11);
+ private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.STRING, (short)12);
+ private static final org.apache.thrift.protocol.TField LAST_ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastAccessTime", org.apache.thrift.protocol.TType.STRING, (short)13);
+ private static final org.apache.thrift.protocol.TField VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", org.apache.thrift.protocol.TType.STRING, (short)14);
+ private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("State", org.apache.thrift.protocol.TType.I32, (short)15);
+ private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("comments", org.apache.thrift.protocol.TType.STRING, (short)16);
+ private static final org.apache.thrift.protocol.TField LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", org.apache.thrift.protocol.TType.LIST, (short)17);
+ private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("gpgKey", org.apache.thrift.protocol.TType.STRING, (short)18);
+ private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeZone", org.apache.thrift.protocol.TType.STRING, (short)19);
+ private static final org.apache.thrift.protocol.TField NSF_DEMOGRAPHICS_FIELD_DESC = new org.apache.thrift.protocol.TField("nsfDemographics", org.apache.thrift.protocol.TType.STRUCT, (short)20);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -140,7 +139,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
private String userId; // required
private List<String> emails; // required
private String userName; // optional
- private String gatewayId; // optional
private String orcidId; // optional
private List<String> phones; // optional
private String country; // optional
@@ -164,26 +162,25 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
USER_ID((short)3, "userId"),
EMAILS((short)4, "emails"),
USER_NAME((short)5, "userName"),
- GATEWAY_ID((short)6, "gatewayId"),
- ORCID_ID((short)7, "orcidId"),
- PHONES((short)8, "phones"),
- COUNTRY((short)9, "country"),
- NATIONALITY((short)10, "nationality"),
- HOME_ORGANIZATION((short)11, "homeOrganization"),
- ORGINATION_AFFILIATION((short)12, "orginationAffiliation"),
- CREATION_TIME((short)13, "creationTime"),
- LAST_ACCESS_TIME((short)14, "lastAccessTime"),
- VALID_UNTIL((short)15, "validUntil"),
+ ORCID_ID((short)6, "orcidId"),
+ PHONES((short)7, "phones"),
+ COUNTRY((short)8, "country"),
+ NATIONALITY((short)9, "nationality"),
+ HOME_ORGANIZATION((short)10, "homeOrganization"),
+ ORGINATION_AFFILIATION((short)11, "orginationAffiliation"),
+ CREATION_TIME((short)12, "creationTime"),
+ LAST_ACCESS_TIME((short)13, "lastAccessTime"),
+ VALID_UNTIL((short)14, "validUntil"),
/**
*
* @see Status
*/
- STATE((short)16, "State"),
- COMMENTS((short)17, "comments"),
- LABELED_URI((short)18, "labeledURI"),
- GPG_KEY((short)19, "gpgKey"),
- TIME_ZONE((short)20, "timeZone"),
- NSF_DEMOGRAPHICS((short)21, "nsfDemographics");
+ STATE((short)15, "State"),
+ COMMENTS((short)16, "comments"),
+ LABELED_URI((short)17, "labeledURI"),
+ GPG_KEY((short)18, "gpgKey"),
+ TIME_ZONE((short)19, "timeZone"),
+ NSF_DEMOGRAPHICS((short)20, "nsfDemographics");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -208,37 +205,35 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
return EMAILS;
case 5: // USER_NAME
return USER_NAME;
- case 6: // GATEWAY_ID
- return GATEWAY_ID;
- case 7: // ORCID_ID
+ case 6: // ORCID_ID
return ORCID_ID;
- case 8: // PHONES
+ case 7: // PHONES
return PHONES;
- case 9: // COUNTRY
+ case 8: // COUNTRY
return COUNTRY;
- case 10: // NATIONALITY
+ case 9: // NATIONALITY
return NATIONALITY;
- case 11: // HOME_ORGANIZATION
+ case 10: // HOME_ORGANIZATION
return HOME_ORGANIZATION;
- case 12: // ORGINATION_AFFILIATION
+ case 11: // ORGINATION_AFFILIATION
return ORGINATION_AFFILIATION;
- case 13: // CREATION_TIME
+ case 12: // CREATION_TIME
return CREATION_TIME;
- case 14: // LAST_ACCESS_TIME
+ case 13: // LAST_ACCESS_TIME
return LAST_ACCESS_TIME;
- case 15: // VALID_UNTIL
+ case 14: // VALID_UNTIL
return VALID_UNTIL;
- case 16: // STATE
+ case 15: // STATE
return STATE;
- case 17: // COMMENTS
+ case 16: // COMMENTS
return COMMENTS;
- case 18: // LABELED_URI
+ case 17: // LABELED_URI
return LABELED_URI;
- case 19: // GPG_KEY
+ case 18: // GPG_KEY
return GPG_KEY;
- case 20: // TIME_ZONE
+ case 19: // TIME_ZONE
return TIME_ZONE;
- case 21: // NSF_DEMOGRAPHICS
+ case 20: // NSF_DEMOGRAPHICS
return NSF_DEMOGRAPHICS;
default:
return null;
@@ -280,7 +275,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.USER_NAME,_Fields.GATEWAY_ID,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS};
+ private static final _Fields optionals[] = {_Fields.USER_NAME,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS};
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);
@@ -295,8 +290,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
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.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ORCID_ID, new org.apache.thrift.meta_data.FieldMetaData("orcidId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.PHONES, new org.apache.thrift.meta_data.FieldMetaData("phones", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -382,9 +375,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
if (other.isSetUserName()) {
this.userName = other.userName;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
if (other.isSetOrcidId()) {
this.orcidId = other.orcidId;
}
@@ -448,7 +438,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
this.userId = null;
this.emails = null;
this.userName = null;
- this.gatewayId = null;
this.orcidId = null;
this.phones = null;
this.country = null;
@@ -596,29 +585,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
}
- 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 getOrcidId() {
return this.orcidId;
}
@@ -1059,14 +1025,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
case ORCID_ID:
if (value == null) {
unsetOrcidId();
@@ -1207,9 +1165,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
case USER_NAME:
return getUserName();
- case GATEWAY_ID:
- return getGatewayId();
-
case ORCID_ID:
return getOrcidId();
@@ -1276,8 +1231,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
return isSetEmails();
case USER_NAME:
return isSetUserName();
- case GATEWAY_ID:
- return isSetGatewayId();
case ORCID_ID:
return isSetOrcidId();
case PHONES:
@@ -1370,15 +1323,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
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_orcidId = true && this.isSetOrcidId();
boolean that_present_orcidId = true && that.isSetOrcidId();
if (this_present_orcidId || that_present_orcidId) {
@@ -1546,11 +1490,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
if (present_userName)
list.add(userName);
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
boolean present_orcidId = true && (isSetOrcidId());
list.add(present_orcidId);
if (present_orcidId)
@@ -1687,16 +1626,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
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(isSetOrcidId()).compareTo(other.isSetOrcidId());
if (lastComparison != 0) {
return lastComparison;
@@ -1908,16 +1837,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
first = false;
}
- if (isSetGatewayId()) {
- if (!first) sb.append(", ");
- sb.append("gatewayId:");
- if (this.gatewayId == null) {
- sb.append("null");
- } else {
- sb.append(this.gatewayId);
- }
- first = false;
- }
if (isSetOrcidId()) {
if (!first) sb.append(", ");
sb.append("orcidId:");
@@ -2188,15 +2107,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // 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 7: // ORCID_ID
+ case 6: // ORCID_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.orcidId = iprot.readString();
struct.setOrcidIdIsSet(true);
@@ -2204,7 +2115,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // PHONES
+ case 7: // PHONES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list27 = iprot.readListBegin();
@@ -2222,7 +2133,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // COUNTRY
+ case 8: // COUNTRY
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.country = iprot.readString();
struct.setCountryIsSet(true);
@@ -2230,7 +2141,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // NATIONALITY
+ case 9: // NATIONALITY
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
@@ -2248,7 +2159,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 11: // HOME_ORGANIZATION
+ case 10: // HOME_ORGANIZATION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.homeOrganization = iprot.readString();
struct.setHomeOrganizationIsSet(true);
@@ -2256,7 +2167,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // ORGINATION_AFFILIATION
+ case 11: // ORGINATION_AFFILIATION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.orginationAffiliation = iprot.readString();
struct.setOrginationAffiliationIsSet(true);
@@ -2264,7 +2175,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 13: // CREATION_TIME
+ case 12: // CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.creationTime = iprot.readString();
struct.setCreationTimeIsSet(true);
@@ -2272,7 +2183,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 14: // LAST_ACCESS_TIME
+ case 13: // LAST_ACCESS_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.lastAccessTime = iprot.readString();
struct.setLastAccessTimeIsSet(true);
@@ -2280,7 +2191,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 15: // VALID_UNTIL
+ case 14: // VALID_UNTIL
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.validUntil = iprot.readString();
struct.setValidUntilIsSet(true);
@@ -2288,7 +2199,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 16: // STATE
+ case 15: // STATE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.State = org.apache.airavata.model.user.Status.findByValue(iprot.readI32());
struct.setStateIsSet(true);
@@ -2296,7 +2207,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 17: // COMMENTS
+ case 16: // COMMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.comments = iprot.readString();
struct.setCommentsIsSet(true);
@@ -2304,7 +2215,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 18: // LABELED_URI
+ case 17: // LABELED_URI
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list33 = iprot.readListBegin();
@@ -2322,7 +2233,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 19: // GPG_KEY
+ case 18: // GPG_KEY
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.gpgKey = iprot.readString();
struct.setGpgKeyIsSet(true);
@@ -2330,7 +2241,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 20: // TIME_ZONE
+ case 19: // TIME_ZONE
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.timeZone = iprot.readString();
struct.setTimeZoneIsSet(true);
@@ -2338,7 +2249,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 21: // NSF_DEMOGRAPHICS
+ case 20: // NSF_DEMOGRAPHICS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.nsfDemographics = new NSFDemographics();
struct.nsfDemographics.read(iprot);
@@ -2394,13 +2305,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
oprot.writeFieldEnd();
}
}
- if (struct.gatewayId != null) {
- if (struct.isSetGatewayId()) {
- oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.gatewayId);
- oprot.writeFieldEnd();
- }
- }
if (struct.orcidId != null) {
if (struct.isSetOrcidId()) {
oprot.writeFieldBegin(ORCID_ID_FIELD_DESC);
@@ -2554,49 +2458,43 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
if (struct.isSetUserName()) {
optionals.set(0);
}
- if (struct.isSetGatewayId()) {
- optionals.set(1);
- }
if (struct.isSetOrcidId()) {
- optionals.set(2);
+ optionals.set(1);
}
if (struct.isSetPhones()) {
- optionals.set(3);
+ optionals.set(2);
}
if (struct.isSetCountry()) {
- optionals.set(4);
+ optionals.set(3);
}
if (struct.isSetNationality()) {
- optionals.set(5);
+ optionals.set(4);
}
if (struct.isSetHomeOrganization()) {
- optionals.set(6);
+ optionals.set(5);
}
if (struct.isSetOrginationAffiliation()) {
- optionals.set(7);
+ optionals.set(6);
}
if (struct.isSetComments()) {
- optionals.set(8);
+ optionals.set(7);
}
if (struct.isSetLabeledURI()) {
- optionals.set(9);
+ optionals.set(8);
}
if (struct.isSetGpgKey()) {
- optionals.set(10);
+ optionals.set(9);
}
if (struct.isSetTimeZone()) {
- optionals.set(11);
+ optionals.set(10);
}
if (struct.isSetNsfDemographics()) {
- optionals.set(12);
+ optionals.set(11);
}
- oprot.writeBitSet(optionals, 13);
+ oprot.writeBitSet(optionals, 12);
if (struct.isSetUserName()) {
oprot.writeString(struct.userName);
}
- if (struct.isSetGatewayId()) {
- oprot.writeString(struct.gatewayId);
- }
if (struct.isSetOrcidId()) {
oprot.writeString(struct.orcidId);
}
@@ -2678,20 +2576,16 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
struct.setValidUntilIsSet(true);
struct.State = org.apache.airavata.model.user.Status.findByValue(iprot.readI32());
struct.setStateIsSet(true);
- BitSet incoming = iprot.readBitSet(13);
+ BitSet incoming = iprot.readBitSet(12);
if (incoming.get(0)) {
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
}
if (incoming.get(1)) {
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
- }
- if (incoming.get(2)) {
struct.orcidId = iprot.readString();
struct.setOrcidIdIsSet(true);
}
- if (incoming.get(3)) {
+ if (incoming.get(2)) {
{
org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.phones = new ArrayList<String>(_list47.size);
@@ -2704,11 +2598,11 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
struct.setPhonesIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(3)) {
struct.country = iprot.readString();
struct.setCountryIsSet(true);
}
- if (incoming.get(5)) {
+ if (incoming.get(4)) {
{
org.apache.thrift.protocol.TList _list50 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.nationality = new ArrayList<String>(_list50.size);
@@ -2721,19 +2615,19 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
struct.setNationalityIsSet(true);
}
- if (incoming.get(6)) {
+ if (incoming.get(5)) {
struct.homeOrganization = iprot.readString();
struct.setHomeOrganizationIsSet(true);
}
- if (incoming.get(7)) {
+ if (incoming.get(6)) {
struct.orginationAffiliation = iprot.readString();
struct.setOrginationAffiliationIsSet(true);
}
- if (incoming.get(8)) {
+ if (incoming.get(7)) {
struct.comments = iprot.readString();
struct.setCommentsIsSet(true);
}
- if (incoming.get(9)) {
+ if (incoming.get(8)) {
{
org.apache.thrift.protocol.TList _list53 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.labeledURI = new ArrayList<String>(_list53.size);
@@ -2746,15 +2640,15 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
struct.setLabeledURIIsSet(true);
}
- if (incoming.get(10)) {
+ if (incoming.get(9)) {
struct.gpgKey = iprot.readString();
struct.setGpgKeyIsSet(true);
}
- if (incoming.get(11)) {
+ if (incoming.get(10)) {
struct.timeZone = iprot.readString();
struct.setTimeZoneIsSet(true);
}
- if (incoming.get(12)) {
+ if (incoming.get(11)) {
struct.nsfDemographics = new NSFDemographics();
struct.nsfDemographics.read(iprot);
struct.setNsfDemographicsIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 272f096..123b4c5 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,14 +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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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");
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)1);
- private static final org.apache.thrift.protocol.TField GATEWAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayName", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField DOMAIN_FIELD_DESC = new org.apache.thrift.protocol.TField("domain", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField EMAIL_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddress", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField GATEWAY_APPROVAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayApprovalStatus", org.apache.thrift.protocol.TType.I32, (short)2);
+ private static final org.apache.thrift.protocol.TField GATEWAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayName", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField DOMAIN_FIELD_DESC = new org.apache.thrift.protocol.TField("domain", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField EMAIL_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddress", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField GATEWAY_ACRONYM_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayAcronym", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField GATEWAY_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayURL", org.apache.thrift.protocol.TType.STRING, (short)7);
+ private static final org.apache.thrift.protocol.TField GATEWAY_PUBLIC_ABSTRACT_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayPublicAbstract", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField REVIEW_PROPOSAL_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("reviewProposalDescription", org.apache.thrift.protocol.TType.STRING, (short)9);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -67,16 +72,30 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
private String gatewayId; // required
+ private GatewayApprovalStatus gatewayApprovalStatus; // required
private String gatewayName; // optional
private String domain; // optional
private String emailAddress; // optional
+ private String gatewayAcronym; // optional
+ private String gatewayURL; // optional
+ private String gatewayPublicAbstract; // optional
+ private String reviewProposalDescription; // 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 {
GATEWAY_ID((short)1, "gatewayId"),
- GATEWAY_NAME((short)2, "gatewayName"),
- DOMAIN((short)3, "domain"),
- EMAIL_ADDRESS((short)4, "emailAddress");
+ /**
+ *
+ * @see GatewayApprovalStatus
+ */
+ GATEWAY_APPROVAL_STATUS((short)2, "gatewayApprovalStatus"),
+ GATEWAY_NAME((short)3, "gatewayName"),
+ DOMAIN((short)4, "domain"),
+ EMAIL_ADDRESS((short)5, "emailAddress"),
+ GATEWAY_ACRONYM((short)6, "gatewayAcronym"),
+ GATEWAY_URL((short)7, "gatewayURL"),
+ GATEWAY_PUBLIC_ABSTRACT((short)8, "gatewayPublicAbstract"),
+ REVIEW_PROPOSAL_DESCRIPTION((short)9, "reviewProposalDescription");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -93,12 +112,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
switch(fieldId) {
case 1: // GATEWAY_ID
return GATEWAY_ID;
- case 2: // GATEWAY_NAME
+ case 2: // GATEWAY_APPROVAL_STATUS
+ return GATEWAY_APPROVAL_STATUS;
+ case 3: // GATEWAY_NAME
return GATEWAY_NAME;
- case 3: // DOMAIN
+ case 4: // DOMAIN
return DOMAIN;
- case 4: // EMAIL_ADDRESS
+ case 5: // EMAIL_ADDRESS
return EMAIL_ADDRESS;
+ case 6: // GATEWAY_ACRONYM
+ return GATEWAY_ACRONYM;
+ case 7: // GATEWAY_URL
+ return GATEWAY_URL;
+ case 8: // GATEWAY_PUBLIC_ABSTRACT
+ return GATEWAY_PUBLIC_ABSTRACT;
+ case 9: // REVIEW_PROPOSAL_DESCRIPTION
+ return REVIEW_PROPOSAL_DESCRIPTION;
default:
return null;
}
@@ -139,18 +168,28 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.GATEWAY_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS};
+ private static final _Fields optionals[] = {_Fields.GATEWAY_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS,_Fields.GATEWAY_ACRONYM,_Fields.GATEWAY_URL,_Fields.GATEWAY_PUBLIC_ABSTRACT,_Fields.REVIEW_PROPOSAL_DESCRIPTION};
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.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.GATEWAY_APPROVAL_STATUS, new org.apache.thrift.meta_data.FieldMetaData("gatewayApprovalStatus", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, GatewayApprovalStatus.class)));
tmpMap.put(_Fields.GATEWAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("gatewayName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.DOMAIN, new org.apache.thrift.meta_data.FieldMetaData("domain", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.EMAIL_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("emailAddress", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_ACRONYM, new org.apache.thrift.meta_data.FieldMetaData("gatewayAcronym", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_URL, new org.apache.thrift.meta_data.FieldMetaData("gatewayURL", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_PUBLIC_ABSTRACT, new org.apache.thrift.meta_data.FieldMetaData("gatewayPublicAbstract", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.REVIEW_PROPOSAL_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("reviewProposalDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Gateway.class, metaDataMap);
}
@@ -159,10 +198,12 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
public Gateway(
- String gatewayId)
+ String gatewayId,
+ GatewayApprovalStatus gatewayApprovalStatus)
{
this();
this.gatewayId = gatewayId;
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
}
/**
@@ -172,6 +213,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (other.isSetGatewayId()) {
this.gatewayId = other.gatewayId;
}
+ if (other.isSetGatewayApprovalStatus()) {
+ this.gatewayApprovalStatus = other.gatewayApprovalStatus;
+ }
if (other.isSetGatewayName()) {
this.gatewayName = other.gatewayName;
}
@@ -181,6 +225,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (other.isSetEmailAddress()) {
this.emailAddress = other.emailAddress;
}
+ if (other.isSetGatewayAcronym()) {
+ this.gatewayAcronym = other.gatewayAcronym;
+ }
+ if (other.isSetGatewayURL()) {
+ this.gatewayURL = other.gatewayURL;
+ }
+ if (other.isSetGatewayPublicAbstract()) {
+ this.gatewayPublicAbstract = other.gatewayPublicAbstract;
+ }
+ if (other.isSetReviewProposalDescription()) {
+ this.reviewProposalDescription = other.reviewProposalDescription;
+ }
}
public Gateway deepCopy() {
@@ -190,9 +246,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
@Override
public void clear() {
this.gatewayId = null;
+ this.gatewayApprovalStatus = null;
this.gatewayName = null;
this.domain = null;
this.emailAddress = null;
+ this.gatewayAcronym = null;
+ this.gatewayURL = null;
+ this.gatewayPublicAbstract = null;
+ this.reviewProposalDescription = null;
}
public String getGatewayId() {
@@ -218,6 +279,37 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
}
+ /**
+ *
+ * @see GatewayApprovalStatus
+ */
+ public GatewayApprovalStatus getGatewayApprovalStatus() {
+ return this.gatewayApprovalStatus;
+ }
+
+ /**
+ *
+ * @see GatewayApprovalStatus
+ */
+ public void setGatewayApprovalStatus(GatewayApprovalStatus gatewayApprovalStatus) {
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
+ }
+
+ public void unsetGatewayApprovalStatus() {
+ this.gatewayApprovalStatus = null;
+ }
+
+ /** Returns true if field gatewayApprovalStatus is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayApprovalStatus() {
+ return this.gatewayApprovalStatus != null;
+ }
+
+ public void setGatewayApprovalStatusIsSet(boolean value) {
+ if (!value) {
+ this.gatewayApprovalStatus = null;
+ }
+ }
+
public String getGatewayName() {
return this.gatewayName;
}
@@ -287,6 +379,98 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
}
+ public String getGatewayAcronym() {
+ return this.gatewayAcronym;
+ }
+
+ public void setGatewayAcronym(String gatewayAcronym) {
+ this.gatewayAcronym = gatewayAcronym;
+ }
+
+ public void unsetGatewayAcronym() {
+ this.gatewayAcronym = null;
+ }
+
+ /** Returns true if field gatewayAcronym is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayAcronym() {
+ return this.gatewayAcronym != null;
+ }
+
+ public void setGatewayAcronymIsSet(boolean value) {
+ if (!value) {
+ this.gatewayAcronym = null;
+ }
+ }
+
+ public String getGatewayURL() {
+ return this.gatewayURL;
+ }
+
+ public void setGatewayURL(String gatewayURL) {
+ this.gatewayURL = gatewayURL;
+ }
+
+ public void unsetGatewayURL() {
+ this.gatewayURL = null;
+ }
+
+ /** Returns true if field gatewayURL is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayURL() {
+ return this.gatewayURL != null;
+ }
+
+ public void setGatewayURLIsSet(boolean value) {
+ if (!value) {
+ this.gatewayURL = null;
+ }
+ }
+
+ public String getGatewayPublicAbstract() {
+ return this.gatewayPublicAbstract;
+ }
+
+ public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
+ this.gatewayPublicAbstract = gatewayPublicAbstract;
+ }
+
+ public void unsetGatewayPublicAbstract() {
+ this.gatewayPublicAbstract = null;
+ }
+
+ /** Returns true if field gatewayPublicAbstract is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayPublicAbstract() {
+ return this.gatewayPublicAbstract != null;
+ }
+
+ public void setGatewayPublicAbstractIsSet(boolean value) {
+ if (!value) {
+ this.gatewayPublicAbstract = null;
+ }
+ }
+
+ public String getReviewProposalDescription() {
+ return this.reviewProposalDescription;
+ }
+
+ public void setReviewProposalDescription(String reviewProposalDescription) {
+ this.reviewProposalDescription = reviewProposalDescription;
+ }
+
+ public void unsetReviewProposalDescription() {
+ this.reviewProposalDescription = null;
+ }
+
+ /** Returns true if field reviewProposalDescription is set (has been assigned a value) and false otherwise */
+ public boolean isSetReviewProposalDescription() {
+ return this.reviewProposalDescription != null;
+ }
+
+ public void setReviewProposalDescriptionIsSet(boolean value) {
+ if (!value) {
+ this.reviewProposalDescription = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case GATEWAY_ID:
@@ -297,6 +481,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
break;
+ case GATEWAY_APPROVAL_STATUS:
+ if (value == null) {
+ unsetGatewayApprovalStatus();
+ } else {
+ setGatewayApprovalStatus((GatewayApprovalStatus)value);
+ }
+ break;
+
case GATEWAY_NAME:
if (value == null) {
unsetGatewayName();
@@ -321,6 +513,38 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
break;
+ case GATEWAY_ACRONYM:
+ if (value == null) {
+ unsetGatewayAcronym();
+ } else {
+ setGatewayAcronym((String)value);
+ }
+ break;
+
+ case GATEWAY_URL:
+ if (value == null) {
+ unsetGatewayURL();
+ } else {
+ setGatewayURL((String)value);
+ }
+ break;
+
+ case GATEWAY_PUBLIC_ABSTRACT:
+ if (value == null) {
+ unsetGatewayPublicAbstract();
+ } else {
+ setGatewayPublicAbstract((String)value);
+ }
+ break;
+
+ case REVIEW_PROPOSAL_DESCRIPTION:
+ if (value == null) {
+ unsetReviewProposalDescription();
+ } else {
+ setReviewProposalDescription((String)value);
+ }
+ break;
+
}
}
@@ -329,6 +553,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
case GATEWAY_ID:
return getGatewayId();
+ case GATEWAY_APPROVAL_STATUS:
+ return getGatewayApprovalStatus();
+
case GATEWAY_NAME:
return getGatewayName();
@@ -338,6 +565,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
case EMAIL_ADDRESS:
return getEmailAddress();
+ case GATEWAY_ACRONYM:
+ return getGatewayAcronym();
+
+ case GATEWAY_URL:
+ return getGatewayURL();
+
+ case GATEWAY_PUBLIC_ABSTRACT:
+ return getGatewayPublicAbstract();
+
+ case REVIEW_PROPOSAL_DESCRIPTION:
+ return getReviewProposalDescription();
+
}
throw new IllegalStateException();
}
@@ -351,12 +590,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
switch (field) {
case GATEWAY_ID:
return isSetGatewayId();
+ case GATEWAY_APPROVAL_STATUS:
+ return isSetGatewayApprovalStatus();
case GATEWAY_NAME:
return isSetGatewayName();
case DOMAIN:
return isSetDomain();
case EMAIL_ADDRESS:
return isSetEmailAddress();
+ case GATEWAY_ACRONYM:
+ return isSetGatewayAcronym();
+ case GATEWAY_URL:
+ return isSetGatewayURL();
+ case GATEWAY_PUBLIC_ABSTRACT:
+ return isSetGatewayPublicAbstract();
+ case REVIEW_PROPOSAL_DESCRIPTION:
+ return isSetReviewProposalDescription();
}
throw new IllegalStateException();
}
@@ -383,6 +632,15 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
return false;
}
+ boolean this_present_gatewayApprovalStatus = true && this.isSetGatewayApprovalStatus();
+ boolean that_present_gatewayApprovalStatus = true && that.isSetGatewayApprovalStatus();
+ if (this_present_gatewayApprovalStatus || that_present_gatewayApprovalStatus) {
+ if (!(this_present_gatewayApprovalStatus && that_present_gatewayApprovalStatus))
+ return false;
+ if (!this.gatewayApprovalStatus.equals(that.gatewayApprovalStatus))
+ return false;
+ }
+
boolean this_present_gatewayName = true && this.isSetGatewayName();
boolean that_present_gatewayName = true && that.isSetGatewayName();
if (this_present_gatewayName || that_present_gatewayName) {
@@ -410,6 +668,42 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
return false;
}
+ boolean this_present_gatewayAcronym = true && this.isSetGatewayAcronym();
+ boolean that_present_gatewayAcronym = true && that.isSetGatewayAcronym();
+ if (this_present_gatewayAcronym || that_present_gatewayAcronym) {
+ if (!(this_present_gatewayAcronym && that_present_gatewayAcronym))
+ return false;
+ if (!this.gatewayAcronym.equals(that.gatewayAcronym))
+ return false;
+ }
+
+ boolean this_present_gatewayURL = true && this.isSetGatewayURL();
+ boolean that_present_gatewayURL = true && that.isSetGatewayURL();
+ if (this_present_gatewayURL || that_present_gatewayURL) {
+ if (!(this_present_gatewayURL && that_present_gatewayURL))
+ return false;
+ if (!this.gatewayURL.equals(that.gatewayURL))
+ return false;
+ }
+
+ boolean this_present_gatewayPublicAbstract = true && this.isSetGatewayPublicAbstract();
+ boolean that_present_gatewayPublicAbstract = true && that.isSetGatewayPublicAbstract();
+ if (this_present_gatewayPublicAbstract || that_present_gatewayPublicAbstract) {
+ if (!(this_present_gatewayPublicAbstract && that_present_gatewayPublicAbstract))
+ return false;
+ if (!this.gatewayPublicAbstract.equals(that.gatewayPublicAbstract))
+ return false;
+ }
+
+ boolean this_present_reviewProposalDescription = true && this.isSetReviewProposalDescription();
+ boolean that_present_reviewProposalDescription = true && that.isSetReviewProposalDescription();
+ if (this_present_reviewProposalDescription || that_present_reviewProposalDescription) {
+ if (!(this_present_reviewProposalDescription && that_present_reviewProposalDescription))
+ return false;
+ if (!this.reviewProposalDescription.equals(that.reviewProposalDescription))
+ return false;
+ }
+
return true;
}
@@ -422,6 +716,11 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (present_gatewayId)
list.add(gatewayId);
+ boolean present_gatewayApprovalStatus = true && (isSetGatewayApprovalStatus());
+ list.add(present_gatewayApprovalStatus);
+ if (present_gatewayApprovalStatus)
+ list.add(gatewayApprovalStatus.getValue());
+
boolean present_gatewayName = true && (isSetGatewayName());
list.add(present_gatewayName);
if (present_gatewayName)
@@ -437,6 +736,26 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (present_emailAddress)
list.add(emailAddress);
+ boolean present_gatewayAcronym = true && (isSetGatewayAcronym());
+ list.add(present_gatewayAcronym);
+ if (present_gatewayAcronym)
+ list.add(gatewayAcronym);
+
+ boolean present_gatewayURL = true && (isSetGatewayURL());
+ list.add(present_gatewayURL);
+ if (present_gatewayURL)
+ list.add(gatewayURL);
+
+ boolean present_gatewayPublicAbstract = true && (isSetGatewayPublicAbstract());
+ list.add(present_gatewayPublicAbstract);
+ if (present_gatewayPublicAbstract)
+ list.add(gatewayPublicAbstract);
+
+ boolean present_reviewProposalDescription = true && (isSetReviewProposalDescription());
+ list.add(present_reviewProposalDescription);
+ if (present_reviewProposalDescription)
+ list.add(reviewProposalDescription);
+
return list.hashCode();
}
@@ -458,6 +777,16 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetGatewayApprovalStatus()).compareTo(other.isSetGatewayApprovalStatus());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayApprovalStatus()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayApprovalStatus, other.gatewayApprovalStatus);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetGatewayName()).compareTo(other.isSetGatewayName());
if (lastComparison != 0) {
return lastComparison;
@@ -488,6 +817,46 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetGatewayAcronym()).compareTo(other.isSetGatewayAcronym());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayAcronym()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayAcronym, other.gatewayAcronym);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetGatewayURL()).compareTo(other.isSetGatewayURL());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayURL()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayURL, other.gatewayURL);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetGatewayPublicAbstract()).compareTo(other.isSetGatewayPublicAbstract());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayPublicAbstract()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayPublicAbstract, other.gatewayPublicAbstract);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetReviewProposalDescription()).compareTo(other.isSetReviewProposalDescription());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetReviewProposalDescription()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reviewProposalDescription, other.reviewProposalDescription);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -515,6 +884,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
sb.append(this.gatewayId);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("gatewayApprovalStatus:");
+ if (this.gatewayApprovalStatus == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayApprovalStatus);
+ }
+ first = false;
if (isSetGatewayName()) {
if (!first) sb.append(", ");
sb.append("gatewayName:");
@@ -545,6 +922,46 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
first = false;
}
+ if (isSetGatewayAcronym()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayAcronym:");
+ if (this.gatewayAcronym == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayAcronym);
+ }
+ first = false;
+ }
+ if (isSetGatewayURL()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayURL:");
+ if (this.gatewayURL == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayURL);
+ }
+ first = false;
+ }
+ if (isSetGatewayPublicAbstract()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayPublicAbstract:");
+ if (this.gatewayPublicAbstract == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayPublicAbstract);
+ }
+ first = false;
+ }
+ if (isSetReviewProposalDescription()) {
+ if (!first) sb.append(", ");
+ sb.append("reviewProposalDescription:");
+ if (this.reviewProposalDescription == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.reviewProposalDescription);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -555,6 +972,10 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
}
+ if (!isSetGatewayApprovalStatus()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayApprovalStatus' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -600,7 +1021,15 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // GATEWAY_NAME
+ case 2: // GATEWAY_APPROVAL_STATUS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.gatewayApprovalStatus = org.apache.airavata.model.workspace.GatewayApprovalStatus.findByValue(iprot.readI32());
+ struct.setGatewayApprovalStatusIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // GATEWAY_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.gatewayName = iprot.readString();
struct.setGatewayNameIsSet(true);
@@ -608,7 +1037,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // DOMAIN
+ case 4: // DOMAIN
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.domain = iprot.readString();
struct.setDomainIsSet(true);
@@ -616,7 +1045,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // EMAIL_ADDRESS
+ case 5: // EMAIL_ADDRESS
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.emailAddress = iprot.readString();
struct.setEmailAddressIsSet(true);
@@ -624,6 +1053,38 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 6: // GATEWAY_ACRONYM
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayAcronym = iprot.readString();
+ struct.setGatewayAcronymIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 7: // GATEWAY_URL
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayURL = iprot.readString();
+ struct.setGatewayURLIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // GATEWAY_PUBLIC_ABSTRACT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayPublicAbstract = iprot.readString();
+ struct.setGatewayPublicAbstractIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 9: // REVIEW_PROPOSAL_DESCRIPTION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.reviewProposalDescription = iprot.readString();
+ struct.setReviewProposalDescriptionIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -642,6 +1103,11 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
oprot.writeString(struct.gatewayId);
oprot.writeFieldEnd();
}
+ if (struct.gatewayApprovalStatus != null) {
+ oprot.writeFieldBegin(GATEWAY_APPROVAL_STATUS_FIELD_DESC);
+ oprot.writeI32(struct.gatewayApprovalStatus.getValue());
+ oprot.writeFieldEnd();
+ }
if (struct.gatewayName != null) {
if (struct.isSetGatewayName()) {
oprot.writeFieldBegin(GATEWAY_NAME_FIELD_DESC);
@@ -663,6 +1129,34 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
oprot.writeFieldEnd();
}
}
+ if (struct.gatewayAcronym != null) {
+ if (struct.isSetGatewayAcronym()) {
+ oprot.writeFieldBegin(GATEWAY_ACRONYM_FIELD_DESC);
+ oprot.writeString(struct.gatewayAcronym);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.gatewayURL != null) {
+ if (struct.isSetGatewayURL()) {
+ oprot.writeFieldBegin(GATEWAY_URL_FIELD_DESC);
+ oprot.writeString(struct.gatewayURL);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.gatewayPublicAbstract != null) {
+ if (struct.isSetGatewayPublicAbstract()) {
+ oprot.writeFieldBegin(GATEWAY_PUBLIC_ABSTRACT_FIELD_DESC);
+ oprot.writeString(struct.gatewayPublicAbstract);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.reviewProposalDescription != null) {
+ if (struct.isSetReviewProposalDescription()) {
+ oprot.writeFieldBegin(REVIEW_PROPOSAL_DESCRIPTION_FIELD_DESC);
+ oprot.writeString(struct.reviewProposalDescription);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -681,6 +1175,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
public void write(org.apache.thrift.protocol.TProtocol prot, Gateway struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.gatewayId);
+ oprot.writeI32(struct.gatewayApprovalStatus.getValue());
BitSet optionals = new BitSet();
if (struct.isSetGatewayName()) {
optionals.set(0);
@@ -691,7 +1186,19 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (struct.isSetEmailAddress()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetGatewayAcronym()) {
+ optionals.set(3);
+ }
+ if (struct.isSetGatewayURL()) {
+ optionals.set(4);
+ }
+ if (struct.isSetGatewayPublicAbstract()) {
+ optionals.set(5);
+ }
+ if (struct.isSetReviewProposalDescription()) {
+ optionals.set(6);
+ }
+ oprot.writeBitSet(optionals, 7);
if (struct.isSetGatewayName()) {
oprot.writeString(struct.gatewayName);
}
@@ -701,6 +1208,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (struct.isSetEmailAddress()) {
oprot.writeString(struct.emailAddress);
}
+ if (struct.isSetGatewayAcronym()) {
+ oprot.writeString(struct.gatewayAcronym);
+ }
+ if (struct.isSetGatewayURL()) {
+ oprot.writeString(struct.gatewayURL);
+ }
+ if (struct.isSetGatewayPublicAbstract()) {
+ oprot.writeString(struct.gatewayPublicAbstract);
+ }
+ if (struct.isSetReviewProposalDescription()) {
+ oprot.writeString(struct.reviewProposalDescription);
+ }
}
@Override
@@ -708,7 +1227,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.gatewayId = iprot.readString();
struct.setGatewayIdIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
+ struct.gatewayApprovalStatus = org.apache.airavata.model.workspace.GatewayApprovalStatus.findByValue(iprot.readI32());
+ struct.setGatewayApprovalStatusIsSet(true);
+ BitSet incoming = iprot.readBitSet(7);
if (incoming.get(0)) {
struct.gatewayName = iprot.readString();
struct.setGatewayNameIsSet(true);
@@ -721,6 +1242,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
struct.emailAddress = iprot.readString();
struct.setEmailAddressIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.gatewayAcronym = iprot.readString();
+ struct.setGatewayAcronymIsSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.gatewayURL = iprot.readString();
+ struct.setGatewayURLIsSet(true);
+ }
+ if (incoming.get(5)) {
+ struct.gatewayPublicAbstract = iprot.readString();
+ struct.setGatewayPublicAbstractIsSet(true);
+ }
+ if (incoming.get(6)) {
+ struct.reviewProposalDescription = iprot.readString();
+ struct.setReviewProposalDescriptionIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 c493a32..8a997e9 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
index 5d7a764..ca209e5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class Notification implements org.apache.thrift.TBase<Notification, Notification._Fields>, java.io.Serializable, Cloneable, Comparable<Notification> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Notification");
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 3b09f70..015f17e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 ddf6b84..27818ce 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
index eb2f221..337b655 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
@@ -52,12 +52,10 @@ public class GatewayRegistry {
resource.setGatewayName(gateway.getGatewayName());
resource.setEmailAddress(gateway.getEmailAddress());
resource.setDomain(gateway.getDomain());
-// resource.setGatewayAcronym(gateway.getG);
-//
-// gateway.setGatewayAcronym(gatewayAcronym);
-// gateway.setGatewayUrl(gatewayUrl);
-// gateway.setGatewayPublicAbstract(gatewayPublicAbstract);
-// gateway.setReviewProposalDescription(reviewProposalDescription);
+ resource.setGatewayAcronym(gateway.getGatewayAcronym());
+ resource.setGatewayUrl(gateway.getGatewayURL());
+ resource.setGatewayPublicAbstract(gateway.getGatewayPublicAbstract());
+ resource.setReviewProposalDescription(gateway.getReviewProposalDescription());
resource.save();
return gateway.getGatewayId();
}catch (RegistryException e){
@@ -72,6 +70,10 @@ public class GatewayRegistry {
existingGateway.setGatewayName(updatedGateway.getGatewayName());
existingGateway.setEmailAddress(updatedGateway.getEmailAddress());
existingGateway.setDomain(updatedGateway.getDomain());
+ existingGateway.setGatewayAcronym(updatedGateway.getGatewayAcronym());
+ existingGateway.setGatewayUrl(updatedGateway.getGatewayURL());
+ existingGateway.setGatewayPublicAbstract(updatedGateway.getGatewayPublicAbstract());
+ existingGateway.setReviewProposalDescription(updatedGateway.getReviewProposalDescription());
existingGateway.save();
}catch (RegistryException e){
logger.error("Error while updating gateway to registry", e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index a95b85e..54329d5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -82,6 +82,10 @@ public class ThriftDataModelConversion {
gateway.setGatewayName(resource.getGatewayName());
gateway.setDomain(resource.getDomain());
gateway.setEmailAddress(resource.getEmailAddress());
+ gateway.setGatewayAcronym(resource.getGatewayAcronym());
+ gateway.setGatewayURL(resource.getGatewayUrl());
+ gateway.setGatewayPublicAbstract(resource.getGatewayPublicAbstract());
+ gateway.setReviewProposalDescription(resource.getReviewProposalDescription());
return gateway;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
index ebc6d4a..1caeeec 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
@@ -58,7 +58,6 @@ struct User {
enum GatewayApprovalStatus {
REQUESTED,
APPROVED,
- APPROVED,
ACTIVE,
DEACTIVATED
}
[10/11] airavata git commit: adding more fields to the gateway Model
Posted by sh...@apache.org.
adding more fields to the gateway Model
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fd5d8369
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fd5d8369
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fd5d8369
Branch: refs/heads/master
Commit: fd5d8369b4a1491c3668b603d79f07e0a6d5ee77
Parents: 07c725a
Author: scnakandala <su...@gmail.com>
Authored: Mon Jul 11 13:19:35 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jul 12 13:48:19 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../lib/airavata/user_profile_model_types.cpp | 80 +--
.../lib/airavata/user_profile_model_types.h | 12 +-
.../lib/airavata/workspace_model_types.cpp | 183 +++++-
.../lib/airavata/workspace_model_types.h | 52 +-
.../resources/lib/Airavata/Model/User/Types.php | 109 ++--
.../lib/Airavata/Model/Workspace/Types.php | 142 ++++-
.../lib/apache/airavata/model/user/ttypes.py | 103 ++--
.../apache/airavata/model/workspace/ttypes.py | 105 +++-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.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/user/NSFDemographics.java | 2 +-
.../apache/airavata/model/user/UserProfile.java | 276 +++------
.../airavata/model/workspace/Gateway.java | 571 ++++++++++++++++++-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Notification.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../catalog/impl/GatewayRegistry.java | 14 +-
.../utils/ThriftDataModelConversion.java | 4 +
.../workspace_model.thrift | 1 -
97 files changed, 1290 insertions(+), 530 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 eb378eb..e24bb46 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class Airavata {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
index 466013d..f89e46f 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
@@ -386,11 +386,6 @@ void UserProfile::__set_userName(const std::string& val) {
__isset.userName = true;
}
-void UserProfile::__set_gatewayId(const std::string& val) {
- this->gatewayId = val;
-__isset.gatewayId = true;
-}
-
void UserProfile::__set_orcidId(const std::string& val) {
this->orcidId = val;
__isset.orcidId = true;
@@ -545,21 +540,13 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- this->__isset.gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 7:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->orcidId);
this->__isset.orcidId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->phones.clear();
@@ -579,7 +566,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->country);
this->__isset.country = true;
@@ -587,7 +574,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->nationality.clear();
@@ -607,7 +594,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 11:
+ case 10:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->homeOrganization);
this->__isset.homeOrganization = true;
@@ -615,7 +602,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 12:
+ case 11:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->orginationAffiliation);
this->__isset.orginationAffiliation = true;
@@ -623,7 +610,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 13:
+ case 12:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->creationTime);
isset_creationTime = true;
@@ -631,7 +618,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 14:
+ case 13:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->lastAccessTime);
isset_lastAccessTime = true;
@@ -639,7 +626,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 15:
+ case 14:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->validUntil);
isset_validUntil = true;
@@ -647,7 +634,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
+ case 15:
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast39;
xfer += iprot->readI32(ecast39);
@@ -657,7 +644,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 17:
+ case 16:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->comments);
this->__isset.comments = true;
@@ -665,7 +652,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 18:
+ case 17:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->labeledURI.clear();
@@ -685,7 +672,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 19:
+ case 18:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gpgKey);
this->__isset.gpgKey = true;
@@ -693,7 +680,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 20:
+ case 19:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->timeZone);
this->__isset.timeZone = true;
@@ -701,7 +688,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 21:
+ case 20:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->nsfDemographics.read(iprot);
this->__isset.nsfDemographics = true;
@@ -771,18 +758,13 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.gatewayId) {
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 6);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
- }
if (this->__isset.orcidId) {
- xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 6);
xfer += oprot->writeString(this->orcidId);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.phones) {
- xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 8);
+ xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->phones.size()));
std::vector<std::string> ::const_iterator _iter46;
@@ -795,12 +777,12 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.country) {
- xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 9);
+ xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 8);
xfer += oprot->writeString(this->country);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.nationality) {
- xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 10);
+ xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->nationality.size()));
std::vector<std::string> ::const_iterator _iter47;
@@ -813,38 +795,38 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.homeOrganization) {
- xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 10);
xfer += oprot->writeString(this->homeOrganization);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.orginationAffiliation) {
- xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 11);
xfer += oprot->writeString(this->orginationAffiliation);
xfer += oprot->writeFieldEnd();
}
- xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_STRING, 12);
xfer += oprot->writeString(this->creationTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_STRING, 13);
xfer += oprot->writeString(this->lastAccessTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_STRING, 15);
+ xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_STRING, 14);
xfer += oprot->writeString(this->validUntil);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 16);
+ xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 15);
xfer += oprot->writeI32((int32_t)this->State);
xfer += oprot->writeFieldEnd();
if (this->__isset.comments) {
- xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 17);
+ xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 16);
xfer += oprot->writeString(this->comments);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.labeledURI) {
- xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 18);
+ xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 17);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->labeledURI.size()));
std::vector<std::string> ::const_iterator _iter48;
@@ -857,17 +839,17 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gpgKey) {
- xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 19);
+ xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 18);
xfer += oprot->writeString(this->gpgKey);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.timeZone) {
- xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 20);
+ xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 19);
xfer += oprot->writeString(this->timeZone);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.nsfDemographics) {
- xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 21);
+ xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 20);
xfer += this->nsfDemographics.write(oprot);
xfer += oprot->writeFieldEnd();
}
@@ -883,7 +865,6 @@ void swap(UserProfile &a, UserProfile &b) {
swap(a.userId, b.userId);
swap(a.emails, b.emails);
swap(a.userName, b.userName);
- swap(a.gatewayId, b.gatewayId);
swap(a.orcidId, b.orcidId);
swap(a.phones, b.phones);
swap(a.country, b.country);
@@ -908,7 +889,6 @@ UserProfile::UserProfile(const UserProfile& other49) {
userId = other49.userId;
emails = other49.emails;
userName = other49.userName;
- gatewayId = other49.gatewayId;
orcidId = other49.orcidId;
phones = other49.phones;
country = other49.country;
@@ -932,7 +912,6 @@ UserProfile& UserProfile::operator=(const UserProfile& other50) {
userId = other50.userId;
emails = other50.emails;
userName = other50.userName;
- gatewayId = other50.gatewayId;
orcidId = other50.orcidId;
phones = other50.phones;
country = other50.country;
@@ -959,7 +938,6 @@ void UserProfile::printTo(std::ostream& out) const {
out << ", " << "userId=" << to_string(userId);
out << ", " << "emails=" << to_string(emails);
out << ", " << "userName="; (__isset.userName ? (out << to_string(userName)) : (out << "<null>"));
- out << ", " << "gatewayId="; (__isset.gatewayId ? (out << to_string(gatewayId)) : (out << "<null>"));
out << ", " << "orcidId="; (__isset.orcidId ? (out << to_string(orcidId)) : (out << "<null>"));
out << ", " << "phones="; (__isset.phones ? (out << to_string(phones)) : (out << "<null>"));
out << ", " << "country="; (__isset.country ? (out << to_string(country)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
index 0881287..4ae9bad 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
@@ -185,9 +185,8 @@ inline std::ostream& operator<<(std::ostream& out, const NSFDemographics& obj)
}
typedef struct _UserProfile__isset {
- _UserProfile__isset() : userName(false), gatewayId(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {}
+ _UserProfile__isset() : userName(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {}
bool userName :1;
- bool gatewayId :1;
bool orcidId :1;
bool phones :1;
bool country :1;
@@ -206,7 +205,7 @@ class UserProfile {
UserProfile(const UserProfile&);
UserProfile& operator=(const UserProfile&);
- UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), userName(), gatewayId(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(), lastAccessTime(), validUntil(), State((Status::type)0), comments(), gpgKey(), timeZone() {
+ UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), userName(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(), lastAccessTime(), validUntil(), State((Status::type)0), comments(), gpgKey(), timeZone() {
}
virtual ~UserProfile() throw();
@@ -215,7 +214,6 @@ class UserProfile {
std::string userId;
std::vector<std::string> emails;
std::string userName;
- std::string gatewayId;
std::string orcidId;
std::vector<std::string> phones;
std::string country;
@@ -244,8 +242,6 @@ class UserProfile {
void __set_userName(const std::string& val);
- void __set_gatewayId(const std::string& val);
-
void __set_orcidId(const std::string& val);
void __set_phones(const std::vector<std::string> & val);
@@ -290,10 +286,6 @@ class UserProfile {
return false;
else if (__isset.userName && !(userName == rhs.userName))
return false;
- if (__isset.gatewayId != rhs.__isset.gatewayId)
- return false;
- else if (__isset.gatewayId && !(gatewayId == rhs.gatewayId))
- return false;
if (__isset.orcidId != rhs.__isset.orcidId)
return false;
else if (__isset.orcidId && !(orcidId == rhs.orcidId))
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
index 2229493..272c3a8 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
@@ -30,6 +30,20 @@
namespace apache { namespace airavata { namespace model { namespace workspace {
+int _kGatewayApprovalStatusValues[] = {
+ GatewayApprovalStatus::REQUESTED,
+ GatewayApprovalStatus::APPROVED,
+ GatewayApprovalStatus::ACTIVE,
+ GatewayApprovalStatus::DEACTIVATED
+};
+const char* _kGatewayApprovalStatusNames[] = {
+ "REQUESTED",
+ "APPROVED",
+ "ACTIVE",
+ "DEACTIVATED"
+};
+const std::map<int, const char*> _GatewayApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kGatewayApprovalStatusValues, _kGatewayApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
int _kNotificationPriorityValues[] = {
NotificationPriority::LOW,
NotificationPriority::NORMAL,
@@ -556,6 +570,10 @@ void Gateway::__set_gatewayId(const std::string& val) {
this->gatewayId = val;
}
+void Gateway::__set_gatewayApprovalStatus(const GatewayApprovalStatus::type val) {
+ this->gatewayApprovalStatus = val;
+}
+
void Gateway::__set_gatewayName(const std::string& val) {
this->gatewayName = val;
__isset.gatewayName = true;
@@ -571,6 +589,26 @@ void Gateway::__set_emailAddress(const std::string& val) {
__isset.emailAddress = true;
}
+void Gateway::__set_gatewayAcronym(const std::string& val) {
+ this->gatewayAcronym = val;
+__isset.gatewayAcronym = true;
+}
+
+void Gateway::__set_gatewayURL(const std::string& val) {
+ this->gatewayURL = val;
+__isset.gatewayURL = true;
+}
+
+void Gateway::__set_gatewayPublicAbstract(const std::string& val) {
+ this->gatewayPublicAbstract = val;
+__isset.gatewayPublicAbstract = true;
+}
+
+void Gateway::__set_reviewProposalDescription(const std::string& val) {
+ this->reviewProposalDescription = val;
+__isset.reviewProposalDescription = true;
+}
+
uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -584,6 +622,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
using ::apache::thrift::protocol::TProtocolException;
bool isset_gatewayId = false;
+ bool isset_gatewayApprovalStatus = false;
while (true)
{
@@ -602,6 +641,16 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 2:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast24;
+ xfer += iprot->readI32(ecast24);
+ this->gatewayApprovalStatus = (GatewayApprovalStatus::type)ecast24;
+ isset_gatewayApprovalStatus = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayName);
this->__isset.gatewayName = true;
@@ -609,7 +658,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->domain);
this->__isset.domain = true;
@@ -617,7 +666,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->emailAddress);
this->__isset.emailAddress = true;
@@ -625,6 +674,38 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayAcronym);
+ this->__isset.gatewayAcronym = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 7:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayURL);
+ this->__isset.gatewayURL = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 8:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayPublicAbstract);
+ this->__isset.gatewayPublicAbstract = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 9:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->reviewProposalDescription);
+ this->__isset.reviewProposalDescription = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -636,6 +717,8 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_gatewayApprovalStatus)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -648,21 +731,45 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("gatewayApprovalStatus", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32((int32_t)this->gatewayApprovalStatus);
+ xfer += oprot->writeFieldEnd();
+
if (this->__isset.gatewayName) {
- xfer += oprot->writeFieldBegin("gatewayName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("gatewayName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->gatewayName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.domain) {
- xfer += oprot->writeFieldBegin("domain", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("domain", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString(this->domain);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.emailAddress) {
- xfer += oprot->writeFieldBegin("emailAddress", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeFieldBegin("emailAddress", ::apache::thrift::protocol::T_STRING, 5);
xfer += oprot->writeString(this->emailAddress);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.gatewayAcronym) {
+ xfer += oprot->writeFieldBegin("gatewayAcronym", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeString(this->gatewayAcronym);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.gatewayURL) {
+ xfer += oprot->writeFieldBegin("gatewayURL", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeString(this->gatewayURL);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.gatewayPublicAbstract) {
+ xfer += oprot->writeFieldBegin("gatewayPublicAbstract", ::apache::thrift::protocol::T_STRING, 8);
+ xfer += oprot->writeString(this->gatewayPublicAbstract);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.reviewProposalDescription) {
+ xfer += oprot->writeFieldBegin("reviewProposalDescription", ::apache::thrift::protocol::T_STRING, 9);
+ xfer += oprot->writeString(this->reviewProposalDescription);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -671,34 +778,54 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const {
void swap(Gateway &a, Gateway &b) {
using ::std::swap;
swap(a.gatewayId, b.gatewayId);
+ swap(a.gatewayApprovalStatus, b.gatewayApprovalStatus);
swap(a.gatewayName, b.gatewayName);
swap(a.domain, b.domain);
swap(a.emailAddress, b.emailAddress);
+ swap(a.gatewayAcronym, b.gatewayAcronym);
+ swap(a.gatewayURL, b.gatewayURL);
+ swap(a.gatewayPublicAbstract, b.gatewayPublicAbstract);
+ swap(a.reviewProposalDescription, b.reviewProposalDescription);
swap(a.__isset, b.__isset);
}
-Gateway::Gateway(const Gateway& other24) {
- gatewayId = other24.gatewayId;
- gatewayName = other24.gatewayName;
- domain = other24.domain;
- emailAddress = other24.emailAddress;
- __isset = other24.__isset;
-}
-Gateway& Gateway::operator=(const Gateway& other25) {
+Gateway::Gateway(const Gateway& other25) {
gatewayId = other25.gatewayId;
+ gatewayApprovalStatus = other25.gatewayApprovalStatus;
gatewayName = other25.gatewayName;
domain = other25.domain;
emailAddress = other25.emailAddress;
+ gatewayAcronym = other25.gatewayAcronym;
+ gatewayURL = other25.gatewayURL;
+ gatewayPublicAbstract = other25.gatewayPublicAbstract;
+ reviewProposalDescription = other25.reviewProposalDescription;
__isset = other25.__isset;
+}
+Gateway& Gateway::operator=(const Gateway& other26) {
+ gatewayId = other26.gatewayId;
+ gatewayApprovalStatus = other26.gatewayApprovalStatus;
+ gatewayName = other26.gatewayName;
+ domain = other26.domain;
+ emailAddress = other26.emailAddress;
+ gatewayAcronym = other26.gatewayAcronym;
+ gatewayURL = other26.gatewayURL;
+ gatewayPublicAbstract = other26.gatewayPublicAbstract;
+ reviewProposalDescription = other26.reviewProposalDescription;
+ __isset = other26.__isset;
return *this;
}
void Gateway::printTo(std::ostream& out) const {
using ::apache::thrift::to_string;
out << "Gateway(";
out << "gatewayId=" << to_string(gatewayId);
+ out << ", " << "gatewayApprovalStatus=" << to_string(gatewayApprovalStatus);
out << ", " << "gatewayName="; (__isset.gatewayName ? (out << to_string(gatewayName)) : (out << "<null>"));
out << ", " << "domain="; (__isset.domain ? (out << to_string(domain)) : (out << "<null>"));
out << ", " << "emailAddress="; (__isset.emailAddress ? (out << to_string(emailAddress)) : (out << "<null>"));
+ out << ", " << "gatewayAcronym="; (__isset.gatewayAcronym ? (out << to_string(gatewayAcronym)) : (out << "<null>"));
+ out << ", " << "gatewayURL="; (__isset.gatewayURL ? (out << to_string(gatewayURL)) : (out << "<null>"));
+ out << ", " << "gatewayPublicAbstract="; (__isset.gatewayPublicAbstract ? (out << to_string(gatewayPublicAbstract)) : (out << "<null>"));
+ out << ", " << "reviewProposalDescription="; (__isset.reviewProposalDescription ? (out << to_string(reviewProposalDescription)) : (out << "<null>"));
out << ")";
}
@@ -826,9 +953,9 @@ uint32_t Notification::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 8:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast26;
- xfer += iprot->readI32(ecast26);
- this->priority = (NotificationPriority::type)ecast26;
+ int32_t ecast27;
+ xfer += iprot->readI32(ecast27);
+ this->priority = (NotificationPriority::type)ecast27;
this->__isset.priority = true;
} else {
xfer += iprot->skip(ftype);
@@ -912,18 +1039,7 @@ void swap(Notification &a, Notification &b) {
swap(a.__isset, b.__isset);
}
-Notification::Notification(const Notification& other27) {
- notificationId = other27.notificationId;
- gatewayId = other27.gatewayId;
- title = other27.title;
- notificationMessage = other27.notificationMessage;
- creationTime = other27.creationTime;
- publishedTime = other27.publishedTime;
- expirationTime = other27.expirationTime;
- priority = other27.priority;
- __isset = other27.__isset;
-}
-Notification& Notification::operator=(const Notification& other28) {
+Notification::Notification(const Notification& other28) {
notificationId = other28.notificationId;
gatewayId = other28.gatewayId;
title = other28.title;
@@ -933,6 +1049,17 @@ Notification& Notification::operator=(const Notification& other28) {
expirationTime = other28.expirationTime;
priority = other28.priority;
__isset = other28.__isset;
+}
+Notification& Notification::operator=(const Notification& other29) {
+ notificationId = other29.notificationId;
+ gatewayId = other29.gatewayId;
+ title = other29.title;
+ notificationMessage = other29.notificationMessage;
+ creationTime = other29.creationTime;
+ publishedTime = other29.publishedTime;
+ expirationTime = other29.expirationTime;
+ priority = other29.priority;
+ __isset = other29.__isset;
return *this;
}
void Notification::printTo(std::ostream& out) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
index 7502186..1485baf 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
@@ -37,6 +37,17 @@
namespace apache { namespace airavata { namespace model { namespace workspace {
+struct GatewayApprovalStatus {
+ enum type {
+ REQUESTED = 0,
+ APPROVED = 1,
+ ACTIVE = 2,
+ DEACTIVATED = 3
+ };
+};
+
+extern const std::map<int, const char*> _GatewayApprovalStatus_VALUES_TO_NAMES;
+
struct NotificationPriority {
enum type {
LOW = 0,
@@ -251,10 +262,14 @@ inline std::ostream& operator<<(std::ostream& out, const User& obj)
}
typedef struct _Gateway__isset {
- _Gateway__isset() : gatewayName(false), domain(false), emailAddress(false) {}
+ _Gateway__isset() : gatewayName(false), domain(false), emailAddress(false), gatewayAcronym(false), gatewayURL(false), gatewayPublicAbstract(false), reviewProposalDescription(false) {}
bool gatewayName :1;
bool domain :1;
bool emailAddress :1;
+ bool gatewayAcronym :1;
+ bool gatewayURL :1;
+ bool gatewayPublicAbstract :1;
+ bool reviewProposalDescription :1;
} _Gateway__isset;
class Gateway {
@@ -262,29 +277,46 @@ class Gateway {
Gateway(const Gateway&);
Gateway& operator=(const Gateway&);
- Gateway() : gatewayId(), gatewayName(), domain(), emailAddress() {
+ Gateway() : gatewayId(), gatewayApprovalStatus((GatewayApprovalStatus::type)0), gatewayName(), domain(), emailAddress(), gatewayAcronym(), gatewayURL(), gatewayPublicAbstract(), reviewProposalDescription() {
}
virtual ~Gateway() throw();
std::string gatewayId;
+ GatewayApprovalStatus::type gatewayApprovalStatus;
std::string gatewayName;
std::string domain;
std::string emailAddress;
+ std::string gatewayAcronym;
+ std::string gatewayURL;
+ std::string gatewayPublicAbstract;
+ std::string reviewProposalDescription;
_Gateway__isset __isset;
void __set_gatewayId(const std::string& val);
+ void __set_gatewayApprovalStatus(const GatewayApprovalStatus::type val);
+
void __set_gatewayName(const std::string& val);
void __set_domain(const std::string& val);
void __set_emailAddress(const std::string& val);
+ void __set_gatewayAcronym(const std::string& val);
+
+ void __set_gatewayURL(const std::string& val);
+
+ void __set_gatewayPublicAbstract(const std::string& val);
+
+ void __set_reviewProposalDescription(const std::string& val);
+
bool operator == (const Gateway & rhs) const
{
if (!(gatewayId == rhs.gatewayId))
return false;
+ if (!(gatewayApprovalStatus == rhs.gatewayApprovalStatus))
+ return false;
if (__isset.gatewayName != rhs.__isset.gatewayName)
return false;
else if (__isset.gatewayName && !(gatewayName == rhs.gatewayName))
@@ -297,6 +329,22 @@ class Gateway {
return false;
else if (__isset.emailAddress && !(emailAddress == rhs.emailAddress))
return false;
+ if (__isset.gatewayAcronym != rhs.__isset.gatewayAcronym)
+ return false;
+ else if (__isset.gatewayAcronym && !(gatewayAcronym == rhs.gatewayAcronym))
+ return false;
+ if (__isset.gatewayURL != rhs.__isset.gatewayURL)
+ return false;
+ else if (__isset.gatewayURL && !(gatewayURL == rhs.gatewayURL))
+ return false;
+ if (__isset.gatewayPublicAbstract != rhs.__isset.gatewayPublicAbstract)
+ return false;
+ else if (__isset.gatewayPublicAbstract && !(gatewayPublicAbstract == rhs.gatewayPublicAbstract))
+ return false;
+ if (__isset.reviewProposalDescription != rhs.__isset.reviewProposalDescription)
+ return false;
+ else if (__isset.reviewProposalDescription && !(reviewProposalDescription == rhs.reviewProposalDescription))
+ return false;
return true;
}
bool operator != (const Gateway &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
index 56e889b..250ef09 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
@@ -450,10 +450,6 @@ class UserProfile {
/**
* @var string
*/
- public $gatewayId = null;
- /**
- * @var string
- */
public $orcidId = null;
/**
* @var string[]
@@ -540,14 +536,10 @@ class UserProfile {
'type' => TType::STRING,
),
6 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 7 => array(
'var' => 'orcidId',
'type' => TType::STRING,
),
- 8 => array(
+ 7 => array(
'var' => 'phones',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -555,11 +547,11 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 9 => array(
+ 8 => array(
'var' => 'country',
'type' => TType::STRING,
),
- 10 => array(
+ 9 => array(
'var' => 'nationality',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -567,35 +559,35 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 11 => array(
+ 10 => array(
'var' => 'homeOrganization',
'type' => TType::STRING,
),
- 12 => array(
+ 11 => array(
'var' => 'orginationAffiliation',
'type' => TType::STRING,
),
- 13 => array(
+ 12 => array(
'var' => 'creationTime',
'type' => TType::STRING,
),
- 14 => array(
+ 13 => array(
'var' => 'lastAccessTime',
'type' => TType::STRING,
),
- 15 => array(
+ 14 => array(
'var' => 'validUntil',
'type' => TType::STRING,
),
- 16 => array(
+ 15 => array(
'var' => 'State',
'type' => TType::I32,
),
- 17 => array(
+ 16 => array(
'var' => 'comments',
'type' => TType::STRING,
),
- 18 => array(
+ 17 => array(
'var' => 'labeledURI',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -603,15 +595,15 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 19 => array(
+ 18 => array(
'var' => 'gpgKey',
'type' => TType::STRING,
),
- 20 => array(
+ 19 => array(
'var' => 'timeZone',
'type' => TType::STRING,
),
- 21 => array(
+ 20 => array(
'var' => 'nsfDemographics',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\User\NSFDemographics',
@@ -634,9 +626,6 @@ class UserProfile {
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
if (isset($vals['orcidId'])) {
$this->orcidId = $vals['orcidId'];
}
@@ -751,19 +740,12 @@ class UserProfile {
break;
case 6:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orcidId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 7:
if ($ftype == TType::LST) {
$this->phones = array();
$_size27 = 0;
@@ -780,14 +762,14 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 8:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->country);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 9:
if ($ftype == TType::LST) {
$this->nationality = array();
$_size33 = 0;
@@ -804,56 +786,56 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 10:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->homeOrganization);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 11:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orginationAffiliation);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 12:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 14:
+ case 13:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->lastAccessTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 15:
+ case 14:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->validUntil);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 16:
+ case 15:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->State);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 17:
+ case 16:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->comments);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 18:
+ case 17:
if ($ftype == TType::LST) {
$this->labeledURI = array();
$_size39 = 0;
@@ -870,21 +852,21 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 19:
+ case 18:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gpgKey);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 20:
+ case 19:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->timeZone);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 21:
+ case 20:
if ($ftype == TType::STRUCT) {
$this->nsfDemographics = new \Airavata\Model\User\NSFDemographics();
$xfer += $this->nsfDemographics->read($input);
@@ -942,13 +924,8 @@ class UserProfile {
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 6);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
if ($this->orcidId !== null) {
- $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 7);
+ $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 6);
$xfer += $output->writeString($this->orcidId);
$xfer += $output->writeFieldEnd();
}
@@ -956,7 +933,7 @@ class UserProfile {
if (!is_array($this->phones)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('phones', TType::LST, 8);
+ $xfer += $output->writeFieldBegin('phones', TType::LST, 7);
{
$output->writeListBegin(TType::STRING, count($this->phones));
{
@@ -970,7 +947,7 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->country !== null) {
- $xfer += $output->writeFieldBegin('country', TType::STRING, 9);
+ $xfer += $output->writeFieldBegin('country', TType::STRING, 8);
$xfer += $output->writeString($this->country);
$xfer += $output->writeFieldEnd();
}
@@ -978,7 +955,7 @@ class UserProfile {
if (!is_array($this->nationality)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('nationality', TType::LST, 10);
+ $xfer += $output->writeFieldBegin('nationality', TType::LST, 9);
{
$output->writeListBegin(TType::STRING, count($this->nationality));
{
@@ -992,37 +969,37 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->homeOrganization !== null) {
- $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 11);
+ $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 10);
$xfer += $output->writeString($this->homeOrganization);
$xfer += $output->writeFieldEnd();
}
if ($this->orginationAffiliation !== null) {
- $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 12);
+ $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 11);
$xfer += $output->writeString($this->orginationAffiliation);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::STRING, 13);
+ $xfer += $output->writeFieldBegin('creationTime', TType::STRING, 12);
$xfer += $output->writeString($this->creationTime);
$xfer += $output->writeFieldEnd();
}
if ($this->lastAccessTime !== null) {
- $xfer += $output->writeFieldBegin('lastAccessTime', TType::STRING, 14);
+ $xfer += $output->writeFieldBegin('lastAccessTime', TType::STRING, 13);
$xfer += $output->writeString($this->lastAccessTime);
$xfer += $output->writeFieldEnd();
}
if ($this->validUntil !== null) {
- $xfer += $output->writeFieldBegin('validUntil', TType::STRING, 15);
+ $xfer += $output->writeFieldBegin('validUntil', TType::STRING, 14);
$xfer += $output->writeString($this->validUntil);
$xfer += $output->writeFieldEnd();
}
if ($this->State !== null) {
- $xfer += $output->writeFieldBegin('State', TType::I32, 16);
+ $xfer += $output->writeFieldBegin('State', TType::I32, 15);
$xfer += $output->writeI32($this->State);
$xfer += $output->writeFieldEnd();
}
if ($this->comments !== null) {
- $xfer += $output->writeFieldBegin('comments', TType::STRING, 17);
+ $xfer += $output->writeFieldBegin('comments', TType::STRING, 16);
$xfer += $output->writeString($this->comments);
$xfer += $output->writeFieldEnd();
}
@@ -1030,7 +1007,7 @@ class UserProfile {
if (!is_array($this->labeledURI)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 18);
+ $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 17);
{
$output->writeListBegin(TType::STRING, count($this->labeledURI));
{
@@ -1044,12 +1021,12 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->gpgKey !== null) {
- $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 19);
+ $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 18);
$xfer += $output->writeString($this->gpgKey);
$xfer += $output->writeFieldEnd();
}
if ($this->timeZone !== null) {
- $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 20);
+ $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 19);
$xfer += $output->writeString($this->timeZone);
$xfer += $output->writeFieldEnd();
}
@@ -1057,7 +1034,7 @@ class UserProfile {
if (!is_object($this->nsfDemographics)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 21);
+ $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 20);
$xfer += $this->nsfDemographics->write($output);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
index 61355c2..b16d03c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
@@ -17,6 +17,19 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
use Thrift\Exception\TApplicationException;
+final class GatewayApprovalStatus {
+ const REQUESTED = 0;
+ const APPROVED = 1;
+ const ACTIVE = 2;
+ const DEACTIVATED = 3;
+ static public $__names = array(
+ 0 => 'REQUESTED',
+ 1 => 'APPROVED',
+ 2 => 'ACTIVE',
+ 3 => 'DEACTIVATED',
+ );
+}
+
final class NotificationPriority {
const LOW = 0;
const NORMAL = 1;
@@ -525,6 +538,10 @@ class Gateway {
*/
public $gatewayId = null;
/**
+ * @var int
+ */
+ public $gatewayApprovalStatus = null;
+ /**
* @var string
*/
public $gatewayName = null;
@@ -536,6 +553,22 @@ class Gateway {
* @var string
*/
public $emailAddress = null;
+ /**
+ * @var string
+ */
+ public $gatewayAcronym = null;
+ /**
+ * @var string
+ */
+ public $gatewayURL = null;
+ /**
+ * @var string
+ */
+ public $gatewayPublicAbstract = null;
+ /**
+ * @var string
+ */
+ public $reviewProposalDescription = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -545,23 +578,46 @@ class Gateway {
'type' => TType::STRING,
),
2 => array(
+ 'var' => 'gatewayApprovalStatus',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
'var' => 'gatewayName',
'type' => TType::STRING,
),
- 3 => array(
+ 4 => array(
'var' => 'domain',
'type' => TType::STRING,
),
- 4 => array(
+ 5 => array(
'var' => 'emailAddress',
'type' => TType::STRING,
),
+ 6 => array(
+ 'var' => 'gatewayAcronym',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'gatewayURL',
+ 'type' => TType::STRING,
+ ),
+ 8 => array(
+ 'var' => 'gatewayPublicAbstract',
+ 'type' => TType::STRING,
+ ),
+ 9 => array(
+ 'var' => 'reviewProposalDescription',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['gatewayApprovalStatus'])) {
+ $this->gatewayApprovalStatus = $vals['gatewayApprovalStatus'];
+ }
if (isset($vals['gatewayName'])) {
$this->gatewayName = $vals['gatewayName'];
}
@@ -571,6 +627,18 @@ class Gateway {
if (isset($vals['emailAddress'])) {
$this->emailAddress = $vals['emailAddress'];
}
+ if (isset($vals['gatewayAcronym'])) {
+ $this->gatewayAcronym = $vals['gatewayAcronym'];
+ }
+ if (isset($vals['gatewayURL'])) {
+ $this->gatewayURL = $vals['gatewayURL'];
+ }
+ if (isset($vals['gatewayPublicAbstract'])) {
+ $this->gatewayPublicAbstract = $vals['gatewayPublicAbstract'];
+ }
+ if (isset($vals['reviewProposalDescription'])) {
+ $this->reviewProposalDescription = $vals['reviewProposalDescription'];
+ }
}
}
@@ -601,26 +669,61 @@ class Gateway {
}
break;
case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->gatewayApprovalStatus);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gatewayName);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 3:
+ case 4:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->domain);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 5:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->emailAddress);
} else {
$xfer += $input->skip($ftype);
}
break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayAcronym);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayURL);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayPublicAbstract);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->reviewProposalDescription);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -639,21 +742,46 @@ class Gateway {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayApprovalStatus !== null) {
+ $xfer += $output->writeFieldBegin('gatewayApprovalStatus', TType::I32, 2);
+ $xfer += $output->writeI32($this->gatewayApprovalStatus);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->gatewayName !== null) {
- $xfer += $output->writeFieldBegin('gatewayName', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('gatewayName', TType::STRING, 3);
$xfer += $output->writeString($this->gatewayName);
$xfer += $output->writeFieldEnd();
}
if ($this->domain !== null) {
- $xfer += $output->writeFieldBegin('domain', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('domain', TType::STRING, 4);
$xfer += $output->writeString($this->domain);
$xfer += $output->writeFieldEnd();
}
if ($this->emailAddress !== null) {
- $xfer += $output->writeFieldBegin('emailAddress', TType::STRING, 4);
+ $xfer += $output->writeFieldBegin('emailAddress', TType::STRING, 5);
$xfer += $output->writeString($this->emailAddress);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayAcronym !== null) {
+ $xfer += $output->writeFieldBegin('gatewayAcronym', TType::STRING, 6);
+ $xfer += $output->writeString($this->gatewayAcronym);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayURL !== null) {
+ $xfer += $output->writeFieldBegin('gatewayURL', TType::STRING, 7);
+ $xfer += $output->writeString($this->gatewayURL);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayPublicAbstract !== null) {
+ $xfer += $output->writeFieldBegin('gatewayPublicAbstract', TType::STRING, 8);
+ $xfer += $output->writeString($this->gatewayPublicAbstract);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->reviewProposalDescription !== null) {
+ $xfer += $output->writeFieldBegin('reviewProposalDescription', TType::STRING, 9);
+ $xfer += $output->writeString($this->reviewProposalDescription);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
index 9c3468c..fd7d4b8 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
@@ -371,7 +371,6 @@ class UserProfile:
- userId
- emails
- userName
- - gatewayId
- orcidId
- phones
- country
@@ -396,31 +395,29 @@ class UserProfile:
(3, TType.STRING, 'userId', None, None, ), # 3
(4, TType.LIST, 'emails', (TType.STRING,None), None, ), # 4
(5, TType.STRING, 'userName', None, None, ), # 5
- (6, TType.STRING, 'gatewayId', None, None, ), # 6
- (7, TType.STRING, 'orcidId', None, None, ), # 7
- (8, TType.LIST, 'phones', (TType.STRING,None), None, ), # 8
- (9, TType.STRING, 'country', None, None, ), # 9
- (10, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 10
- (11, TType.STRING, 'homeOrganization', None, None, ), # 11
- (12, TType.STRING, 'orginationAffiliation', None, None, ), # 12
- (13, TType.STRING, 'creationTime', None, None, ), # 13
- (14, TType.STRING, 'lastAccessTime', None, None, ), # 14
- (15, TType.STRING, 'validUntil', None, None, ), # 15
- (16, TType.I32, 'State', None, None, ), # 16
- (17, TType.STRING, 'comments', None, None, ), # 17
- (18, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 18
- (19, TType.STRING, 'gpgKey', None, None, ), # 19
- (20, TType.STRING, 'timeZone', None, None, ), # 20
- (21, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 21
+ (6, TType.STRING, 'orcidId', None, None, ), # 6
+ (7, TType.LIST, 'phones', (TType.STRING,None), None, ), # 7
+ (8, TType.STRING, 'country', None, None, ), # 8
+ (9, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 9
+ (10, TType.STRING, 'homeOrganization', None, None, ), # 10
+ (11, TType.STRING, 'orginationAffiliation', None, None, ), # 11
+ (12, TType.STRING, 'creationTime', None, None, ), # 12
+ (13, TType.STRING, 'lastAccessTime', None, None, ), # 13
+ (14, TType.STRING, 'validUntil', None, None, ), # 14
+ (15, TType.I32, 'State', None, None, ), # 15
+ (16, TType.STRING, 'comments', None, None, ), # 16
+ (17, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 17
+ (18, TType.STRING, 'gpgKey', None, None, ), # 18
+ (19, TType.STRING, 'timeZone', None, None, ), # 19
+ (20, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 20
)
- def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, emails=None, userName=None, gatewayId=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
+ def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, emails=None, userName=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
self.userModelVersion = userModelVersion
self.airavataInternalUserId = airavataInternalUserId
self.userId = userId
self.emails = emails
self.userName = userName
- self.gatewayId = gatewayId
self.orcidId = orcidId
self.phones = phones
self.country = country
@@ -478,15 +475,10 @@ class UserProfile:
iprot.skip(ftype)
elif fid == 6:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 7:
- if ftype == TType.STRING:
self.orcidId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 8:
+ elif fid == 7:
if ftype == TType.LIST:
self.phones = []
(_etype30, _size27) = iprot.readListBegin()
@@ -496,12 +488,12 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 9:
+ elif fid == 8:
if ftype == TType.STRING:
self.country = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 10:
+ elif fid == 9:
if ftype == TType.LIST:
self.nationality = []
(_etype36, _size33) = iprot.readListBegin()
@@ -511,42 +503,42 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 11:
+ elif fid == 10:
if ftype == TType.STRING:
self.homeOrganization = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 12:
+ elif fid == 11:
if ftype == TType.STRING:
self.orginationAffiliation = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 13:
+ elif fid == 12:
if ftype == TType.STRING:
self.creationTime = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 14:
+ elif fid == 13:
if ftype == TType.STRING:
self.lastAccessTime = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 15:
+ elif fid == 14:
if ftype == TType.STRING:
self.validUntil = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 16:
+ elif fid == 15:
if ftype == TType.I32:
self.State = iprot.readI32()
else:
iprot.skip(ftype)
- elif fid == 17:
+ elif fid == 16:
if ftype == TType.STRING:
self.comments = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 18:
+ elif fid == 17:
if ftype == TType.LIST:
self.labeledURI = []
(_etype42, _size39) = iprot.readListBegin()
@@ -556,17 +548,17 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 19:
+ elif fid == 18:
if ftype == TType.STRING:
self.gpgKey = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 20:
+ elif fid == 19:
if ftype == TType.STRING:
self.timeZone = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 21:
+ elif fid == 20:
if ftype == TType.STRUCT:
self.nsfDemographics = NSFDemographics()
self.nsfDemographics.read(iprot)
@@ -605,77 +597,73 @@ class UserProfile:
oprot.writeFieldBegin('userName', TType.STRING, 5)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 6)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
if self.orcidId is not None:
- oprot.writeFieldBegin('orcidId', TType.STRING, 7)
+ oprot.writeFieldBegin('orcidId', TType.STRING, 6)
oprot.writeString(self.orcidId)
oprot.writeFieldEnd()
if self.phones is not None:
- oprot.writeFieldBegin('phones', TType.LIST, 8)
+ oprot.writeFieldBegin('phones', TType.LIST, 7)
oprot.writeListBegin(TType.STRING, len(self.phones))
for iter46 in self.phones:
oprot.writeString(iter46)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.country is not None:
- oprot.writeFieldBegin('country', TType.STRING, 9)
+ oprot.writeFieldBegin('country', TType.STRING, 8)
oprot.writeString(self.country)
oprot.writeFieldEnd()
if self.nationality is not None:
- oprot.writeFieldBegin('nationality', TType.LIST, 10)
+ oprot.writeFieldBegin('nationality', TType.LIST, 9)
oprot.writeListBegin(TType.STRING, len(self.nationality))
for iter47 in self.nationality:
oprot.writeString(iter47)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.homeOrganization is not None:
- oprot.writeFieldBegin('homeOrganization', TType.STRING, 11)
+ oprot.writeFieldBegin('homeOrganization', TType.STRING, 10)
oprot.writeString(self.homeOrganization)
oprot.writeFieldEnd()
if self.orginationAffiliation is not None:
- oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 12)
+ oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 11)
oprot.writeString(self.orginationAffiliation)
oprot.writeFieldEnd()
if self.creationTime is not None:
- oprot.writeFieldBegin('creationTime', TType.STRING, 13)
+ oprot.writeFieldBegin('creationTime', TType.STRING, 12)
oprot.writeString(self.creationTime)
oprot.writeFieldEnd()
if self.lastAccessTime is not None:
- oprot.writeFieldBegin('lastAccessTime', TType.STRING, 14)
+ oprot.writeFieldBegin('lastAccessTime', TType.STRING, 13)
oprot.writeString(self.lastAccessTime)
oprot.writeFieldEnd()
if self.validUntil is not None:
- oprot.writeFieldBegin('validUntil', TType.STRING, 15)
+ oprot.writeFieldBegin('validUntil', TType.STRING, 14)
oprot.writeString(self.validUntil)
oprot.writeFieldEnd()
if self.State is not None:
- oprot.writeFieldBegin('State', TType.I32, 16)
+ oprot.writeFieldBegin('State', TType.I32, 15)
oprot.writeI32(self.State)
oprot.writeFieldEnd()
if self.comments is not None:
- oprot.writeFieldBegin('comments', TType.STRING, 17)
+ oprot.writeFieldBegin('comments', TType.STRING, 16)
oprot.writeString(self.comments)
oprot.writeFieldEnd()
if self.labeledURI is not None:
- oprot.writeFieldBegin('labeledURI', TType.LIST, 18)
+ oprot.writeFieldBegin('labeledURI', TType.LIST, 17)
oprot.writeListBegin(TType.STRING, len(self.labeledURI))
for iter48 in self.labeledURI:
oprot.writeString(iter48)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.gpgKey is not None:
- oprot.writeFieldBegin('gpgKey', TType.STRING, 19)
+ oprot.writeFieldBegin('gpgKey', TType.STRING, 18)
oprot.writeString(self.gpgKey)
oprot.writeFieldEnd()
if self.timeZone is not None:
- oprot.writeFieldBegin('timeZone', TType.STRING, 20)
+ oprot.writeFieldBegin('timeZone', TType.STRING, 19)
oprot.writeString(self.timeZone)
oprot.writeFieldEnd()
if self.nsfDemographics is not None:
- oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 21)
+ oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 20)
self.nsfDemographics.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -708,7 +696,6 @@ class UserProfile:
value = (value * 31) ^ hash(self.userId)
value = (value * 31) ^ hash(self.emails)
value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.orcidId)
value = (value * 31) ^ hash(self.phones)
value = (value * 31) ^ hash(self.country)
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
index 74678df..14e2d91 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
@@ -18,6 +18,26 @@ except:
fastbinary = None
+class GatewayApprovalStatus:
+ REQUESTED = 0
+ APPROVED = 1
+ ACTIVE = 2
+ DEACTIVATED = 3
+
+ _VALUES_TO_NAMES = {
+ 0: "REQUESTED",
+ 1: "APPROVED",
+ 2: "ACTIVE",
+ 3: "DEACTIVATED",
+ }
+
+ _NAMES_TO_VALUES = {
+ "REQUESTED": 0,
+ "APPROVED": 1,
+ "ACTIVE": 2,
+ "DEACTIVATED": 3,
+ }
+
class NotificationPriority:
LOW = 0
NORMAL = 1
@@ -374,24 +394,39 @@ class Gateway:
"""
Attributes:
- gatewayId
+ - gatewayApprovalStatus
- gatewayName
- domain
- emailAddress
+ - gatewayAcronym
+ - gatewayURL
+ - gatewayPublicAbstract
+ - reviewProposalDescription
"""
thrift_spec = (
None, # 0
(1, TType.STRING, 'gatewayId', None, None, ), # 1
- (2, TType.STRING, 'gatewayName', None, None, ), # 2
- (3, TType.STRING, 'domain', None, None, ), # 3
- (4, TType.STRING, 'emailAddress', None, None, ), # 4
+ (2, TType.I32, 'gatewayApprovalStatus', None, None, ), # 2
+ (3, TType.STRING, 'gatewayName', None, None, ), # 3
+ (4, TType.STRING, 'domain', None, None, ), # 4
+ (5, TType.STRING, 'emailAddress', None, None, ), # 5
+ (6, TType.STRING, 'gatewayAcronym', None, None, ), # 6
+ (7, TType.STRING, 'gatewayURL', None, None, ), # 7
+ (8, TType.STRING, 'gatewayPublicAbstract', None, None, ), # 8
+ (9, TType.STRING, 'reviewProposalDescription', None, None, ), # 9
)
- def __init__(self, gatewayId=None, gatewayName=None, domain=None, emailAddress=None,):
+ def __init__(self, gatewayId=None, gatewayApprovalStatus=None, gatewayName=None, domain=None, emailAddress=None, gatewayAcronym=None, gatewayURL=None, gatewayPublicAbstract=None, reviewProposalDescription=None,):
self.gatewayId = gatewayId
+ self.gatewayApprovalStatus = gatewayApprovalStatus
self.gatewayName = gatewayName
self.domain = domain
self.emailAddress = emailAddress
+ self.gatewayAcronym = gatewayAcronym
+ self.gatewayURL = gatewayURL
+ self.gatewayPublicAbstract = gatewayPublicAbstract
+ self.reviewProposalDescription = reviewProposalDescription
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:
@@ -408,20 +443,45 @@ class Gateway:
else:
iprot.skip(ftype)
elif fid == 2:
+ if ftype == TType.I32:
+ self.gatewayApprovalStatus = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
if ftype == TType.STRING:
self.gatewayName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 3:
+ elif fid == 4:
if ftype == TType.STRING:
self.domain = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 4:
+ elif fid == 5:
if ftype == TType.STRING:
self.emailAddress = iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.STRING:
+ self.gatewayAcronym = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 7:
+ if ftype == TType.STRING:
+ self.gatewayURL = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.STRING:
+ self.gatewayPublicAbstract = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 9:
+ if ftype == TType.STRING:
+ self.reviewProposalDescription = iprot.readString()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -436,33 +496,60 @@ class Gateway:
oprot.writeFieldBegin('gatewayId', TType.STRING, 1)
oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
+ if self.gatewayApprovalStatus is not None:
+ oprot.writeFieldBegin('gatewayApprovalStatus', TType.I32, 2)
+ oprot.writeI32(self.gatewayApprovalStatus)
+ oprot.writeFieldEnd()
if self.gatewayName is not None:
- oprot.writeFieldBegin('gatewayName', TType.STRING, 2)
+ oprot.writeFieldBegin('gatewayName', TType.STRING, 3)
oprot.writeString(self.gatewayName)
oprot.writeFieldEnd()
if self.domain is not None:
- oprot.writeFieldBegin('domain', TType.STRING, 3)
+ oprot.writeFieldBegin('domain', TType.STRING, 4)
oprot.writeString(self.domain)
oprot.writeFieldEnd()
if self.emailAddress is not None:
- oprot.writeFieldBegin('emailAddress', TType.STRING, 4)
+ oprot.writeFieldBegin('emailAddress', TType.STRING, 5)
oprot.writeString(self.emailAddress)
oprot.writeFieldEnd()
+ if self.gatewayAcronym is not None:
+ oprot.writeFieldBegin('gatewayAcronym', TType.STRING, 6)
+ oprot.writeString(self.gatewayAcronym)
+ oprot.writeFieldEnd()
+ if self.gatewayURL is not None:
+ oprot.writeFieldBegin('gatewayURL', TType.STRING, 7)
+ oprot.writeString(self.gatewayURL)
+ oprot.writeFieldEnd()
+ if self.gatewayPublicAbstract is not None:
+ oprot.writeFieldBegin('gatewayPublicAbstract', TType.STRING, 8)
+ oprot.writeString(self.gatewayPublicAbstract)
+ oprot.writeFieldEnd()
+ if self.reviewProposalDescription is not None:
+ oprot.writeFieldBegin('reviewProposalDescription', TType.STRING, 9)
+ oprot.writeString(self.reviewProposalDescription)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
if self.gatewayId is None:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
+ if self.gatewayApprovalStatus is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayApprovalStatus is unset!')
return
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.gatewayId)
+ value = (value * 31) ^ hash(self.gatewayApprovalStatus)
value = (value * 31) ^ hash(self.gatewayName)
value = (value * 31) ^ hash(self.domain)
value = (value * 31) ^ hash(self.emailAddress)
+ value = (value * 31) ^ hash(self.gatewayAcronym)
+ value = (value * 31) ^ hash(self.gatewayURL)
+ value = (value * 31) ^ hash(self.gatewayPublicAbstract)
+ value = (value * 31) ^ hash(self.reviewProposalDescription)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 67f4495..ca0b765 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 c0e2c31..b3ea9e9 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 2909325..be0ba4c 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 ad292ab..8a06823 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 62de7a7..5d6655e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 43830b2..e2332a3 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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");
[07/11] airavata git commit: Adding extra fields to create gateway
approval workflow
Posted by sh...@apache.org.
Adding extra fields to create gateway approval workflow
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d3e14997
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d3e14997
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d3e14997
Branch: refs/heads/master
Commit: d3e14997b6f5aa9f7d1bc4b110c802c7830e26c9
Parents: 714fcae
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Jul 11 09:44:42 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jul 12 13:48:19 2016 -0400
----------------------------------------------------------------------
.../workspace_model.thrift | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d3e14997/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
index f2532dd..ebc6d4a 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
@@ -55,11 +55,24 @@ struct User {
2: optional list<Group> groupList
}
+enum GatewayApprovalStatus {
+ REQUESTED,
+ APPROVED,
+ APPROVED,
+ ACTIVE,
+ DEACTIVATED
+}
+
struct Gateway {
1: required string gatewayId,
- 2: optional string gatewayName,
- 3: optional string domain,
- 4: optional string emailAddress
+ 2: required GatewayApprovalStatus gatewayApprovalStatus,
+ 3: optional string gatewayName,
+ 4: optional string domain,
+ 5: optional string emailAddress
+ 6: optional string gatewayAcronym,
+ 7: optional string gatewayURL,
+ 8: optional string gatewayPublicAbstract,
+ 9: optional string reviewProposalDescription
}
enum NotificationPriority {
[06/11] airavata git commit: WIP
Posted by sh...@apache.org.
WIP
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/07c725ae
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/07c725ae
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/07c725ae
Branch: refs/heads/master
Commit: 07c725ae26c01f0fb68296ac4f5df93a8d209c6a
Parents: d3e1499
Author: scnakandala <su...@gmail.com>
Authored: Mon Jul 11 12:27:50 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jul 12 13:48:19 2016 -0400
----------------------------------------------------------------------
.../catalog/impl/GatewayRegistry.java | 6 +++
.../core/experiment/catalog/model/Gateway.java | 53 +++++++++++++++++++-
.../catalog/resources/GatewayResource.java | 53 ++++++++++++++++++++
3 files changed, 111 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/07c725ae/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
index 4fb29e5..eb2f221 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
@@ -52,6 +52,12 @@ public class GatewayRegistry {
resource.setGatewayName(gateway.getGatewayName());
resource.setEmailAddress(gateway.getEmailAddress());
resource.setDomain(gateway.getDomain());
+// resource.setGatewayAcronym(gateway.getG);
+//
+// gateway.setGatewayAcronym(gatewayAcronym);
+// gateway.setGatewayUrl(gatewayUrl);
+// gateway.setGatewayPublicAbstract(gatewayPublicAbstract);
+// gateway.setReviewProposalDescription(reviewProposalDescription);
resource.save();
return gateway.getGatewayId();
}catch (RegistryException e){
http://git-wip-us.apache.org/repos/asf/airavata/blob/07c725ae/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
index bb045b8..2c301f1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
@@ -34,6 +34,11 @@ public class Gateway {
private String gatewayName;
private String domain;
private String emailAddress;
+ private String gatewayApprovalStatus;
+ private String gatewayAcronym;
+ private String gatewayUrl;
+ private String gatewayPublicAbstract;
+ private String reviewProposalDescription;
private Collection<GatewayWorker> gatewayWorkers;
private Collection<Project> projects;
@@ -74,7 +79,53 @@ public class Gateway {
this.emailAddress = emailAddress;
}
-// @Override
+ @Column(name = "GATEWAY_APPROVAL_STATUS")
+ public String getGatewayApprovalStatus() {
+ return gatewayApprovalStatus;
+ }
+
+ public void setGatewayApprovalStatus(String gatewayApprovalStatus) {
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
+ }
+
+ @Column(name = "GATEWAY_ACRONYM")
+ public String getGatewayAcronym() {
+ return gatewayAcronym;
+ }
+
+ public void setGatewayAcronym(String gatewayAcronym) {
+ this.gatewayAcronym = gatewayAcronym;
+ }
+
+ @Column(name = "GATEWAY_URL")
+ public String getGatewayUrl() {
+ return gatewayUrl;
+ }
+
+ public void setGatewayUrl(String gatewayUrl) {
+ this.gatewayUrl = gatewayUrl;
+ }
+
+ @Column(name = "GATEWAY_PUBLIC_ABSTRACT")
+ public String getGatewayPublicAbstract() {
+ return gatewayPublicAbstract;
+ }
+
+ public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
+ this.gatewayPublicAbstract = gatewayPublicAbstract;
+ }
+
+ @Column(name = "GATEWAY_REVIEW_PROPOSAL_DESCRIPTION")
+ public String getReviewProposalDescription() {
+ return reviewProposalDescription;
+ }
+
+ public void setReviewProposalDescription(String reviewProposalDescription) {
+ this.reviewProposalDescription = reviewProposalDescription;
+ }
+
+
+ // @Override
// public boolean equals(Object o) {
// if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false;
http://git-wip-us.apache.org/repos/asf/airavata/blob/07c725ae/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index 8266543..b5faa47 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -41,6 +41,11 @@ public class GatewayResource extends AbstractExpCatResource {
private String gatewayName;
private String domain;
private String emailAddress;
+ private String gatewayApprovalStatus;
+ private String gatewayAcronym;
+ private String gatewayUrl;
+ private String gatewayPublicAbstract;
+ private String reviewProposalDescription;
public String getGatewayId() {
return gatewayId;
@@ -58,6 +63,46 @@ public class GatewayResource extends AbstractExpCatResource {
this.emailAddress = emailAddress;
}
+ public String getGatewayApprovalStatus() {
+ return gatewayApprovalStatus;
+ }
+
+ public void setGatewayApprovalStatus(String gatewayApprovalStatus) {
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
+ }
+
+ public String getGatewayAcronym() {
+ return gatewayAcronym;
+ }
+
+ public void setGatewayAcronym(String gatewayAcronym) {
+ this.gatewayAcronym = gatewayAcronym;
+ }
+
+ public String getGatewayUrl() {
+ return gatewayUrl;
+ }
+
+ public void setGatewayUrl(String gatewayUrl) {
+ this.gatewayUrl = gatewayUrl;
+ }
+
+ public String getGatewayPublicAbstract() {
+ return gatewayPublicAbstract;
+ }
+
+ public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
+ this.gatewayPublicAbstract = gatewayPublicAbstract;
+ }
+
+ public String getReviewProposalDescription() {
+ return reviewProposalDescription;
+ }
+
+ public void setReviewProposalDescription(String reviewProposalDescription) {
+ this.reviewProposalDescription = reviewProposalDescription;
+ }
+
/**
*
* @param gatewayId gateway name
@@ -332,10 +377,18 @@ public class GatewayResource extends AbstractExpCatResource {
gateway.setGatewayId(gatewayId);
gateway.setDomain(domain);
gateway.setEmailAddress(emailAddress);
+ gateway.setGatewayAcronym(gatewayAcronym);
+ gateway.setGatewayUrl(gatewayUrl);
+ gateway.setGatewayPublicAbstract(gatewayPublicAbstract);
+ gateway.setReviewProposalDescription(reviewProposalDescription);
if (existingGateway != null) {
existingGateway.setDomain(domain);
existingGateway.setGatewayName(gatewayName);
existingGateway.setEmailAddress(emailAddress);
+ existingGateway.setGatewayAcronym(gatewayAcronym);
+ existingGateway.setGatewayUrl(gatewayUrl);
+ existingGateway.setGatewayPublicAbstract(gatewayPublicAbstract);
+ existingGateway.setReviewProposalDescription(reviewProposalDescription);
em.merge(existingGateway);
} else {
em.persist(gateway);
[11/11] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by sh...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2a3b3489
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2a3b3489
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2a3b3489
Branch: refs/heads/master
Commit: 2a3b3489dcc493049035fab587ac50a0a4d04ae8
Parents: fd5d836 034de76
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Jul 12 13:48:45 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jul 12 13:48:45 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/11] airavata git commit: adding more fields to the gateway Model
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 8b2fbe8..669236b 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 d8506f4..059e53a 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 141c494..231912f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 25a639b..29ec52d 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 d3d6096..de229ab 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 d572df7..ba2b876 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 648139f..0836709 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 fd28a7a..0f36407 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 baa05e5..02612c3 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 9034eb6..1736702 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 7fae4fb..9608bd8 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 043ea3b..2a171a2 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 1de24f8..87c640e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 dec2256..78417e7 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 524888d..9e95bc7 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 b27d3bc..3c129be 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
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* identityServerPwdCredToken:
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 dd0949c..e705fe0 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 c159cd3..a7ca1f2 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 7eb3f0b..31afb43 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 a02d3a6..8e31392 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 9807d44..5c5a927 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 9d81f4c..ff38771 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 57494ba..e97ffb4 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 d3066d3..b0bae82 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 b70acb9..86ba396 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 d10cf9b..2984c80 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 c0ce0fc..c66847c 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 471eb25..72a38fe 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
index 38c5056..32a9400 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class DataProductModel implements org.apache.thrift.TBase<DataProductModel, DataProductModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataProductModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataProductModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
index d163609..7bb3cb9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 40145be..c46101b 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 20e109d..85506d1 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 57d3440..8f1a226 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 5f4a333..50047ca 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 1a9761c..912487b 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 9ca3cfe..ab0d5cd 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 bb14ef8..6ef9081 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 2cb70c6..946b3f2 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 1760f95..481aea1 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 8362503..b8c2a5f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 6f1704b..878a33f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 da66e7d..b753f91 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 6230a41..2e91720 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 06fbea6..7abe9bb 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 7f5e40a..b1a8f92 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 ead501e..58c331e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 2f8f94f..f7ac2ce 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 d854bf5..67c1867 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 54a4105..50248a7 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 5faeaef..e66e973 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 8901f85..0b3e86f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 b0b3169..00c983b 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 f1e97ec..b587ff3 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 8b6da4b..18fc0f2 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 ace3c91..053d679 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 367820d..cfcf651 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 140c404..ebcb05f 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 714f267..15324db 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 20fdd62..5422455 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 0ea390b..2ad8602 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 006d391..9dac288 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 5214e17..cff821e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 87a90c3..c447d7c 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 b6a4fcf..09e278a 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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");
[05/11] airavata git commit: adding more fields to the gateway Model
Posted by sh...@apache.org.
adding more fields to the gateway Model
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/034de76c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/034de76c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/034de76c
Branch: refs/heads/master
Commit: 034de76cf6a41bc44aa5ce0aeb92b3890bf455c8
Parents: f85d41a
Author: scnakandala <su...@gmail.com>
Authored: Mon Jul 11 13:19:35 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jul 11 13:19:35 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../lib/airavata/user_profile_model_types.cpp | 80 +--
.../lib/airavata/user_profile_model_types.h | 12 +-
.../lib/airavata/workspace_model_types.cpp | 183 +++++-
.../lib/airavata/workspace_model_types.h | 52 +-
.../resources/lib/Airavata/Model/User/Types.php | 109 ++--
.../lib/Airavata/Model/Workspace/Types.php | 142 ++++-
.../lib/apache/airavata/model/user/ttypes.py | 103 ++--
.../apache/airavata/model/workspace/ttypes.py | 105 +++-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.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/user/NSFDemographics.java | 2 +-
.../apache/airavata/model/user/UserProfile.java | 276 +++------
.../airavata/model/workspace/Gateway.java | 571 ++++++++++++++++++-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Notification.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../catalog/impl/GatewayRegistry.java | 14 +-
.../utils/ThriftDataModelConversion.java | 4 +
.../workspace_model.thrift | 1 -
97 files changed, 1290 insertions(+), 530 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 eb378eb..e24bb46 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class Airavata {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
index 466013d..f89e46f 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
@@ -386,11 +386,6 @@ void UserProfile::__set_userName(const std::string& val) {
__isset.userName = true;
}
-void UserProfile::__set_gatewayId(const std::string& val) {
- this->gatewayId = val;
-__isset.gatewayId = true;
-}
-
void UserProfile::__set_orcidId(const std::string& val) {
this->orcidId = val;
__isset.orcidId = true;
@@ -545,21 +540,13 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- this->__isset.gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 7:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->orcidId);
this->__isset.orcidId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->phones.clear();
@@ -579,7 +566,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->country);
this->__isset.country = true;
@@ -587,7 +574,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->nationality.clear();
@@ -607,7 +594,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 11:
+ case 10:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->homeOrganization);
this->__isset.homeOrganization = true;
@@ -615,7 +602,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 12:
+ case 11:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->orginationAffiliation);
this->__isset.orginationAffiliation = true;
@@ -623,7 +610,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 13:
+ case 12:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->creationTime);
isset_creationTime = true;
@@ -631,7 +618,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 14:
+ case 13:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->lastAccessTime);
isset_lastAccessTime = true;
@@ -639,7 +626,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 15:
+ case 14:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->validUntil);
isset_validUntil = true;
@@ -647,7 +634,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
+ case 15:
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast39;
xfer += iprot->readI32(ecast39);
@@ -657,7 +644,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 17:
+ case 16:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->comments);
this->__isset.comments = true;
@@ -665,7 +652,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 18:
+ case 17:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->labeledURI.clear();
@@ -685,7 +672,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 19:
+ case 18:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gpgKey);
this->__isset.gpgKey = true;
@@ -693,7 +680,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 20:
+ case 19:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->timeZone);
this->__isset.timeZone = true;
@@ -701,7 +688,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 21:
+ case 20:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->nsfDemographics.read(iprot);
this->__isset.nsfDemographics = true;
@@ -771,18 +758,13 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.gatewayId) {
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 6);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
- }
if (this->__isset.orcidId) {
- xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 6);
xfer += oprot->writeString(this->orcidId);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.phones) {
- xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 8);
+ xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->phones.size()));
std::vector<std::string> ::const_iterator _iter46;
@@ -795,12 +777,12 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.country) {
- xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 9);
+ xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 8);
xfer += oprot->writeString(this->country);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.nationality) {
- xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 10);
+ xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->nationality.size()));
std::vector<std::string> ::const_iterator _iter47;
@@ -813,38 +795,38 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.homeOrganization) {
- xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 10);
xfer += oprot->writeString(this->homeOrganization);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.orginationAffiliation) {
- xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 11);
xfer += oprot->writeString(this->orginationAffiliation);
xfer += oprot->writeFieldEnd();
}
- xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_STRING, 12);
xfer += oprot->writeString(this->creationTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_STRING, 13);
xfer += oprot->writeString(this->lastAccessTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_STRING, 15);
+ xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_STRING, 14);
xfer += oprot->writeString(this->validUntil);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 16);
+ xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 15);
xfer += oprot->writeI32((int32_t)this->State);
xfer += oprot->writeFieldEnd();
if (this->__isset.comments) {
- xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 17);
+ xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 16);
xfer += oprot->writeString(this->comments);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.labeledURI) {
- xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 18);
+ xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 17);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->labeledURI.size()));
std::vector<std::string> ::const_iterator _iter48;
@@ -857,17 +839,17 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gpgKey) {
- xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 19);
+ xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 18);
xfer += oprot->writeString(this->gpgKey);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.timeZone) {
- xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 20);
+ xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 19);
xfer += oprot->writeString(this->timeZone);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.nsfDemographics) {
- xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 21);
+ xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 20);
xfer += this->nsfDemographics.write(oprot);
xfer += oprot->writeFieldEnd();
}
@@ -883,7 +865,6 @@ void swap(UserProfile &a, UserProfile &b) {
swap(a.userId, b.userId);
swap(a.emails, b.emails);
swap(a.userName, b.userName);
- swap(a.gatewayId, b.gatewayId);
swap(a.orcidId, b.orcidId);
swap(a.phones, b.phones);
swap(a.country, b.country);
@@ -908,7 +889,6 @@ UserProfile::UserProfile(const UserProfile& other49) {
userId = other49.userId;
emails = other49.emails;
userName = other49.userName;
- gatewayId = other49.gatewayId;
orcidId = other49.orcidId;
phones = other49.phones;
country = other49.country;
@@ -932,7 +912,6 @@ UserProfile& UserProfile::operator=(const UserProfile& other50) {
userId = other50.userId;
emails = other50.emails;
userName = other50.userName;
- gatewayId = other50.gatewayId;
orcidId = other50.orcidId;
phones = other50.phones;
country = other50.country;
@@ -959,7 +938,6 @@ void UserProfile::printTo(std::ostream& out) const {
out << ", " << "userId=" << to_string(userId);
out << ", " << "emails=" << to_string(emails);
out << ", " << "userName="; (__isset.userName ? (out << to_string(userName)) : (out << "<null>"));
- out << ", " << "gatewayId="; (__isset.gatewayId ? (out << to_string(gatewayId)) : (out << "<null>"));
out << ", " << "orcidId="; (__isset.orcidId ? (out << to_string(orcidId)) : (out << "<null>"));
out << ", " << "phones="; (__isset.phones ? (out << to_string(phones)) : (out << "<null>"));
out << ", " << "country="; (__isset.country ? (out << to_string(country)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
index 0881287..4ae9bad 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
@@ -185,9 +185,8 @@ inline std::ostream& operator<<(std::ostream& out, const NSFDemographics& obj)
}
typedef struct _UserProfile__isset {
- _UserProfile__isset() : userName(false), gatewayId(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {}
+ _UserProfile__isset() : userName(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {}
bool userName :1;
- bool gatewayId :1;
bool orcidId :1;
bool phones :1;
bool country :1;
@@ -206,7 +205,7 @@ class UserProfile {
UserProfile(const UserProfile&);
UserProfile& operator=(const UserProfile&);
- UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), userName(), gatewayId(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(), lastAccessTime(), validUntil(), State((Status::type)0), comments(), gpgKey(), timeZone() {
+ UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), userName(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(), lastAccessTime(), validUntil(), State((Status::type)0), comments(), gpgKey(), timeZone() {
}
virtual ~UserProfile() throw();
@@ -215,7 +214,6 @@ class UserProfile {
std::string userId;
std::vector<std::string> emails;
std::string userName;
- std::string gatewayId;
std::string orcidId;
std::vector<std::string> phones;
std::string country;
@@ -244,8 +242,6 @@ class UserProfile {
void __set_userName(const std::string& val);
- void __set_gatewayId(const std::string& val);
-
void __set_orcidId(const std::string& val);
void __set_phones(const std::vector<std::string> & val);
@@ -290,10 +286,6 @@ class UserProfile {
return false;
else if (__isset.userName && !(userName == rhs.userName))
return false;
- if (__isset.gatewayId != rhs.__isset.gatewayId)
- return false;
- else if (__isset.gatewayId && !(gatewayId == rhs.gatewayId))
- return false;
if (__isset.orcidId != rhs.__isset.orcidId)
return false;
else if (__isset.orcidId && !(orcidId == rhs.orcidId))
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
index 2229493..272c3a8 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
@@ -30,6 +30,20 @@
namespace apache { namespace airavata { namespace model { namespace workspace {
+int _kGatewayApprovalStatusValues[] = {
+ GatewayApprovalStatus::REQUESTED,
+ GatewayApprovalStatus::APPROVED,
+ GatewayApprovalStatus::ACTIVE,
+ GatewayApprovalStatus::DEACTIVATED
+};
+const char* _kGatewayApprovalStatusNames[] = {
+ "REQUESTED",
+ "APPROVED",
+ "ACTIVE",
+ "DEACTIVATED"
+};
+const std::map<int, const char*> _GatewayApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kGatewayApprovalStatusValues, _kGatewayApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
int _kNotificationPriorityValues[] = {
NotificationPriority::LOW,
NotificationPriority::NORMAL,
@@ -556,6 +570,10 @@ void Gateway::__set_gatewayId(const std::string& val) {
this->gatewayId = val;
}
+void Gateway::__set_gatewayApprovalStatus(const GatewayApprovalStatus::type val) {
+ this->gatewayApprovalStatus = val;
+}
+
void Gateway::__set_gatewayName(const std::string& val) {
this->gatewayName = val;
__isset.gatewayName = true;
@@ -571,6 +589,26 @@ void Gateway::__set_emailAddress(const std::string& val) {
__isset.emailAddress = true;
}
+void Gateway::__set_gatewayAcronym(const std::string& val) {
+ this->gatewayAcronym = val;
+__isset.gatewayAcronym = true;
+}
+
+void Gateway::__set_gatewayURL(const std::string& val) {
+ this->gatewayURL = val;
+__isset.gatewayURL = true;
+}
+
+void Gateway::__set_gatewayPublicAbstract(const std::string& val) {
+ this->gatewayPublicAbstract = val;
+__isset.gatewayPublicAbstract = true;
+}
+
+void Gateway::__set_reviewProposalDescription(const std::string& val) {
+ this->reviewProposalDescription = val;
+__isset.reviewProposalDescription = true;
+}
+
uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -584,6 +622,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
using ::apache::thrift::protocol::TProtocolException;
bool isset_gatewayId = false;
+ bool isset_gatewayApprovalStatus = false;
while (true)
{
@@ -602,6 +641,16 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 2:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast24;
+ xfer += iprot->readI32(ecast24);
+ this->gatewayApprovalStatus = (GatewayApprovalStatus::type)ecast24;
+ isset_gatewayApprovalStatus = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayName);
this->__isset.gatewayName = true;
@@ -609,7 +658,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->domain);
this->__isset.domain = true;
@@ -617,7 +666,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->emailAddress);
this->__isset.emailAddress = true;
@@ -625,6 +674,38 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayAcronym);
+ this->__isset.gatewayAcronym = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 7:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayURL);
+ this->__isset.gatewayURL = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 8:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayPublicAbstract);
+ this->__isset.gatewayPublicAbstract = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 9:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->reviewProposalDescription);
+ this->__isset.reviewProposalDescription = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -636,6 +717,8 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_gatewayApprovalStatus)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -648,21 +731,45 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("gatewayApprovalStatus", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32((int32_t)this->gatewayApprovalStatus);
+ xfer += oprot->writeFieldEnd();
+
if (this->__isset.gatewayName) {
- xfer += oprot->writeFieldBegin("gatewayName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("gatewayName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->gatewayName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.domain) {
- xfer += oprot->writeFieldBegin("domain", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("domain", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString(this->domain);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.emailAddress) {
- xfer += oprot->writeFieldBegin("emailAddress", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeFieldBegin("emailAddress", ::apache::thrift::protocol::T_STRING, 5);
xfer += oprot->writeString(this->emailAddress);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.gatewayAcronym) {
+ xfer += oprot->writeFieldBegin("gatewayAcronym", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeString(this->gatewayAcronym);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.gatewayURL) {
+ xfer += oprot->writeFieldBegin("gatewayURL", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeString(this->gatewayURL);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.gatewayPublicAbstract) {
+ xfer += oprot->writeFieldBegin("gatewayPublicAbstract", ::apache::thrift::protocol::T_STRING, 8);
+ xfer += oprot->writeString(this->gatewayPublicAbstract);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.reviewProposalDescription) {
+ xfer += oprot->writeFieldBegin("reviewProposalDescription", ::apache::thrift::protocol::T_STRING, 9);
+ xfer += oprot->writeString(this->reviewProposalDescription);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -671,34 +778,54 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const {
void swap(Gateway &a, Gateway &b) {
using ::std::swap;
swap(a.gatewayId, b.gatewayId);
+ swap(a.gatewayApprovalStatus, b.gatewayApprovalStatus);
swap(a.gatewayName, b.gatewayName);
swap(a.domain, b.domain);
swap(a.emailAddress, b.emailAddress);
+ swap(a.gatewayAcronym, b.gatewayAcronym);
+ swap(a.gatewayURL, b.gatewayURL);
+ swap(a.gatewayPublicAbstract, b.gatewayPublicAbstract);
+ swap(a.reviewProposalDescription, b.reviewProposalDescription);
swap(a.__isset, b.__isset);
}
-Gateway::Gateway(const Gateway& other24) {
- gatewayId = other24.gatewayId;
- gatewayName = other24.gatewayName;
- domain = other24.domain;
- emailAddress = other24.emailAddress;
- __isset = other24.__isset;
-}
-Gateway& Gateway::operator=(const Gateway& other25) {
+Gateway::Gateway(const Gateway& other25) {
gatewayId = other25.gatewayId;
+ gatewayApprovalStatus = other25.gatewayApprovalStatus;
gatewayName = other25.gatewayName;
domain = other25.domain;
emailAddress = other25.emailAddress;
+ gatewayAcronym = other25.gatewayAcronym;
+ gatewayURL = other25.gatewayURL;
+ gatewayPublicAbstract = other25.gatewayPublicAbstract;
+ reviewProposalDescription = other25.reviewProposalDescription;
__isset = other25.__isset;
+}
+Gateway& Gateway::operator=(const Gateway& other26) {
+ gatewayId = other26.gatewayId;
+ gatewayApprovalStatus = other26.gatewayApprovalStatus;
+ gatewayName = other26.gatewayName;
+ domain = other26.domain;
+ emailAddress = other26.emailAddress;
+ gatewayAcronym = other26.gatewayAcronym;
+ gatewayURL = other26.gatewayURL;
+ gatewayPublicAbstract = other26.gatewayPublicAbstract;
+ reviewProposalDescription = other26.reviewProposalDescription;
+ __isset = other26.__isset;
return *this;
}
void Gateway::printTo(std::ostream& out) const {
using ::apache::thrift::to_string;
out << "Gateway(";
out << "gatewayId=" << to_string(gatewayId);
+ out << ", " << "gatewayApprovalStatus=" << to_string(gatewayApprovalStatus);
out << ", " << "gatewayName="; (__isset.gatewayName ? (out << to_string(gatewayName)) : (out << "<null>"));
out << ", " << "domain="; (__isset.domain ? (out << to_string(domain)) : (out << "<null>"));
out << ", " << "emailAddress="; (__isset.emailAddress ? (out << to_string(emailAddress)) : (out << "<null>"));
+ out << ", " << "gatewayAcronym="; (__isset.gatewayAcronym ? (out << to_string(gatewayAcronym)) : (out << "<null>"));
+ out << ", " << "gatewayURL="; (__isset.gatewayURL ? (out << to_string(gatewayURL)) : (out << "<null>"));
+ out << ", " << "gatewayPublicAbstract="; (__isset.gatewayPublicAbstract ? (out << to_string(gatewayPublicAbstract)) : (out << "<null>"));
+ out << ", " << "reviewProposalDescription="; (__isset.reviewProposalDescription ? (out << to_string(reviewProposalDescription)) : (out << "<null>"));
out << ")";
}
@@ -826,9 +953,9 @@ uint32_t Notification::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 8:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast26;
- xfer += iprot->readI32(ecast26);
- this->priority = (NotificationPriority::type)ecast26;
+ int32_t ecast27;
+ xfer += iprot->readI32(ecast27);
+ this->priority = (NotificationPriority::type)ecast27;
this->__isset.priority = true;
} else {
xfer += iprot->skip(ftype);
@@ -912,18 +1039,7 @@ void swap(Notification &a, Notification &b) {
swap(a.__isset, b.__isset);
}
-Notification::Notification(const Notification& other27) {
- notificationId = other27.notificationId;
- gatewayId = other27.gatewayId;
- title = other27.title;
- notificationMessage = other27.notificationMessage;
- creationTime = other27.creationTime;
- publishedTime = other27.publishedTime;
- expirationTime = other27.expirationTime;
- priority = other27.priority;
- __isset = other27.__isset;
-}
-Notification& Notification::operator=(const Notification& other28) {
+Notification::Notification(const Notification& other28) {
notificationId = other28.notificationId;
gatewayId = other28.gatewayId;
title = other28.title;
@@ -933,6 +1049,17 @@ Notification& Notification::operator=(const Notification& other28) {
expirationTime = other28.expirationTime;
priority = other28.priority;
__isset = other28.__isset;
+}
+Notification& Notification::operator=(const Notification& other29) {
+ notificationId = other29.notificationId;
+ gatewayId = other29.gatewayId;
+ title = other29.title;
+ notificationMessage = other29.notificationMessage;
+ creationTime = other29.creationTime;
+ publishedTime = other29.publishedTime;
+ expirationTime = other29.expirationTime;
+ priority = other29.priority;
+ __isset = other29.__isset;
return *this;
}
void Notification::printTo(std::ostream& out) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
index 7502186..1485baf 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
@@ -37,6 +37,17 @@
namespace apache { namespace airavata { namespace model { namespace workspace {
+struct GatewayApprovalStatus {
+ enum type {
+ REQUESTED = 0,
+ APPROVED = 1,
+ ACTIVE = 2,
+ DEACTIVATED = 3
+ };
+};
+
+extern const std::map<int, const char*> _GatewayApprovalStatus_VALUES_TO_NAMES;
+
struct NotificationPriority {
enum type {
LOW = 0,
@@ -251,10 +262,14 @@ inline std::ostream& operator<<(std::ostream& out, const User& obj)
}
typedef struct _Gateway__isset {
- _Gateway__isset() : gatewayName(false), domain(false), emailAddress(false) {}
+ _Gateway__isset() : gatewayName(false), domain(false), emailAddress(false), gatewayAcronym(false), gatewayURL(false), gatewayPublicAbstract(false), reviewProposalDescription(false) {}
bool gatewayName :1;
bool domain :1;
bool emailAddress :1;
+ bool gatewayAcronym :1;
+ bool gatewayURL :1;
+ bool gatewayPublicAbstract :1;
+ bool reviewProposalDescription :1;
} _Gateway__isset;
class Gateway {
@@ -262,29 +277,46 @@ class Gateway {
Gateway(const Gateway&);
Gateway& operator=(const Gateway&);
- Gateway() : gatewayId(), gatewayName(), domain(), emailAddress() {
+ Gateway() : gatewayId(), gatewayApprovalStatus((GatewayApprovalStatus::type)0), gatewayName(), domain(), emailAddress(), gatewayAcronym(), gatewayURL(), gatewayPublicAbstract(), reviewProposalDescription() {
}
virtual ~Gateway() throw();
std::string gatewayId;
+ GatewayApprovalStatus::type gatewayApprovalStatus;
std::string gatewayName;
std::string domain;
std::string emailAddress;
+ std::string gatewayAcronym;
+ std::string gatewayURL;
+ std::string gatewayPublicAbstract;
+ std::string reviewProposalDescription;
_Gateway__isset __isset;
void __set_gatewayId(const std::string& val);
+ void __set_gatewayApprovalStatus(const GatewayApprovalStatus::type val);
+
void __set_gatewayName(const std::string& val);
void __set_domain(const std::string& val);
void __set_emailAddress(const std::string& val);
+ void __set_gatewayAcronym(const std::string& val);
+
+ void __set_gatewayURL(const std::string& val);
+
+ void __set_gatewayPublicAbstract(const std::string& val);
+
+ void __set_reviewProposalDescription(const std::string& val);
+
bool operator == (const Gateway & rhs) const
{
if (!(gatewayId == rhs.gatewayId))
return false;
+ if (!(gatewayApprovalStatus == rhs.gatewayApprovalStatus))
+ return false;
if (__isset.gatewayName != rhs.__isset.gatewayName)
return false;
else if (__isset.gatewayName && !(gatewayName == rhs.gatewayName))
@@ -297,6 +329,22 @@ class Gateway {
return false;
else if (__isset.emailAddress && !(emailAddress == rhs.emailAddress))
return false;
+ if (__isset.gatewayAcronym != rhs.__isset.gatewayAcronym)
+ return false;
+ else if (__isset.gatewayAcronym && !(gatewayAcronym == rhs.gatewayAcronym))
+ return false;
+ if (__isset.gatewayURL != rhs.__isset.gatewayURL)
+ return false;
+ else if (__isset.gatewayURL && !(gatewayURL == rhs.gatewayURL))
+ return false;
+ if (__isset.gatewayPublicAbstract != rhs.__isset.gatewayPublicAbstract)
+ return false;
+ else if (__isset.gatewayPublicAbstract && !(gatewayPublicAbstract == rhs.gatewayPublicAbstract))
+ return false;
+ if (__isset.reviewProposalDescription != rhs.__isset.reviewProposalDescription)
+ return false;
+ else if (__isset.reviewProposalDescription && !(reviewProposalDescription == rhs.reviewProposalDescription))
+ return false;
return true;
}
bool operator != (const Gateway &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
index 56e889b..250ef09 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
@@ -450,10 +450,6 @@ class UserProfile {
/**
* @var string
*/
- public $gatewayId = null;
- /**
- * @var string
- */
public $orcidId = null;
/**
* @var string[]
@@ -540,14 +536,10 @@ class UserProfile {
'type' => TType::STRING,
),
6 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 7 => array(
'var' => 'orcidId',
'type' => TType::STRING,
),
- 8 => array(
+ 7 => array(
'var' => 'phones',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -555,11 +547,11 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 9 => array(
+ 8 => array(
'var' => 'country',
'type' => TType::STRING,
),
- 10 => array(
+ 9 => array(
'var' => 'nationality',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -567,35 +559,35 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 11 => array(
+ 10 => array(
'var' => 'homeOrganization',
'type' => TType::STRING,
),
- 12 => array(
+ 11 => array(
'var' => 'orginationAffiliation',
'type' => TType::STRING,
),
- 13 => array(
+ 12 => array(
'var' => 'creationTime',
'type' => TType::STRING,
),
- 14 => array(
+ 13 => array(
'var' => 'lastAccessTime',
'type' => TType::STRING,
),
- 15 => array(
+ 14 => array(
'var' => 'validUntil',
'type' => TType::STRING,
),
- 16 => array(
+ 15 => array(
'var' => 'State',
'type' => TType::I32,
),
- 17 => array(
+ 16 => array(
'var' => 'comments',
'type' => TType::STRING,
),
- 18 => array(
+ 17 => array(
'var' => 'labeledURI',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -603,15 +595,15 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 19 => array(
+ 18 => array(
'var' => 'gpgKey',
'type' => TType::STRING,
),
- 20 => array(
+ 19 => array(
'var' => 'timeZone',
'type' => TType::STRING,
),
- 21 => array(
+ 20 => array(
'var' => 'nsfDemographics',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\User\NSFDemographics',
@@ -634,9 +626,6 @@ class UserProfile {
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
if (isset($vals['orcidId'])) {
$this->orcidId = $vals['orcidId'];
}
@@ -751,19 +740,12 @@ class UserProfile {
break;
case 6:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orcidId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 7:
if ($ftype == TType::LST) {
$this->phones = array();
$_size27 = 0;
@@ -780,14 +762,14 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 8:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->country);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 9:
if ($ftype == TType::LST) {
$this->nationality = array();
$_size33 = 0;
@@ -804,56 +786,56 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 10:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->homeOrganization);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 11:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orginationAffiliation);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 12:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 14:
+ case 13:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->lastAccessTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 15:
+ case 14:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->validUntil);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 16:
+ case 15:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->State);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 17:
+ case 16:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->comments);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 18:
+ case 17:
if ($ftype == TType::LST) {
$this->labeledURI = array();
$_size39 = 0;
@@ -870,21 +852,21 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 19:
+ case 18:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gpgKey);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 20:
+ case 19:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->timeZone);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 21:
+ case 20:
if ($ftype == TType::STRUCT) {
$this->nsfDemographics = new \Airavata\Model\User\NSFDemographics();
$xfer += $this->nsfDemographics->read($input);
@@ -942,13 +924,8 @@ class UserProfile {
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 6);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
if ($this->orcidId !== null) {
- $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 7);
+ $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 6);
$xfer += $output->writeString($this->orcidId);
$xfer += $output->writeFieldEnd();
}
@@ -956,7 +933,7 @@ class UserProfile {
if (!is_array($this->phones)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('phones', TType::LST, 8);
+ $xfer += $output->writeFieldBegin('phones', TType::LST, 7);
{
$output->writeListBegin(TType::STRING, count($this->phones));
{
@@ -970,7 +947,7 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->country !== null) {
- $xfer += $output->writeFieldBegin('country', TType::STRING, 9);
+ $xfer += $output->writeFieldBegin('country', TType::STRING, 8);
$xfer += $output->writeString($this->country);
$xfer += $output->writeFieldEnd();
}
@@ -978,7 +955,7 @@ class UserProfile {
if (!is_array($this->nationality)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('nationality', TType::LST, 10);
+ $xfer += $output->writeFieldBegin('nationality', TType::LST, 9);
{
$output->writeListBegin(TType::STRING, count($this->nationality));
{
@@ -992,37 +969,37 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->homeOrganization !== null) {
- $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 11);
+ $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 10);
$xfer += $output->writeString($this->homeOrganization);
$xfer += $output->writeFieldEnd();
}
if ($this->orginationAffiliation !== null) {
- $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 12);
+ $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 11);
$xfer += $output->writeString($this->orginationAffiliation);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::STRING, 13);
+ $xfer += $output->writeFieldBegin('creationTime', TType::STRING, 12);
$xfer += $output->writeString($this->creationTime);
$xfer += $output->writeFieldEnd();
}
if ($this->lastAccessTime !== null) {
- $xfer += $output->writeFieldBegin('lastAccessTime', TType::STRING, 14);
+ $xfer += $output->writeFieldBegin('lastAccessTime', TType::STRING, 13);
$xfer += $output->writeString($this->lastAccessTime);
$xfer += $output->writeFieldEnd();
}
if ($this->validUntil !== null) {
- $xfer += $output->writeFieldBegin('validUntil', TType::STRING, 15);
+ $xfer += $output->writeFieldBegin('validUntil', TType::STRING, 14);
$xfer += $output->writeString($this->validUntil);
$xfer += $output->writeFieldEnd();
}
if ($this->State !== null) {
- $xfer += $output->writeFieldBegin('State', TType::I32, 16);
+ $xfer += $output->writeFieldBegin('State', TType::I32, 15);
$xfer += $output->writeI32($this->State);
$xfer += $output->writeFieldEnd();
}
if ($this->comments !== null) {
- $xfer += $output->writeFieldBegin('comments', TType::STRING, 17);
+ $xfer += $output->writeFieldBegin('comments', TType::STRING, 16);
$xfer += $output->writeString($this->comments);
$xfer += $output->writeFieldEnd();
}
@@ -1030,7 +1007,7 @@ class UserProfile {
if (!is_array($this->labeledURI)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 18);
+ $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 17);
{
$output->writeListBegin(TType::STRING, count($this->labeledURI));
{
@@ -1044,12 +1021,12 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->gpgKey !== null) {
- $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 19);
+ $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 18);
$xfer += $output->writeString($this->gpgKey);
$xfer += $output->writeFieldEnd();
}
if ($this->timeZone !== null) {
- $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 20);
+ $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 19);
$xfer += $output->writeString($this->timeZone);
$xfer += $output->writeFieldEnd();
}
@@ -1057,7 +1034,7 @@ class UserProfile {
if (!is_object($this->nsfDemographics)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 21);
+ $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 20);
$xfer += $this->nsfDemographics->write($output);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
index 61355c2..b16d03c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
@@ -17,6 +17,19 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
use Thrift\Exception\TApplicationException;
+final class GatewayApprovalStatus {
+ const REQUESTED = 0;
+ const APPROVED = 1;
+ const ACTIVE = 2;
+ const DEACTIVATED = 3;
+ static public $__names = array(
+ 0 => 'REQUESTED',
+ 1 => 'APPROVED',
+ 2 => 'ACTIVE',
+ 3 => 'DEACTIVATED',
+ );
+}
+
final class NotificationPriority {
const LOW = 0;
const NORMAL = 1;
@@ -525,6 +538,10 @@ class Gateway {
*/
public $gatewayId = null;
/**
+ * @var int
+ */
+ public $gatewayApprovalStatus = null;
+ /**
* @var string
*/
public $gatewayName = null;
@@ -536,6 +553,22 @@ class Gateway {
* @var string
*/
public $emailAddress = null;
+ /**
+ * @var string
+ */
+ public $gatewayAcronym = null;
+ /**
+ * @var string
+ */
+ public $gatewayURL = null;
+ /**
+ * @var string
+ */
+ public $gatewayPublicAbstract = null;
+ /**
+ * @var string
+ */
+ public $reviewProposalDescription = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -545,23 +578,46 @@ class Gateway {
'type' => TType::STRING,
),
2 => array(
+ 'var' => 'gatewayApprovalStatus',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
'var' => 'gatewayName',
'type' => TType::STRING,
),
- 3 => array(
+ 4 => array(
'var' => 'domain',
'type' => TType::STRING,
),
- 4 => array(
+ 5 => array(
'var' => 'emailAddress',
'type' => TType::STRING,
),
+ 6 => array(
+ 'var' => 'gatewayAcronym',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'gatewayURL',
+ 'type' => TType::STRING,
+ ),
+ 8 => array(
+ 'var' => 'gatewayPublicAbstract',
+ 'type' => TType::STRING,
+ ),
+ 9 => array(
+ 'var' => 'reviewProposalDescription',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['gatewayApprovalStatus'])) {
+ $this->gatewayApprovalStatus = $vals['gatewayApprovalStatus'];
+ }
if (isset($vals['gatewayName'])) {
$this->gatewayName = $vals['gatewayName'];
}
@@ -571,6 +627,18 @@ class Gateway {
if (isset($vals['emailAddress'])) {
$this->emailAddress = $vals['emailAddress'];
}
+ if (isset($vals['gatewayAcronym'])) {
+ $this->gatewayAcronym = $vals['gatewayAcronym'];
+ }
+ if (isset($vals['gatewayURL'])) {
+ $this->gatewayURL = $vals['gatewayURL'];
+ }
+ if (isset($vals['gatewayPublicAbstract'])) {
+ $this->gatewayPublicAbstract = $vals['gatewayPublicAbstract'];
+ }
+ if (isset($vals['reviewProposalDescription'])) {
+ $this->reviewProposalDescription = $vals['reviewProposalDescription'];
+ }
}
}
@@ -601,26 +669,61 @@ class Gateway {
}
break;
case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->gatewayApprovalStatus);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gatewayName);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 3:
+ case 4:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->domain);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 5:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->emailAddress);
} else {
$xfer += $input->skip($ftype);
}
break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayAcronym);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayURL);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayPublicAbstract);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->reviewProposalDescription);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -639,21 +742,46 @@ class Gateway {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayApprovalStatus !== null) {
+ $xfer += $output->writeFieldBegin('gatewayApprovalStatus', TType::I32, 2);
+ $xfer += $output->writeI32($this->gatewayApprovalStatus);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->gatewayName !== null) {
- $xfer += $output->writeFieldBegin('gatewayName', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('gatewayName', TType::STRING, 3);
$xfer += $output->writeString($this->gatewayName);
$xfer += $output->writeFieldEnd();
}
if ($this->domain !== null) {
- $xfer += $output->writeFieldBegin('domain', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('domain', TType::STRING, 4);
$xfer += $output->writeString($this->domain);
$xfer += $output->writeFieldEnd();
}
if ($this->emailAddress !== null) {
- $xfer += $output->writeFieldBegin('emailAddress', TType::STRING, 4);
+ $xfer += $output->writeFieldBegin('emailAddress', TType::STRING, 5);
$xfer += $output->writeString($this->emailAddress);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayAcronym !== null) {
+ $xfer += $output->writeFieldBegin('gatewayAcronym', TType::STRING, 6);
+ $xfer += $output->writeString($this->gatewayAcronym);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayURL !== null) {
+ $xfer += $output->writeFieldBegin('gatewayURL', TType::STRING, 7);
+ $xfer += $output->writeString($this->gatewayURL);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayPublicAbstract !== null) {
+ $xfer += $output->writeFieldBegin('gatewayPublicAbstract', TType::STRING, 8);
+ $xfer += $output->writeString($this->gatewayPublicAbstract);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->reviewProposalDescription !== null) {
+ $xfer += $output->writeFieldBegin('reviewProposalDescription', TType::STRING, 9);
+ $xfer += $output->writeString($this->reviewProposalDescription);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
index 9c3468c..fd7d4b8 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
@@ -371,7 +371,6 @@ class UserProfile:
- userId
- emails
- userName
- - gatewayId
- orcidId
- phones
- country
@@ -396,31 +395,29 @@ class UserProfile:
(3, TType.STRING, 'userId', None, None, ), # 3
(4, TType.LIST, 'emails', (TType.STRING,None), None, ), # 4
(5, TType.STRING, 'userName', None, None, ), # 5
- (6, TType.STRING, 'gatewayId', None, None, ), # 6
- (7, TType.STRING, 'orcidId', None, None, ), # 7
- (8, TType.LIST, 'phones', (TType.STRING,None), None, ), # 8
- (9, TType.STRING, 'country', None, None, ), # 9
- (10, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 10
- (11, TType.STRING, 'homeOrganization', None, None, ), # 11
- (12, TType.STRING, 'orginationAffiliation', None, None, ), # 12
- (13, TType.STRING, 'creationTime', None, None, ), # 13
- (14, TType.STRING, 'lastAccessTime', None, None, ), # 14
- (15, TType.STRING, 'validUntil', None, None, ), # 15
- (16, TType.I32, 'State', None, None, ), # 16
- (17, TType.STRING, 'comments', None, None, ), # 17
- (18, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 18
- (19, TType.STRING, 'gpgKey', None, None, ), # 19
- (20, TType.STRING, 'timeZone', None, None, ), # 20
- (21, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 21
+ (6, TType.STRING, 'orcidId', None, None, ), # 6
+ (7, TType.LIST, 'phones', (TType.STRING,None), None, ), # 7
+ (8, TType.STRING, 'country', None, None, ), # 8
+ (9, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 9
+ (10, TType.STRING, 'homeOrganization', None, None, ), # 10
+ (11, TType.STRING, 'orginationAffiliation', None, None, ), # 11
+ (12, TType.STRING, 'creationTime', None, None, ), # 12
+ (13, TType.STRING, 'lastAccessTime', None, None, ), # 13
+ (14, TType.STRING, 'validUntil', None, None, ), # 14
+ (15, TType.I32, 'State', None, None, ), # 15
+ (16, TType.STRING, 'comments', None, None, ), # 16
+ (17, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 17
+ (18, TType.STRING, 'gpgKey', None, None, ), # 18
+ (19, TType.STRING, 'timeZone', None, None, ), # 19
+ (20, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 20
)
- def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, emails=None, userName=None, gatewayId=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
+ def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, emails=None, userName=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
self.userModelVersion = userModelVersion
self.airavataInternalUserId = airavataInternalUserId
self.userId = userId
self.emails = emails
self.userName = userName
- self.gatewayId = gatewayId
self.orcidId = orcidId
self.phones = phones
self.country = country
@@ -478,15 +475,10 @@ class UserProfile:
iprot.skip(ftype)
elif fid == 6:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 7:
- if ftype == TType.STRING:
self.orcidId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 8:
+ elif fid == 7:
if ftype == TType.LIST:
self.phones = []
(_etype30, _size27) = iprot.readListBegin()
@@ -496,12 +488,12 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 9:
+ elif fid == 8:
if ftype == TType.STRING:
self.country = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 10:
+ elif fid == 9:
if ftype == TType.LIST:
self.nationality = []
(_etype36, _size33) = iprot.readListBegin()
@@ -511,42 +503,42 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 11:
+ elif fid == 10:
if ftype == TType.STRING:
self.homeOrganization = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 12:
+ elif fid == 11:
if ftype == TType.STRING:
self.orginationAffiliation = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 13:
+ elif fid == 12:
if ftype == TType.STRING:
self.creationTime = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 14:
+ elif fid == 13:
if ftype == TType.STRING:
self.lastAccessTime = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 15:
+ elif fid == 14:
if ftype == TType.STRING:
self.validUntil = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 16:
+ elif fid == 15:
if ftype == TType.I32:
self.State = iprot.readI32()
else:
iprot.skip(ftype)
- elif fid == 17:
+ elif fid == 16:
if ftype == TType.STRING:
self.comments = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 18:
+ elif fid == 17:
if ftype == TType.LIST:
self.labeledURI = []
(_etype42, _size39) = iprot.readListBegin()
@@ -556,17 +548,17 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 19:
+ elif fid == 18:
if ftype == TType.STRING:
self.gpgKey = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 20:
+ elif fid == 19:
if ftype == TType.STRING:
self.timeZone = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 21:
+ elif fid == 20:
if ftype == TType.STRUCT:
self.nsfDemographics = NSFDemographics()
self.nsfDemographics.read(iprot)
@@ -605,77 +597,73 @@ class UserProfile:
oprot.writeFieldBegin('userName', TType.STRING, 5)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 6)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
if self.orcidId is not None:
- oprot.writeFieldBegin('orcidId', TType.STRING, 7)
+ oprot.writeFieldBegin('orcidId', TType.STRING, 6)
oprot.writeString(self.orcidId)
oprot.writeFieldEnd()
if self.phones is not None:
- oprot.writeFieldBegin('phones', TType.LIST, 8)
+ oprot.writeFieldBegin('phones', TType.LIST, 7)
oprot.writeListBegin(TType.STRING, len(self.phones))
for iter46 in self.phones:
oprot.writeString(iter46)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.country is not None:
- oprot.writeFieldBegin('country', TType.STRING, 9)
+ oprot.writeFieldBegin('country', TType.STRING, 8)
oprot.writeString(self.country)
oprot.writeFieldEnd()
if self.nationality is not None:
- oprot.writeFieldBegin('nationality', TType.LIST, 10)
+ oprot.writeFieldBegin('nationality', TType.LIST, 9)
oprot.writeListBegin(TType.STRING, len(self.nationality))
for iter47 in self.nationality:
oprot.writeString(iter47)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.homeOrganization is not None:
- oprot.writeFieldBegin('homeOrganization', TType.STRING, 11)
+ oprot.writeFieldBegin('homeOrganization', TType.STRING, 10)
oprot.writeString(self.homeOrganization)
oprot.writeFieldEnd()
if self.orginationAffiliation is not None:
- oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 12)
+ oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 11)
oprot.writeString(self.orginationAffiliation)
oprot.writeFieldEnd()
if self.creationTime is not None:
- oprot.writeFieldBegin('creationTime', TType.STRING, 13)
+ oprot.writeFieldBegin('creationTime', TType.STRING, 12)
oprot.writeString(self.creationTime)
oprot.writeFieldEnd()
if self.lastAccessTime is not None:
- oprot.writeFieldBegin('lastAccessTime', TType.STRING, 14)
+ oprot.writeFieldBegin('lastAccessTime', TType.STRING, 13)
oprot.writeString(self.lastAccessTime)
oprot.writeFieldEnd()
if self.validUntil is not None:
- oprot.writeFieldBegin('validUntil', TType.STRING, 15)
+ oprot.writeFieldBegin('validUntil', TType.STRING, 14)
oprot.writeString(self.validUntil)
oprot.writeFieldEnd()
if self.State is not None:
- oprot.writeFieldBegin('State', TType.I32, 16)
+ oprot.writeFieldBegin('State', TType.I32, 15)
oprot.writeI32(self.State)
oprot.writeFieldEnd()
if self.comments is not None:
- oprot.writeFieldBegin('comments', TType.STRING, 17)
+ oprot.writeFieldBegin('comments', TType.STRING, 16)
oprot.writeString(self.comments)
oprot.writeFieldEnd()
if self.labeledURI is not None:
- oprot.writeFieldBegin('labeledURI', TType.LIST, 18)
+ oprot.writeFieldBegin('labeledURI', TType.LIST, 17)
oprot.writeListBegin(TType.STRING, len(self.labeledURI))
for iter48 in self.labeledURI:
oprot.writeString(iter48)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.gpgKey is not None:
- oprot.writeFieldBegin('gpgKey', TType.STRING, 19)
+ oprot.writeFieldBegin('gpgKey', TType.STRING, 18)
oprot.writeString(self.gpgKey)
oprot.writeFieldEnd()
if self.timeZone is not None:
- oprot.writeFieldBegin('timeZone', TType.STRING, 20)
+ oprot.writeFieldBegin('timeZone', TType.STRING, 19)
oprot.writeString(self.timeZone)
oprot.writeFieldEnd()
if self.nsfDemographics is not None:
- oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 21)
+ oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 20)
self.nsfDemographics.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -708,7 +696,6 @@ class UserProfile:
value = (value * 31) ^ hash(self.userId)
value = (value * 31) ^ hash(self.emails)
value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.orcidId)
value = (value * 31) ^ hash(self.phones)
value = (value * 31) ^ hash(self.country)
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
index 74678df..14e2d91 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
@@ -18,6 +18,26 @@ except:
fastbinary = None
+class GatewayApprovalStatus:
+ REQUESTED = 0
+ APPROVED = 1
+ ACTIVE = 2
+ DEACTIVATED = 3
+
+ _VALUES_TO_NAMES = {
+ 0: "REQUESTED",
+ 1: "APPROVED",
+ 2: "ACTIVE",
+ 3: "DEACTIVATED",
+ }
+
+ _NAMES_TO_VALUES = {
+ "REQUESTED": 0,
+ "APPROVED": 1,
+ "ACTIVE": 2,
+ "DEACTIVATED": 3,
+ }
+
class NotificationPriority:
LOW = 0
NORMAL = 1
@@ -374,24 +394,39 @@ class Gateway:
"""
Attributes:
- gatewayId
+ - gatewayApprovalStatus
- gatewayName
- domain
- emailAddress
+ - gatewayAcronym
+ - gatewayURL
+ - gatewayPublicAbstract
+ - reviewProposalDescription
"""
thrift_spec = (
None, # 0
(1, TType.STRING, 'gatewayId', None, None, ), # 1
- (2, TType.STRING, 'gatewayName', None, None, ), # 2
- (3, TType.STRING, 'domain', None, None, ), # 3
- (4, TType.STRING, 'emailAddress', None, None, ), # 4
+ (2, TType.I32, 'gatewayApprovalStatus', None, None, ), # 2
+ (3, TType.STRING, 'gatewayName', None, None, ), # 3
+ (4, TType.STRING, 'domain', None, None, ), # 4
+ (5, TType.STRING, 'emailAddress', None, None, ), # 5
+ (6, TType.STRING, 'gatewayAcronym', None, None, ), # 6
+ (7, TType.STRING, 'gatewayURL', None, None, ), # 7
+ (8, TType.STRING, 'gatewayPublicAbstract', None, None, ), # 8
+ (9, TType.STRING, 'reviewProposalDescription', None, None, ), # 9
)
- def __init__(self, gatewayId=None, gatewayName=None, domain=None, emailAddress=None,):
+ def __init__(self, gatewayId=None, gatewayApprovalStatus=None, gatewayName=None, domain=None, emailAddress=None, gatewayAcronym=None, gatewayURL=None, gatewayPublicAbstract=None, reviewProposalDescription=None,):
self.gatewayId = gatewayId
+ self.gatewayApprovalStatus = gatewayApprovalStatus
self.gatewayName = gatewayName
self.domain = domain
self.emailAddress = emailAddress
+ self.gatewayAcronym = gatewayAcronym
+ self.gatewayURL = gatewayURL
+ self.gatewayPublicAbstract = gatewayPublicAbstract
+ self.reviewProposalDescription = reviewProposalDescription
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:
@@ -408,20 +443,45 @@ class Gateway:
else:
iprot.skip(ftype)
elif fid == 2:
+ if ftype == TType.I32:
+ self.gatewayApprovalStatus = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
if ftype == TType.STRING:
self.gatewayName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 3:
+ elif fid == 4:
if ftype == TType.STRING:
self.domain = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 4:
+ elif fid == 5:
if ftype == TType.STRING:
self.emailAddress = iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.STRING:
+ self.gatewayAcronym = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 7:
+ if ftype == TType.STRING:
+ self.gatewayURL = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.STRING:
+ self.gatewayPublicAbstract = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 9:
+ if ftype == TType.STRING:
+ self.reviewProposalDescription = iprot.readString()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -436,33 +496,60 @@ class Gateway:
oprot.writeFieldBegin('gatewayId', TType.STRING, 1)
oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
+ if self.gatewayApprovalStatus is not None:
+ oprot.writeFieldBegin('gatewayApprovalStatus', TType.I32, 2)
+ oprot.writeI32(self.gatewayApprovalStatus)
+ oprot.writeFieldEnd()
if self.gatewayName is not None:
- oprot.writeFieldBegin('gatewayName', TType.STRING, 2)
+ oprot.writeFieldBegin('gatewayName', TType.STRING, 3)
oprot.writeString(self.gatewayName)
oprot.writeFieldEnd()
if self.domain is not None:
- oprot.writeFieldBegin('domain', TType.STRING, 3)
+ oprot.writeFieldBegin('domain', TType.STRING, 4)
oprot.writeString(self.domain)
oprot.writeFieldEnd()
if self.emailAddress is not None:
- oprot.writeFieldBegin('emailAddress', TType.STRING, 4)
+ oprot.writeFieldBegin('emailAddress', TType.STRING, 5)
oprot.writeString(self.emailAddress)
oprot.writeFieldEnd()
+ if self.gatewayAcronym is not None:
+ oprot.writeFieldBegin('gatewayAcronym', TType.STRING, 6)
+ oprot.writeString(self.gatewayAcronym)
+ oprot.writeFieldEnd()
+ if self.gatewayURL is not None:
+ oprot.writeFieldBegin('gatewayURL', TType.STRING, 7)
+ oprot.writeString(self.gatewayURL)
+ oprot.writeFieldEnd()
+ if self.gatewayPublicAbstract is not None:
+ oprot.writeFieldBegin('gatewayPublicAbstract', TType.STRING, 8)
+ oprot.writeString(self.gatewayPublicAbstract)
+ oprot.writeFieldEnd()
+ if self.reviewProposalDescription is not None:
+ oprot.writeFieldBegin('reviewProposalDescription', TType.STRING, 9)
+ oprot.writeString(self.reviewProposalDescription)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
if self.gatewayId is None:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
+ if self.gatewayApprovalStatus is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayApprovalStatus is unset!')
return
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.gatewayId)
+ value = (value * 31) ^ hash(self.gatewayApprovalStatus)
value = (value * 31) ^ hash(self.gatewayName)
value = (value * 31) ^ hash(self.domain)
value = (value * 31) ^ hash(self.emailAddress)
+ value = (value * 31) ^ hash(self.gatewayAcronym)
+ value = (value * 31) ^ hash(self.gatewayURL)
+ value = (value * 31) ^ hash(self.gatewayPublicAbstract)
+ value = (value * 31) ^ hash(self.reviewProposalDescription)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 67f4495..ca0b765 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 c0e2c31..b3ea9e9 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 2909325..be0ba4c 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 ad292ab..8a06823 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/034de76c/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 62de7a7..5d6655e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/034de76c/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 43830b2..e2332a3 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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");
[08/11] airavata git commit: adding more fields to the gateway Model
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 ad5d994..0443043 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 01a1932..f44a5c7 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 a46a3c6..abbbedb 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 2858048..8097b92 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 4286a11..d19c340 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 a7fc645..461b01e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 f455b3a..8fd72cb 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 ab3a5f6..0819236 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
index 0a13976..9fc5644 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class NSFDemographics implements org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, java.io.Serializable, Cloneable, Comparable<NSFDemographics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NSFDemographics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
index ff2b2cb..67e4161 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
* * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
* *
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserProfile");
@@ -112,22 +112,21 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField EMAILS_FIELD_DESC = new org.apache.thrift.protocol.TField("emails", org.apache.thrift.protocol.TType.LIST, (short)4);
private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)5);
- 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)6);
- private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orcidId", org.apache.thrift.protocol.TType.STRING, (short)7);
- private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = new org.apache.thrift.protocol.TField("phones", org.apache.thrift.protocol.TType.LIST, (short)8);
- private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("country", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", org.apache.thrift.protocol.TType.LIST, (short)10);
- private static final org.apache.thrift.protocol.TField HOME_ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("homeOrganization", org.apache.thrift.protocol.TType.STRING, (short)11);
- private static final org.apache.thrift.protocol.TField ORGINATION_AFFILIATION_FIELD_DESC = new org.apache.thrift.protocol.TField("orginationAffiliation", org.apache.thrift.protocol.TType.STRING, (short)12);
- private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.STRING, (short)13);
- private static final org.apache.thrift.protocol.TField LAST_ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastAccessTime", org.apache.thrift.protocol.TType.STRING, (short)14);
- private static final org.apache.thrift.protocol.TField VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", org.apache.thrift.protocol.TType.STRING, (short)15);
- private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("State", org.apache.thrift.protocol.TType.I32, (short)16);
- private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("comments", org.apache.thrift.protocol.TType.STRING, (short)17);
- private static final org.apache.thrift.protocol.TField LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", org.apache.thrift.protocol.TType.LIST, (short)18);
- private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("gpgKey", org.apache.thrift.protocol.TType.STRING, (short)19);
- private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeZone", org.apache.thrift.protocol.TType.STRING, (short)20);
- private static final org.apache.thrift.protocol.TField NSF_DEMOGRAPHICS_FIELD_DESC = new org.apache.thrift.protocol.TField("nsfDemographics", org.apache.thrift.protocol.TType.STRUCT, (short)21);
+ private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orcidId", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = new org.apache.thrift.protocol.TField("phones", org.apache.thrift.protocol.TType.LIST, (short)7);
+ private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("country", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", org.apache.thrift.protocol.TType.LIST, (short)9);
+ private static final org.apache.thrift.protocol.TField HOME_ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("homeOrganization", org.apache.thrift.protocol.TType.STRING, (short)10);
+ private static final org.apache.thrift.protocol.TField ORGINATION_AFFILIATION_FIELD_DESC = new org.apache.thrift.protocol.TField("orginationAffiliation", org.apache.thrift.protocol.TType.STRING, (short)11);
+ private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.STRING, (short)12);
+ private static final org.apache.thrift.protocol.TField LAST_ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastAccessTime", org.apache.thrift.protocol.TType.STRING, (short)13);
+ private static final org.apache.thrift.protocol.TField VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", org.apache.thrift.protocol.TType.STRING, (short)14);
+ private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("State", org.apache.thrift.protocol.TType.I32, (short)15);
+ private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("comments", org.apache.thrift.protocol.TType.STRING, (short)16);
+ private static final org.apache.thrift.protocol.TField LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", org.apache.thrift.protocol.TType.LIST, (short)17);
+ private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("gpgKey", org.apache.thrift.protocol.TType.STRING, (short)18);
+ private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeZone", org.apache.thrift.protocol.TType.STRING, (short)19);
+ private static final org.apache.thrift.protocol.TField NSF_DEMOGRAPHICS_FIELD_DESC = new org.apache.thrift.protocol.TField("nsfDemographics", org.apache.thrift.protocol.TType.STRUCT, (short)20);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -140,7 +139,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
private String userId; // required
private List<String> emails; // required
private String userName; // optional
- private String gatewayId; // optional
private String orcidId; // optional
private List<String> phones; // optional
private String country; // optional
@@ -164,26 +162,25 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
USER_ID((short)3, "userId"),
EMAILS((short)4, "emails"),
USER_NAME((short)5, "userName"),
- GATEWAY_ID((short)6, "gatewayId"),
- ORCID_ID((short)7, "orcidId"),
- PHONES((short)8, "phones"),
- COUNTRY((short)9, "country"),
- NATIONALITY((short)10, "nationality"),
- HOME_ORGANIZATION((short)11, "homeOrganization"),
- ORGINATION_AFFILIATION((short)12, "orginationAffiliation"),
- CREATION_TIME((short)13, "creationTime"),
- LAST_ACCESS_TIME((short)14, "lastAccessTime"),
- VALID_UNTIL((short)15, "validUntil"),
+ ORCID_ID((short)6, "orcidId"),
+ PHONES((short)7, "phones"),
+ COUNTRY((short)8, "country"),
+ NATIONALITY((short)9, "nationality"),
+ HOME_ORGANIZATION((short)10, "homeOrganization"),
+ ORGINATION_AFFILIATION((short)11, "orginationAffiliation"),
+ CREATION_TIME((short)12, "creationTime"),
+ LAST_ACCESS_TIME((short)13, "lastAccessTime"),
+ VALID_UNTIL((short)14, "validUntil"),
/**
*
* @see Status
*/
- STATE((short)16, "State"),
- COMMENTS((short)17, "comments"),
- LABELED_URI((short)18, "labeledURI"),
- GPG_KEY((short)19, "gpgKey"),
- TIME_ZONE((short)20, "timeZone"),
- NSF_DEMOGRAPHICS((short)21, "nsfDemographics");
+ STATE((short)15, "State"),
+ COMMENTS((short)16, "comments"),
+ LABELED_URI((short)17, "labeledURI"),
+ GPG_KEY((short)18, "gpgKey"),
+ TIME_ZONE((short)19, "timeZone"),
+ NSF_DEMOGRAPHICS((short)20, "nsfDemographics");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -208,37 +205,35 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
return EMAILS;
case 5: // USER_NAME
return USER_NAME;
- case 6: // GATEWAY_ID
- return GATEWAY_ID;
- case 7: // ORCID_ID
+ case 6: // ORCID_ID
return ORCID_ID;
- case 8: // PHONES
+ case 7: // PHONES
return PHONES;
- case 9: // COUNTRY
+ case 8: // COUNTRY
return COUNTRY;
- case 10: // NATIONALITY
+ case 9: // NATIONALITY
return NATIONALITY;
- case 11: // HOME_ORGANIZATION
+ case 10: // HOME_ORGANIZATION
return HOME_ORGANIZATION;
- case 12: // ORGINATION_AFFILIATION
+ case 11: // ORGINATION_AFFILIATION
return ORGINATION_AFFILIATION;
- case 13: // CREATION_TIME
+ case 12: // CREATION_TIME
return CREATION_TIME;
- case 14: // LAST_ACCESS_TIME
+ case 13: // LAST_ACCESS_TIME
return LAST_ACCESS_TIME;
- case 15: // VALID_UNTIL
+ case 14: // VALID_UNTIL
return VALID_UNTIL;
- case 16: // STATE
+ case 15: // STATE
return STATE;
- case 17: // COMMENTS
+ case 16: // COMMENTS
return COMMENTS;
- case 18: // LABELED_URI
+ case 17: // LABELED_URI
return LABELED_URI;
- case 19: // GPG_KEY
+ case 18: // GPG_KEY
return GPG_KEY;
- case 20: // TIME_ZONE
+ case 19: // TIME_ZONE
return TIME_ZONE;
- case 21: // NSF_DEMOGRAPHICS
+ case 20: // NSF_DEMOGRAPHICS
return NSF_DEMOGRAPHICS;
default:
return null;
@@ -280,7 +275,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.USER_NAME,_Fields.GATEWAY_ID,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS};
+ private static final _Fields optionals[] = {_Fields.USER_NAME,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS};
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);
@@ -295,8 +290,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
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.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ORCID_ID, new org.apache.thrift.meta_data.FieldMetaData("orcidId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.PHONES, new org.apache.thrift.meta_data.FieldMetaData("phones", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -382,9 +375,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
if (other.isSetUserName()) {
this.userName = other.userName;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
if (other.isSetOrcidId()) {
this.orcidId = other.orcidId;
}
@@ -448,7 +438,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
this.userId = null;
this.emails = null;
this.userName = null;
- this.gatewayId = null;
this.orcidId = null;
this.phones = null;
this.country = null;
@@ -596,29 +585,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
}
- 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 getOrcidId() {
return this.orcidId;
}
@@ -1059,14 +1025,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
case ORCID_ID:
if (value == null) {
unsetOrcidId();
@@ -1207,9 +1165,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
case USER_NAME:
return getUserName();
- case GATEWAY_ID:
- return getGatewayId();
-
case ORCID_ID:
return getOrcidId();
@@ -1276,8 +1231,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
return isSetEmails();
case USER_NAME:
return isSetUserName();
- case GATEWAY_ID:
- return isSetGatewayId();
case ORCID_ID:
return isSetOrcidId();
case PHONES:
@@ -1370,15 +1323,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
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_orcidId = true && this.isSetOrcidId();
boolean that_present_orcidId = true && that.isSetOrcidId();
if (this_present_orcidId || that_present_orcidId) {
@@ -1546,11 +1490,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
if (present_userName)
list.add(userName);
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
boolean present_orcidId = true && (isSetOrcidId());
list.add(present_orcidId);
if (present_orcidId)
@@ -1687,16 +1626,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
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(isSetOrcidId()).compareTo(other.isSetOrcidId());
if (lastComparison != 0) {
return lastComparison;
@@ -1908,16 +1837,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
first = false;
}
- if (isSetGatewayId()) {
- if (!first) sb.append(", ");
- sb.append("gatewayId:");
- if (this.gatewayId == null) {
- sb.append("null");
- } else {
- sb.append(this.gatewayId);
- }
- first = false;
- }
if (isSetOrcidId()) {
if (!first) sb.append(", ");
sb.append("orcidId:");
@@ -2188,15 +2107,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // 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 7: // ORCID_ID
+ case 6: // ORCID_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.orcidId = iprot.readString();
struct.setOrcidIdIsSet(true);
@@ -2204,7 +2115,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // PHONES
+ case 7: // PHONES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list27 = iprot.readListBegin();
@@ -2222,7 +2133,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // COUNTRY
+ case 8: // COUNTRY
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.country = iprot.readString();
struct.setCountryIsSet(true);
@@ -2230,7 +2141,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // NATIONALITY
+ case 9: // NATIONALITY
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
@@ -2248,7 +2159,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 11: // HOME_ORGANIZATION
+ case 10: // HOME_ORGANIZATION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.homeOrganization = iprot.readString();
struct.setHomeOrganizationIsSet(true);
@@ -2256,7 +2167,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // ORGINATION_AFFILIATION
+ case 11: // ORGINATION_AFFILIATION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.orginationAffiliation = iprot.readString();
struct.setOrginationAffiliationIsSet(true);
@@ -2264,7 +2175,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 13: // CREATION_TIME
+ case 12: // CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.creationTime = iprot.readString();
struct.setCreationTimeIsSet(true);
@@ -2272,7 +2183,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 14: // LAST_ACCESS_TIME
+ case 13: // LAST_ACCESS_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.lastAccessTime = iprot.readString();
struct.setLastAccessTimeIsSet(true);
@@ -2280,7 +2191,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 15: // VALID_UNTIL
+ case 14: // VALID_UNTIL
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.validUntil = iprot.readString();
struct.setValidUntilIsSet(true);
@@ -2288,7 +2199,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 16: // STATE
+ case 15: // STATE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.State = org.apache.airavata.model.user.Status.findByValue(iprot.readI32());
struct.setStateIsSet(true);
@@ -2296,7 +2207,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 17: // COMMENTS
+ case 16: // COMMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.comments = iprot.readString();
struct.setCommentsIsSet(true);
@@ -2304,7 +2215,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 18: // LABELED_URI
+ case 17: // LABELED_URI
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list33 = iprot.readListBegin();
@@ -2322,7 +2233,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 19: // GPG_KEY
+ case 18: // GPG_KEY
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.gpgKey = iprot.readString();
struct.setGpgKeyIsSet(true);
@@ -2330,7 +2241,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 20: // TIME_ZONE
+ case 19: // TIME_ZONE
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.timeZone = iprot.readString();
struct.setTimeZoneIsSet(true);
@@ -2338,7 +2249,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 21: // NSF_DEMOGRAPHICS
+ case 20: // NSF_DEMOGRAPHICS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.nsfDemographics = new NSFDemographics();
struct.nsfDemographics.read(iprot);
@@ -2394,13 +2305,6 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
oprot.writeFieldEnd();
}
}
- if (struct.gatewayId != null) {
- if (struct.isSetGatewayId()) {
- oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.gatewayId);
- oprot.writeFieldEnd();
- }
- }
if (struct.orcidId != null) {
if (struct.isSetOrcidId()) {
oprot.writeFieldBegin(ORCID_ID_FIELD_DESC);
@@ -2554,49 +2458,43 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
if (struct.isSetUserName()) {
optionals.set(0);
}
- if (struct.isSetGatewayId()) {
- optionals.set(1);
- }
if (struct.isSetOrcidId()) {
- optionals.set(2);
+ optionals.set(1);
}
if (struct.isSetPhones()) {
- optionals.set(3);
+ optionals.set(2);
}
if (struct.isSetCountry()) {
- optionals.set(4);
+ optionals.set(3);
}
if (struct.isSetNationality()) {
- optionals.set(5);
+ optionals.set(4);
}
if (struct.isSetHomeOrganization()) {
- optionals.set(6);
+ optionals.set(5);
}
if (struct.isSetOrginationAffiliation()) {
- optionals.set(7);
+ optionals.set(6);
}
if (struct.isSetComments()) {
- optionals.set(8);
+ optionals.set(7);
}
if (struct.isSetLabeledURI()) {
- optionals.set(9);
+ optionals.set(8);
}
if (struct.isSetGpgKey()) {
- optionals.set(10);
+ optionals.set(9);
}
if (struct.isSetTimeZone()) {
- optionals.set(11);
+ optionals.set(10);
}
if (struct.isSetNsfDemographics()) {
- optionals.set(12);
+ optionals.set(11);
}
- oprot.writeBitSet(optionals, 13);
+ oprot.writeBitSet(optionals, 12);
if (struct.isSetUserName()) {
oprot.writeString(struct.userName);
}
- if (struct.isSetGatewayId()) {
- oprot.writeString(struct.gatewayId);
- }
if (struct.isSetOrcidId()) {
oprot.writeString(struct.orcidId);
}
@@ -2678,20 +2576,16 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
struct.setValidUntilIsSet(true);
struct.State = org.apache.airavata.model.user.Status.findByValue(iprot.readI32());
struct.setStateIsSet(true);
- BitSet incoming = iprot.readBitSet(13);
+ BitSet incoming = iprot.readBitSet(12);
if (incoming.get(0)) {
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
}
if (incoming.get(1)) {
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
- }
- if (incoming.get(2)) {
struct.orcidId = iprot.readString();
struct.setOrcidIdIsSet(true);
}
- if (incoming.get(3)) {
+ if (incoming.get(2)) {
{
org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.phones = new ArrayList<String>(_list47.size);
@@ -2704,11 +2598,11 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
struct.setPhonesIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(3)) {
struct.country = iprot.readString();
struct.setCountryIsSet(true);
}
- if (incoming.get(5)) {
+ if (incoming.get(4)) {
{
org.apache.thrift.protocol.TList _list50 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.nationality = new ArrayList<String>(_list50.size);
@@ -2721,19 +2615,19 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
struct.setNationalityIsSet(true);
}
- if (incoming.get(6)) {
+ if (incoming.get(5)) {
struct.homeOrganization = iprot.readString();
struct.setHomeOrganizationIsSet(true);
}
- if (incoming.get(7)) {
+ if (incoming.get(6)) {
struct.orginationAffiliation = iprot.readString();
struct.setOrginationAffiliationIsSet(true);
}
- if (incoming.get(8)) {
+ if (incoming.get(7)) {
struct.comments = iprot.readString();
struct.setCommentsIsSet(true);
}
- if (incoming.get(9)) {
+ if (incoming.get(8)) {
{
org.apache.thrift.protocol.TList _list53 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.labeledURI = new ArrayList<String>(_list53.size);
@@ -2746,15 +2640,15 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro
}
struct.setLabeledURIIsSet(true);
}
- if (incoming.get(10)) {
+ if (incoming.get(9)) {
struct.gpgKey = iprot.readString();
struct.setGpgKeyIsSet(true);
}
- if (incoming.get(11)) {
+ if (incoming.get(10)) {
struct.timeZone = iprot.readString();
struct.setTimeZoneIsSet(true);
}
- if (incoming.get(12)) {
+ if (incoming.get(11)) {
struct.nsfDemographics = new NSFDemographics();
struct.nsfDemographics.read(iprot);
struct.setNsfDemographicsIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 272f096..123b4c5 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,14 +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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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");
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)1);
- private static final org.apache.thrift.protocol.TField GATEWAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayName", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField DOMAIN_FIELD_DESC = new org.apache.thrift.protocol.TField("domain", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField EMAIL_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddress", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField GATEWAY_APPROVAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayApprovalStatus", org.apache.thrift.protocol.TType.I32, (short)2);
+ private static final org.apache.thrift.protocol.TField GATEWAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayName", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField DOMAIN_FIELD_DESC = new org.apache.thrift.protocol.TField("domain", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField EMAIL_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddress", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField GATEWAY_ACRONYM_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayAcronym", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField GATEWAY_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayURL", org.apache.thrift.protocol.TType.STRING, (short)7);
+ private static final org.apache.thrift.protocol.TField GATEWAY_PUBLIC_ABSTRACT_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayPublicAbstract", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField REVIEW_PROPOSAL_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("reviewProposalDescription", org.apache.thrift.protocol.TType.STRING, (short)9);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -67,16 +72,30 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
private String gatewayId; // required
+ private GatewayApprovalStatus gatewayApprovalStatus; // required
private String gatewayName; // optional
private String domain; // optional
private String emailAddress; // optional
+ private String gatewayAcronym; // optional
+ private String gatewayURL; // optional
+ private String gatewayPublicAbstract; // optional
+ private String reviewProposalDescription; // 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 {
GATEWAY_ID((short)1, "gatewayId"),
- GATEWAY_NAME((short)2, "gatewayName"),
- DOMAIN((short)3, "domain"),
- EMAIL_ADDRESS((short)4, "emailAddress");
+ /**
+ *
+ * @see GatewayApprovalStatus
+ */
+ GATEWAY_APPROVAL_STATUS((short)2, "gatewayApprovalStatus"),
+ GATEWAY_NAME((short)3, "gatewayName"),
+ DOMAIN((short)4, "domain"),
+ EMAIL_ADDRESS((short)5, "emailAddress"),
+ GATEWAY_ACRONYM((short)6, "gatewayAcronym"),
+ GATEWAY_URL((short)7, "gatewayURL"),
+ GATEWAY_PUBLIC_ABSTRACT((short)8, "gatewayPublicAbstract"),
+ REVIEW_PROPOSAL_DESCRIPTION((short)9, "reviewProposalDescription");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -93,12 +112,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
switch(fieldId) {
case 1: // GATEWAY_ID
return GATEWAY_ID;
- case 2: // GATEWAY_NAME
+ case 2: // GATEWAY_APPROVAL_STATUS
+ return GATEWAY_APPROVAL_STATUS;
+ case 3: // GATEWAY_NAME
return GATEWAY_NAME;
- case 3: // DOMAIN
+ case 4: // DOMAIN
return DOMAIN;
- case 4: // EMAIL_ADDRESS
+ case 5: // EMAIL_ADDRESS
return EMAIL_ADDRESS;
+ case 6: // GATEWAY_ACRONYM
+ return GATEWAY_ACRONYM;
+ case 7: // GATEWAY_URL
+ return GATEWAY_URL;
+ case 8: // GATEWAY_PUBLIC_ABSTRACT
+ return GATEWAY_PUBLIC_ABSTRACT;
+ case 9: // REVIEW_PROPOSAL_DESCRIPTION
+ return REVIEW_PROPOSAL_DESCRIPTION;
default:
return null;
}
@@ -139,18 +168,28 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.GATEWAY_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS};
+ private static final _Fields optionals[] = {_Fields.GATEWAY_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS,_Fields.GATEWAY_ACRONYM,_Fields.GATEWAY_URL,_Fields.GATEWAY_PUBLIC_ABSTRACT,_Fields.REVIEW_PROPOSAL_DESCRIPTION};
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.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.GATEWAY_APPROVAL_STATUS, new org.apache.thrift.meta_data.FieldMetaData("gatewayApprovalStatus", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, GatewayApprovalStatus.class)));
tmpMap.put(_Fields.GATEWAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("gatewayName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.DOMAIN, new org.apache.thrift.meta_data.FieldMetaData("domain", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.EMAIL_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("emailAddress", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_ACRONYM, new org.apache.thrift.meta_data.FieldMetaData("gatewayAcronym", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_URL, new org.apache.thrift.meta_data.FieldMetaData("gatewayURL", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_PUBLIC_ABSTRACT, new org.apache.thrift.meta_data.FieldMetaData("gatewayPublicAbstract", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.REVIEW_PROPOSAL_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("reviewProposalDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Gateway.class, metaDataMap);
}
@@ -159,10 +198,12 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
public Gateway(
- String gatewayId)
+ String gatewayId,
+ GatewayApprovalStatus gatewayApprovalStatus)
{
this();
this.gatewayId = gatewayId;
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
}
/**
@@ -172,6 +213,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (other.isSetGatewayId()) {
this.gatewayId = other.gatewayId;
}
+ if (other.isSetGatewayApprovalStatus()) {
+ this.gatewayApprovalStatus = other.gatewayApprovalStatus;
+ }
if (other.isSetGatewayName()) {
this.gatewayName = other.gatewayName;
}
@@ -181,6 +225,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (other.isSetEmailAddress()) {
this.emailAddress = other.emailAddress;
}
+ if (other.isSetGatewayAcronym()) {
+ this.gatewayAcronym = other.gatewayAcronym;
+ }
+ if (other.isSetGatewayURL()) {
+ this.gatewayURL = other.gatewayURL;
+ }
+ if (other.isSetGatewayPublicAbstract()) {
+ this.gatewayPublicAbstract = other.gatewayPublicAbstract;
+ }
+ if (other.isSetReviewProposalDescription()) {
+ this.reviewProposalDescription = other.reviewProposalDescription;
+ }
}
public Gateway deepCopy() {
@@ -190,9 +246,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
@Override
public void clear() {
this.gatewayId = null;
+ this.gatewayApprovalStatus = null;
this.gatewayName = null;
this.domain = null;
this.emailAddress = null;
+ this.gatewayAcronym = null;
+ this.gatewayURL = null;
+ this.gatewayPublicAbstract = null;
+ this.reviewProposalDescription = null;
}
public String getGatewayId() {
@@ -218,6 +279,37 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
}
+ /**
+ *
+ * @see GatewayApprovalStatus
+ */
+ public GatewayApprovalStatus getGatewayApprovalStatus() {
+ return this.gatewayApprovalStatus;
+ }
+
+ /**
+ *
+ * @see GatewayApprovalStatus
+ */
+ public void setGatewayApprovalStatus(GatewayApprovalStatus gatewayApprovalStatus) {
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
+ }
+
+ public void unsetGatewayApprovalStatus() {
+ this.gatewayApprovalStatus = null;
+ }
+
+ /** Returns true if field gatewayApprovalStatus is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayApprovalStatus() {
+ return this.gatewayApprovalStatus != null;
+ }
+
+ public void setGatewayApprovalStatusIsSet(boolean value) {
+ if (!value) {
+ this.gatewayApprovalStatus = null;
+ }
+ }
+
public String getGatewayName() {
return this.gatewayName;
}
@@ -287,6 +379,98 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
}
+ public String getGatewayAcronym() {
+ return this.gatewayAcronym;
+ }
+
+ public void setGatewayAcronym(String gatewayAcronym) {
+ this.gatewayAcronym = gatewayAcronym;
+ }
+
+ public void unsetGatewayAcronym() {
+ this.gatewayAcronym = null;
+ }
+
+ /** Returns true if field gatewayAcronym is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayAcronym() {
+ return this.gatewayAcronym != null;
+ }
+
+ public void setGatewayAcronymIsSet(boolean value) {
+ if (!value) {
+ this.gatewayAcronym = null;
+ }
+ }
+
+ public String getGatewayURL() {
+ return this.gatewayURL;
+ }
+
+ public void setGatewayURL(String gatewayURL) {
+ this.gatewayURL = gatewayURL;
+ }
+
+ public void unsetGatewayURL() {
+ this.gatewayURL = null;
+ }
+
+ /** Returns true if field gatewayURL is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayURL() {
+ return this.gatewayURL != null;
+ }
+
+ public void setGatewayURLIsSet(boolean value) {
+ if (!value) {
+ this.gatewayURL = null;
+ }
+ }
+
+ public String getGatewayPublicAbstract() {
+ return this.gatewayPublicAbstract;
+ }
+
+ public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
+ this.gatewayPublicAbstract = gatewayPublicAbstract;
+ }
+
+ public void unsetGatewayPublicAbstract() {
+ this.gatewayPublicAbstract = null;
+ }
+
+ /** Returns true if field gatewayPublicAbstract is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayPublicAbstract() {
+ return this.gatewayPublicAbstract != null;
+ }
+
+ public void setGatewayPublicAbstractIsSet(boolean value) {
+ if (!value) {
+ this.gatewayPublicAbstract = null;
+ }
+ }
+
+ public String getReviewProposalDescription() {
+ return this.reviewProposalDescription;
+ }
+
+ public void setReviewProposalDescription(String reviewProposalDescription) {
+ this.reviewProposalDescription = reviewProposalDescription;
+ }
+
+ public void unsetReviewProposalDescription() {
+ this.reviewProposalDescription = null;
+ }
+
+ /** Returns true if field reviewProposalDescription is set (has been assigned a value) and false otherwise */
+ public boolean isSetReviewProposalDescription() {
+ return this.reviewProposalDescription != null;
+ }
+
+ public void setReviewProposalDescriptionIsSet(boolean value) {
+ if (!value) {
+ this.reviewProposalDescription = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case GATEWAY_ID:
@@ -297,6 +481,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
break;
+ case GATEWAY_APPROVAL_STATUS:
+ if (value == null) {
+ unsetGatewayApprovalStatus();
+ } else {
+ setGatewayApprovalStatus((GatewayApprovalStatus)value);
+ }
+ break;
+
case GATEWAY_NAME:
if (value == null) {
unsetGatewayName();
@@ -321,6 +513,38 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
break;
+ case GATEWAY_ACRONYM:
+ if (value == null) {
+ unsetGatewayAcronym();
+ } else {
+ setGatewayAcronym((String)value);
+ }
+ break;
+
+ case GATEWAY_URL:
+ if (value == null) {
+ unsetGatewayURL();
+ } else {
+ setGatewayURL((String)value);
+ }
+ break;
+
+ case GATEWAY_PUBLIC_ABSTRACT:
+ if (value == null) {
+ unsetGatewayPublicAbstract();
+ } else {
+ setGatewayPublicAbstract((String)value);
+ }
+ break;
+
+ case REVIEW_PROPOSAL_DESCRIPTION:
+ if (value == null) {
+ unsetReviewProposalDescription();
+ } else {
+ setReviewProposalDescription((String)value);
+ }
+ break;
+
}
}
@@ -329,6 +553,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
case GATEWAY_ID:
return getGatewayId();
+ case GATEWAY_APPROVAL_STATUS:
+ return getGatewayApprovalStatus();
+
case GATEWAY_NAME:
return getGatewayName();
@@ -338,6 +565,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
case EMAIL_ADDRESS:
return getEmailAddress();
+ case GATEWAY_ACRONYM:
+ return getGatewayAcronym();
+
+ case GATEWAY_URL:
+ return getGatewayURL();
+
+ case GATEWAY_PUBLIC_ABSTRACT:
+ return getGatewayPublicAbstract();
+
+ case REVIEW_PROPOSAL_DESCRIPTION:
+ return getReviewProposalDescription();
+
}
throw new IllegalStateException();
}
@@ -351,12 +590,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
switch (field) {
case GATEWAY_ID:
return isSetGatewayId();
+ case GATEWAY_APPROVAL_STATUS:
+ return isSetGatewayApprovalStatus();
case GATEWAY_NAME:
return isSetGatewayName();
case DOMAIN:
return isSetDomain();
case EMAIL_ADDRESS:
return isSetEmailAddress();
+ case GATEWAY_ACRONYM:
+ return isSetGatewayAcronym();
+ case GATEWAY_URL:
+ return isSetGatewayURL();
+ case GATEWAY_PUBLIC_ABSTRACT:
+ return isSetGatewayPublicAbstract();
+ case REVIEW_PROPOSAL_DESCRIPTION:
+ return isSetReviewProposalDescription();
}
throw new IllegalStateException();
}
@@ -383,6 +632,15 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
return false;
}
+ boolean this_present_gatewayApprovalStatus = true && this.isSetGatewayApprovalStatus();
+ boolean that_present_gatewayApprovalStatus = true && that.isSetGatewayApprovalStatus();
+ if (this_present_gatewayApprovalStatus || that_present_gatewayApprovalStatus) {
+ if (!(this_present_gatewayApprovalStatus && that_present_gatewayApprovalStatus))
+ return false;
+ if (!this.gatewayApprovalStatus.equals(that.gatewayApprovalStatus))
+ return false;
+ }
+
boolean this_present_gatewayName = true && this.isSetGatewayName();
boolean that_present_gatewayName = true && that.isSetGatewayName();
if (this_present_gatewayName || that_present_gatewayName) {
@@ -410,6 +668,42 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
return false;
}
+ boolean this_present_gatewayAcronym = true && this.isSetGatewayAcronym();
+ boolean that_present_gatewayAcronym = true && that.isSetGatewayAcronym();
+ if (this_present_gatewayAcronym || that_present_gatewayAcronym) {
+ if (!(this_present_gatewayAcronym && that_present_gatewayAcronym))
+ return false;
+ if (!this.gatewayAcronym.equals(that.gatewayAcronym))
+ return false;
+ }
+
+ boolean this_present_gatewayURL = true && this.isSetGatewayURL();
+ boolean that_present_gatewayURL = true && that.isSetGatewayURL();
+ if (this_present_gatewayURL || that_present_gatewayURL) {
+ if (!(this_present_gatewayURL && that_present_gatewayURL))
+ return false;
+ if (!this.gatewayURL.equals(that.gatewayURL))
+ return false;
+ }
+
+ boolean this_present_gatewayPublicAbstract = true && this.isSetGatewayPublicAbstract();
+ boolean that_present_gatewayPublicAbstract = true && that.isSetGatewayPublicAbstract();
+ if (this_present_gatewayPublicAbstract || that_present_gatewayPublicAbstract) {
+ if (!(this_present_gatewayPublicAbstract && that_present_gatewayPublicAbstract))
+ return false;
+ if (!this.gatewayPublicAbstract.equals(that.gatewayPublicAbstract))
+ return false;
+ }
+
+ boolean this_present_reviewProposalDescription = true && this.isSetReviewProposalDescription();
+ boolean that_present_reviewProposalDescription = true && that.isSetReviewProposalDescription();
+ if (this_present_reviewProposalDescription || that_present_reviewProposalDescription) {
+ if (!(this_present_reviewProposalDescription && that_present_reviewProposalDescription))
+ return false;
+ if (!this.reviewProposalDescription.equals(that.reviewProposalDescription))
+ return false;
+ }
+
return true;
}
@@ -422,6 +716,11 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (present_gatewayId)
list.add(gatewayId);
+ boolean present_gatewayApprovalStatus = true && (isSetGatewayApprovalStatus());
+ list.add(present_gatewayApprovalStatus);
+ if (present_gatewayApprovalStatus)
+ list.add(gatewayApprovalStatus.getValue());
+
boolean present_gatewayName = true && (isSetGatewayName());
list.add(present_gatewayName);
if (present_gatewayName)
@@ -437,6 +736,26 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (present_emailAddress)
list.add(emailAddress);
+ boolean present_gatewayAcronym = true && (isSetGatewayAcronym());
+ list.add(present_gatewayAcronym);
+ if (present_gatewayAcronym)
+ list.add(gatewayAcronym);
+
+ boolean present_gatewayURL = true && (isSetGatewayURL());
+ list.add(present_gatewayURL);
+ if (present_gatewayURL)
+ list.add(gatewayURL);
+
+ boolean present_gatewayPublicAbstract = true && (isSetGatewayPublicAbstract());
+ list.add(present_gatewayPublicAbstract);
+ if (present_gatewayPublicAbstract)
+ list.add(gatewayPublicAbstract);
+
+ boolean present_reviewProposalDescription = true && (isSetReviewProposalDescription());
+ list.add(present_reviewProposalDescription);
+ if (present_reviewProposalDescription)
+ list.add(reviewProposalDescription);
+
return list.hashCode();
}
@@ -458,6 +777,16 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetGatewayApprovalStatus()).compareTo(other.isSetGatewayApprovalStatus());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayApprovalStatus()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayApprovalStatus, other.gatewayApprovalStatus);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetGatewayName()).compareTo(other.isSetGatewayName());
if (lastComparison != 0) {
return lastComparison;
@@ -488,6 +817,46 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetGatewayAcronym()).compareTo(other.isSetGatewayAcronym());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayAcronym()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayAcronym, other.gatewayAcronym);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetGatewayURL()).compareTo(other.isSetGatewayURL());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayURL()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayURL, other.gatewayURL);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetGatewayPublicAbstract()).compareTo(other.isSetGatewayPublicAbstract());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayPublicAbstract()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayPublicAbstract, other.gatewayPublicAbstract);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetReviewProposalDescription()).compareTo(other.isSetReviewProposalDescription());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetReviewProposalDescription()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reviewProposalDescription, other.reviewProposalDescription);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -515,6 +884,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
sb.append(this.gatewayId);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("gatewayApprovalStatus:");
+ if (this.gatewayApprovalStatus == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayApprovalStatus);
+ }
+ first = false;
if (isSetGatewayName()) {
if (!first) sb.append(", ");
sb.append("gatewayName:");
@@ -545,6 +922,46 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
}
first = false;
}
+ if (isSetGatewayAcronym()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayAcronym:");
+ if (this.gatewayAcronym == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayAcronym);
+ }
+ first = false;
+ }
+ if (isSetGatewayURL()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayURL:");
+ if (this.gatewayURL == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayURL);
+ }
+ first = false;
+ }
+ if (isSetGatewayPublicAbstract()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayPublicAbstract:");
+ if (this.gatewayPublicAbstract == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayPublicAbstract);
+ }
+ first = false;
+ }
+ if (isSetReviewProposalDescription()) {
+ if (!first) sb.append(", ");
+ sb.append("reviewProposalDescription:");
+ if (this.reviewProposalDescription == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.reviewProposalDescription);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -555,6 +972,10 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
}
+ if (!isSetGatewayApprovalStatus()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayApprovalStatus' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -600,7 +1021,15 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // GATEWAY_NAME
+ case 2: // GATEWAY_APPROVAL_STATUS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.gatewayApprovalStatus = org.apache.airavata.model.workspace.GatewayApprovalStatus.findByValue(iprot.readI32());
+ struct.setGatewayApprovalStatusIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // GATEWAY_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.gatewayName = iprot.readString();
struct.setGatewayNameIsSet(true);
@@ -608,7 +1037,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // DOMAIN
+ case 4: // DOMAIN
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.domain = iprot.readString();
struct.setDomainIsSet(true);
@@ -616,7 +1045,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // EMAIL_ADDRESS
+ case 5: // EMAIL_ADDRESS
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.emailAddress = iprot.readString();
struct.setEmailAddressIsSet(true);
@@ -624,6 +1053,38 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 6: // GATEWAY_ACRONYM
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayAcronym = iprot.readString();
+ struct.setGatewayAcronymIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 7: // GATEWAY_URL
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayURL = iprot.readString();
+ struct.setGatewayURLIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // GATEWAY_PUBLIC_ABSTRACT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayPublicAbstract = iprot.readString();
+ struct.setGatewayPublicAbstractIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 9: // REVIEW_PROPOSAL_DESCRIPTION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.reviewProposalDescription = iprot.readString();
+ struct.setReviewProposalDescriptionIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -642,6 +1103,11 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
oprot.writeString(struct.gatewayId);
oprot.writeFieldEnd();
}
+ if (struct.gatewayApprovalStatus != null) {
+ oprot.writeFieldBegin(GATEWAY_APPROVAL_STATUS_FIELD_DESC);
+ oprot.writeI32(struct.gatewayApprovalStatus.getValue());
+ oprot.writeFieldEnd();
+ }
if (struct.gatewayName != null) {
if (struct.isSetGatewayName()) {
oprot.writeFieldBegin(GATEWAY_NAME_FIELD_DESC);
@@ -663,6 +1129,34 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
oprot.writeFieldEnd();
}
}
+ if (struct.gatewayAcronym != null) {
+ if (struct.isSetGatewayAcronym()) {
+ oprot.writeFieldBegin(GATEWAY_ACRONYM_FIELD_DESC);
+ oprot.writeString(struct.gatewayAcronym);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.gatewayURL != null) {
+ if (struct.isSetGatewayURL()) {
+ oprot.writeFieldBegin(GATEWAY_URL_FIELD_DESC);
+ oprot.writeString(struct.gatewayURL);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.gatewayPublicAbstract != null) {
+ if (struct.isSetGatewayPublicAbstract()) {
+ oprot.writeFieldBegin(GATEWAY_PUBLIC_ABSTRACT_FIELD_DESC);
+ oprot.writeString(struct.gatewayPublicAbstract);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.reviewProposalDescription != null) {
+ if (struct.isSetReviewProposalDescription()) {
+ oprot.writeFieldBegin(REVIEW_PROPOSAL_DESCRIPTION_FIELD_DESC);
+ oprot.writeString(struct.reviewProposalDescription);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -681,6 +1175,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
public void write(org.apache.thrift.protocol.TProtocol prot, Gateway struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.gatewayId);
+ oprot.writeI32(struct.gatewayApprovalStatus.getValue());
BitSet optionals = new BitSet();
if (struct.isSetGatewayName()) {
optionals.set(0);
@@ -691,7 +1186,19 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (struct.isSetEmailAddress()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetGatewayAcronym()) {
+ optionals.set(3);
+ }
+ if (struct.isSetGatewayURL()) {
+ optionals.set(4);
+ }
+ if (struct.isSetGatewayPublicAbstract()) {
+ optionals.set(5);
+ }
+ if (struct.isSetReviewProposalDescription()) {
+ optionals.set(6);
+ }
+ oprot.writeBitSet(optionals, 7);
if (struct.isSetGatewayName()) {
oprot.writeString(struct.gatewayName);
}
@@ -701,6 +1208,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
if (struct.isSetEmailAddress()) {
oprot.writeString(struct.emailAddress);
}
+ if (struct.isSetGatewayAcronym()) {
+ oprot.writeString(struct.gatewayAcronym);
+ }
+ if (struct.isSetGatewayURL()) {
+ oprot.writeString(struct.gatewayURL);
+ }
+ if (struct.isSetGatewayPublicAbstract()) {
+ oprot.writeString(struct.gatewayPublicAbstract);
+ }
+ if (struct.isSetReviewProposalDescription()) {
+ oprot.writeString(struct.reviewProposalDescription);
+ }
}
@Override
@@ -708,7 +1227,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.gatewayId = iprot.readString();
struct.setGatewayIdIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
+ struct.gatewayApprovalStatus = org.apache.airavata.model.workspace.GatewayApprovalStatus.findByValue(iprot.readI32());
+ struct.setGatewayApprovalStatusIsSet(true);
+ BitSet incoming = iprot.readBitSet(7);
if (incoming.get(0)) {
struct.gatewayName = iprot.readString();
struct.setGatewayNameIsSet(true);
@@ -721,6 +1242,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
struct.emailAddress = iprot.readString();
struct.setEmailAddressIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.gatewayAcronym = iprot.readString();
+ struct.setGatewayAcronymIsSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.gatewayURL = iprot.readString();
+ struct.setGatewayURLIsSet(true);
+ }
+ if (incoming.get(5)) {
+ struct.gatewayPublicAbstract = iprot.readString();
+ struct.setGatewayPublicAbstractIsSet(true);
+ }
+ if (incoming.get(6)) {
+ struct.reviewProposalDescription = iprot.readString();
+ struct.setReviewProposalDescriptionIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 c493a32..8a997e9 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
index 5d7a764..ca209e5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
public class Notification implements org.apache.thrift.TBase<Notification, Notification._Fields>, java.io.Serializable, Cloneable, Comparable<Notification> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Notification");
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 3b09f70..015f17e 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/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 ddf6b84..27818ce 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-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
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/fd5d8369/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
index eb2f221..337b655 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
@@ -52,12 +52,10 @@ public class GatewayRegistry {
resource.setGatewayName(gateway.getGatewayName());
resource.setEmailAddress(gateway.getEmailAddress());
resource.setDomain(gateway.getDomain());
-// resource.setGatewayAcronym(gateway.getG);
-//
-// gateway.setGatewayAcronym(gatewayAcronym);
-// gateway.setGatewayUrl(gatewayUrl);
-// gateway.setGatewayPublicAbstract(gatewayPublicAbstract);
-// gateway.setReviewProposalDescription(reviewProposalDescription);
+ resource.setGatewayAcronym(gateway.getGatewayAcronym());
+ resource.setGatewayUrl(gateway.getGatewayURL());
+ resource.setGatewayPublicAbstract(gateway.getGatewayPublicAbstract());
+ resource.setReviewProposalDescription(gateway.getReviewProposalDescription());
resource.save();
return gateway.getGatewayId();
}catch (RegistryException e){
@@ -72,6 +70,10 @@ public class GatewayRegistry {
existingGateway.setGatewayName(updatedGateway.getGatewayName());
existingGateway.setEmailAddress(updatedGateway.getEmailAddress());
existingGateway.setDomain(updatedGateway.getDomain());
+ existingGateway.setGatewayAcronym(updatedGateway.getGatewayAcronym());
+ existingGateway.setGatewayUrl(updatedGateway.getGatewayURL());
+ existingGateway.setGatewayPublicAbstract(updatedGateway.getGatewayPublicAbstract());
+ existingGateway.setReviewProposalDescription(updatedGateway.getReviewProposalDescription());
existingGateway.save();
}catch (RegistryException e){
logger.error("Error while updating gateway to registry", e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index a95b85e..54329d5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -82,6 +82,10 @@ public class ThriftDataModelConversion {
gateway.setGatewayName(resource.getGatewayName());
gateway.setDomain(resource.getDomain());
gateway.setEmailAddress(resource.getEmailAddress());
+ gateway.setGatewayAcronym(resource.getGatewayAcronym());
+ gateway.setGatewayURL(resource.getGatewayUrl());
+ gateway.setGatewayPublicAbstract(resource.getGatewayPublicAbstract());
+ gateway.setReviewProposalDescription(resource.getReviewProposalDescription());
return gateway;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
index ebc6d4a..1caeeec 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
@@ -58,7 +58,6 @@ struct User {
enum GatewayApprovalStatus {
REQUESTED,
APPROVED,
- APPROVED,
ACTIVE,
DEACTIVATED
}