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/02/27 15:39:09 UTC
[1/3] git commit: Upgrade to SLF4J 1.7.6
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes ceb6b86d6 -> 3ec3ecc20
Upgrade to SLF4J 1.7.6
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/439bda1c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/439bda1c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/439bda1c
Branch: refs/heads/2.6.x-fixes
Commit: 439bda1cc81df6d1906c746df9f30edf2aec54b8
Parents: ceb6b86
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 27 14:08:29 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 27 14:38:54 2014 +0000
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/439bda1c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bc2bbe2..2e1fec7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -141,7 +141,7 @@
<cxf.servlet-api.version>1.0</cxf.servlet-api.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
- <cxf.slf4j.version>1.7.5</cxf.slf4j.version>
+ <cxf.slf4j.version>1.7.6</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.1</cxf.specs.jaxws.api.version>
<cxf.spring.version>3.0.7.RELEASE</cxf.spring.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
[3/3] 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/3ec3ecc2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ec3ecc2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ec3ecc2
Branch: refs/heads/2.6.x-fixes
Commit: 3ec3ecc20897123be6d50435bcf870f46a658c41
Parents: cd57929
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 27 14:38:57 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 27 14:38:57 2014 +0000
----------------------------------------------------------------------
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3ec3ecc2/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2208bb9..44f6d22 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -167,6 +167,7 @@ B 326599a8ae5f253c677473179cdc0c48f4434c35
B 3266a179f2e720482ba9a2a832d60986dfb6a370
B 327b5abdd5a5312b9e4fb53882b19072da104e68
B 3309327f10f6fd27a09b0a73b12afa1bb490d281
+B 337c6c696f9c8d5a9b004c66cb51e3bab1a2c0bf
B 33e5125a47d56214f7d4c66089f24ce6d56f7f13
B 33eefa157cf36ce7f614c18aa1c863eda4050eea
B 340b4001fd63567651715e4852aaa648704268f9
@@ -493,6 +494,7 @@ B 922a3f7514b9f114aee3d6c2d79bdf8c1999a93c
B 92ebf486c4a92949fe586cbb7d0d8341707960ca
B 932abde4e5fe26c62c4d0c3bfa0db56328608621
B 9450a0c79905937fa2218d4003115f43bd9ef556
+B 947faeef0d5212edfd0729232d096d1bfdc3260c
B 948a81674b46019174618ec82729fa0bcca82de4
B 94a98b3fe9c79e2cf3941acbbad216ba54999bc0
B 94c6412a78f6c305f622ee8fce86ff1d99cc1482
@@ -962,6 +964,7 @@ M 69da5182286cb3b45adf931959e21c160a56f9f1
M 6a2d541daad0ee521d8a77dde7663ef50a22ea29
M 6d105b463d95ac6dfc35d5512eac5fe35409bef4
M 6dd839afbb4d834ed668738bd89e7775c1cf2f9d
+M 6e18b08ec062bbd6a06468a99e518200f6b8a8e8
M 6f6f716c1d77bed7e96672006cdf271153850fd6
M 7163afce80bfc3dcfb50184e9195e13f110e665b
M 719874641bdac6ef65a3d486a39515dceba41f92
@@ -1085,6 +1088,7 @@ M c4f615f3bd90b787a63201349246b65c606ad945
M c575f25e318aead5c138aa470e1bd2706407735e
M c57adf0b1d66466cd92860995d57d3c36c3189ea
M c582d0887587fee5fec6329846895390abc32e6c
+M c5a345f585abc871cae0e1f85aa0edd4c8c039d8
M c5ad8c884ae5b6f894c687a76f186d4f7083f3f0
M c78d6a29ba550984e09b330d84eb934d77ac5324
M c7dc5effbf42cc458fdcb6ec5f75157952fd0ce5
[2/3] git commit: Backmerging caching issue
Posted by co...@apache.org.
Backmerging caching issue
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cd579295
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cd579295
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cd579295
Branch: refs/heads/2.6.x-fixes
Commit: cd5792951da9dcbb56d53975dfed93d322b73131
Parents: 439bda1
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 27 14:37:20 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 27 14:38:57 2014 +0000
----------------------------------------------------------------------
.../policy/interceptors/IssuedTokenInterceptorProvider.java | 9 +++------
.../cxf/ws/security/policy/interceptors/STSInvoker.java | 2 +-
.../wss4j/policyhandlers/AbstractBindingBuilder.java | 7 ++-----
3 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/cd579295/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index 442ff4f..2f5ab2e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -499,6 +499,7 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
return;
}
if (!isRequestor(message)) {
+ message.getExchange().remove(SecurityConstants.TOKEN);
List<WSHandlerResult> results =
CastUtils.cast((List<?>)message.get(WSHandlerConstants.RECV_RESULTS));
if (results != null && results.size() > 0) {
@@ -531,9 +532,7 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
boolean valid = issuedValidator.validatePolicy(issuedAis, assertionWrapper);
if (valid) {
SecurityToken token = createSecurityToken(assertionWrapper);
- getTokenStore(message).add(token);
- message.getExchange().remove(SecurityConstants.TOKEN);
- message.getExchange().put(SecurityConstants.TOKEN_ID, token.getId());
+ message.getExchange().put(SecurityConstants.TOKEN, token);
return;
}
}
@@ -541,9 +540,7 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
boolean valid = issuedValidator.validatePolicy(issuedAis, binarySecurityToken);
if (valid) {
SecurityToken token = createSecurityToken(binarySecurityToken);
- getTokenStore(message).add(token);
- message.getExchange().remove(SecurityConstants.TOKEN);
- message.getExchange().put(SecurityConstants.TOKEN_ID, token.getId());
+ message.getExchange().put(SecurityConstants.TOKEN, token);
return;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/cd579295/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
index e36252f..dacdc77 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
@@ -162,7 +162,7 @@ abstract class STSInvoker implements Invoker {
.getProperty(TokenStore.class.getName());
store.remove(cancelToken.getId());
// Put the token on the out message so that we can sign the response
- exchange.getEndpoint().put(SecurityConstants.TOKEN, cancelToken);
+ exchange.put(SecurityConstants.TOKEN, cancelToken);
writer.writeEmptyElement(prefix, "RequestedTokenCancelled", namespace);
writer.writeEndElement();
http://git-wip-us.apache.org/repos/asf/cxf/blob/cd579295/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 8fed2d4..1b6f154 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -622,11 +622,8 @@ public abstract class AbstractBindingBuilder {
st = getTokenStore().getToken(id);
}
}
- if (st != null) {
- getTokenStore().add(st);
- return st;
- }
- return null;
+
+ return st;
}
protected void addSignatureParts(Map<Token, Object> tokenMap,