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 2011/04/06 16:08:39 UTC
svn commit: r1089464 [2/2] - in /webservices/wss4j/trunk/src:
main/java/org/apache/ws/security/ main/java/org/apache/ws/security/action/
main/java/org/apache/ws/security/components/crypto/
main/java/org/apache/ws/security/handler/ main/java/org/apache/...
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
@@ -36,7 +34,8 @@ import org.w3c.dom.Document;
* @author Werner Dittmann (Werner.Dittmann@siemens.com)
*/
public class SKISignatureTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SKISignatureTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SKISignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.SOAPConstants;
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSConstants;
@@ -42,7 +40,8 @@ import java.util.ArrayList;
* @author Davanum Srinivas (dims@yahoo.com)
*/
public class STRSignatureTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(STRSignatureTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(STRSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java Wed Apr 6 14:08:37 2011
@@ -21,8 +21,6 @@ package org.apache.ws.security.message;
import javax.xml.crypto.dsig.SignatureMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.common.SecretKeyCallbackHandler;
@@ -39,7 +37,8 @@ import org.w3c.dom.Document;
* @author Ruchith Fernando (ruchith.fernando@gmail.com)
*/
public class SecurityContextTokenTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SecurityContextTokenTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SecurityContextTokenTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private SecretKeyCallbackHandler callbackHandler = new SecretKeyCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
@@ -68,7 +66,8 @@ import java.util.List;
*
*/
public class SignatureCertTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SignatureCertTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SignatureCertTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
private Crypto cryptoCA = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSEncryptionPart;
@@ -47,7 +45,8 @@ import java.util.ArrayList;
* @author Davanum Srinivas (dims@yahoo.com)
*/
public class SignatureEncryptionTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SignatureEncryptionTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SignatureEncryptionTest.class);
private static final String SOAPMSG =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SOAP-ENV:Envelope "
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.PublicKeyPrincipal;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
@@ -40,7 +38,8 @@ import java.util.List;
* WS-Security, it's necessary to support it for WCF interop.
*/
public class SignatureKeyValueTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SignatureKeyValueTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SignatureKeyValueTest.class);
private Crypto crypto = null;
public SignatureKeyValueTest() throws Exception {
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.SOAPConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSEncryptionPart;
@@ -56,7 +54,8 @@ import javax.xml.namespace.QName;
* has a custom header added.
*/
public class SignaturePartsTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SignaturePartsTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(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/src/test/java/org/apache/ws/security/message/SignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureTest.java Wed Apr 6 14:08:37 2011
@@ -24,8 +24,6 @@ import java.util.List;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
@@ -48,7 +46,8 @@ import org.w3c.dom.Document;
* @author Werner Dittmann (Werner.Dittmann@siemens.com)
*/
public class SignatureTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SignatureTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java Wed Apr 6 14:08:37 2011
@@ -28,8 +28,6 @@ import javax.security.auth.callback.Call
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.xml.crypto.dsig.SignatureMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSConfig;
@@ -53,7 +51,8 @@ import org.w3c.dom.Document;
* calling processSecurityHeader method of WSSecurityEngine.
*/
public class SymmetricSignatureTest extends org.junit.Assert implements CallbackHandler {
- private static final Log LOG = LogFactory.getLog(SymmetricSignatureTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SymmetricSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private SecretKeyCallbackHandler secretKeyCallbackHandler = new SecretKeyCallbackHandler();
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
@@ -42,7 +40,8 @@ import java.util.List;
* WS-Security Test Case for Timestamps.
*/
public class TimestampTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(TimestampTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(TimestampTest.class);
/**
* This is a test for processing a valid Timestamp.
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
@@ -49,7 +47,8 @@ import java.util.List;
* and sign, as per wsc:DerivedKeyToken.
*/
public class UTDerivedKeyTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(UTDerivedKeyTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(UTDerivedKeyTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
@@ -49,7 +47,8 @@ import java.util.List;
* non-standard implementation.
*/
public class UTSignatureTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(UTSignatureTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(UTSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
@@ -41,7 +39,8 @@ import javax.security.auth.callback.Call
* @author Werner Dittmann (Wern.erDittmann@siemens.com)
*/
public class UTWseSignatureTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(UTWseSignatureTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(UTWseSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSPasswordCallback;
@@ -51,7 +49,8 @@ import java.util.List;
* @author Davanum Srinivas (dims@yahoo.com)
*/
public class UsernameTokenTest extends org.junit.Assert implements CallbackHandler {
- private static final Log LOG = LogFactory.getLog(UsernameTokenTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(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/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message.token;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
@@ -49,7 +47,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 Log LOG = LogFactory.getLog(BSTKerberosTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(BSTKerberosTest.class);
private static final String AP_REQ =
"http://docs.oasis-open.org/wss/oasis-wss-kerberos-token-profile-1.1#Kerberosv5_AP_REQ";
private static final String BASE64_NS =
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message.token;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
@@ -41,7 +39,8 @@ import java.util.List;
* This is a test for constructing and processing BinarySecurityTokens.
*/
public class BinarySecurityTokenTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(BinarySecurityTokenTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(BinarySecurityTokenTest.class);
private Crypto crypto = null;
public BinarySecurityTokenTest() throws Exception {
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message.token;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.SOAPUtil;
@@ -32,7 +30,8 @@ import org.w3c.dom.Element;
* Some tests for the SecurityTokenReference class.
*/
public class SecurityTokenReferenceTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SecurityTokenReferenceTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SecurityTokenReferenceTest.class);
/**
* Test for a Reference with no URI
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.message.token;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSConfig;
@@ -38,7 +36,8 @@ import javax.security.auth.callback.Call
* qualified (incorrectly). WSS-199 added the ability to process these Username Tokens.
*/
public class WCFUsernameTokenTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(WCFUsernameTokenTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(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/src/test/java/org/apache/ws/security/processor/EncryptedKeyDataRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/processor/EncryptedKeyDataRefTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/processor/EncryptedKeyDataRefTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/processor/EncryptedKeyDataRefTest.java Wed Apr 6 14:08:37 2011
@@ -24,8 +24,6 @@ import java.util.ArrayList;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSEncryptionPart;
@@ -55,7 +53,8 @@ import org.w3c.dom.Element;
*
*/
public class EncryptedKeyDataRefTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(EncryptedKeyDataRefTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(EncryptedKeyDataRefTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/processor/ReferenceListDataRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/processor/ReferenceListDataRefTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/processor/ReferenceListDataRefTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/processor/ReferenceListDataRefTest.java Wed Apr 6 14:08:37 2011
@@ -24,8 +24,6 @@ import java.util.ArrayList;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSEncryptionPart;
@@ -55,7 +53,8 @@ import org.w3c.dom.Element;
*
*/
public class ReferenceListDataRefTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(ReferenceListDataRefTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(ReferenceListDataRefTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.saml;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
@@ -63,7 +61,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 Log LOG = LogFactory.getLog(SamlNegativeTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SamlNegativeTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto trustCrypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.saml;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSEncryptionPart;
@@ -60,7 +58,8 @@ import javax.security.auth.callback.Call
* WSS-265 is fixed: https://issues.apache.org/jira/browse/WSS-265
*/
public class SamlReferenceTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SamlReferenceTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SamlReferenceTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = CryptoFactory.getInstance("crypto.properties");
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java Wed Apr 6 14:08:37 2011
@@ -19,9 +19,6 @@
package org.apache.ws.security.saml;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
@@ -49,7 +46,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 Log LOG = LogFactory.getLog(SamlTokenHOKTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SamlTokenHOKTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java Wed Apr 6 14:08:37 2011
@@ -19,9 +19,6 @@
package org.apache.ws.security.saml;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSSConfig;
@@ -53,7 +50,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 Log LOG = LogFactory.getLog(SamlTokenSVTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SamlTokenSVTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java Wed Apr 6 14:08:37 2011
@@ -19,9 +19,6 @@
package org.apache.ws.security.saml;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
@@ -50,7 +47,8 @@ import java.util.List;
* @author Davanum Srinivas (dims@yahoo.com)
*/
public class SamlTokenTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SamlTokenTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SamlTokenTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
public SamlTokenTest() {
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java Wed Apr 6 14:08:37 2011
@@ -19,8 +19,6 @@
package org.apache.ws.security.saml;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSSConfig;
@@ -57,7 +55,8 @@ import java.util.List;
* SOAP body.
*/
public class SignedSamlTokenHOKTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(SignedSamlTokenHOKTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(SignedSamlTokenHOKTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto trustCrypto = null;
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java?rev=1089464&r1=1089463&r2=1089464&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java Wed Apr 6 14:08:37 2011
@@ -24,8 +24,6 @@ import java.util.List;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
@@ -54,7 +52,8 @@ import org.w3c.dom.Document;
* Validator implementations.
*/
public class ValidatorTest extends org.junit.Assert {
- private static final Log LOG = LogFactory.getLog(ValidatorTest.class);
+ private static final org.apache.commons.logging.Log LOG =
+ org.apache.commons.logging.LogFactory.getLog(ValidatorTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
/**