Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java Thu May 23 13:17:26 2013 @@ -37,7 +37,8 @@ import org.example.contract.doubleit.Dou import org.junit.BeforeClass; /** - * A set of tests for Username Tokens over the Transport Binding. + * A set of tests for Username Tokens over the Transport Binding. It tests both DOM + StAX clients against the + * DOM server */ public class UsernameTokenTest extends AbstractBusClientServerTestBase { static final String PORT = allocatePort(Server.class); @@ -78,6 +79,16 @@ public class UsernameTokenTest extends A service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + // DOM + utPort.doubleIt(25); + + // Streaming + ((BindingProvider)utPort).getRequestContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); + ((BindingProvider)utPort).getResponseContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); utPort.doubleIt(25); ((java.io.Closeable)utPort).close(); @@ -101,6 +112,16 @@ public class UsernameTokenTest extends A service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + // DOM + utPort.doubleIt(25); + + // Streaming + ((BindingProvider)utPort).getRequestContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); + ((BindingProvider)utPort).getResponseContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); utPort.doubleIt(25); ((java.io.Closeable)utPort).close(); @@ -124,6 +145,16 @@ public class UsernameTokenTest extends A service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + // DOM + utPort.doubleIt(25); + + // Streaming + ((BindingProvider)utPort).getRequestContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); + ((BindingProvider)utPort).getResponseContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); utPort.doubleIt(25); ((java.io.Closeable)utPort).close(); @@ -147,6 +178,16 @@ public class UsernameTokenTest extends A service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + // DOM + utPort.doubleIt(25); + + // Streaming + ((BindingProvider)utPort).getRequestContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); + ((BindingProvider)utPort).getResponseContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); utPort.doubleIt(25); ((java.io.Closeable)utPort).close(); @@ -169,6 +210,17 @@ public class UsernameTokenTest extends A DoubleItPortType utPort = service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + + // DOM + utPort.doubleIt(25); + + // Streaming + ((BindingProvider)utPort).getRequestContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); + ((BindingProvider)utPort).getResponseContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); utPort.doubleIt(25); ((java.io.Closeable)utPort).close(); @@ -191,6 +243,17 @@ public class UsernameTokenTest extends A DoubleItPortType utPort = service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + + // DOM + utPort.doubleIt(25); + + // Streaming + ((BindingProvider)utPort).getRequestContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); + ((BindingProvider)utPort).getResponseContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); utPort.doubleIt(25); ((java.io.Closeable)utPort).close(); @@ -213,6 +276,17 @@ public class UsernameTokenTest extends A DoubleItPortType utPort = service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + + // DOM + utPort.doubleIt(25); + + // Streaming + ((BindingProvider)utPort).getRequestContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); + ((BindingProvider)utPort).getResponseContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); utPort.doubleIt(25); ((java.io.Closeable)utPort).close(); @@ -236,6 +310,24 @@ public class UsernameTokenTest extends A service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + // DOM + try { + utPort.doubleIt(25); + fail("Failure expected on no UsernameToken"); + } catch (javax.xml.ws.soap.SOAPFaultException ex) { + String error = "The received token does not match the token inclusion requirement"; + assertTrue(ex.getMessage().contains(error)); + } + + /* + // TODO + // Streaming + ((BindingProvider)utPort).getRequestContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); + ((BindingProvider)utPort).getResponseContext().put( + SecurityConstants.ENABLE_STREAMING_SECURITY, "true" + ); try { utPort.doubleIt(25); fail("Failure expected on no UsernameToken"); @@ -243,6 +335,7 @@ public class UsernameTokenTest extends A String error = "The received token does not match the token inclusion requirement"; assertTrue(ex.getMessage().contains(error)); } + */ ((java.io.Closeable)utPort).close(); bus.shutdown(true); @@ -341,8 +434,23 @@ public class UsernameTokenTest extends A service.getPort(portQName, DoubleItPortType.class); updateAddressPort(utPort, PORT); + // DOM ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "Alice"); + utPort.doubleIt(25); + try { + ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "Frank"); + utPort.doubleIt(30); + fail("Failure expected on a user with the wrong role"); + } catch (javax.xml.ws.soap.SOAPFaultException ex) { + String error = "Unauthorized"; + assertTrue(ex.getMessage().contains(error)); + } + + // Streaming + /* + // TODO + ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "Alice"); utPort.doubleIt(25); try { @@ -353,6 +461,7 @@ public class UsernameTokenTest extends A String error = "Unauthorized"; assertTrue(ex.getMessage().contains(error)); } + */ ((java.io.Closeable)utPort).close(); bus.shutdown(true);
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/CustomUTValidator.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/CustomUTValidator.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/CustomUTValidator.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/CustomUTValidator.java Thu May 23 13:17:26 2013 @@ -22,12 +22,12 @@ package org.apache.cxf.systest.ws.ut.ser import javax.security.auth.Subject; import org.apache.cxf.common.security.SimpleGroup; -import org.apache.ws.security.WSSecurityException; -import org.apache.ws.security.WSUsernameTokenPrincipal; -import org.apache.ws.security.handler.RequestData; -import org.apache.ws.security.message.token.UsernameToken; -import org.apache.ws.security.validate.Credential; -import org.apache.ws.security.validate.UsernameTokenValidator; +import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl; +import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.dom.message.token.UsernameToken; +import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.dom.validate.UsernameTokenValidator; /** * A custom UsernameToken Validator that wraps the default Validator in WSS4J and set a Subject @@ -40,8 +40,8 @@ public class CustomUTValidator extends U Credential cred = super.validate(credential, data); UsernameToken ut = credential.getUsernametoken(); - WSUsernameTokenPrincipal principal = - new WSUsernameTokenPrincipal(ut.getName(), ut.isHashed()); + WSUsernameTokenPrincipalImpl principal = + new WSUsernameTokenPrincipalImpl(ut.getName(), ut.isHashed()); principal.setCreatedTime(ut.getCreated()); principal.setNonce(principal.getNonce()); principal.setPassword(ut.getPassword()); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java Thu May 23 13:17:26 2013 @@ -27,7 +27,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java Thu May 23 13:17:26 2013 @@ -26,7 +26,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java Thu May 23 13:17:26 2013 @@ -25,7 +25,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java Thu May 23 13:17:26 2013 @@ -26,7 +26,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java Thu May 23 13:17:26 2013 @@ -26,7 +26,7 @@ import org.apache.cxf.common.security.Si import org.apache.cxf.interceptor.Fault; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.wss4j.UsernameTokenInterceptor; -import org.apache.ws.security.message.token.UsernameToken; +import org.apache.wss4j.dom.message.token.UsernameToken; public class CustomUsernameTokenInterceptor extends UsernameTokenInterceptor { Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java Thu May 23 13:17:26 2013 @@ -26,7 +26,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java Thu May 23 13:17:26 2013 @@ -26,7 +26,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java Thu May 23 13:17:26 2013 @@ -18,13 +18,13 @@ */ package org.apache.cxf.systest.ws.wssec11; -import org.w3c.dom.Element; - import org.apache.cxf.Bus; -import org.apache.cxf.helpers.DOMUtils; -import org.apache.cxf.ws.security.policy.SPConstants; import org.apache.cxf.ws.security.policy.custom.AlgorithmSuiteLoader; -import org.apache.cxf.ws.security.policy.model.AlgorithmSuite; +import org.apache.neethi.Assertion; +import org.apache.neethi.Policy; +import org.apache.wss4j.policy.SPConstants; +import org.apache.wss4j.policy.model.AbstractSecurityAssertion; +import org.apache.wss4j.policy.model.AlgorithmSuite; /** * This class retrieves a custom AlgorithmSuite for use with restricted security policies @@ -35,14 +35,41 @@ public class RestrictedAlgorithmSuiteLoa bus.setExtension(this, AlgorithmSuiteLoader.class); } - public AlgorithmSuite getAlgorithmSuite(Element policyElement, SPConstants consts) { - if (policyElement != null) { - RestrictedAlgorithmSuite algorithmSuite = new RestrictedAlgorithmSuite(consts); - String algorithmSuiteName = DOMUtils.getFirstElement(policyElement).getLocalName(); - algorithmSuite.setAlgorithmSuite(algorithmSuiteName); - return algorithmSuite; - } - return null; + public AlgorithmSuite getAlgorithmSuite(Bus bus, SPConstants.SPVersion version, Policy nestedPolicy) { + return new CustomAlgorithmSuite(version, nestedPolicy); } + private static class CustomAlgorithmSuite extends AlgorithmSuite { + + CustomAlgorithmSuite(SPConstants.SPVersion version, Policy nestedPolicy) { + super(version, nestedPolicy); + } + + @Override + protected AbstractSecurityAssertion cloneAssertion(Policy nestedPolicy) { + return new CustomAlgorithmSuite(getVersion(), nestedPolicy); + } + + @Override + protected void parseCustomAssertion(Assertion assertion) { + String assertionName = assertion.getName().getLocalPart(); + + AlgorithmSuiteType algorithmSuiteType = algorithmSuiteTypes.get(assertionName); + + setAlgorithmSuiteType(new AlgorithmSuiteType( + assertionName, + algorithmSuiteType.getDigest(), + algorithmSuiteType.getEncryption(), + algorithmSuiteType.getSymmetricKeyWrap(), + algorithmSuiteType.getAsymmetricKeyWrap(), + algorithmSuiteType.getEncryptionKeyDerivation(), + algorithmSuiteType.getSignatureKeyDerivation(), + algorithmSuiteType.getEncryptionDerivedKeyLength(), + algorithmSuiteType.getSignatureDerivedKeyLength(), + algorithmSuiteType.getMinimumSymmetricKeyLength(), + algorithmSuiteType.getMaximumSymmetricKeyLength(), + 512, + algorithmSuiteType.getMaximumAsymmetricKeyLength())); + } + } } Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java Thu May 23 13:17:26 2013 @@ -26,7 +26,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java Thu May 23 13:17:26 2013 @@ -27,7 +27,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java Thu May 23 13:17:26 2013 @@ -27,7 +27,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; /** */ Modified: cxf/trunk/systests/ws-security/src/test/resources/logging.properties URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/logging.properties?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/logging.properties (original) +++ cxf/trunk/systests/ws-security/src/test/resources/logging.properties Thu May 23 13:17:26 2013 @@ -35,7 +35,7 @@ # Note that these classes must be on the system classpath. # By default we only configure a ConsoleHandler, which will only # show messages at the INFO and above levels. -handlers= java.util.logging.ConsoleHandler +#handlers= java.util.logging.ConsoleHandler # To also add the FileHandler, use the following line instead. #handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler @@ -60,7 +60,7 @@ java.util.logging.FileHandler.count = 1 java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter # Limit the message that are printed on the console to INFO and above. -java.util.logging.ConsoleHandler.level = SEVERE +java.util.logging.ConsoleHandler.level = INFO java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml (original) +++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml Thu May 23 13:17:26 2013 @@ -76,7 +76,7 @@ class="org.apache.cxf.systest.ws.kerberos.server.KerberosTokenDecoderImpl"/>--> <bean id="kerberosValidator" - class="org.apache.ws.security.validate.KerberosTokenValidator"> + class="org.apache.wss4j.dom.validate.KerberosTokenValidator"> <property name="contextName" value="bob"/> <property name="serviceName" value="[email protected]"/> <!--<property name="kerberosTokenDecoder" ref="kerberosTicketDecoderImpl"/>--> Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1485693&r1=1485692&r2=1485693&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml (original) +++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml Thu May 23 13:17:26 2013 @@ -85,7 +85,7 @@ </jaxws:endpoint> - <bean id="crypto" class="org.apache.ws.security.components.crypto.CryptoFactory" + <bean id="crypto" class="org.apache.wss4j.common.crypto.CryptoFactory" factory-method="getInstance"> <constructor-arg> <util:properties id="cryptoProperties"
