airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject git commit: using the input parameter name instead of arguemnt
Date Fri, 11 Jul 2014 19:53:31 GMT
Repository: airavata
Updated Branches:
  refs/heads/master d64741c74 -> 0714710f1


using the input parameter name instead of arguemnt


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

Branch: refs/heads/master
Commit: 0714710f187ee10da39361c72522445f423459d6
Parents: d64741c
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Fri Jul 11 15:53:21 2014 -0400
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Fri Jul 11 15:53:21 2014 -0400

----------------------------------------------------------------------
 .../org/apache/airavata/gfac/server/GfacServerHandler.java     | 6 +++---
 .../java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/0714710f/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index 5d59746..ea6fd0e 100644
--- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -222,9 +222,9 @@ public class GfacServerHandler implements GfacService.Iface, Watcher{
         this.airavataUserName = airavataUserName;
     }
     protected void setGatewayProperties() throws ApplicationSettingsException {
-         setAiravataUserName(ServerSettings.getProperties().getProperty("system.user"));
-         setGatewayName(ServerSettings.getProperties().getProperty("system.gateway"));
-         setRegistryURL(ServerSettings.getProperties().getProperty("airavata.server.url"));
+         setAiravataUserName(ServerSettings.getSetting("system.user"));
+         setGatewayName(ServerSettings.getSetting("system.gateway"));
+         setRegistryURL(ServerSettings.getSetting("airavata.server.url"));
      }
 
     private GFac getGfac()throws TException{

http://git-wip-us.apache.org/repos/asf/airavata/blob/0714710f/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index fffd108..3eab643 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -283,7 +283,7 @@ public class BetterGfacImpl implements GFac {
         List<InputDataObjectType> applicationInputs = applicationInterface.getApplicationInputs();
         for (InputDataObjectType dataObjectType : applicationInputs) {
             InputParameterType parameter = InputParameterType.Factory.newInstance();
-            parameter.setParameterName(dataObjectType.getApplicationArgument());
+            parameter.setParameterName(dataObjectType.getName());
             parameter.setParameterDescription(dataObjectType.getUserFriendlyDescription());
             ParameterType parameterType = parameter.addNewParameterType();
             switch (dataObjectType.getType()) {


Mime
View raw message