Author: sergeyb
Date: Tue Feb 8 11:32:37 2011
New Revision: 1068338
URL: http://svn.apache.org/viewvc?rev=1068338&view=rev
Log:
Merged revisions 1068337 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1068337 | sergeyb | 2011-02-08 11:27:22 +0000 (Tue, 08 Feb 2011) | 1 line
Removingthe leftover code from UsernameTokenInterceptor
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 8 11:32:37 2011
@@ -1 +1 @@
-/cxf/trunk:1068320
+/cxf/trunk:1068320,1068337
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java?rev=1068338&r1=1068337&r2=1068338&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
Tue Feb 8 11:32:37 2011
@@ -142,11 +142,6 @@ public class UsernameTokenInterceptor ex
assertUsernameTokens(message, princ);
message.put(WSS4JInInterceptor.PRINCIPAL_RESULT,
princ);
- boolean utWithCallbacks =
!MessageUtils.getContextualBoolean(message,
-
SecurityConstants.USERNAME_TOKEN_NO_CALLBACKS, false);
- if (!utWithCallbacks) {
- WSS4JTokenConverter.convertToken(message, princ);
- }
SecurityContext sc =
message.get(SecurityContext.class);
if (sc == null || sc.getUserPrincipal() == null) {
Subject subject = createSubject(princ.getName(),
princ.getPassword(),
