Update of /cvsroot/beepcore-java/beepcore-java/example/org/beepcore/beep/example
In directory usw-pr-cvs1:/tmp/cvs-serv8393/example/org/beepcore/beep/example
Modified Files:
Beepd.java Bing.java
Log Message:
changed to use commons-logging
Index: Beepd.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/example/org/beepcore/beep/example/Beepd.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Beepd.java 8 Nov 2001 05:51:33 -0000 1.7
--- Beepd.java 5 Oct 2002 15:33:22 -0000 1.8
***************
*** 34,37 ****
--- 34,40 ----
import org.xml.sax.SAXException;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
import org.beepcore.beep.core.ProfileRegistry;
import org.beepcore.beep.core.SessionTuningProperties;
***************
*** 39,44 ****
import org.beepcore.beep.profile.ProfileConfiguration;
import org.beepcore.beep.transport.tcp.TCPSessionCreator;
- import org.beepcore.beep.util.ConsoleLog;
- import org.beepcore.beep.util.Log;
/**
--- 42,45 ----
***************
*** 58,61 ****
--- 59,65 ----
ProfileRegistry reg;
+ private Log log = LogFactory.getLog(this.getClass());
+
+
/**
* Parses the beepd element in the configuration file and loads the
***************
*** 199,205 ****
}
- ConsoleLog log = new ConsoleLog();
- Log.setLogService(log);
-
// Start the servers listening
Iterator i = servers.iterator();
--- 203,206 ----
***************
*** 218,223 ****
}
} catch (Exception e) {
! Log.logEntry(Log.SEV_ERROR, e);
! Log.logEntry(Log.SEV_ERROR, "Listener exiting");
}
}
--- 219,223 ----
}
} catch (Exception e) {
! log.error("Listener exiting", e);
}
}
Index: Bing.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/example/org/beepcore/beep/example/Bing.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Bing.java 25 Nov 2001 08:00:28 -0000 1.10
--- Bing.java 5 Oct 2002 15:33:22 -0000 1.11
***************
*** 33,38 ****
import org.beepcore.beep.transport.tcp.TCPSessionCreator;
import org.beepcore.beep.transport.tcp.TCPSession;
- import org.beepcore.beep.util.ConsoleLog;
- import org.beepcore.beep.util.Log;
/**
--- 33,36 ----
|
