Use slf4j api

pom.xml

@@ -304,7 +304,7 @@
         </executions>
         <configuration>
           <excludes>
-            <exluce>**/xri/**</exluce>
+            <exlude>**/xri/**</exlude>
             <exclude>**/infocard/**</exclude>
           </excludes>
         </configuration>
@@ -493,7 +493,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>3.8.2</version>
+        <version>4.12</version>
       </dependency>
       <dependency>
         <groupId>jdom</groupId>
@@ -541,9 +541,21 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.10</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jcl</artifactId>
+      <version>1.7.10</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>

src/org/openid4java/association/Association.java

@@ -5,8 +5,8 @@
 package org.openid4java.association;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.crypto.SecretKey;
 import javax.crypto.KeyGenerator;
@@ -23,7 +23,7 @@
  */
 public class Association implements Serializable
 {
-    private static Log _log = LogFactory.getLog(Association.class);
+    private static Logger _log = LoggerFactory.getLogger(Association.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     public static final String FAILED_ASSOC_HANDLE      = " ";

src/org/openid4java/association/AssociationSessionType.java

@@ -4,8 +4,8 @@
 
 package org.openid4java.association;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Modells the session and association types allowed in OpenID associations.
@@ -21,7 +21,7 @@
  */
 public class AssociationSessionType implements Comparable
 {
-    private static Log _log = LogFactory.getLog(AssociationSessionType.class);
+    private static Logger _log = LoggerFactory.getLogger(AssociationSessionType.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     public static final AssociationSessionType NO_ENCRYPTION_SHA1MAC

src/org/openid4java/association/DiffieHellmanSession.java

@@ -9,18 +9,20 @@
 import javax.crypto.spec.DHPublicKeySpec;
 import javax.crypto.interfaces.DHPublicKey;
 import javax.crypto.interfaces.DHPrivateKey;
+
 import java.math.BigInteger;
 import java.security.*;
+
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Marius Scurtescu, Johnny Bufu
  */
 public class DiffieHellmanSession
 {
-    private static Log _log = LogFactory.getLog(DiffieHellmanSession.class);
+    private static Logger _log = LoggerFactory.getLogger(DiffieHellmanSession.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     public static final String DEFAULT_MODULUS_HEX =
@@ -120,8 +122,7 @@ public static DHParameterSpec generateRandomParameter(int primeSize, int keySize
 
             AlgorithmParameters params = paramGen.generateParameters();
 
-            DHParameterSpec result = (DHParameterSpec)
-                    params.getParameterSpec(DHParameterSpec.class);
+            DHParameterSpec result = params.getParameterSpec(DHParameterSpec.class);
 
             if (DEBUG) _log.debug("Generated random DHParameterSpec, base: "
                     + result.getG() + ", modulus: " + result.getP());

src/org/openid4java/consumer/AbstractNonceVerifier.java

@@ -5,19 +5,18 @@
 package org.openid4java.consumer;
 
 import org.openid4java.util.InternetDateFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 import java.text.ParseException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * @author Marius Scurtescu, Johnny Bufu
  */
 public abstract class AbstractNonceVerifier implements NonceVerifier
 {
-    private static Log _log = LogFactory.getLog(AbstractNonceVerifier.class);
+    private static Logger _log = LoggerFactory.getLogger(AbstractNonceVerifier.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     protected static InternetDateFormat _dateFormat = new InternetDateFormat();

src/org/openid4java/consumer/ConsumerManager.java

@@ -5,8 +5,7 @@
 package org.openid4java.consumer;
 
 import com.google.inject.Inject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
 import org.apache.http.HttpStatus;
 import org.openid4java.OpenIDException;
 import org.openid4java.association.Association;
@@ -27,6 +26,8 @@
 import org.openid4java.util.HttpFetcherFactory;
 import org.openid4java.util.HttpRequestOptions;
 import org.openid4java.util.HttpResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.crypto.spec.DHParameterSpec;
 import java.io.IOException;
@@ -47,7 +48,7 @@
  */
 public class ConsumerManager
 {
-    private static Log _log = LogFactory.getLog(ConsumerManager.class);
+    private static Logger _log = LoggerFactory.getLogger(ConsumerManager.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     /**

src/org/openid4java/consumer/EhcacheNonceVerifier.java

@@ -9,15 +9,15 @@
 
 import java.util.Date;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Marius Scurtescu, Johnny Bufu
  */
 public class EhcacheNonceVerifier extends AbstractNonceVerifier
 {
-    private static Log _log = LogFactory.getLog(EhcacheNonceVerifier.class);
+    private static Logger _log = LoggerFactory.getLogger(EhcacheNonceVerifier.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     private Cache _cache;

src/org/openid4java/consumer/InMemoryConsumerAssociationStore.java

@@ -5,18 +5,17 @@
 package org.openid4java.consumer;
 
 import org.openid4java.association.Association;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * @author Marius Scurtescu, Johnny Bufu
  */
 public class InMemoryConsumerAssociationStore implements ConsumerAssociationStore
 {
-    private static Log _log = LogFactory.getLog(InMemoryConsumerAssociationStore.class);
+    private static Logger _log = LoggerFactory.getLogger(InMemoryConsumerAssociationStore.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     private Map _opMap = new HashMap();

src/org/openid4java/consumer/InMemoryNonceVerifier.java

@@ -4,8 +4,8 @@
 
 package org.openid4java.consumer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.text.ParseException;
@@ -15,7 +15,7 @@
  */
 public class InMemoryNonceVerifier extends AbstractNonceVerifier
 {
-    private static Log _log = LogFactory.getLog(InMemoryNonceVerifier.class);
+    private static Logger _log = LoggerFactory.getLogger(InMemoryNonceVerifier.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     private Map _opMap = new HashMap();

src/org/openid4java/consumer/JdbcConsumerAssociationStore.java

@@ -5,10 +5,10 @@
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.openid4java.association.Association;
 import org.openid4java.association.AssociationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -32,7 +32,7 @@ public class JdbcConsumerAssociationStore
 		extends JdbcDaoSupport
 		implements ConsumerAssociationStore
 {
-	private static Log _log = LogFactory.getLog ( JdbcConsumerAssociationStore.class ) ;
+	private static Logger _log = LoggerFactory.getLogger ( JdbcConsumerAssociationStore.class ) ;
 
 	private String _tableName ;
 	private String _sqlInsert ;

src/org/openid4java/consumer/JdbcNonceVerifier.java

@@ -1,8 +1,8 @@
 
 package org.openid4java.consumer ;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
@@ -41,7 +41,7 @@ public class JdbcNonceVerifier
 		extends JdbcDaoSupport
 		implements NonceVerifier
 {
-	private static Log _log = LogFactory.getLog ( JdbcNonceVerifier.class ) ;
+	private static Logger _log = LoggerFactory.getLogger ( JdbcNonceVerifier.class ) ;
 
 	private NonceVerifier _verifier ;
 	private String _tableName ;

src/org/openid4java/discovery/Discovery.java

@@ -6,13 +6,13 @@
 
 import com.google.inject.Inject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.openid4java.discovery.html.HtmlResolver;
 import org.openid4java.discovery.xri.XriResolver;
 import org.openid4java.discovery.yadis.YadisResolver;
 import org.openid4java.util.HttpFetcherFactory;
 import org.openid4java.util.OpenID4JavaUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.regex.Pattern;
@@ -22,7 +22,7 @@
  */
 public class Discovery
 {
-    private static Log _log = LogFactory.getLog(Discovery.class);
+    private static Logger _log = LoggerFactory.getLogger(Discovery.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     private static final Pattern URL_PATTERN =

src/org/openid4java/discovery/UrlIdentifier.java

@@ -4,8 +4,8 @@
 
 package org.openid4java.discovery;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.*;
 import java.util.Set;
@@ -17,7 +17,7 @@
  */
 public class UrlIdentifier implements Identifier
 {
-    private static Log _log = LogFactory.getLog(UrlIdentifier.class);
+    private static Logger _log = LoggerFactory.getLogger(UrlIdentifier.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     private static final Set UNRESERVED_CHARACTERS = new HashSet();

src/org/openid4java/discovery/html/CyberNekoDOMHtmlParser.java

@@ -4,12 +4,12 @@
 
 package org.openid4java.discovery.html;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.html.dom.HTMLDocumentImpl;
 import org.openid4java.OpenIDException;
 import org.openid4java.discovery.DiscoveryException;
 import org.openid4java.util.OpenID4JavaDOMParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.html.HTMLHeadElement;
 import org.w3c.dom.html.HTMLLinkElement;
@@ -19,14 +19,14 @@
 
 /**
  * A {@link HtmlParser} implementation using the DOMParser of CyberNeko HTML.
- * 
+ *
  * @author Sutra Zhou
  * @since 0.9.4
  * @see org.openid4java.util.OpenID4JavaDOMParser
  */
 public class CyberNekoDOMHtmlParser implements HtmlParser
 {
-    private static final Log _log = LogFactory.getLog(CyberNekoDOMHtmlParser.class);
+    private static final Logger _log = LoggerFactory.getLogger(CyberNekoDOMHtmlParser.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     /*

src/org/openid4java/discovery/html/HtmlResolver.java

@@ -6,8 +6,6 @@
 
 import com.google.inject.Inject;
 import org.apache.http.HttpStatus;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.io.IOException;
 import java.util.List;
@@ -23,13 +21,15 @@
 import org.openid4java.util.HttpRequestOptions;
 import org.openid4java.util.OpenID4JavaUtils;
 import org.openid4java.OpenIDException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Marius Scurtescu, Johnny Bufu, Sutra Zhou
  */
 public class HtmlResolver
 {
-    private static Log _log = LogFactory.getLog(HtmlResolver.class);
+    private static Logger _log = LoggerFactory.getLogger(HtmlResolver.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     private static final String HTML_PARSER_CLASS_NAME_KEY = "discovery.html.parser";

src/org/openid4java/discovery/xrds/XrdsParserImpl.java

@@ -1,11 +1,11 @@
 package org.openid4java.discovery.xrds;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.openid4java.OpenIDException;
 import org.openid4java.discovery.Discovery;
 import org.openid4java.discovery.DiscoveryException;
 import org.openid4java.discovery.RuntimeDiscoveryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -23,7 +23,7 @@
  */
 public class XrdsParserImpl implements XrdsParser
 {
-    private static final Log _log = LogFactory.getLog(XrdsParserImpl.class);
+    private static final Logger _log = LoggerFactory.getLogger(XrdsParserImpl.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
 
     private static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";