svn commit: r1036511 - in /cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security: trust/STSClient.java wss4j/policyhandlers/SymmetricBindingHandler.java

[coheigea]

Author: coheigea
Date: Thu Nov 18 16:08:22 2010
New Revision: 1036511

URL: http://svn.apache.org/viewvc?rev=1036511&view=rev
Log:
Some small changes following a recent merge to WSS4J trunk.

Modified:
    
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
    
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java

Modified: 
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1036511&r1=1036510&r2=1036511&view=diff
==============================================================================
--- 
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 (original)
+++ 
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 Thu Nov 18 16:08:22 2010
@@ -102,6 +102,7 @@ import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyComponent;
 import org.apache.ws.security.WSConstants;
 import org.apache.ws.security.WSSConfig;
+import org.apache.ws.security.WSSecurityEngineResult;
 import org.apache.ws.security.WSSecurityException;
 import org.apache.ws.security.components.crypto.Crypto;
 import org.apache.ws.security.components.crypto.CryptoFactory;
@@ -311,7 +312,7 @@ public class STSClient implements Config
     protected void setPolicyInternal(Policy newPolicy) {
         this.policy = newPolicy;
         if (algorithmSuite == null) {
-            Iterator i = policy.getAlternatives();
+            Iterator<?> i = policy.getAlternatives();
             while (i.hasNext() && algorithmSuite == null) {
                 List<PolicyComponent> p = CastUtils.cast((List)i.next());
                 for (PolicyComponent p2 : p) {
@@ -884,7 +885,7 @@ public class STSClient implements Config
                     EncryptedKeyProcessor processor = new 
EncryptedKeyProcessor();
 
                     processor.handleToken(child, null, createCrypto(true), 
createHandler(), null,
-                                          new Vector(), null);
+                                          new 
Vector<WSSecurityEngineResult>(), null);
 
                     secret = processor.getDecryptedBytes();
                 } catch (IOException e) {

Modified: 
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java?rev=1036511&r1=1036510&r2=1036511&view=diff
==============================================================================
--- 
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
 (original)
+++ 
cxf/sandbox/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
 Thu Nov 18 16:08:22 2010
@@ -495,7 +495,7 @@ public class SymmetricBindingHandler ext
                         encr.setEncKeyIdDirectId(true);
                     }
                     if (encrTok.getTokenType() != null) {
-                        encr.setEncKeyValueType(encrTok.getTokenType());
+                        encr.setCustomReferenceValue(encrTok.getTokenType());
                     }
                     encr.setEncKeyId(encrTokId);
                     encr.setEphemeralKey(encrTok.getSecret());