diff --git a/pom.xml b/pom.xml index 4f5754e4..ccc7fc2d 100644 --- a/pom.xml +++ b/pom.xml @@ -304,7 +304,7 @@ - **/xri/** + **/xri/** **/infocard/** @@ -493,7 +493,7 @@ junit junit - 3.8.2 + 4.12 jdom @@ -541,9 +541,21 @@ + + org.slf4j + slf4j-api + 1.7.10 + + + org.slf4j + slf4j-jcl + 1.7.10 + test + commons-logging commons-logging + test org.apache.httpcomponents diff --git a/src/org/openid4java/association/Association.java b/src/org/openid4java/association/Association.java index 5a11ac77..7d6057b4 100644 --- a/src/org/openid4java/association/Association.java +++ b/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 = " "; diff --git a/src/org/openid4java/association/AssociationSessionType.java b/src/org/openid4java/association/AssociationSessionType.java index d46088ac..495b28eb 100644 --- a/src/org/openid4java/association/AssociationSessionType.java +++ b/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 diff --git a/src/org/openid4java/association/DiffieHellmanSession.java b/src/org/openid4java/association/DiffieHellmanSession.java index 46af098c..08440f73 100644 --- a/src/org/openid4java/association/DiffieHellmanSession.java +++ b/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()); diff --git a/src/org/openid4java/consumer/AbstractNonceVerifier.java b/src/org/openid4java/consumer/AbstractNonceVerifier.java index 9bd56446..96b61b9c 100644 --- a/src/org/openid4java/consumer/AbstractNonceVerifier.java +++ b/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(); diff --git a/src/org/openid4java/consumer/ConsumerManager.java b/src/org/openid4java/consumer/ConsumerManager.java index 31482550..9cb73eb4 100644 --- a/src/org/openid4java/consumer/ConsumerManager.java +++ b/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(); /** diff --git a/src/org/openid4java/consumer/EhcacheNonceVerifier.java b/src/org/openid4java/consumer/EhcacheNonceVerifier.java index 239a24c4..e1966a19 100644 --- a/src/org/openid4java/consumer/EhcacheNonceVerifier.java +++ b/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; diff --git a/src/org/openid4java/consumer/InMemoryConsumerAssociationStore.java b/src/org/openid4java/consumer/InMemoryConsumerAssociationStore.java index 2fde1644..905f71af 100644 --- a/src/org/openid4java/consumer/InMemoryConsumerAssociationStore.java +++ b/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(); diff --git a/src/org/openid4java/consumer/InMemoryNonceVerifier.java b/src/org/openid4java/consumer/InMemoryNonceVerifier.java index fe791e3e..61b644e1 100644 --- a/src/org/openid4java/consumer/InMemoryNonceVerifier.java +++ b/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(); diff --git a/src/org/openid4java/consumer/JdbcConsumerAssociationStore.java b/src/org/openid4java/consumer/JdbcConsumerAssociationStore.java index 9beb501e..3b0ecf08 100644 --- a/src/org/openid4java/consumer/JdbcConsumerAssociationStore.java +++ b/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 ; diff --git a/src/org/openid4java/consumer/JdbcNonceVerifier.java b/src/org/openid4java/consumer/JdbcNonceVerifier.java index f0ca6943..f883c3ce 100644 --- a/src/org/openid4java/consumer/JdbcNonceVerifier.java +++ b/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 ; diff --git a/src/org/openid4java/discovery/Discovery.java b/src/org/openid4java/discovery/Discovery.java index 548e1aca..8f7537f8 100644 --- a/src/org/openid4java/discovery/Discovery.java +++ b/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 = diff --git a/src/org/openid4java/discovery/UrlIdentifier.java b/src/org/openid4java/discovery/UrlIdentifier.java index 530d789d..7ab80984 100644 --- a/src/org/openid4java/discovery/UrlIdentifier.java +++ b/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(); diff --git a/src/org/openid4java/discovery/html/CyberNekoDOMHtmlParser.java b/src/org/openid4java/discovery/html/CyberNekoDOMHtmlParser.java index a11757f8..7e361428 100644 --- a/src/org/openid4java/discovery/html/CyberNekoDOMHtmlParser.java +++ b/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(); /* diff --git a/src/org/openid4java/discovery/html/HtmlResolver.java b/src/org/openid4java/discovery/html/HtmlResolver.java index 7b93d96b..7011b027 100644 --- a/src/org/openid4java/discovery/html/HtmlResolver.java +++ b/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"; diff --git a/src/org/openid4java/discovery/xrds/XrdsParserImpl.java b/src/org/openid4java/discovery/xrds/XrdsParserImpl.java index ccb26350..0defb1ea 100644 --- a/src/org/openid4java/discovery/xrds/XrdsParserImpl.java +++ b/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"; diff --git a/src/org/openid4java/discovery/xri/LocalXriResolver.java b/src/org/openid4java/discovery/xri/LocalXriResolver.java index 86a4fa46..dc982c0f 100644 --- a/src/org/openid4java/discovery/xri/LocalXriResolver.java +++ b/src/org/openid4java/discovery/xri/LocalXriResolver.java @@ -6,8 +6,6 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.discovery.DiscoveryException; import org.openid4java.discovery.DiscoveryInformation; import org.openid4java.discovery.Identifier; @@ -23,10 +21,12 @@ import org.openxri.xml.Status; import org.openxri.xml.XRD; import org.openxri.xml.XRDS; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class LocalXriResolver implements XriResolver { - private static Log _log = LogFactory.getLog(LocalXriResolver.class); + private static Logger _log = LoggerFactory.getLogger(LocalXriResolver.class); private static final boolean DEBUG = _log.isDebugEnabled(); private Resolver _openXriResolver; diff --git a/src/org/openid4java/discovery/xri/XriDotNetProxyResolver.java b/src/org/openid4java/discovery/xri/XriDotNetProxyResolver.java index 24667f0d..0e7980c0 100644 --- a/src/org/openid4java/discovery/xri/XriDotNetProxyResolver.java +++ b/src/org/openid4java/discovery/xri/XriDotNetProxyResolver.java @@ -2,8 +2,6 @@ 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.discovery.DiscoveryException; import org.openid4java.discovery.DiscoveryInformation; @@ -16,6 +14,8 @@ import org.openid4java.util.HttpRequestOptions; import org.openid4java.util.HttpResponse; import org.openid4java.util.OpenID4JavaUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.net.MalformedURLException; @@ -30,7 +30,7 @@ */ public class XriDotNetProxyResolver implements XriResolver { - private static Log _log = LogFactory.getLog(XriDotNetProxyResolver.class); + private static Logger _log = LoggerFactory.getLogger(XriDotNetProxyResolver.class); private static final boolean DEBUG = _log.isDebugEnabled(); private final HttpFetcher _httpFetcher; diff --git a/src/org/openid4java/discovery/yadis/CyberNekoDOMYadisHtmlParser.java b/src/org/openid4java/discovery/yadis/CyberNekoDOMYadisHtmlParser.java index eb3a7101..f839cbc8 100644 --- a/src/org/openid4java/discovery/yadis/CyberNekoDOMYadisHtmlParser.java +++ b/src/org/openid4java/discovery/yadis/CyberNekoDOMYadisHtmlParser.java @@ -4,11 +4,11 @@ package org.openid4java.discovery.yadis; -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.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.HTMLMetaElement; @@ -24,7 +24,7 @@ */ public class CyberNekoDOMYadisHtmlParser implements YadisHtmlParser { - private static final Log _log = LogFactory.getLog(CyberNekoDOMYadisHtmlParser.class); + private static final Logger _log = LoggerFactory.getLogger(CyberNekoDOMYadisHtmlParser.class); private static final boolean DEBUG = _log.isDebugEnabled(); /* diff --git a/src/org/openid4java/discovery/yadis/YadisResolver.java b/src/org/openid4java/discovery/yadis/YadisResolver.java index e5d51868..f6fcb9c0 100644 --- a/src/org/openid4java/discovery/yadis/YadisResolver.java +++ b/src/org/openid4java/discovery/yadis/YadisResolver.java @@ -9,8 +9,6 @@ import org.apache.http.HttpException; import org.apache.http.HttpStatus; import org.apache.http.Header; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.http.client.ClientProtocolException; import java.io.IOException; @@ -28,6 +26,8 @@ import org.openid4java.util.HttpRequestOptions; import org.openid4java.util.HttpResponse; import org.openid4java.util.OpenID4JavaUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @@ -55,7 +55,7 @@ */ public class YadisResolver { - private static Log _log = LogFactory.getLog(YadisResolver.class); + private static Logger _log = LoggerFactory.getLogger(YadisResolver.class); private static final boolean DEBUG = _log.isDebugEnabled(); // Yadis constants diff --git a/src/org/openid4java/discovery/yadis/YadisResult.java b/src/org/openid4java/discovery/yadis/YadisResult.java index 4b7e96c0..4eb34298 100644 --- a/src/org/openid4java/discovery/yadis/YadisResult.java +++ b/src/org/openid4java/discovery/yadis/YadisResult.java @@ -4,13 +4,13 @@ package org.openid4java.discovery.yadis; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.discovery.DiscoveryInformation; import org.openid4java.discovery.UrlIdentifier; import org.openid4java.discovery.DiscoveryException; import org.openid4java.discovery.xrds.XrdsServiceEndpoint; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.URL; import java.net.MalformedURLException; @@ -30,7 +30,7 @@ */ public class YadisResult { - private static Log _log = LogFactory.getLog(YadisResult.class); + private static Logger _log = LoggerFactory.getLogger(YadisResult.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/infocard/OpenIDToken.java b/src/org/openid4java/infocard/OpenIDToken.java index 1ecd3653..ae3047d5 100644 --- a/src/org/openid4java/infocard/OpenIDToken.java +++ b/src/org/openid4java/infocard/OpenIDToken.java @@ -7,8 +7,8 @@ import org.openid4java.message.Message; import org.openid4java.message.ParameterList; import org.openid4java.OpenIDException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -29,7 +29,7 @@ */ public class OpenIDToken { - private static Log _log = LogFactory.getLog(OpenIDToken.class); + private static Logger _log = LoggerFactory.getLogger(OpenIDToken.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/infocard/rp/InfocardInvocation.java b/src/org/openid4java/infocard/rp/InfocardInvocation.java index 3ad4febd..fa0dd4ce 100644 --- a/src/org/openid4java/infocard/rp/InfocardInvocation.java +++ b/src/org/openid4java/infocard/rp/InfocardInvocation.java @@ -4,10 +4,10 @@ package org.openid4java.infocard.rp; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.message.ax.FetchRequest; import org.openid4java.infocard.OpenIDTokenType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.ArrayList; @@ -24,7 +24,7 @@ */ public class InfocardInvocation { - private static Log _log = LogFactory.getLog(InfocardInvocation.class); + private static Logger _log = LoggerFactory.getLogger(InfocardInvocation.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/message/AssociationError.java b/src/org/openid4java/message/AssociationError.java index fe4ecb46..2aa5aefe 100644 --- a/src/org/openid4java/message/AssociationError.java +++ b/src/org/openid4java/message/AssociationError.java @@ -6,19 +6,18 @@ import org.openid4java.association.AssociationSessionType; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * @author Marius Scurtescu, Johnny Bufu */ public class AssociationError extends DirectError { - private static Log _log = LogFactory.getLog(AssociationError.class); + private static Logger _log = LoggerFactory.getLogger(AssociationError.class); public static final String ASSOC_ERR = "unsupported-type"; diff --git a/src/org/openid4java/message/AssociationRequest.java b/src/org/openid4java/message/AssociationRequest.java index 2df402fa..5614960a 100644 --- a/src/org/openid4java/message/AssociationRequest.java +++ b/src/org/openid4java/message/AssociationRequest.java @@ -8,13 +8,12 @@ import org.openid4java.association.AssociationSessionType; import org.openid4java.association.AssociationException; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * The OpenID Association Request message. *

@@ -25,7 +24,7 @@ */ public class AssociationRequest extends Message { - private static Log _log = LogFactory.getLog(AssociationRequest.class); + private static Logger _log = LoggerFactory.getLogger(AssociationRequest.class); private static final boolean DEBUG = _log.isDebugEnabled(); public static final String MODE_ASSOC = "associate"; diff --git a/src/org/openid4java/message/AssociationResponse.java b/src/org/openid4java/message/AssociationResponse.java index d6ebe6af..9b85b2a4 100644 --- a/src/org/openid4java/message/AssociationResponse.java +++ b/src/org/openid4java/message/AssociationResponse.java @@ -9,13 +9,13 @@ import org.openid4java.association.AssociationException; import org.openid4java.association.AssociationSessionType; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Arrays; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * The OpenID Association Response message. @@ -27,7 +27,7 @@ */ public class AssociationResponse extends Message { - private static Log _log = LogFactory.getLog(AssociationResponse.class); + private static Logger _log = LoggerFactory.getLogger(AssociationResponse.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List requiredFields = Arrays.asList( new String[] { diff --git a/src/org/openid4java/message/AuthFailure.java b/src/org/openid4java/message/AuthFailure.java index f065a191..65f80dd1 100644 --- a/src/org/openid4java/message/AuthFailure.java +++ b/src/org/openid4java/message/AuthFailure.java @@ -4,9 +4,9 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Arrays; @@ -16,7 +16,7 @@ */ public class AuthFailure extends Message { - private static Log _log = LogFactory.getLog(AuthFailure.class); + private static Logger _log = LoggerFactory.getLogger(AuthFailure.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List requiredFields = Arrays.asList( new String[] { diff --git a/src/org/openid4java/message/AuthImmediateFailure.java b/src/org/openid4java/message/AuthImmediateFailure.java index f426014e..455779db 100644 --- a/src/org/openid4java/message/AuthImmediateFailure.java +++ b/src/org/openid4java/message/AuthImmediateFailure.java @@ -4,9 +4,9 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Arrays; @@ -18,7 +18,7 @@ */ public class AuthImmediateFailure extends Message { - private static Log _log = LogFactory.getLog(AuthImmediateFailure.class); + private static Logger _log = LoggerFactory.getLogger(AuthImmediateFailure.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List requiredFields = Arrays.asList( new String[] { diff --git a/src/org/openid4java/message/AuthRequest.java b/src/org/openid4java/message/AuthRequest.java index 3a4dec2f..ad9b7ad9 100644 --- a/src/org/openid4java/message/AuthRequest.java +++ b/src/org/openid4java/message/AuthRequest.java @@ -4,11 +4,11 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; import org.openid4java.association.Association; import org.openid4java.server.RealmVerifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.MalformedURLException; import java.net.URL; @@ -21,7 +21,7 @@ */ public class AuthRequest extends Message { - private static Log _log = LogFactory.getLog(AuthRequest.class); + private static Logger _log = LoggerFactory.getLogger(AuthRequest.class); private static final boolean DEBUG = _log.isDebugEnabled(); public static final String MODE_SETUP = "checkid_setup"; diff --git a/src/org/openid4java/message/AuthSuccess.java b/src/org/openid4java/message/AuthSuccess.java index 3d6e8e5d..dafec680 100644 --- a/src/org/openid4java/message/AuthSuccess.java +++ b/src/org/openid4java/message/AuthSuccess.java @@ -4,12 +4,12 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; import org.openid4java.association.Association; import org.openid4java.association.AssociationException; import org.openid4java.util.InternetDateFormat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.MalformedURLException; import java.net.URL; @@ -24,7 +24,7 @@ */ public class AuthSuccess extends Message { - private static Log _log = LogFactory.getLog(AuthSuccess.class); + private static Logger _log = LoggerFactory.getLogger(AuthSuccess.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List requiredFields = Arrays.asList( new String[] { diff --git a/src/org/openid4java/message/DirectError.java b/src/org/openid4java/message/DirectError.java index 99d61318..2829c68b 100644 --- a/src/org/openid4java/message/DirectError.java +++ b/src/org/openid4java/message/DirectError.java @@ -4,9 +4,9 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Arrays; @@ -16,7 +16,7 @@ */ public class DirectError extends Message { - private static Log _log = LogFactory.getLog(DirectError.class); + private static Logger _log = LoggerFactory.getLogger(DirectError.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List requiredFields = Arrays.asList( new String[] { diff --git a/src/org/openid4java/message/IndirectError.java b/src/org/openid4java/message/IndirectError.java index a85124a4..6a7c6d9a 100644 --- a/src/org/openid4java/message/IndirectError.java +++ b/src/org/openid4java/message/IndirectError.java @@ -4,16 +4,16 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Marius Scurtescu, Johnny Bufu */ public class IndirectError extends Message { - private static Log _log = LogFactory.getLog(IndirectError.class); + private static Logger _log = LoggerFactory.getLogger(IndirectError.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected IndirectError(String msg, String returnTo) diff --git a/src/org/openid4java/message/Message.java b/src/org/openid4java/message/Message.java index 1d95de81..3773aa1f 100644 --- a/src/org/openid4java/message/Message.java +++ b/src/org/openid4java/message/Message.java @@ -4,12 +4,12 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.message.ax.AxMessage; import org.openid4java.message.pape.PapeMessage; import org.openid4java.message.sreg.SReg11ExtensionFactory; import org.openid4java.message.sreg.SRegMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -20,7 +20,7 @@ */ public class Message { - private static Log _log = LogFactory.getLog(Message.class); + private static Logger _log = LoggerFactory.getLogger(Message.class); private static final boolean DEBUG = _log.isDebugEnabled(); // message constants diff --git a/src/org/openid4java/message/ParameterList.java b/src/org/openid4java/message/ParameterList.java index 574c4498..bd37f2ad 100644 --- a/src/org/openid4java/message/ParameterList.java +++ b/src/org/openid4java/message/ParameterList.java @@ -4,13 +4,12 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.*; -import java.util.List; import java.net.URLDecoder; /** @@ -21,7 +20,7 @@ */ public class ParameterList implements Serializable { - private static Log _log = LogFactory.getLog(ParameterList.class); + private static Logger _log = LoggerFactory.getLogger(ParameterList.class); private static final boolean DEBUG = _log.isDebugEnabled(); Map _parameterMap; diff --git a/src/org/openid4java/message/VerifyRequest.java b/src/org/openid4java/message/VerifyRequest.java index f6822d43..5bab5773 100644 --- a/src/org/openid4java/message/VerifyRequest.java +++ b/src/org/openid4java/message/VerifyRequest.java @@ -4,9 +4,9 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -17,7 +17,7 @@ */ public class VerifyRequest extends AuthSuccess { - private static Log _log = LogFactory.getLog(VerifyRequest.class); + private static Logger _log = LoggerFactory.getLogger(VerifyRequest.class); private static final boolean DEBUG = _log.isDebugEnabled(); public static final String MODE_CHKAUTH = "check_authentication"; diff --git a/src/org/openid4java/message/VerifyResponse.java b/src/org/openid4java/message/VerifyResponse.java index 489ca06b..86850ead 100644 --- a/src/org/openid4java/message/VerifyResponse.java +++ b/src/org/openid4java/message/VerifyResponse.java @@ -4,9 +4,9 @@ package org.openid4java.message; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Arrays; @@ -16,7 +16,7 @@ */ public class VerifyResponse extends Message { - private static Log _log = LogFactory.getLog(VerifyResponse.class); + private static Logger _log = LoggerFactory.getLogger(VerifyResponse.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List requiredFields = Arrays.asList(new String[] { diff --git a/src/org/openid4java/message/ax/AxMessage.java b/src/org/openid4java/message/ax/AxMessage.java index 5c90701f..c7c79743 100644 --- a/src/org/openid4java/message/ax/AxMessage.java +++ b/src/org/openid4java/message/ax/AxMessage.java @@ -5,8 +5,8 @@ package org.openid4java.message.ax; import org.openid4java.message.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base class for the Attribute Exchange implementation. @@ -25,7 +25,7 @@ */ public class AxMessage implements MessageExtension, MessageExtensionFactory { - private static Log _log = LogFactory.getLog(AxMessage.class); + private static Logger _log = LoggerFactory.getLogger(AxMessage.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/message/ax/AxPayload.java b/src/org/openid4java/message/ax/AxPayload.java index 7bd5e187..6efb8e5f 100644 --- a/src/org/openid4java/message/ax/AxPayload.java +++ b/src/org/openid4java/message/ax/AxPayload.java @@ -2,8 +2,8 @@ import org.openid4java.message.MessageException; import org.openid4java.message.Parameter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -12,7 +12,7 @@ */ public abstract class AxPayload extends AxMessage { - private static Log _log = LogFactory.getLog(AxPayload.class); + private static Logger _log = LoggerFactory.getLogger(AxPayload.class); private static final boolean DEBUG = _log.isDebugEnabled(); private int _attrAliasCounter = 0; diff --git a/src/org/openid4java/message/ax/FetchRequest.java b/src/org/openid4java/message/ax/FetchRequest.java index d172181d..66c20228 100644 --- a/src/org/openid4java/message/ax/FetchRequest.java +++ b/src/org/openid4java/message/ax/FetchRequest.java @@ -7,6 +7,8 @@ import org.openid4java.message.MessageException; import org.openid4java.message.Parameter; import org.openid4java.message.ParameterList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.URL; import java.net.MalformedURLException; @@ -15,9 +17,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Implements the extension for Attribute Exchange fetch requests. * @@ -26,7 +25,7 @@ */ public class FetchRequest extends AxMessage { - private static Log _log = LogFactory.getLog(FetchRequest.class); + private static Logger _log = LoggerFactory.getLogger(FetchRequest.class); private static final boolean DEBUG = _log.isDebugEnabled(); private int _aliasCounter = 0; diff --git a/src/org/openid4java/message/ax/FetchResponse.java b/src/org/openid4java/message/ax/FetchResponse.java index 91ed98de..bd37276f 100644 --- a/src/org/openid4java/message/ax/FetchResponse.java +++ b/src/org/openid4java/message/ax/FetchResponse.java @@ -4,11 +4,11 @@ package org.openid4java.message.ax; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.message.MessageException; import org.openid4java.message.Parameter; import org.openid4java.message.ParameterList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.MalformedURLException; import java.net.URL; @@ -23,7 +23,7 @@ */ public class FetchResponse extends AxPayload { - private static Log _log = LogFactory.getLog(FetchResponse.class); + private static Logger _log = LoggerFactory.getLogger(FetchResponse.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/message/ax/StoreRequest.java b/src/org/openid4java/message/ax/StoreRequest.java index 1546d60f..b082f7d7 100644 --- a/src/org/openid4java/message/ax/StoreRequest.java +++ b/src/org/openid4java/message/ax/StoreRequest.java @@ -7,9 +7,8 @@ import org.openid4java.message.MessageException; import org.openid4java.message.Parameter; import org.openid4java.message.ParameterList; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implements the extension for Attribute Exchange store requests. @@ -18,7 +17,7 @@ */ public class StoreRequest extends AxPayload { - private static Log _log = LogFactory.getLog(StoreRequest.class); + private static Logger _log = LoggerFactory.getLogger(StoreRequest.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/message/ax/StoreResponse.java b/src/org/openid4java/message/ax/StoreResponse.java index 98b1ae3a..04b0bfd8 100644 --- a/src/org/openid4java/message/ax/StoreResponse.java +++ b/src/org/openid4java/message/ax/StoreResponse.java @@ -7,12 +7,11 @@ import org.openid4java.message.ParameterList; import org.openid4java.message.MessageException; import org.openid4java.message.Parameter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Iterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Implements the extension for Attribute Exchange store responses. * @@ -20,7 +19,7 @@ */ public class StoreResponse extends AxMessage { - private static Log _log = LogFactory.getLog(StoreResponse.class); + private static Logger _log = LoggerFactory.getLogger(StoreResponse.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/message/pape/PapeMessage.java b/src/org/openid4java/message/pape/PapeMessage.java index e2728b99..b2b4700a 100644 --- a/src/org/openid4java/message/pape/PapeMessage.java +++ b/src/org/openid4java/message/pape/PapeMessage.java @@ -5,8 +5,8 @@ package org.openid4java.message.pape; import org.openid4java.message.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Map; import java.util.HashMap; @@ -29,7 +29,7 @@ */ public class PapeMessage implements MessageExtension, MessageExtensionFactory { - private static Log _log = LogFactory.getLog(PapeMessage.class); + private static Logger _log = LoggerFactory.getLogger(PapeMessage.class); private static final boolean DEBUG = _log.isDebugEnabled(); public static final String PAPE_POLICY_PHISHING_RESISTANT = diff --git a/src/org/openid4java/message/pape/PapeRequest.java b/src/org/openid4java/message/pape/PapeRequest.java index e3abca14..3be4337b 100644 --- a/src/org/openid4java/message/pape/PapeRequest.java +++ b/src/org/openid4java/message/pape/PapeRequest.java @@ -8,12 +8,11 @@ import org.openid4java.message.Parameter; import org.openid4java.message.ParameterList; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Implements the extension for OpenID Provider Authentication Policy requests. * @@ -22,7 +21,7 @@ */ public class PapeRequest extends PapeMessage { - private static Log _log = LogFactory.getLog(PapeRequest.class); + private static Logger _log = LoggerFactory.getLogger(PapeRequest.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List PAPE_FIELDS = Arrays.asList( new String[] { diff --git a/src/org/openid4java/message/pape/PapeResponse.java b/src/org/openid4java/message/pape/PapeResponse.java index 923b7b06..083e56f1 100644 --- a/src/org/openid4java/message/pape/PapeResponse.java +++ b/src/org/openid4java/message/pape/PapeResponse.java @@ -9,13 +9,12 @@ import org.openid4java.message.Parameter; import org.openid4java.util.InternetDateFormat; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; import java.text.ParseException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Implements the extension for OpenID Provider Authentication Policy responses. * @@ -23,7 +22,7 @@ */ public class PapeResponse extends PapeMessage { - private static Log _log = LogFactory.getLog(PapeResponse.class); + private static Logger _log = LoggerFactory.getLogger(PapeResponse.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List PAPE_FIELDS = Arrays.asList( new String[] { diff --git a/src/org/openid4java/message/sreg/SRegMessage.java b/src/org/openid4java/message/sreg/SRegMessage.java index a7fb9e38..73fd1ffe 100644 --- a/src/org/openid4java/message/sreg/SRegMessage.java +++ b/src/org/openid4java/message/sreg/SRegMessage.java @@ -5,8 +5,8 @@ package org.openid4java.message.sreg; import org.openid4java.message.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base class for the Simple Registration implementation. @@ -44,7 +44,7 @@ */ public class SRegMessage implements MessageExtension, MessageExtensionFactory { - private static Log _log = LogFactory.getLog(SRegMessage.class); + private static Logger _log = LoggerFactory.getLogger(SRegMessage.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/message/sreg/SRegRequest.java b/src/org/openid4java/message/sreg/SRegRequest.java index 56f6380c..7639311a 100644 --- a/src/org/openid4java/message/sreg/SRegRequest.java +++ b/src/org/openid4java/message/sreg/SRegRequest.java @@ -7,14 +7,13 @@ import org.openid4java.message.MessageException; import org.openid4java.message.Parameter; import org.openid4java.message.ParameterList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.URL; import java.net.MalformedURLException; import java.util.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Implements the extension for Simple Registration fetch requests. * @@ -23,7 +22,7 @@ */ public class SRegRequest extends SRegMessage { - private static Log _log = LogFactory.getLog(SRegRequest.class); + private static Logger _log = LoggerFactory.getLogger(SRegRequest.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/message/sreg/SRegResponse.java b/src/org/openid4java/message/sreg/SRegResponse.java index fccfe170..3691d114 100644 --- a/src/org/openid4java/message/sreg/SRegResponse.java +++ b/src/org/openid4java/message/sreg/SRegResponse.java @@ -7,12 +7,11 @@ import org.openid4java.message.ParameterList; import org.openid4java.message.MessageException; import org.openid4java.message.Parameter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Implements the extension for Simple Registration fetch responses. * @@ -20,7 +19,7 @@ */ public class SRegResponse extends SRegMessage { - private static Log _log = LogFactory.getLog(SRegResponse.class); + private static Logger _log = LoggerFactory.getLogger(SRegResponse.class); private static final boolean DEBUG = _log.isDebugEnabled(); protected final static List SREG_FIELDS = Arrays.asList( new String[] { diff --git a/src/org/openid4java/server/InMemoryServerAssociationStore.java b/src/org/openid4java/server/InMemoryServerAssociationStore.java index db923da0..a09cfd73 100644 --- a/src/org/openid4java/server/InMemoryServerAssociationStore.java +++ b/src/org/openid4java/server/InMemoryServerAssociationStore.java @@ -6,18 +6,17 @@ import org.openid4java.association.Association; import org.openid4java.association.AssociationException; +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 InMemoryServerAssociationStore implements ServerAssociationStore { - private static Log _log = LogFactory.getLog(InMemoryServerAssociationStore.class); + private static Logger _log = LoggerFactory.getLogger(InMemoryServerAssociationStore.class); private static final boolean DEBUG = _log.isDebugEnabled(); private String _timestamp; diff --git a/src/org/openid4java/server/IncrementalNonceGenerator.java b/src/org/openid4java/server/IncrementalNonceGenerator.java index 7cc450bd..2dfbc438 100644 --- a/src/org/openid4java/server/IncrementalNonceGenerator.java +++ b/src/org/openid4java/server/IncrementalNonceGenerator.java @@ -5,18 +5,17 @@ package org.openid4java.server; import org.openid4java.util.InternetDateFormat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Date; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * @author Marius Scurtescu, Johnny Bufu */ public class IncrementalNonceGenerator implements NonceGenerator { - private static Log _log = LogFactory.getLog(IncrementalNonceGenerator.class); + private static Logger _log = LoggerFactory.getLogger(IncrementalNonceGenerator.class); private static final boolean DEBUG = _log.isDebugEnabled(); private static InternetDateFormat _dateFormat = new InternetDateFormat(); diff --git a/src/org/openid4java/server/JdbcServerAssociationStore.java b/src/org/openid4java/server/JdbcServerAssociationStore.java index f70a88ec..5e43b30a 100644 --- a/src/org/openid4java/server/JdbcServerAssociationStore.java +++ b/src/org/openid4java/server/JdbcServerAssociationStore.java @@ -8,13 +8,14 @@ import org.openid4java.association.AssociationException; import java.util.*; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.support.JdbcDaoSupport; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.dao.DataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * JDBC implementation for the ServerAssociationStore interface. @@ -37,7 +38,7 @@ public class JdbcServerAssociationStore extends JdbcDaoSupport implements ServerAssociationStore { - private static Log _log = LogFactory.getLog(JdbcServerAssociationStore.class); + private static Logger _log = LoggerFactory.getLogger(JdbcServerAssociationStore.class); private static final boolean DEBUG = _log.isDebugEnabled(); private static Random _random = new Random(System.currentTimeMillis()); diff --git a/src/org/openid4java/server/RealmVerifier.java b/src/org/openid4java/server/RealmVerifier.java index e6131493..cb9b8770 100644 --- a/src/org/openid4java/server/RealmVerifier.java +++ b/src/org/openid4java/server/RealmVerifier.java @@ -4,12 +4,12 @@ package org.openid4java.server; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.discovery.Discovery; import org.openid4java.discovery.DiscoveryException; import org.openid4java.discovery.DiscoveryInformation; import org.openid4java.discovery.yadis.YadisResolver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.ArrayList; @@ -23,7 +23,7 @@ */ public class RealmVerifier { - private static Log _log = LogFactory.getLog(RealmVerifier.class); + private static Logger _log = LoggerFactory.getLogger(RealmVerifier.class); private static final boolean DEBUG = _log.isDebugEnabled(); public static final int OK = 0; diff --git a/src/org/openid4java/server/ServerManager.java b/src/org/openid4java/server/ServerManager.java index 3e42a252..a3457ee5 100644 --- a/src/org/openid4java/server/ServerManager.java +++ b/src/org/openid4java/server/ServerManager.java @@ -5,8 +5,7 @@ package org.openid4java.server; import com.google.inject.Inject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; + import org.openid4java.OpenIDException; import org.openid4java.association.Association; import org.openid4java.association.AssociationException; @@ -15,6 +14,8 @@ import org.openid4java.discovery.yadis.YadisResolver; import org.openid4java.message.*; import org.openid4java.util.HttpFetcherFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.MalformedURLException; import java.net.URL; @@ -26,7 +27,7 @@ */ public class ServerManager { - private static Log _log = LogFactory.getLog(ServerManager.class); + private static Logger _log = LoggerFactory.getLogger(ServerManager.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/util/HttpCache.java b/src/org/openid4java/util/HttpCache.java index 5782f04f..b560d1ca 100644 --- a/src/org/openid4java/util/HttpCache.java +++ b/src/org/openid4java/util/HttpCache.java @@ -4,8 +4,6 @@ package org.openid4java.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; @@ -17,6 +15,8 @@ import org.apache.http.client.params.AllClientPNames; import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.message.BasicNameValuePair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; @@ -39,7 +39,7 @@ */ public class HttpCache extends AbstractHttpFetcher { - private static Log _log = LogFactory.getLog(HttpCache.class); + private static Logger _log = LoggerFactory.getLogger(HttpCache.class); private static final boolean DEBUG = _log.isDebugEnabled(); /** diff --git a/src/org/openid4java/util/InternetDateFormat.java b/src/org/openid4java/util/InternetDateFormat.java index 7808d26d..0292f656 100644 --- a/src/org/openid4java/util/InternetDateFormat.java +++ b/src/org/openid4java/util/InternetDateFormat.java @@ -4,8 +4,8 @@ package org.openid4java.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.text.SimpleDateFormat; import java.text.ParseException; @@ -24,7 +24,7 @@ */ public class InternetDateFormat extends SimpleDateFormat { - private static Log _log = LogFactory.getLog(InternetDateFormat.class); + private static Logger _log = LoggerFactory.getLogger(InternetDateFormat.class); private static final boolean DEBUG = _log.isDebugEnabled(); public static final String PATTERN = "yyyy-MM-dd'T'HH:mm:ss'Z'"; diff --git a/src/org/openid4java/util/OpenID4JavaUtils.java b/src/org/openid4java/util/OpenID4JavaUtils.java index 8039dda3..e8616f4e 100644 --- a/src/org/openid4java/util/OpenID4JavaUtils.java +++ b/src/org/openid4java/util/OpenID4JavaUtils.java @@ -8,9 +8,9 @@ import java.io.InputStream; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.openid4java.OpenIDException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Load properties from classpath:org.openid4java.util.openid4java-default.properties, @@ -22,7 +22,7 @@ */ public class OpenID4JavaUtils { - private static Log _log = LogFactory.getLog(OpenID4JavaUtils.class); + private static Logger _log = LoggerFactory.getLogger(OpenID4JavaUtils.class); private static final Properties _appProperties;