svn commit: r1068364 - in /cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j: UsernameTokenInterceptor.java WSS4JInInterceptor.java

[coheigea]

Author: coheigea
Date: Tue Feb  8 13:08:52 2011
New Revision: 1068364

URL: http://svn.apache.org/viewvc?rev=1068364&view=rev
Log:
Some updates following WSS4J trunk changes.

Modified:
    
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
    
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

Modified: 
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java?rev=1068364&r1=1068363&r2=1068364&view=diff
==============================================================================
--- 
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
 (original)
+++ 
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
 Tue Feb  8 13:08:52 2011
@@ -133,7 +133,7 @@ public class UsernameTokenInterceptor ex
                         List<WSSecurityEngineResult>v = new 
ArrayList<WSSecurityEngineResult>();
                         int action = WSConstants.UT;
                         if (princ.getPassword() == null) {
-                            action = WSConstants.UT_UNKNOWN;
+                            action = WSConstants.UT_NOPASSWORD;
                         }
                         v.add(0, new WSSecurityEngineResult(action, princ, 
null, null, null));
                         List<WSHandlerResult> results = 
CastUtils.cast((List<?>)message

Modified: 
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1068364&r1=1068363&r2=1068364&view=diff
==============================================================================
--- 
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
 (original)
+++ 
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
 Tue Feb  8 13:08:52 2011
@@ -451,7 +451,7 @@ public class WSS4JInInterceptor extends 
                 
                 String id = pc.getIdentifier();
                 
-                if 
(SecurityTokenReference.ENC_KEY_SHA1_URI.equals(pc.getKeyType())) {
+                if 
(SecurityTokenReference.ENC_KEY_SHA1_URI.equals(pc.getType())) {
                     for (SecurityToken token : store.getValidTokens()) {
                         if (id.equals(token.getSHA1())) {
                             pc.setKey(token.getSecret());
@@ -477,7 +477,7 @@ public class WSS4JInInterceptor extends 
     protected CallbackHandler getCallback(RequestData reqData, int doAction, 
boolean utWithCallbacks) 
         throws WSSecurityException {
         if (!utWithCallbacks 
-            && ((doAction & WSConstants.UT) != 0 || (doAction & 
WSConstants.UT_UNKNOWN) != 0)) {
+            && ((doAction & WSConstants.UT) != 0 || (doAction & 
WSConstants.UT_NOPASSWORD) != 0)) {
             CallbackHandler pwdCallback = null;
             try {
                 pwdCallback = getCallback(reqData, doAction);