airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1189745 - in /incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac: context/security/impl/GSISecurityContext.java provider/utils/GramRSLGenerator.java
Date Thu, 27 Oct 2011 13:24:54 GMT
Author: lahiru
Date: Thu Oct 27 13:24:53 2011
New Revision: 1189745

URL: http://svn.apache.org/viewvc?rev=1189745&view=rev
Log:
minor changes to gfac-core to get Gramprovider working.

Modified:
    incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java
    incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java

Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java?rev=1189745&r1=1189744&r2=1189745&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java
(original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/security/impl/GSISecurityContext.java
Thu Oct 27 13:24:53 2011
@@ -59,7 +59,7 @@ public class GSISecurityContext implemen
                     gssCredentails = proxyRenewer.renewProxy();
                 } else if (myproxyUserName != null && myproxyPasswd != null &&
myproxyServer != null) {
                     this.proxyRenewer = new MyProxyManager(myproxyUserName, myproxyPasswd,
MyProxy.MYPROXY_SERVER_PORT,
-                            myproxyLifetime, myproxyServer);
+                            myproxyLifetime, myproxyServer,trustedCertLoc);
                     log.info("loaded credentails from Proxy server");
                     gssCredentails = this.proxyRenewer.renewProxy();
                 }
@@ -70,6 +70,14 @@ public class GSISecurityContext implemen
         }
     }
 
+    public String getTrustedCertLoc() {
+        return trustedCertLoc;
+    }
+
+    public void setTrustedCertLoc(String trustedCertLoc) {
+        this.trustedCertLoc = trustedCertLoc;
+    }
+
     public String getMyproxyUserName() {
         return myproxyUserName;
     }

Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java?rev=1189745&r1=1189744&r2=1189745&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
(original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
Thu Oct 27 13:24:53 2011
@@ -58,18 +58,18 @@ public class GramRSLGenerator {
          * and application description documents
          */
         ShellApplicationDeploymentType.Env.Entry[] env = app.getEnv().getEntryArray();
+        if(env.length != 0){
+            Map<String, String> nv = null;
+            for (int i = 0; i < env.length; i++) {
+                String key = app.getEnv().getEntryArray(i).getKey();
+                String value = app.getEnv().getEntryArray(i).getValue();
+                nv.put(key, value);
+            }
 
-        Map<String, String> nv = null;
-        for (int i = 0; i < env.length; i++) {
-            String key = app.getEnv().getEntryArray(i).getKey();
-            String value = app.getEnv().getEntryArray(i).getValue();
-            nv.put(key, value);
-        }
-
-        for (Entry<String, String> entry : nv.entrySet()) {
-            jobAttr.addEnvVariable(entry.getKey(), entry.getValue());
+            for (Entry<String, String> entry : nv.entrySet()) {
+                jobAttr.addEnvVariable(entry.getKey(), entry.getValue());
+            }
         }
-
         jobAttr.addEnvVariable(GFacConstants.INPUT_DATA_DIR_VAR_NAME, app.getInputDir());
         jobAttr.addEnvVariable(GFacConstants.INPUT_DATA_DIR_VAR_NAME, app.getOutputDir());
 



Mime
View raw message