You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/08/01 15:40:18 UTC
[1/2] git commit: Adding back in relative path
Repository: cxf-fediz
Updated Branches:
refs/heads/master 863f99bd0 -> e17038b53
Adding back in relative path
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/3f8504b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/3f8504b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/3f8504b9
Branch: refs/heads/master
Commit: 3f8504b95cddb0325948ab4be20cb42a35fd9c26
Parents: 863f99b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Aug 1 12:07:28 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Aug 1 12:07:28 2014 +0100
----------------------------------------------------------------------
.../cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3f8504b9/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
----------------------------------------------------------------------
diff --git a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
index 853f916..b37a4d1 100644
--- a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
+++ b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
@@ -235,7 +235,11 @@ public abstract class AbstractServiceProviderFilter implements ContainerRequestF
}
FedizContext config = configurator.getFedizContext(contextName);
if (config == null) {
- throw new IllegalStateException("No Fediz configuration for context: " + contextName);
+ throw new IllegalStateException("No Fediz configuration for context :" + contextName);
+ }
+ String catalinaBase = System.getProperty("catalina.base");
+ if (catalinaBase != null && catalinaBase.length() > 0) {
+ config.setRelativePath(catalinaBase);
}
return config;
[2/2] git commit: Fixing NPE
Posted by co...@apache.org.
Fixing NPE
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e17038b5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e17038b5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e17038b5
Branch: refs/heads/master
Commit: e17038b5330bc4db66214bf59e5315d7efdeebde
Parents: 3f8504b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Aug 1 14:40:09 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Aug 1 14:40:09 2014 +0100
----------------------------------------------------------------------
.../org/apache/cxf/fediz/core/config/FedizContext.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e17038b5/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
index dc8b1ed..5212793 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
@@ -182,9 +182,10 @@ public class FedizContext implements Closeable {
crypto = CryptoFactory.getInstance(sigProperties);
keyManager.setCrypto(crypto);
} catch (WSSecurityException e) {
+ String name = keyManager.getName();
keyManager = null;
- LOG.error("Failed to load keystore '" + keyManager.getName() + "'", e);
- throw new IllegalConfigurationException("Failed to load keystore '" + keyManager.getName() + "'");
+ LOG.error("Failed to load keystore '" + name + "'", e);
+ throw new IllegalConfigurationException("Failed to load keystore '" + name + "'");
}
return keyManager;
@@ -202,9 +203,10 @@ public class FedizContext implements Closeable {
crypto = CryptoFactory.getInstance(decProperties);
decryptionKeyManager.setCrypto(crypto);
} catch (WSSecurityException e) {
+ String name = decryptionKeyManager.getName();
decryptionKeyManager = null;
- LOG.error("Failed to load keystore '" + decryptionKeyManager.getName() + "'", e);
- throw new IllegalConfigurationException("Failed to load keystore '" + decryptionKeyManager.getName() + "'");
+ LOG.error("Failed to load keystore '" + name + "'", e);
+ throw new IllegalConfigurationException("Failed to load keystore '" + name + "'");
}
return decryptionKeyManager;