[Beepcore-java-commits] CVS: beepcore-java/src/org/beepcore/beep/core Frame.java,1.18,1.19

[Huston F. <hu...@us...>]

Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv5732/src/org/beepcore/beep/core

Modified Files:
	Frame.java 
Log Message:
changed to use commons-logging

Index: Frame.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Frame.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** Frame.java	7 Sep 2002 15:15:49 -0000	1.18
--- Frame.java	5 Oct 2002 15:26:51 -0000	1.19
***************
*** 23,29 ****
  import java.util.StringTokenizer;
  
  import org.beepcore.beep.util.BufferSegment;
  import org.beepcore.beep.util.HeaderParser;
- import org.beepcore.beep.util.Log;
  import org.beepcore.beep.util.StringUtil;
  
--- 23,31 ----
  import java.util.StringTokenizer;
  
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
  import org.beepcore.beep.util.BufferSegment;
  import org.beepcore.beep.util.HeaderParser;
  import org.beepcore.beep.util.StringUtil;
  
***************
*** 85,88 ****
--- 87,92 ----
          new BufferSegment(TRAILER.getBytes());
  
+     private Log log = LogFactory.getLog(this.getClass());
+ 
      /** BEEP message type of  <code>Frame</code>. */
      private int messageType;
***************
*** 279,284 ****
          header.append(this.CRLF);
  
!         if (Log.isLogged(Log.SEV_DEBUG)) {
!             Log.logEntry(Log.SEV_DEBUG, header.toString());
          }
          return StringUtil.stringBufferToAscii(header);
--- 283,288 ----
          header.append(this.CRLF);
  
!         if (log.isTraceEnabled()) {
!             log.trace(header);
          }
          return StringUtil.stringBufferToAscii(header);
***************
*** 288,293 ****
          throws BEEPException
      {
-         Log.logEntry(Log.SEV_DEBUG_VERBOSE, "Processing normal BEEP frame");
- 
          HeaderParser header = new HeaderParser(headerBuffer, length);
  
--- 292,295 ----
***************
*** 353,361 ****
                      break;
                  }
-             }
- 
-             if (Log.isLogged(Log.SEV_DEBUG_VERBOSE)) {
-                 Log.logEntry(Log.SEV_DEBUG_VERBOSE, "getMessageType=" +
-                              types[ret] + " (" + ret + ")");
              }
  
--- 355,358 ----