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:51 UTC
[06/11] airavata git commit: WIP
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);