svn commit: r1043376 - in /cxf/branches/wss4j-1.6-port: rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java

[coheigea]

Author: coheigea
Date: Wed Dec  8 12:10:32 2010
New Revision: 1043376

URL: http://svn.apache.org/viewvc?rev=1043376&view=rev
Log:
Fixing some build failures.

Modified:
    
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
    
cxf/branches/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java

Modified: 
cxf/branches/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/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1043376&r1=1043375&r2=1043376&view=diff
==============================================================================
--- 
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 (original)
+++ 
cxf/branches/wss4j-1.6-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 Wed Dec  8 12:10:32 2010
@@ -101,7 +101,6 @@ import org.apache.neethi.ExactlyOne;
 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;
@@ -315,7 +314,7 @@ public class STSClient implements Config
         if (algorithmSuite == null) {
             Iterator<?> i = policy.getAlternatives();
             while (i.hasNext() && algorithmSuite == null) {
-                List<PolicyComponent> p = CastUtils.cast((List)i.next());
+                List<PolicyComponent> p = CastUtils.cast((List<?>)i.next());
                 for (PolicyComponent p2 : p) {
                     if (p2 instanceof Binding) {
                         algorithmSuite = ((Binding)p2).getAlgorithmSuite();
@@ -956,7 +955,6 @@ public class STSClient implements Config
     }
 
     private Crypto createCrypto(boolean decrypt) throws IOException {
-        WSSConfig.getDefaultWSConfig();
         Crypto crypto = (Crypto)getProperty(SecurityConstants.STS_TOKEN_CRYPTO 
+ (decrypt ? ".decrypt" : ""));
         if (crypto != null) {
             return crypto;

Modified: 
cxf/branches/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java?rev=1043376&r1=1043375&r2=1043376&view=diff
==============================================================================
--- 
cxf/branches/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
 (original)
+++ 
cxf/branches/wss4j-1.6-port/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
 Wed Dec  8 12:10:32 2010
@@ -28,7 +28,6 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.systest.ws.wssc.client.KeystorePasswordCallback;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.ws.security.SecurityConstants;
-import org.apache.ws.security.WSSConfig;
 
 
 public class Server extends AbstractBusTestServerBase {
@@ -86,7 +85,6 @@ public class Server extends AbstractBusT
     
     protected void run()  {
         try {
-            WSSConfig.getDefaultWSConfig();
             new Server("http://localhost:"; + PORT + "/");
             Bus busLocal = new SpringBusFactory().createBus(
                     "org/apache/cxf/systest/ws/wssc/server/server.xml");
@@ -119,7 +117,6 @@ public class Server extends AbstractBusT
     }
     
     public static void main(String args[]) throws Exception {
-        WSSConfig.getDefaultWSConfig();
         new 
SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/server/server.xml");
         new Server("http://localhost:9001/";);
         System.out.println("Server ready...");