svn commit: r1456848 - /cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SecretKeyPasswordCallback.java

[coheigea]

Author: coheigea
Date: Fri Mar 15 09:50:15 2013
New Revision: 1456848

URL: http://svn.apache.org/r1456848
Log:
Merging security fixes from trunk

Modified:
    
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SecretKeyPasswordCallback.java

Modified: 
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SecretKeyPasswordCallback.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SecretKeyPasswordCallback.java?rev=1456848&r1=1456847&r2=1456848&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SecretKeyPasswordCallback.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SecretKeyPasswordCallback.java
 Fri Mar 15 09:50:15 2013
@@ -24,7 +24,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.apache.ws.security.WSPasswordCallback;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class SecretKeyPasswordCallback implements CallbackHandler {
     
@@ -46,7 +46,7 @@ public class SecretKeyPasswordCallback i
     public void handle(Callback[] callbacks) throws IOException, 
UnsupportedCallbackException {
         for (int i = 0; i < callbacks.length; i++) {
             WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-            if (pc.getUsage() == WSPasswordCallback.SECRET_KEY) {
+            if (pc.getUsage() == WSPasswordCallback.Usage.SECRET_KEY) {
                 pc.setKey(KEY);
             }
         }