You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/03/26 11:57:59 UTC
svn commit: r1461059 [2/3] - in /webservices/wss4j/trunk: integration/
integration/src/test/java/org/apache/wss4j/integration/test/dom/ parent/
ws-security-common/ ws-security-common/src/main/java/org/apache/wss4j/common/
ws-security-common/src/main/ja...
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java Tue Mar 26 10:57:49 2013
@@ -49,8 +49,8 @@ import javax.security.auth.callback.Call
* about Java KeyStores, but just wraps a list of trusted certificates.
*/
public class CertificateStoreTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(CertificateStoreTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(CertificateStoreTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto senderCrypto = CryptoFactory.getInstance("wss40.properties");
private Crypto receiverCrypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java Tue Mar 26 10:57:49 2013
@@ -50,8 +50,8 @@ import java.security.cert.X509Certificat
* OU=WSS4J,O=Apache,L=Munich,ST=Bayern,C=DE"
*/
public class CryptoProviderTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(CryptoProviderTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(CryptoProviderTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java Tue Mar 26 10:57:49 2013
@@ -35,8 +35,8 @@ import javax.security.auth.callback.Call
* https://issues.apache.org/jira/browse/WSS-245
*/
public class CallbackRefTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(CallbackRefTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(CallbackRefTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java Tue Mar 26 10:57:49 2013
@@ -44,8 +44,8 @@ import java.util.ArrayList;
* A test for adding custom actions/processors etc.
*/
public class CustomActionProcessorTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(CustomActionProcessorTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(CustomActionProcessorTest.class);
private Crypto crypto = null;
public CustomActionProcessorTest() throws Exception {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java Tue Mar 26 10:57:49 2013
@@ -47,8 +47,8 @@ import org.w3c.dom.Element;
* A set of test-cases for SignatureConfirmation.
*/
public class SignatureConfirmationTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureConfirmationTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureConfirmationTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java Tue Mar 26 10:57:49 2013
@@ -43,8 +43,8 @@ import org.w3c.dom.Document;
* be different than user name used for UsernameToken".
*/
public class SignatureUTAliasTest extends org.junit.Assert implements CallbackHandler {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureUTAliasTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureUTAliasTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java Tue Mar 26 10:57:49 2013
@@ -35,8 +35,8 @@ import javax.security.auth.callback.Call
* <p/>
*/
public class WSHandlerGetPasswordTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(WSHandlerGetPasswordTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(WSHandlerGetPasswordTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java Tue Mar 26 10:57:49 2013
@@ -41,8 +41,8 @@ import javax.security.auth.callback.Call
* A set of tests for using a derived key for encryption/signature.
*/
public class DerivedKeyTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(DerivedKeyTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(DerivedKeyTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java Tue Mar 26 10:57:49 2013
@@ -45,8 +45,8 @@ import org.w3c.dom.Element;
* encrypted Timestamp needs to be decrypted or not.
*/
public class EncryptedDataInHeaderTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(EncryptedDataInHeaderTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(EncryptedDataInHeaderTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java Tue Mar 26 10:57:49 2013
@@ -48,8 +48,8 @@ import org.apache.xml.security.utils.Bas
* AlgorithmSuite policy.
*/
public class EncryptionAlgorithmSuiteTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(EncryptionAlgorithmSuiteTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(EncryptionAlgorithmSuiteTest.class);
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java Tue Mar 26 10:57:49 2013
@@ -42,8 +42,8 @@ import org.apache.wss4j.dom.handler.WSHa
* This test reuses the revoked certificate from SignatureCRLTest
*/
public class EncryptionCRLTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(EncryptionCRLTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(EncryptionCRLTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler keystoreCallbackHandler = new KeystoreCallbackHandler();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java Tue Mar 26 10:57:49 2013
@@ -44,8 +44,8 @@ import java.util.List;
* https://issues.apache.org/jira/browse/WSS-325
*/
public class EncryptionGCMTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(EncryptionGCMTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(EncryptionGCMTest.class);
private static final javax.xml.namespace.QName SOAP_BODY =
new javax.xml.namespace.QName(
WSConstants.URI_SOAP11_ENV,
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java Tue Mar 26 10:57:49 2013
@@ -47,8 +47,8 @@ import java.util.ArrayList;
* has a custom header added.
*/
public class EncryptionPartsTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(EncryptionPartsTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(EncryptionPartsTest.class);
private static final String SOAPMSG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<soapenv:Envelope xmlns:foo=\"urn:foo.bar\" xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
" <soapenv:Header>" +
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java Tue Mar 26 10:57:49 2013
@@ -56,8 +56,8 @@ import java.util.List;
* A set of test-cases for encrypting and decrypting SOAP requests.
*/
public class EncryptionTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(EncryptionTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(EncryptionTest.class);
private static final javax.xml.namespace.QName SOAP_BODY =
new javax.xml.namespace.QName(
WSConstants.URI_SOAP11_ENV,
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java Tue Mar 26 10:57:49 2013
@@ -53,8 +53,8 @@ import javax.security.auth.callback.Call
* This class tests the modification of requests.
*/
public class ModifiedRequestTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(ModifiedRequestTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(ModifiedRequestTest.class);
private static final String SOAPMSG =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SOAP-ENV:Envelope "
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java Tue Mar 26 10:57:49 2013
@@ -33,8 +33,8 @@ import org.w3c.dom.Document;
* http://issues.apache.org/jira/browse/WSS-60
*/
public class NoSoapPrefixSignatureTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(NoSoapPrefixSignatureTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(NoSoapPrefixSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java Tue Mar 26 10:57:49 2013
@@ -38,8 +38,8 @@ import javax.security.auth.callback.Call
* password type. See WSS-255.
*/
public class PasswordTypeTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(PasswordTypeTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(PasswordTypeTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java Tue Mar 26 10:57:49 2013
@@ -46,8 +46,8 @@ import org.w3c.dom.Element;
* Some test-cases for replay attacks.
*/
public class ReplayTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(ReplayTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(ReplayTest.class);
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java Tue Mar 26 10:57:49 2013
@@ -50,8 +50,8 @@ import org.w3c.dom.Element;
* mentioned option is on.
*/
public class RequireSignedEncryptedDataElementsTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(RequireSignedEncryptedDataElementsTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(RequireSignedEncryptedDataElementsTest.class);
private static ResourceBundle resources = ResourceBundle.getBundle("messages.wss4j_errors");
private static final String SOAPMSG =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java Tue Mar 26 10:57:49 2013
@@ -37,8 +37,8 @@ import org.w3c.dom.Document;
* WS-Security Test Case for SubjectKeyIdentifier.
*/
public class SKISignatureTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SKISignatureTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SKISignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java Tue Mar 26 10:57:49 2013
@@ -39,8 +39,8 @@ import java.util.ArrayList;
* SecurityTokenReference transform.
*/
public class STRSignatureTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(STRSignatureTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(STRSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java Tue Mar 26 10:57:49 2013
@@ -40,8 +40,8 @@ import org.w3c.dom.Document;
* A set of tests for SecurityContextTokens.
*/
public class SecurityContextTokenTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SecurityContextTokenTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SecurityContextTokenTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private SecretKeyCallbackHandler callbackHandler = new SecretKeyCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java Tue Mar 26 10:57:49 2013
@@ -50,8 +50,8 @@ import org.apache.xml.security.utils.Bas
* AlgorithmSuite policy.
*/
public class SignatureAlgorithmSuiteTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureAlgorithmSuiteTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureAlgorithmSuiteTest.class);
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java Tue Mar 26 10:57:49 2013
@@ -63,8 +63,8 @@ import org.w3c.dom.Element;
* -config ca.config -crldays 3650
*/
public class SignatureCRLTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureCRLTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureCRLTest.class);
private Crypto crypto = null;
private Crypto cryptoCA = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java Tue Mar 26 10:57:49 2013
@@ -43,8 +43,8 @@ import org.w3c.dom.Element;
* verify the signature is validated against a set of cert constraints.
*/
public class SignatureCertConstraintsTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureCertConstraintsTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureCertConstraintsTest.class);
private Crypto crypto = null;
private Crypto cryptoCA = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java Tue Mar 26 10:57:49 2013
@@ -67,8 +67,8 @@ import java.util.List;
*
*/
public class SignatureCertTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureCertTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureCertTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
private Crypto cryptoCA = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java Tue Mar 26 10:57:49 2013
@@ -47,8 +47,8 @@ import java.util.ArrayList;
* A set of tests for combined signature/encryption, verification/decryption.
*/
public class SignatureEncryptionTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureEncryptionTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureEncryptionTest.class);
private static final String SOAPMSG =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SOAP-ENV:Envelope "
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java Tue Mar 26 10:57:49 2013
@@ -43,8 +43,8 @@ import org.apache.wss4j.dom.util.WSSecur
* WS-Security, it's necessary to support it for WCF interop.
*/
public class SignatureKeyValueTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureKeyValueTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureKeyValueTest.class);
private Crypto crypto = null;
public SignatureKeyValueTest() throws Exception {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java Tue Mar 26 10:57:49 2013
@@ -55,8 +55,8 @@ import javax.xml.namespace.QName;
* has a custom header added.
*/
public class SignaturePartsTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignaturePartsTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignaturePartsTest.class);
private static final String SOAPMSG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<soapenv:Envelope xmlns:foo=\"urn:foo.bar\" xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
" <soapenv:Header>" +
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java Tue Mar 26 10:57:49 2013
@@ -53,8 +53,8 @@ import org.w3c.dom.Node;
* A set of test-cases for signing and verifying SOAP requests.
*/
public class SignatureTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignatureTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java Tue Mar 26 10:57:49 2013
@@ -42,8 +42,8 @@ import org.w3c.dom.Document;
* used to verify the signature.
*/
public class SignedBSTTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignedBSTTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignedBSTTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java Tue Mar 26 10:57:49 2013
@@ -52,8 +52,8 @@ import org.w3c.dom.Document;
* calling processSecurityHeader method of WSSecurityEngine.
*/
public class SymmetricSignatureTest extends org.junit.Assert implements CallbackHandler {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SymmetricSignatureTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SymmetricSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private SecretKeyCallbackHandler secretKeyCallbackHandler = new SecretKeyCallbackHandler();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java Tue Mar 26 10:57:49 2013
@@ -38,8 +38,7 @@ import org.w3c.dom.NodeList;
* org.apache.wss4j.dom.message.RequireSignedEncryptedDataElementsTest
*/
public class TestMessageTransformer extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
- .getLog(TestMessageTransformer.class);
+ private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(TestMessageTransformer.class);
public static Element duplicateEncryptedDataInWsseHeader(Element saaj, boolean moveReferenceList) throws TransformerException {
if (moveReferenceList) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java Tue Mar 26 10:57:49 2013
@@ -46,8 +46,8 @@ import java.util.List;
* WS-Security Test Case for Timestamps.
*/
public class TimestampTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(TimestampTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(TimestampTest.class);
/**
* This is a test for processing a valid Timestamp.
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java Tue Mar 26 10:57:49 2013
@@ -51,8 +51,8 @@ import java.util.List;
* and sign, as per wsc:DerivedKeyToken.
*/
public class UTDerivedKeyTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(UTDerivedKeyTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(UTDerivedKeyTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java Tue Mar 26 10:57:49 2013
@@ -48,8 +48,8 @@ import java.util.List;
* non-standard implementation.
*/
public class UTSignatureTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(UTSignatureTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(UTSignatureTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTWseSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTWseSignatureTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTWseSignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTWseSignatureTest.java Tue Mar 26 10:57:49 2013
@@ -38,8 +38,8 @@ import javax.security.auth.callback.Call
* This a test for deriving a key from a Username Token using a non-standard (WSE) implementation.
*/
public class UTWseSignatureTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(UTWseSignatureTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(UTWseSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java Tue Mar 26 10:57:49 2013
@@ -55,8 +55,8 @@ import java.util.List;
* WS-Security Test Case for UsernameTokens.
*/
public class UsernameTokenTest extends org.junit.Assert implements CallbackHandler {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(UsernameTokenTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(UsernameTokenTest.class);
private static final String SOAPUTMSG =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" "
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java Tue Mar 26 10:57:49 2013
@@ -54,8 +54,8 @@ import java.util.List;
* This is a test for the Kerberos Token Profile 1.1
*/
public class BSTKerberosTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(BSTKerberosTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(BSTKerberosTest.class);
private static final String AP_REQ = WSConstants.WSS_GSS_KRB_V5_AP_REQ;
private static final String BASE64_NS =
WSConstants.SOAPMESSAGE_NS + "#Base64Binary";
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java Tue Mar 26 10:57:49 2013
@@ -41,8 +41,8 @@ import java.util.List;
* This is a test for constructing and processing BinarySecurityTokens.
*/
public class BinarySecurityTokenTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(BinarySecurityTokenTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(BinarySecurityTokenTest.class);
private Crypto crypto = null;
public BinarySecurityTokenTest() throws Exception {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java Tue Mar 26 10:57:49 2013
@@ -34,8 +34,8 @@ import org.w3c.dom.Element;
* Some tests for the SecurityTokenReference class.
*/
public class SecurityTokenReferenceTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SecurityTokenReferenceTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SecurityTokenReferenceTest.class);
/**
* Test for a Reference with no URI
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java Tue Mar 26 10:57:49 2013
@@ -44,8 +44,8 @@ import org.w3c.dom.Document;
* qualified (incorrectly). WSS-199 added the ability to process these Username Tokens.
*/
public class WCFUsernameTokenTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(WCFUsernameTokenTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(WCFUsernameTokenTest.class);
private static final String SOAPUTMSG =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" "
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java Tue Mar 26 10:57:49 2013
@@ -60,8 +60,8 @@ import org.apache.wss4j.dom.validate.Val
* Test various principal objects after processing a security token.
*/
public class PrincipalTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(PrincipalTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(PrincipalTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java Tue Mar 26 10:57:49 2013
@@ -53,8 +53,8 @@ import org.w3c.dom.Element;
*
*/
public class EncryptedKeyDataRefTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(EncryptedKeyDataRefTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(EncryptedKeyDataRefTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java Tue Mar 26 10:57:49 2013
@@ -53,8 +53,8 @@ import org.w3c.dom.Element;
*
*/
public class ReferenceListDataRefTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(ReferenceListDataRefTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(ReferenceListDataRefTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java Tue Mar 26 10:57:49 2013
@@ -49,8 +49,8 @@ import org.apache.wss4j.dom.util.WSSecur
* SAML (HOK) assertion when specifying an AlgorithmSuite policy.
*/
public class SamlAlgorithmSuiteTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlAlgorithmSuiteTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlAlgorithmSuiteTest.class);
private Crypto crypto = null;
public SamlAlgorithmSuiteTest() throws Exception {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java Tue Mar 26 10:57:49 2013
@@ -45,8 +45,8 @@ import org.w3c.dom.Document;
* Test-case for sending and processing an a SAML Token with a custom Conditions element.
*/
public class SamlConditionsTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlConditionsTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlConditionsTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
public SamlConditionsTest() {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java Tue Mar 26 10:57:49 2013
@@ -63,8 +63,8 @@ import org.w3c.dom.NodeList;
* we expect an exception to be thrown when processing it.
*/
public class SamlNegativeTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlNegativeTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlNegativeTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto trustCrypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java Tue Mar 26 10:57:49 2013
@@ -58,8 +58,8 @@ import javax.security.auth.callback.Call
* Some tests for how SAML tokens are referenced.
*/
public class SamlReferenceTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlReferenceTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlReferenceTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = CryptoFactory.getInstance("crypto.properties");
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java Tue Mar 26 10:57:49 2013
@@ -51,8 +51,8 @@ import org.w3c.dom.Element;
/**
*/
public class SamlTokenCustomSignatureTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlTokenCustomSignatureTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlTokenCustomSignatureTest.class);
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java Tue Mar 26 10:57:49 2013
@@ -55,8 +55,8 @@ import javax.security.auth.callback.Call
* derived key.
*/
public class SamlTokenDerivedTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlTokenDerivedTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlTokenDerivedTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java Tue Mar 26 10:57:49 2013
@@ -49,8 +49,8 @@ import java.util.List;
* information in the SAML Subject to sign the SOAP body.
*/
public class SamlTokenHOKTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlTokenHOKTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlTokenHOKTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java Tue Mar 26 10:57:49 2013
@@ -52,8 +52,8 @@ import javax.security.auth.callback.Call
* Test-case for sending and processing a signed (sender vouches) SAML Assertion.
*/
public class SamlTokenSVTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlTokenSVTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlTokenSVTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java Tue Mar 26 10:57:49 2013
@@ -59,8 +59,8 @@ import java.util.List;
* Test-case for sending and processing an unsigned (sender vouches) SAML Assertion.
*/
public class SamlTokenTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SamlTokenTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SamlTokenTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
public SamlTokenTest() {
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java Tue Mar 26 10:57:49 2013
@@ -57,8 +57,8 @@ import java.util.List;
* SOAP body.
*/
public class SignedSamlTokenHOKTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(SignedSamlTokenHOKTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(SignedSamlTokenHOKTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto trustCrypto = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java Tue Mar 26 10:57:49 2013
@@ -56,8 +56,8 @@ import org.w3c.dom.Document;
* Validator implementations.
*/
public class ValidatorTest extends org.junit.Assert {
- private static final org.apache.commons.logging.Log LOG =
- org.apache.commons.logging.LogFactory.getLog(ValidatorTest.class);
+ private static final org.slf4j.Logger LOG =
+ org.slf4j.LoggerFactory.getLogger(ValidatorTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
/**
Modified: webservices/wss4j/trunk/ws-security-policy-stax/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/pom.xml?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/pom.xml Tue Mar 26 10:57:49 2013
@@ -70,11 +70,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java Tue Mar 26 10:57:49 2013
@@ -18,14 +18,74 @@
*/
package org.apache.wss4j.policy.stax;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.neethi.*;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import org.apache.neethi.Assertion;
+import org.apache.neethi.ExactlyOne;
+import org.apache.neethi.Policy;
+import org.apache.neethi.PolicyComponent;
+import org.apache.neethi.PolicyContainingAssertion;
+import org.apache.neethi.PolicyOperator;
import org.apache.neethi.builders.PrimitiveAssertion;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.policy.WSSPolicyException;
-import org.apache.wss4j.policy.model.*;
-import org.apache.wss4j.policy.stax.assertionStates.*;
+import org.apache.wss4j.policy.model.AbstractBinding;
+import org.apache.wss4j.policy.model.AbstractSecurityAssertion;
+import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding;
+import org.apache.wss4j.policy.model.AbstractToken;
+import org.apache.wss4j.policy.model.AlgorithmSuite;
+import org.apache.wss4j.policy.model.ContentEncryptedElements;
+import org.apache.wss4j.policy.model.EncryptedElements;
+import org.apache.wss4j.policy.model.EncryptedParts;
+import org.apache.wss4j.policy.model.HttpsToken;
+import org.apache.wss4j.policy.model.IssuedToken;
+import org.apache.wss4j.policy.model.KerberosToken;
+import org.apache.wss4j.policy.model.KeyValueToken;
+import org.apache.wss4j.policy.model.RelToken;
+import org.apache.wss4j.policy.model.RequiredElements;
+import org.apache.wss4j.policy.model.RequiredParts;
+import org.apache.wss4j.policy.model.SamlToken;
+import org.apache.wss4j.policy.model.SecureConversationToken;
+import org.apache.wss4j.policy.model.SecurityContextToken;
+import org.apache.wss4j.policy.model.SignedElements;
+import org.apache.wss4j.policy.model.SignedParts;
+import org.apache.wss4j.policy.model.SpnegoContextToken;
+import org.apache.wss4j.policy.model.SupportingTokens;
+import org.apache.wss4j.policy.model.UsernameToken;
+import org.apache.wss4j.policy.model.X509Token;
+import org.apache.wss4j.policy.stax.assertionStates.AlgorithmSuiteAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.ContentEncryptedElementsAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.EncryptedElementsAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.EncryptedPartsAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.HttpsTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.IncludeTimeStampAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.IssuedTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.KerberosTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.KeyValueTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.OnlySignEntireHeadersAndBodyAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.ProtectionOrderAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.RelTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.RequiredElementsAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.RequiredPartsAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.SamlTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.SecureConversationTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.SecurityContextTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.SignatureProtectionAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.SignedElementsAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.SignedPartsAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.SpnegoContextTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.TokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.TokenProtectionAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.UsernameTokenAssertionState;
+import org.apache.wss4j.policy.stax.assertionStates.X509TokenAssertionState;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
@@ -34,9 +94,6 @@ import org.apache.xml.security.stax.secu
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
-import javax.xml.namespace.QName;
-import java.util.*;
-
/**
* The PolicyEnforcer verifies the Policy assertions
* The Assertion will be validated in realtime as far as possible
@@ -53,7 +110,8 @@ public class PolicyEnforcer implements S
// HttpsToken Algorithms
//unused tokens must be checked (algorithms etc)
- protected static final transient Log log = LogFactory.getLog(PolicyEnforcer.class);
+ protected static final transient org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(PolicyEnforcer.class);
private final List<OperationPolicy> operationPolicies;
private OperationPolicy effectivePolicy;
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java Tue Mar 26 10:57:49 2013
@@ -18,37 +18,86 @@
*/
package org.apache.wss4j.policy.stax;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.wsdl.Binding;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.Definition;
+import javax.wsdl.Operation;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.WSDLElement;
+import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.UnknownExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Operation;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyBuilder;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.wss4j.policy.WSSPolicyException;
-import org.apache.wss4j.policy.builders.*;
+import org.apache.wss4j.policy.builders.AlgorithmSuiteBuilder;
+import org.apache.wss4j.policy.builders.AsymmetricBindingBuilder;
+import org.apache.wss4j.policy.builders.ContentEncryptedElementsBuilder;
+import org.apache.wss4j.policy.builders.EncryptedElementsBuilder;
+import org.apache.wss4j.policy.builders.EncryptedPartsBuilder;
+import org.apache.wss4j.policy.builders.EncryptionTokenBuilder;
+import org.apache.wss4j.policy.builders.HttpsTokenBuilder;
+import org.apache.wss4j.policy.builders.InitiatorEncryptionTokenBuilder;
+import org.apache.wss4j.policy.builders.InitiatorSignatureTokenBuilder;
+import org.apache.wss4j.policy.builders.InitiatorTokenBuilder;
+import org.apache.wss4j.policy.builders.IssuedTokenBuilder;
+import org.apache.wss4j.policy.builders.KerberosTokenBuilder;
+import org.apache.wss4j.policy.builders.KeyValueTokenBuilder;
+import org.apache.wss4j.policy.builders.LayoutBuilder;
+import org.apache.wss4j.policy.builders.ProtectionTokenBuilder;
+import org.apache.wss4j.policy.builders.RecipientEncryptionTokenBuilder;
+import org.apache.wss4j.policy.builders.RecipientSignatureTokenBuilder;
+import org.apache.wss4j.policy.builders.RecipientTokenBuilder;
+import org.apache.wss4j.policy.builders.RelTokenBuilder;
+import org.apache.wss4j.policy.builders.RequiredElementsBuilder;
+import org.apache.wss4j.policy.builders.RequiredPartsBuilder;
+import org.apache.wss4j.policy.builders.SamlTokenBuilder;
+import org.apache.wss4j.policy.builders.SecureConversationTokenBuilder;
+import org.apache.wss4j.policy.builders.SecurityContextTokenBuilder;
+import org.apache.wss4j.policy.builders.SignatureTokenBuilder;
+import org.apache.wss4j.policy.builders.SignedElementsBuilder;
+import org.apache.wss4j.policy.builders.SignedPartsBuilder;
+import org.apache.wss4j.policy.builders.SpnegoContextTokenBuilder;
+import org.apache.wss4j.policy.builders.SupportingTokensBuilder;
+import org.apache.wss4j.policy.builders.SymmetricBindingBuilder;
+import org.apache.wss4j.policy.builders.TransportBindingBuilder;
+import org.apache.wss4j.policy.builders.TransportTokenBuilder;
+import org.apache.wss4j.policy.builders.Trust10Builder;
+import org.apache.wss4j.policy.builders.Trust13Builder;
+import org.apache.wss4j.policy.builders.UsernameTokenBuilder;
+import org.apache.wss4j.policy.builders.WSS10Builder;
+import org.apache.wss4j.policy.builders.WSS11Builder;
+import org.apache.wss4j.policy.builders.X509TokenBuilder;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import javax.wsdl.*;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.wsdl.extensions.soap12.SOAP12Operation;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import java.net.URL;
-import java.util.*;
-
/**
* PolicyEnforcerFactory builds a map of all the possible effective Policies
* and caches them for reuse
*/
public class PolicyEnforcerFactory {
- protected static final transient Log log = LogFactory.getLog(PolicyEnforcerFactory.class);
+ protected static final transient org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(PolicyEnforcerFactory.class);
private final List<AssertionBuilder<Element>> assertionBuilders;
Modified: webservices/wss4j/trunk/ws-security-stax/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/pom.xml?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-stax/pom.xml Tue Mar 26 10:57:49 2013
@@ -59,6 +59,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>jcs</groupId>
<artifactId>jcs</artifactId>
<scope>compile</scope>
@@ -220,11 +225,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java Tue Mar 26 10:57:49 2013
@@ -18,8 +18,6 @@
*/
package org.apache.wss4j.stax.ext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.stax.impl.InboundWSSecurityContextImpl;
import org.apache.wss4j.stax.impl.WSSecurityStreamReader;
@@ -53,7 +51,8 @@ import java.util.List;
*/
public class InboundWSSec {
- protected static final transient Log log = LogFactory.getLog(InboundWSSec.class);
+ protected static final transient org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(InboundWSSec.class);
private static final XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java Tue Mar 26 10:57:49 2013
@@ -18,8 +18,15 @@
*/
package org.apache.wss4j.stax.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.stax.ext.WSSConstants;
@@ -29,17 +36,21 @@ import org.apache.wss4j.stax.securityEve
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.ConfigurationProperties;
import org.apache.xml.security.stax.ext.SecurityToken;
-import org.apache.xml.security.stax.securityEvent.*;
-
-import javax.xml.namespace.QName;
-import java.util.*;
+import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
+import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
/**
* Concrete security context implementation
*/
public class InboundWSSecurityContextImpl extends WSSecurityContextImpl {
- private static final transient Log logger = LogFactory.getLog(WSSecurityContextImpl.class);
+ private static final transient org.slf4j.Logger logger =
+ org.slf4j.LoggerFactory.getLogger(WSSecurityContextImpl.class);
private static final Boolean allowRSA15KeyTransportAlgorithm = Boolean.valueOf(ConfigurationProperties.getProperty("AllowRSA15KeyTransportAlgorithm"));
private final Deque<SecurityEvent> securityEventQueue = new ArrayDeque<SecurityEvent>();
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java?rev=1461059&r1=1461058&r2=1461059&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java Tue Mar 26 10:57:49 2013
@@ -18,8 +18,13 @@
*/
package org.apache.wss4j.stax.impl.processor.input;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.stax.ext.WSSConstants;
@@ -28,25 +33,23 @@ import org.apache.wss4j.stax.ext.WSSUtil
import org.apache.wss4j.stax.ext.WSSecurityContext;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.SecurityHeaderHandlerMapper;
-import org.apache.xml.security.stax.ext.*;
+import org.apache.xml.security.stax.ext.AbstractInputProcessor;
+import org.apache.xml.security.stax.ext.InputProcessorChain;
+import org.apache.xml.security.stax.ext.XMLSecurityHeaderHandler;
+import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import org.apache.xml.security.stax.impl.processor.input.XMLEventReaderInputProcessor;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import java.util.ArrayDeque;
-import java.util.Deque;
-
/**
* Processor for the Security-Header XML Structure.
* This processor instantiates more processors on demand
*/
public class SecurityHeaderInputProcessor extends AbstractInputProcessor {
- protected static final transient Log logger = LogFactory.getLog(SecurityHeaderInputProcessor.class);
+ protected static final transient org.slf4j.Logger logger =
+ org.slf4j.LoggerFactory.getLogger(SecurityHeaderInputProcessor.class);
private final ArrayDeque<XMLSecEvent> xmlSecEventList = new ArrayDeque<XMLSecEvent>();
private int eventCount = 0;