You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/25 21:11:30 UTC
airavata git commit: removing host name from GF
Repository: airavata
Updated Branches:
refs/heads/master c135fbf8c -> 766433652
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/master
Commit: 766433652a3c968917b3200e8fd248e9e6a65280
Parents: c135fbf
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Nov 25 15:11:24 2015 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
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<ComputeResourcePreference> 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<ComputeResourcePreference> 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;