You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/06/30 18:58:37 UTC
git commit: Integrating credential store to airavata to job
submission and file transfer and directory creation
Repository: airavata
Updated Branches:
refs/heads/master 2d0ebede8 -> f36f43a1b
Integrating credential store to airavata to job submission and file transfer and directory creation
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f36f43a1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f36f43a1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f36f43a1
Branch: refs/heads/master
Commit: f36f43a1bd27df2f0ba1519ee84b8ba4ff7f6350
Parents: 2d0ebed
Author: lahiru <la...@apache.org>
Authored: Mon Jun 30 12:58:18 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Mon Jun 30 12:58:18 2014 -0400
----------------------------------------------------------------------
modules/distribution/server/pom.xml | 16 +---------------
.../apache/airavata/gfac/core/utils/GFacUtils.java | 2 +-
.../gsissh/security/TokenizedMyProxyAuthInfo.java | 3 ++-
3 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f36f43a1/modules/distribution/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml
index d9055c2..716aae6 100644
--- a/modules/distribution/server/pom.xml
+++ b/modules/distribution/server/pom.xml
@@ -570,21 +570,7 @@
<version>1.2</version>
</dependency>
<!-- Unicore dependencies -->
- <dependency>
- <groupId>eu.unicore</groupId>
- <artifactId>ogsabes-client</artifactId>
- <version>1.7.0-rc</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
http://git-wip-us.apache.org/repos/asf/airavata/blob/f36f43a1/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
index 3aa7c55..bc43ac5 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java
@@ -876,7 +876,7 @@ public class GFacUtils {
}
public static CredentialReader getCredentialReader() throws ApplicationSettingsException, IllegalAccessException, ClassNotFoundException, InstantiationException {
- String jdbcUrl = ServerSettings.getCredentialStoreDBDriver();
+ String jdbcUrl = ServerSettings.getCredentialStoreDBURL();
String jdbcUsr = ServerSettings.getCredentialStoreDBUser();
String jdbcPass = ServerSettings.getCredentialStoreDBPassword();
String driver = ServerSettings.getCredentialStoreDBDriver();
http://git-wip-us.apache.org/repos/asf/airavata/blob/f36f43a1/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
index 0fb1c41..59b7207 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
@@ -111,7 +111,8 @@ public class TokenizedMyProxyAuthInfo extends GSIAuthenticationInfo {
"Will continue with my proxy user name and password. Provided TokenId:" + requestData.getTokenId(), e);
}
- if(gssCredentials == null){
+ if (gssCredentials == null) {
+ System.out.println("Authenticating with provided token failed, so falling back to authenticate with defaultCredentials");
try {
gssCredentials = getDefaultCredentials();
} catch (Exception e) {