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 2016/01/15 17:46:00 UTC
[1/3] cxf git commit: Updating LOG message
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes cb0d7506c -> 8858a63be
Updating LOG message
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1e83ecab
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1e83ecab
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1e83ecab
Branch: refs/heads/3.0.x-fixes
Commit: 1e83ecab0beecd2276f95149ff6502354cbfa3b7
Parents: cb0d750
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jan 15 16:28:04 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jan 15 16:44:31 2016 +0000
----------------------------------------------------------------------
.../apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1e83ecab/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
index 8b05935..5f2c1e9 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
@@ -111,7 +111,9 @@ public final class WSSecurityPolicyLoader implements PolicyInterceptorProviderLo
//as the policy framework will then not find the providers
//and error out at that point. If nothing uses ws-securitypolicy
//no warnings/errors will display
- LOG.log(Level.FINE, "Could not load or register WS-SecurityPolicy related classes.", t);
+ String error = "Could not load or register WS-SecurityPolicy related classes. "
+ + "Please check that (the correct version of) Apache WSS4J is on the classpath";
+ LOG.log(Level.FINE, error, t);
}
}
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8858a63b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8858a63b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8858a63b
Branch: refs/heads/3.0.x-fixes
Commit: 8858a63be1353aa1801afdd68c77f66498e5c2f8
Parents: a7052d0
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jan 15 16:44:33 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jan 15 16:44:33 2016 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8858a63b/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0a8b1bc..aa67a5b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -64,6 +64,7 @@ B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2
B 2004b1021ce0d0975eb49cae36416863bd8c59bb
B 20467ecea3cb0778bd02e60029d4d4ec7a8a2483
B 20539c0278472689722204f0c08e68a86597aae1
+B 205c61c48b2aad973572aa74d8c9dfa83c2dd7bd
B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1
B 22d0c244d3b60aafbd3c070e9599012019de486c
B 2302aa5820661975bb04857fa6d48bb68bebb4f7
[2/3] cxf git commit: Log a warning when WSS4J not found.
Posted by co...@apache.org.
Log a warning when WSS4J not found.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a7052d0d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a7052d0d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a7052d0d
Branch: refs/heads/3.0.x-fixes
Commit: a7052d0daf517abfe4a767d535dc0c7523f140ad
Parents: 1e83eca
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jan 15 16:37:21 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jan 15 16:44:32 2016 +0000
----------------------------------------------------------------------
.../apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a7052d0d/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
index 5f2c1e9..f149056 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
@@ -107,12 +107,9 @@ public final class WSSecurityPolicyLoader implements PolicyInterceptorProviderLo
try {
registerProviders();
} catch (Throwable t) {
- //probably wss4j isn't found or something. We'll ignore this
- //as the policy framework will then not find the providers
- //and error out at that point. If nothing uses ws-securitypolicy
- //no warnings/errors will display
String error = "Could not load or register WS-SecurityPolicy related classes. "
+ "Please check that (the correct version of) Apache WSS4J is on the classpath";
+ LOG.log(Level.WARNING, error + ": " + t.getMessage());
LOG.log(Level.FINE, error, t);
}
}