psmith 2004/05/25 15:37:39
Modified: src/java/org/apache/log4j/chainsaw/version
VersionManager.java
src/java/org/apache/log4j/chainsaw/receivers known.receivers
ReceiversHelper.java
tests/src/java/org/apache/log4j/chainsaw/receivers
ReceiversHelperTest.java
. build.xml
src/java/org/apache/log4j/chainsaw/help release-notes.html
Log:
This series of changes allows Chainsaw to be able to create a JMSReceiver.
The JMSReceiver class has now been added to the list of 'known' receivers, but
at run-time, should the class or any of it's dependant classes not be available
it will degrade gracefully, output an error message, and move on. In this
case the JMSReceiver is not presented as an option when creating a Receiver.
The JMS jar, if available, has been added to the classpath of the 'chainsaw' ant
run target.
When creating a Java Web start distribution, the distribution creator _should_ make
sure they
have the JMS libraries present, otherwise the Web start version will not have the
JMSReceiver
class bundled with it.
Revision Changes Path
1.6 +1 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/version/VersionManager.java
Index: VersionManager.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/version/VersionManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VersionManager.java 25 May 2004 01:01:01 -0000 1.5
+++ VersionManager.java 25 May 2004 22:37:36 -0000 1.6
@@ -10,7 +10,7 @@
private static final VersionManager instance = new VersionManager();
- private static final String VERSION_INFO = "1.99.99 (25th May 2004 11:00
GMT+10)";
+ private static final String VERSION_INFO = "1.99.99 (26th May 2004 08:00
GMT+10)";
public static final VersionManager getInstance() {
return instance;
1.5 +1 -0
logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/known.receivers
Index: known.receivers
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/known.receivers,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- known.receivers 6 Mar 2004 16:36:37 -0000 1.4
+++ known.receivers 25 May 2004 22:37:37 -0000 1.5
@@ -6,4 +6,5 @@
org.apache.log4j.net.SocketReceiver
org.apache.log4j.net.UDPReceiver
org.apache.log4j.net.XMLSocketReceiver
+org.apache.log4j.net.JMSReceiver
org.apache.log4j.varia.LogFilePatternReceiver
1.5 +14 -11
logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
Index: ReceiversHelper.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReceiversHelper.java 28 Mar 2004 10:04:30 -0000 1.4
+++ ReceiversHelper.java 25 May 2004 22:37:37 -0000 1.5
@@ -56,17 +56,20 @@
String line;
while ((line = stream.readLine()) != null) {
-
- try {
- if (line.startsWith("#") || (line.length() == 0)) {
- continue;
- }
- Class receiverClass = Class.forName(line);
- receiverClassList.add(receiverClass);
- LogLog.debug("Located known Receiver class " +
receiverClass.getName());
- } catch (Exception e) {
- LogLog.error("Failed to locate Receiver class:" + line);
- }
+
+ try {
+ if (line.startsWith("#") || (line.length() == 0)) {
+ continue;
+ }
+ Class receiverClass = Class.forName(line);
+ receiverClassList.add(receiverClass);
+ LogLog.debug("Located known Receiver class " +
receiverClass.getName());
+ } catch (Exception e) {
+ LogLog.error("Failed to locate Receiver class:" + line, e);
+ }
+ catch (NoClassDefFoundError e) {
+ LogLog.error("Failed to locate Receiver class:" + line + ",
looks like a dependent class is missing from the classpath", e);
+ }
}
} catch (Exception e) {
e.printStackTrace();
1.3 +3 -1
logging-log4j/tests/src/java/org/apache/log4j/chainsaw/receivers/ReceiversHelperTest.java
Index: ReceiversHelperTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/chainsaw/receivers/ReceiversHelperTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReceiversHelperTest.java 6 Mar 2004 16:36:37 -0000 1.2
+++ ReceiversHelperTest.java 25 May 2004 22:37:37 -0000 1.3
@@ -5,6 +5,7 @@
import junit.framework.TestCase;
import org.apache.log4j.chainsaw.receivers.ReceiversHelper;
+import org.apache.log4j.net.JMSReceiver;
import org.apache.log4j.net.MulticastReceiver;
import org.apache.log4j.net.SocketHubReceiver;
import org.apache.log4j.net.SocketReceiver;
@@ -40,7 +41,8 @@
SocketReceiver.class,
UDPReceiver.class,
XMLSocketReceiver.class,
- LogFilePatternReceiver.class
+ LogFilePatternReceiver.class,
+ JMSReceiver.class,
};
for (int i = 0; i < expectedList.length; i++) {
1.102 +1 -1 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- build.xml 21 May 2004 11:31:47 -0000 1.101
+++ build.xml 25 May 2004 22:37:38 -0000 1.102
@@ -444,7 +444,7 @@
<!-- Need to fork to avoid problems -->
<java classname="org.apache.log4j.chainsaw.LogUI" fork="yes"
-
classpath="${jar.dest}/${log4j.jar};${jar.dest}/${log4j-chainsaw.jar};${ant.home}/lib/crimson.jar;${regexp.oro.jar}">
+
classpath="${jar.dest}/${log4j.jar};${jar.dest}/${log4j-chainsaw.jar};${ant.home}/lib/crimson.jar;${regexp.oro.jar};${jms.jar}">
<sysproperty key="log4j.debug" value="${log4j.debug}"/>
</java>
</target>
1.15 +5 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html
Index: release-notes.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- release-notes.html 25 May 2004 01:01:01 -0000 1.14
+++ release-notes.html 25 May 2004 22:37:38 -0000 1.15
@@ -7,7 +7,11 @@
<BODY>
<h2>Release Notes</h2>
-
+<h2>1.99.99 (26th May 2004 08:00 GMT+10)</h2>
+<ul>
+ <li>Added the JMSReceiver to the bundled distribution of 'known' receivers. This
will require you to have it's
+ dependencies in your System classpath for it to work.</li>
+</ul>
<h2>1.99.99 (25th May 2004 11:00 GMT+10)</h2>
<ul>
<li>Fixed a bug in the SocketNode class that prevented listeners of being notified
when the Socket dies. Unfortunately one
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
