Author: sdeboy
Date: Sat Jun 12 06:20:57 2010
New Revision: 953945
URL: http://svn.apache.org/viewvc?rev=953945&view=rev
Log:
Fix Bug 49421: Chainsaw don't show Logger for SocketReceiver and
SocketHubReceiver
All calls to the LoggingEvent constructor which pass in another event's Logger
may only have a categoryName field and not logger field available - updated
calls to LoggingEvent constructor to ensure logger was passed in if not null,
or a logger was created from the logger name (pre-existing bug in rewritepolicy
classes if they were used with socketappender/receiver).
Also (arbitrarily) updated Chainsaw revision in the pom.xml 2.1.0, in order to
keep folks from being confused that this latest version is the original 2.0
(which according to maven was previously 1.99)
Modified:
logging/chainsaw/trunk/pom.xml
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
Modified: logging/chainsaw/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/pom.xml?rev=953945&r1=953944&r2=953945&view=diff
==============================================================================
--- logging/chainsaw/trunk/pom.xml (original)
+++ logging/chainsaw/trunk/pom.xml Sat Jun 12 06:20:57 2010
@@ -4,7 +4,7 @@
<groupId>log4j</groupId>
<artifactId>apache-chainsaw</artifactId>
<name>Apache Chainsaw</name>
- <version>1.99.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<description>Graphical Viewer for Logging events from a local or remote
log4j event system.</description>
<url>http://logging.apache.org:80/chainsaw</url>
<issueManagement>
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java?rev=953945&r1=953944&r2=953945&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java
(original)
+++
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java
Sat Jun 12 06:20:57 2010
@@ -20,6 +20,7 @@ import java.awt.Color;
import java.util.HashMap;
import java.util.Map;
+import org.apache.log4j.Logger;
import org.apache.log4j.rule.Rule;
import org.apache.log4j.spi.LoggingEvent;
@@ -34,7 +35,7 @@ public class ExtendedLoggingEvent extend
//copy constructor
public ExtendedLoggingEvent(LoggingEvent e) {
- super(e.getFQNOfLoggerClass(), e.getLogger(), e.getTimeStamp(),
e.getLevel(), e.getMessage(), e.getThreadName(), e.getThrowableInformation(),
e.getNDC(), e.getLocationInformation(), e.getProperties());
+ super(e.getFQNOfLoggerClass(), e.getLogger() != null ? e.getLogger() :
Logger.getLogger(e.getLoggerName()), e.getTimeStamp(), e.getLevel(),
e.getMessage(), e.getThreadName(), e.getThrowableInformation(), e.getNDC(),
e.getLocationInformation(), e.getProperties());
}
public void updateColorRuleColors(Color backgroundColor, Color
foregroundColor) {
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java?rev=953945&r1=953944&r2=953945&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java
Sat Jun 12 06:20:57 2010
@@ -407,6 +407,8 @@ public class LogUI extends JFrame implem
logUI.loadConfigurationUsingPluginClassLoader(configURL);
} catch(MalformedURLException e) {
logger.error("Initial configuration - failed to convert config string
to url", e);
+ } catch (IOException e) {
+ logger.error("Unable to access auto-configuration URL: " + config);
}
}
Modified:
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html?rev=953945&r1=953944&r2=953945&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
(original)
+++
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
Sat Jun 12 06:20:57 2010
@@ -9,7 +9,11 @@
<br>
<b>NOTE:</b> The mechanism and format used to persist settings in Chainsaw is
subject to change. If you are experiencing problems displaying events in
Chainsaw, please delete everything in the $user.dir/.chainsaw directory and
restart Chainsaw.
<br>
-<h1>2.0</h1>
+<h1>2.1</h1>
+<h2>11 Jun 2010</h2>
+<ul>
+<li>Updated Chainsaw Maven version to 2.1.</li>
+</ul>
<h2>6 Jun 2010</h2>
<ul>
<li>Loggers can now be ignored from the logger tree even while focus-on is
enabled.</li>
