Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A660118C39 for ; Fri, 4 Dec 2015 21:24:49 +0000 (UTC) Received: (qmail 49346 invoked by uid 500); 4 Dec 2015 21:24:49 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 49213 invoked by uid 500); 4 Dec 2015 21:24:49 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 49010 invoked by uid 99); 4 Dec 2015 21:24:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2015 21:24:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 24A95E6854; Fri, 4 Dec 2015 21:24:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Fri, 04 Dec 2015 21:24:56 -0000 Message-Id: In-Reply-To: <8d02cb62078342059b9599f26e76f5cf@git.apache.org> References: <8d02cb62078342059b9599f26e76f5cf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/16] airavata git commit: removing host name from GF removing host name from GF Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/76643365 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/76643365 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/76643365 Branch: refs/heads/develop Commit: 766433652a3c968917b3200e8fd248e9e6a65280 Parents: c135fbf Author: Chathuri Wimalasena Authored: Wed Nov 25 15:11:24 2015 -0500 Committer: Chathuri Wimalasena Committed: Wed Nov 25 15:11:24 2015 -0500 ---------------------------------------------------------------------- .../airavata/api/server/util/AppCatalogInitUtil.java | 1 - .../core/app/catalog/impl/GwyResourceProfileImpl.java | 2 -- .../registry/core/app/catalog/model/GatewayProfile.java | 11 ----------- .../app/catalog/resources/GatewayProfileResource.java | 11 ----------- .../core/app/catalog/util/AppCatalogJPAUtils.java | 1 - .../app/catalog/util/AppCatalogThriftConversion.java | 1 - 6 files changed, 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/76643365/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java index b513f1d..c6dcd22 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java @@ -82,7 +82,6 @@ public class AppCatalogInitUtil { if (!gatewayProfileResource.isExists(ServerSettings.getDefaultUserGateway())){ gatewayProfileResource.setGatewayID(ServerSettings.getDefaultUserGateway()); gatewayProfileResource.setCreatedTime(AiravataUtils.getCurrentTimestamp()); - gatewayProfileResource.setDataStorageHost("localhost"); gatewayProfileResource.save(); } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/76643365/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java index 5ef87f3..a72ebff 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java @@ -47,7 +47,6 @@ public class GwyResourceProfileImpl implements GwyResourceProfile { profileResource.setGatewayID(gatewayProfile.getGatewayID()); } profileResource.setCredentialStoreToken(gatewayProfile.getCredentialStoreToken()); - profileResource.setDataStorageHost(gatewayProfile.getDataStorageHostName()); // profileResource.setGatewayID(gatewayProfile.getGatewayID()); profileResource.save(); List computeResourcePreferences = gatewayProfile.getComputeResourcePreferences(); @@ -102,7 +101,6 @@ public class GwyResourceProfileImpl implements GwyResourceProfile { GatewayProfileResource profileResource = new GatewayProfileResource(); GatewayProfileResource existingGP = (GatewayProfileResource)profileResource.get(gatewayId); existingGP.setCredentialStoreToken(updatedProfile.getCredentialStoreToken()); - existingGP.setDataStorageHost(updatedProfile.getDataStorageHostName()); existingGP.save(); List computeResourcePreferences = updatedProfile.getComputeResourcePreferences(); http://git-wip-us.apache.org/repos/asf/airavata/blob/76643365/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java index 6292881..70d508e 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java @@ -43,9 +43,6 @@ public class GatewayProfile implements Serializable { @Column(name = "CS_TOKEN") private String credentialStoreToken; - @Column(name = "DATA_STORAGE_HOST") - private String dataStorageHost; - public Timestamp getCreationTime() { return creationTime; } @@ -78,12 +75,4 @@ public class GatewayProfile implements Serializable { public void setCredentialStoreToken(String credentialStoreToken) { this.credentialStoreToken = credentialStoreToken; } - - public String getDataStorageHost() { - return dataStorageHost; - } - - public void setDataStorageHost(String dataStorageHost) { - this.dataStorageHost = dataStorageHost; - } } http://git-wip-us.apache.org/repos/asf/airavata/blob/76643365/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java index 0ac6632..7d92dcb 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java @@ -42,7 +42,6 @@ public class GatewayProfileResource extends AppCatAbstractResource { private Timestamp createdTime; private Timestamp updatedTime; private String credentialStoreToken; - private String dataStorageHost; public Timestamp getCreatedTime() { return createdTime; @@ -64,14 +63,6 @@ public class GatewayProfileResource extends AppCatAbstractResource { return credentialStoreToken; } - public String getDataStorageHost() { - return dataStorageHost; - } - - public void setDataStorageHost(String dataStorageHost) { - this.dataStorageHost = dataStorageHost; - } - public void setCredentialStoreToken(String credentialStoreToken) { this.credentialStoreToken = credentialStoreToken; } @@ -285,14 +276,12 @@ public class GatewayProfileResource extends AppCatAbstractResource { if (existingGatewayProfile != null) { existingGatewayProfile.setUpdateTime(AiravataUtils.getCurrentTimestamp()); existingGatewayProfile.setCredentialStoreToken(credentialStoreToken); - existingGatewayProfile.setDataStorageHost(dataStorageHost); em.merge(existingGatewayProfile); } else { GatewayProfile gatewayProfile = new GatewayProfile(); gatewayProfile.setGatewayID(gatewayID); gatewayProfile.setCreationTime(AiravataUtils.getCurrentTimestamp()); gatewayProfile.setCredentialStoreToken(credentialStoreToken); - gatewayProfile.setDataStorageHost(dataStorageHost); em.persist(gatewayProfile); } em.getTransaction().commit(); http://git-wip-us.apache.org/repos/asf/airavata/blob/76643365/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java index f6bd161..59a4c25 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java @@ -872,7 +872,6 @@ public class AppCatalogJPAUtils { resource.setGatewayID(o.getGatewayID()); resource.setCreatedTime(o.getCreationTime()); resource.setCredentialStoreToken(o.getCredentialStoreToken()); - resource.setDataStorageHost(o.getDataStorageHost()); if (o.getUpdateTime() != null){ resource.setUpdatedTime(o.getUpdateTime()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/76643365/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java index af88c58..045cd75 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java @@ -818,7 +818,6 @@ public class AppCatalogThriftConversion { GatewayResourceProfile gatewayProfile = new GatewayResourceProfile(); gatewayProfile.setGatewayID(gw.getGatewayID()); gatewayProfile.setCredentialStoreToken(gw.getCredentialStoreToken()); - gatewayProfile.setDataStorageHostName(gw.getDataStorageHost()); gatewayProfile.setComputeResourcePreferences(preferences); gatewayProfile.setDataStoragePreferences(storagePreferences); return gatewayProfile;