You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2005/08/28 14:53:14 UTC
svn commit: r263872 - in
/directory/protocol-providers/kerberos/branches/refactor-to-chain: ./
src/java/org/apache/kerberos/kdc/
src/java/org/apache/kerberos/kdc/preauthentication/
src/java/org/apache/kerberos/protocol/
Author: erodriguez
Date: Sun Aug 28 05:53:09 2005
New Revision: 263872
URL: http://svn.apache.org/viewcvs?rev=263872&view=rev
Log:
Replaced commons-logging with SLF4J in Kerberos protocol provider.
Modified:
directory/protocol-providers/kerberos/branches/refactor-to-chain/project.xml
directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorContext.java
directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorReply.java
directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorRequest.java
directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifySam.java
directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java
Modified: directory/protocol-providers/kerberos/branches/refactor-to-chain/project.xml
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/branches/refactor-to-chain/project.xml?rev=263872&r1=263871&r2=263872&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/branches/refactor-to-chain/project.xml (original)
+++ directory/protocol-providers/kerberos/branches/refactor-to-chain/project.xml Sun Aug 28 05:53:09 2005
@@ -78,14 +78,15 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>nlog4j</artifactId>
+ <version>1.2.14</version>
+ <url>http://slf4j.org/nlog4j</url>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>kerberos-common</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>directory-network</groupId>
Modified: directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorContext.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorContext.java?rev=263872&r1=263871&r2=263872&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorContext.java (original)
+++ directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorContext.java Sun Aug 28 05:53:09 2005
@@ -16,15 +16,15 @@
*/
package org.apache.kerberos.kdc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.kerberos.chain.Context;
import org.apache.kerberos.chain.impl.CommandBase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MonitorContext extends CommandBase
{
/** the log for this class */
- private static final Log log = LogFactory.getLog( MonitorContext.class );
+ private static final Logger log = LoggerFactory.getLogger( MonitorContext.class );
public boolean execute( Context context ) throws Exception
{
Modified: directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorReply.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorReply.java?rev=263872&r1=263871&r2=263872&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorReply.java (original)
+++ directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorReply.java Sun Aug 28 05:53:09 2005
@@ -16,17 +16,17 @@
*/
package org.apache.kerberos.kdc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.kerberos.chain.Context;
import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.messages.ErrorMessage;
import org.apache.kerberos.messages.KdcReply;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MonitorReply extends CommandBase
{
/** the log for this class */
- private static final Log log = LogFactory.getLog( MonitorReply.class );
+ private static final Logger log = LoggerFactory.getLogger( MonitorReply.class );
public boolean execute( Context context ) throws Exception
{
Modified: directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorRequest.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorRequest.java?rev=263872&r1=263871&r2=263872&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorRequest.java (original)
+++ directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/MonitorRequest.java Sun Aug 28 05:53:09 2005
@@ -16,17 +16,17 @@
*/
package org.apache.kerberos.kdc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.kerberos.chain.Context;
import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.crypto.encryption.EncryptionType;
import org.apache.kerberos.messages.KdcRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MonitorRequest extends CommandBase
{
/** the log for this class */
- private static final Log log = LogFactory.getLog( MonitorRequest.class );
+ private static final Logger log = LoggerFactory.getLogger( MonitorRequest.class );
public boolean execute( Context context ) throws Exception
{
Modified: directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java?rev=263872&r1=263871&r2=263872&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java (original)
+++ directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java Sun Aug 28 05:53:09 2005
@@ -18,8 +18,6 @@
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.kerberos.chain.Context;
import org.apache.kerberos.crypto.encryption.EncryptionEngine;
import org.apache.kerberos.crypto.encryption.EncryptionEngineFactory;
@@ -36,11 +34,13 @@
import org.apache.kerberos.messages.value.PreAuthenticationData;
import org.apache.kerberos.messages.value.PreAuthenticationDataType;
import org.apache.kerberos.store.PrincipalStoreEntry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class VerifyEncryptedTimestamp extends VerifierBase
{
/** the log for this class */
- private static final Log log = LogFactory.getLog( VerifyEncryptedTimestamp.class );
+ private static final Logger log = LoggerFactory.getLogger( VerifyEncryptedTimestamp.class );
public boolean execute( Context ctx ) throws Exception
{
Modified: directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifySam.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifySam.java?rev=263872&r1=263871&r2=263872&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifySam.java (original)
+++ directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/kdc/preauthentication/VerifySam.java Sun Aug 28 05:53:09 2005
@@ -18,8 +18,6 @@
import javax.security.auth.kerberos.KerberosKey;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.kerberos.chain.Context;
import org.apache.kerberos.crypto.encryption.EncryptionType;
import org.apache.kerberos.exceptions.ErrorType;
@@ -33,11 +31,13 @@
import org.apache.kerberos.sam.SamSubsystem;
import org.apache.kerberos.sam.TimestampChecker;
import org.apache.kerberos.store.PrincipalStoreEntry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class VerifySam extends VerifierBase
{
/** the log for this class */
- private static final Log log = LogFactory.getLog( VerifySam.class );
+ private static final Logger log = LoggerFactory.getLogger( VerifySam.class );
static
{
Modified: directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java?rev=263872&r1=263871&r2=263872&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java (original)
+++ directory/protocol-providers/kerberos/branches/refactor-to-chain/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java Sun Aug 28 05:53:09 2005
@@ -16,8 +16,6 @@
*/
package org.apache.kerberos.protocol;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.kerberos.chain.Command;
import org.apache.kerberos.exceptions.ErrorType;
import org.apache.kerberos.kdc.KdcConfiguration;
@@ -30,6 +28,8 @@
import org.apache.mina.common.IdleStatus;
import org.apache.mina.protocol.ProtocolHandler;
import org.apache.mina.protocol.ProtocolSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Kerberos protocol handler for MINA which handles requests for the authentication
@@ -40,7 +40,7 @@
*/
public class KerberosProtocolHandler implements ProtocolHandler
{
- private static final Log log = LogFactory.getLog( KerberosProtocolHandler.class );
+ private static final Logger log = LoggerFactory.getLogger( KerberosProtocolHandler.class );
private KdcConfiguration config;
private PrincipalStore store;
@@ -142,7 +142,7 @@
}
catch ( Exception e )
{
- log.error( e.getStackTrace() );
+ log.error( e.getMessage() );
}
}