[PATCH] for logging
Harrie Hazewinkel <[email protected]> Mon, 13 Sep 2004 09:53:43 +0200
| Newsgroups | gmane.network.beep.beepcore.java.general |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format.
--------------050002010108040707080301
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
HI,
While checking out the functionality of beepcore-java
I run into a problem of the API with log4j. Attached is a
patch that fixes the code for a recent 1.3 version of log4j.
Hope it will be applied.
Harrie
--------------050002010108040707080301
Content-Type: text/plain;
name="log4j.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="log4j.patch"
? build
? build.properties
? log4j.patch
? log4j.properties
? example/org/beepcore/beep/example/CapClient.java
? lib/log4j-1.2.8.jar
? src/org/beepcore/beep/profile/cap
Index: build.xml
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/build.xml,v
retrieving revision 1.27
diff -u -r1.27 build.xml
--- build.xml 20 Nov 2003 15:32:49 -0000 1.27
+++ build.xml 5 Sep 2004 08:39:52 -0000
@@ -10,7 +10,7 @@
<property name="debug" value="on"/>
<property name="optimize" value="on"/>
- <property name="deprecation" value="off"/>
+ <property name="deprecation" value="on"/>
<!-- Construct classpath for building core -->
<path id="core.compile.classpath">
@@ -28,7 +28,7 @@
<property name="core.doc.dir" value="${release.dir}/doc/core" />
<property name="core.jar.name" value="beepcore.jar" />
<property name="core.src.dir" value="src" />
- <property name="core.packages" value="org.beepcore.beep.core,org.beepcore.beep.util,org.beepcore.beep.transport.tcp,org.beepcore.beep.lib,org.beepcore.beep.profile,org.beepcore.beep.profile.echo,org.beepcore.beep.profile.tls"/>
+ <property name="core.packages" value="org.beepcore.beep.core,org.beepcore.beep.util,org.beepcore.beep.transport.tcp,org.beepcore.beep.lib,org.beepcore.beep.profile,org.beepcore.beep.profile.echo,beepcore.beep.profile.cap,org.beepcore.beep.profile.tls"/>
<property name="source.jar.name" value="beepsource.jar"/>
@@ -101,6 +101,7 @@
<include name="**/lib/*.java"/>
<include name="**/profile/*.java"/>
<include name="**/profile/echo/*.java"/>
+ <include name="**/profile/cap/*.java"/>
<include name="**/profile/tls/*.java"/>
<include name="**/transport/**/*.java"/>
<include name="**/util/*.java"/>
Index: example/org/beepcore/beep/example/Beepd.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/example/org/beepcore/beep/example/Beepd.java,v
retrieving revision 1.8
diff -u -r1.8 Beepd.java
--- example/org/beepcore/beep/example/Beepd.java 5 Oct 2002 15:33:22 -0000 1.8
+++ example/org/beepcore/beep/example/Beepd.java 5 Sep 2004 08:39:53 -0000
@@ -33,8 +33,7 @@
import org.xml.sax.SAXException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.core.ProfileRegistry;
import org.beepcore.beep.core.SessionTuningProperties;
@@ -58,7 +57,7 @@
private int port;
ProfileRegistry reg;
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
/**
Index: src/org/beepcore/beep/core/ChannelImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ChannelImpl.java,v
retrieving revision 1.11
diff -u -r1.11 ChannelImpl.java
--- src/org/beepcore/beep/core/ChannelImpl.java 1 Jan 2004 19:12:51 -0000 1.11
+++ src/org/beepcore/beep/core/ChannelImpl.java 5 Sep 2004 08:39:53 -0000
@@ -22,8 +22,8 @@
import edu.oswego.cs.dl.util.concurrent.PooledExecutor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.beepcore.beep.util.BufferSegment;
@@ -57,7 +57,7 @@
// instance variables
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
/** syntax of messages */
private String profile;
@@ -1024,13 +1024,13 @@
synchronized void freeReceiveBufferBytes(int size)
{
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Freed up " + size + " bytes on channel " + number);
}
recvWindowFreed += size;
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("recvWindowUsed = " + recvWindowUsed +
" recvWindowFreed = " + recvWindowFreed +
" recvWindowSize = " + recvWindowSize);
@@ -1104,6 +1104,6 @@
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
}
Index: src/org/beepcore/beep/core/Frame.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Frame.java,v
retrieving revision 1.21
diff -u -r1.21 Frame.java
--- src/org/beepcore/beep/core/Frame.java 23 Apr 2003 15:23:04 -0000 1.21
+++ src/org/beepcore/beep/core/Frame.java 5 Sep 2004 08:39:53 -0000
@@ -21,8 +21,8 @@
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.beepcore.beep.util.BufferSegment;
import org.beepcore.beep.util.HeaderParser;
@@ -85,7 +85,7 @@
private static final BufferSegment trailerBufferSegment =
new BufferSegment(TRAILER.getBytes());
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
/** BEEP message type of <code>Frame</code>. */
private int messageType;
@@ -281,7 +281,7 @@
header.append(Frame.CRLF);
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace(header);
}
return StringUtil.stringBufferToAscii(header);
Index: src/org/beepcore/beep/core/InputDataStreamAdapter.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/InputDataStreamAdapter.java,v
retrieving revision 1.2
diff -u -r1.2 InputDataStreamAdapter.java
--- src/org/beepcore/beep/core/InputDataStreamAdapter.java 5 Oct 2002 15:28:49 -0000 1.2
+++ src/org/beepcore/beep/core/InputDataStreamAdapter.java 5 Sep 2004 08:39:53 -0000
@@ -22,8 +22,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.util.BufferSegment;
@@ -419,7 +418,7 @@
private static final int STATE_PARSING_HEADERS_TERMINATOR = 5;
private static final int STATE_HEADERS_PARSED = 6;
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private int state = STATE_INIT;
private ByteArrayOutputStream name = new ByteArrayOutputStream(32);
Index: src/org/beepcore/beep/core/ProfileRegistry.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ProfileRegistry.java,v
retrieving revision 1.14
diff -u -r1.14 ProfileRegistry.java
--- src/org/beepcore/beep/core/ProfileRegistry.java 7 Nov 2003 17:38:11 -0000 1.14
+++ src/org/beepcore/beep/core/ProfileRegistry.java 5 Sep 2004 08:39:53 -0000
@@ -18,8 +18,7 @@
package org.beepcore.beep.core;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -41,7 +40,7 @@
public class ProfileRegistry implements Cloneable {
// Instance Data
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private class InternalProfile {
StartChannelListener listener;
Index: src/org/beepcore/beep/core/SessionImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/SessionImpl.java,v
retrieving revision 1.16
diff -u -r1.16 SessionImpl.java
--- src/org/beepcore/beep/core/SessionImpl.java 1 Jan 2004 19:12:51 -0000 1.16
+++ src/org/beepcore/beep/core/SessionImpl.java 5 Sep 2004 08:39:54 -0000
@@ -31,8 +31,7 @@
import javax.xml.parsers.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.w3c.dom.*;
@@ -102,7 +101,7 @@
StringUtil.stringToAscii("<ok />");
// Instance Data
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private int state;
private long nextChannelNumber = 0;
@@ -1816,7 +1815,7 @@
}
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
static class GREETING_SENT_SessionOperations implements SessionOperations {
@@ -1841,7 +1840,7 @@
}
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
static class ACTIVE_SessionOperations implements SessionOperations {
@@ -1860,7 +1859,7 @@
return ((ChannelImpl)f.getChannel()).postFrame(f);
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
static class TUNING_PENDING_SessionOperations
@@ -1881,7 +1880,7 @@
return ((ChannelImpl)f.getChannel()).postFrame(f);
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
static class TUNING_SessionOperations implements SessionOperations {
@@ -1899,7 +1898,7 @@
return ((ChannelImpl)f.getChannel()).postFrame(f);
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
static class CLOSE_PENDING_SessionOperations implements SessionOperations {
@@ -1921,7 +1920,7 @@
return false;
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
static class CLOSING_SessionOperations implements SessionOperations {
@@ -1939,7 +1938,7 @@
return ((ChannelImpl)f.getChannel()).postFrame(f);
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
static class CLOSED_SessionOperations implements SessionOperations {
@@ -1961,7 +1960,7 @@
return false;
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
static class ABORTED_SessionOperations implements SessionOperations {
@@ -1976,6 +1975,6 @@
return false;
}
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
}
}
Index: src/org/beepcore/beep/core/TuningProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/TuningProfile.java,v
retrieving revision 1.13
diff -u -r1.13 TuningProfile.java
--- src/org/beepcore/beep/core/TuningProfile.java 1 Jan 2004 19:12:51 -0000 1.13
+++ src/org/beepcore/beep/core/TuningProfile.java 5 Sep 2004 08:39:54 -0000
@@ -21,8 +21,7 @@
import java.util.HashSet;
import java.util.LinkedList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
/**
* TuningProfiles change the security of a Session, either by
@@ -47,7 +46,7 @@
// Constants
private static final String TLS_URI = "http://iana.org/beep/TLS";
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
// Data
// If the channel has begun tuning, it's in the table.
Index: src/org/beepcore/beep/lib/ChannelPool.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib/ChannelPool.java,v
retrieving revision 1.11
diff -u -r1.11 ChannelPool.java
--- src/org/beepcore/beep/lib/ChannelPool.java 1 Jan 2004 19:12:51 -0000 1.11
+++ src/org/beepcore/beep/lib/ChannelPool.java 5 Sep 2004 08:39:54 -0000
@@ -26,8 +26,8 @@
import java.util.Date;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
/**
@@ -51,7 +51,7 @@
*/
private static final long DEFAULT_TIME_TO_LIVE = 120000; // two minutes
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private long timeToLive = DEFAULT_TIME_TO_LIVE;
Session session;
@@ -130,7 +130,7 @@
// clean up channels that have expired
garbageCollect();
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Sharing channel number:" + sharedCh.getNumber());
}
@@ -190,7 +190,7 @@
// clean up channels that have expired
garbageCollect();
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Sharing channel number:" + sharedCh.getNumber());
}
@@ -262,7 +262,7 @@
(SharedChannel) availableChannels.remove(0);
try {
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("garbage collected channel number:"
+ shCh.getNumber());
}
Index: src/org/beepcore/beep/lib/MessageQueue.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib/MessageQueue.java,v
retrieving revision 1.6
diff -u -r1.6 MessageQueue.java
--- src/org/beepcore/beep/lib/MessageQueue.java 1 Jan 2004 19:12:51 -0000 1.6
+++ src/org/beepcore/beep/lib/MessageQueue.java 5 Sep 2004 08:39:54 -0000
@@ -20,8 +20,7 @@
import java.util.LinkedList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.core.MessageMSG;
import org.beepcore.beep.core.RequestHandler;
@@ -43,7 +42,7 @@
*/
public class MessageQueue implements RequestHandler {
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private LinkedList queue = new LinkedList();
Index: src/org/beepcore/beep/profile/echo/EchoProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/echo/EchoProfile.java,v
retrieving revision 1.18
diff -u -r1.18 EchoProfile.java
--- src/org/beepcore/beep/profile/echo/EchoProfile.java 14 Sep 2003 04:17:39 -0000 1.18
+++ src/org/beepcore/beep/profile/echo/EchoProfile.java 5 Sep 2004 08:39:54 -0000
@@ -18,8 +18,7 @@
package org.beepcore.beep.profile.echo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.core.*;
import org.beepcore.beep.profile.*;
@@ -42,7 +41,7 @@
public static final String ECHO_URI =
"http://xml.resource.org/profiles/NULL/ECHO";
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
public StartChannelListener init(String uri, ProfileConfiguration config)
throws BEEPException
Index: src/org/beepcore/beep/profile/sasl/Blob.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/Blob.java,v
retrieving revision 1.10
diff -u -r1.10 Blob.java
--- src/org/beepcore/beep/profile/sasl/Blob.java 18 Nov 2003 14:03:08 -0000 1.10
+++ src/org/beepcore/beep/profile/sasl/Blob.java 5 Sep 2004 08:39:54 -0000
@@ -26,8 +26,7 @@
import sun.misc.BASE64Decoder;
import sun.misc.BASE64Encoder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
/**
@@ -77,7 +76,7 @@
private static boolean initialized = false;
// Data
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private int status;
private String blobData;
Index: src/org/beepcore/beep/profile/sasl/SASLSessionTable.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/SASLSessionTable.java,v
retrieving revision 1.7
diff -u -r1.7 SASLSessionTable.java
--- src/org/beepcore/beep/profile/sasl/SASLSessionTable.java 20 May 2003 22:22:02 -0000 1.7
+++ src/org/beepcore/beep/profile/sasl/SASLSessionTable.java 5 Sep 2004 08:39:54 -0000
@@ -19,8 +19,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.core.Session;
import org.beepcore.beep.core.SessionCredential;
@@ -52,7 +51,7 @@
private static final String MSG_USER_PREFIX = "===] User=>";
private static final String MSG_SESSIONS_TABLE_TRAILER="===] End of Table";
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private Hashtable nameToSession, sessionToName;
SASLSessionTable()
Index: src/org/beepcore/beep/profile/sasl/anonymous/AnonymousAuthenticator.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/anonymous/AnonymousAuthenticator.java,v
retrieving revision 1.15
diff -u -r1.15 AnonymousAuthenticator.java
--- src/org/beepcore/beep/profile/sasl/anonymous/AnonymousAuthenticator.java 10 Jun 2003 18:59:22 -0000 1.15
+++ src/org/beepcore/beep/profile/sasl/anonymous/AnonymousAuthenticator.java 5 Sep 2004 08:39:54 -0000
@@ -22,8 +22,7 @@
import java.util.Hashtable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.core.*;
import org.beepcore.beep.profile.sasl.*;
@@ -69,7 +68,7 @@
"Unexpected SASL-Anonymous Message";
// Data
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private int state;
private Channel channel;
Index: src/org/beepcore/beep/profile/sasl/anonymous/SASLAnonymousProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/anonymous/SASLAnonymousProfile.java,v
retrieving revision 1.13
diff -u -r1.13 SASLAnonymousProfile.java
--- src/org/beepcore/beep/profile/sasl/anonymous/SASLAnonymousProfile.java 18 Nov 2003 14:03:09 -0000 1.13
+++ src/org/beepcore/beep/profile/sasl/anonymous/SASLAnonymousProfile.java 5 Sep 2004 08:39:54 -0000
@@ -20,8 +20,7 @@
import java.util.Hashtable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.core.*;
import org.beepcore.beep.profile.*;
@@ -56,7 +55,7 @@
public static final String MECHANISM = "SASL/ANONYMOUS";
private static SASLAnonymousProfile instance = null;
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
public SASLAnonymousProfile()
{
Index: src/org/beepcore/beep/profile/sasl/otp/OTPAuthenticator.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/OTPAuthenticator.java,v
retrieving revision 1.15
diff -u -r1.15 OTPAuthenticator.java
--- src/org/beepcore/beep/profile/sasl/otp/OTPAuthenticator.java 13 Sep 2003 21:17:30 -0000 1.15
+++ src/org/beepcore/beep/profile/sasl/otp/OTPAuthenticator.java 5 Sep 2004 08:39:54 -0000
@@ -24,8 +24,8 @@
import java.util.Hashtable;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.beepcore.beep.core.*;
import org.beepcore.beep.profile.sasl.*;
@@ -95,7 +95,7 @@
static final char SPACE_CHAR = ' ';
// Data
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private int state;
private Algorithm algorithm;
@@ -334,7 +334,7 @@
// Get the two hashes
byte nextHash[] = database.getLastHash();
byte responseHash[] = algorithm.generateHash(hash);
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Test====>"+SASLOTPProfile.convertBytesToHex(responseHash));
log.trace("Control=>"+SASLOTPProfile.convertBytesToHex(nextHash));
}
Index: src/org/beepcore/beep/profile/sasl/otp/OTPDictionary.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/OTPDictionary.java,v
retrieving revision 1.3
diff -u -r1.3 OTPDictionary.java
--- src/org/beepcore/beep/profile/sasl/otp/OTPDictionary.java 5 Oct 2002 15:32:06 -0000 1.3
+++ src/org/beepcore/beep/profile/sasl/otp/OTPDictionary.java 5 Sep 2004 08:39:54 -0000
@@ -21,8 +21,7 @@
import java.util.Hashtable;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.profile.sasl.SASLException;
import org.beepcore.beep.profile.sasl.InvalidParameterException;
@@ -449,7 +448,7 @@
"YARN", "YAWL", "YAWN", "YEAH", "YEAR",
"YELL", "YOGA", "YOKE" };
- private static Log slog = LogFactory.getLog(OTPDictionary.class);
+ private static Logger slog = Logger.getLogger(OTPDictionary.class);
static public String find(int index) throws InvalidParameterException
{
Index: src/org/beepcore/beep/profile/sasl/otp/SASLOTPProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/SASLOTPProfile.java,v
retrieving revision 1.15
diff -u -r1.15 SASLOTPProfile.java
--- src/org/beepcore/beep/profile/sasl/otp/SASLOTPProfile.java 18 Nov 2003 14:03:09 -0000 1.15
+++ src/org/beepcore/beep/profile/sasl/otp/SASLOTPProfile.java 5 Sep 2004 08:39:55 -0000
@@ -19,8 +19,7 @@
import java.util.Hashtable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.core.*;
import org.beepcore.beep.profile.*;
@@ -68,7 +67,7 @@
"Invalid or improperly formatted Identity information";
// Instance Data
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private Hashtable authenticators;
private MD5 md5;
Index: src/org/beepcore/beep/profile/sasl/otp/database/UserDatabasePool.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/database/UserDatabasePool.java,v
retrieving revision 1.5
diff -u -r1.5 UserDatabasePool.java
--- src/org/beepcore/beep/profile/sasl/otp/database/UserDatabasePool.java 18 Nov 2003 14:03:10 -0000 1.5
+++ src/org/beepcore/beep/profile/sasl/otp/database/UserDatabasePool.java 5 Sep 2004 08:39:55 -0000
@@ -22,8 +22,7 @@
import java.util.Hashtable;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
import org.beepcore.beep.profile.sasl.SASLException;
@@ -49,7 +48,7 @@
public class UserDatabasePool implements UserDatabaseManager
{
// Data
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private Hashtable userpool = new Hashtable(4);
Index: src/org/beepcore/beep/transport/tcp/TCPSession.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSession.java,v
retrieving revision 1.36
diff -u -r1.36 TCPSession.java
--- src/org/beepcore/beep/transport/tcp/TCPSession.java 18 Nov 2003 14:03:10 -0000 1.36
+++ src/org/beepcore/beep/transport/tcp/TCPSession.java 5 Sep 2004 08:39:55 -0000
@@ -24,8 +24,8 @@
import java.net.Socket;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.beepcore.beep.core.BEEPException;
import org.beepcore.beep.core.Channel;
@@ -70,7 +70,7 @@
// Instance Data
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
private byte headerBuffer[] = new byte[Frame.MAX_HEADER_SIZE];
private byte[] outputBuf = new byte[0];
@@ -318,7 +318,7 @@
os.write(outputBuf, 0, n);
os.flush();
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Wrote the following\n" +
new String(outputBuf, 0, n));
}
@@ -337,7 +337,7 @@
ProfileRegistry reg, Object argument)
throws BEEPException
{
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Reset as "
+ (isInitiator() ? "INITIATOR" : "LISTENER"));
}
@@ -422,7 +422,7 @@
InputStream is = socket.getInputStream();
while (running) {
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Processing next frame");
}
@@ -542,7 +542,7 @@
amountToRead = (tokenCount * 2) + Frame.TRAILER.length();
}
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace(new String(headerBuffer, 0, headerLength));
}
@@ -585,7 +585,7 @@
count += n;
}
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace(new String(payload));
}
Index: tls/org/beepcore/beep/profile/tls/jsse/TLSProfileJSSE.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/jsse/TLSProfileJSSE.java,v
retrieving revision 1.13
diff -u -r1.13 TLSProfileJSSE.java
--- tls/org/beepcore/beep/profile/tls/jsse/TLSProfileJSSE.java 18 Nov 2003 14:03:10 -0000 1.13
+++ tls/org/beepcore/beep/profile/tls/jsse/TLSProfileJSSE.java 5 Sep 2004 08:39:55 -0000
@@ -48,8 +48,7 @@
import java.io.InputStreamReader;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
/**
@@ -131,7 +130,7 @@
// socket factory that creates/wraps SSL connections
static SSLSocketFactory socketFactory = null;
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
// listeners to update when an SSL handshake completes
// static List handshakeListeners = null;
Index: tls/org/beepcore/beep/profile/tls/ptls/TLSProfilePureTLS.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/ptls/TLSProfilePureTLS.java,v
retrieving revision 1.9
diff -u -r1.9 TLSProfilePureTLS.java
--- tls/org/beepcore/beep/profile/tls/ptls/TLSProfilePureTLS.java 7 Nov 2003 23:01:35 -0000 1.9
+++ tls/org/beepcore/beep/profile/tls/ptls/TLSProfilePureTLS.java 5 Sep 2004 08:39:56 -0000
@@ -24,8 +24,8 @@
import java.security.PrivateKey;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.beepcore.beep.core.*;
import org.beepcore.beep.profile.tls.TLSProfile;
@@ -110,7 +110,7 @@
public static final String PROPERTY_PRIVATE_KEY_ALGORITHM =
"Private Key Type";
- private Log log = LogFactory.getLog(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
// properties set from the configuration
boolean needPeerAuth = true;
@@ -456,7 +456,7 @@
X509Cert cert = (X509Cert) enum.nextElement();
String subject = cert.getSubjectName().getNameString();
String issuer = cert.getIssuerName().getNameString();
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Name = " + subject + " issued by " + issuer);
}
}
@@ -635,7 +635,7 @@
X509Cert cert = (X509Cert) enum.nextElement();
String subject = cert.getSubjectName().getNameString();
String issuer = cert.getIssuerName().getNameString();
- if (log.isTraceEnabled()) {
+ if (log.isEnabledFor(Level.TRACE)) {
log.trace("Name = " + subject + " issued by " + issuer);
}
}
--------------050002010108040707080301--
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php