airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [1/5] git commit: updating to use the existing gateway id
Date Tue, 08 Jul 2014 18:21:36 GMT
Repository: airavata
Updated Branches:
  refs/heads/master a33dd2a91 -> e53dd346b


updating to use the existing gateway id


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

Branch: refs/heads/master
Commit: d953a3f9fca179dd2e7c8537f9d7696241a46ba6
Parents: a34c0d9
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Tue Jul 8 14:18:11 2014 -0400
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Tue Jul 8 14:18:11 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/airavata/client/tools/DocumentCreatorNew.java | 3 ++-
 .../client/src/main/resources/airavata-client.properties          | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/d953a3f9/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
index f6a4f26..564a800 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import org.airavata.appcatalog.cpi.AppCatalog;
 import org.airavata.appcatalog.cpi.AppCatalogException;
 import org.apache.airavata.api.Airavata;
+import org.apache.airavata.common.utils.ClientSettings;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
@@ -100,7 +101,7 @@ public class DocumentCreatorNew {
 				null, null);
 		gatewayResourceProfile = new GatewayResourceProfile();
 //		gatewayResourceProfile.setGatewayID("default");
-		gatewayResourceProfile.setGatewayName("default");
+		gatewayResourceProfile.setGatewayName(ClientSettings.getSetting("gateway_id", "php_reference_gateway"));
 		gatewayResourceProfile.addToComputeResourcePreferences(computeResourcePreference);
         String gatewayId = client.registerGatewayResourceProfile(gatewayResourceProfile);
         gatewayResourceProfile.setGatewayID(gatewayId);

http://git-wip-us.apache.org/repos/asf/airavata/blob/d953a3f9/modules/configuration/client/src/main/resources/airavata-client.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/client/src/main/resources/airavata-client.properties b/modules/configuration/client/src/main/resources/airavata-client.properties
index bc70787..a673565 100644
--- a/modules/configuration/client/src/main/resources/airavata-client.properties
+++ b/modules/configuration/client/src/main/resources/airavata-client.properties
@@ -96,3 +96,5 @@ thrift.server.port=8930
 #app.catalog.server.host=${thrift.server.host}
 #app.catalog.server.port=8931
 
+gateway_id=php_reference_gateway
+


Mime
View raw message