sdeboy 2004/11/20 23:01:27
Modified: src/java/org/apache/log4j/chainsaw/receivers
ReceiversTreeModel.java NewReceiverDialogPanel.java
ReceiversHelper.java ReceiversPanel.java
PluginPropertyEditorPanel.java
src/java/org/apache/log4j/chainsaw
ChainsawCyclicBufferTableModel.java LogUI.java
LogPanelLoggerTreeModel.java LogPanel.java
NoReceiversWarningPanel.java
LoggerNameTreePanel.java
LogPanelPreferencePanel.java
ApplicationPreferenceModelPanel.java
ChainsawAppenderHandler.java
src/java/org/apache/log4j/chainsaw/plugins
PluginClassLoaderFactory.java
src/java/org/apache/log4j/chainsaw/icons
LineIconFactory.java
src/java/org/apache/log4j/chainsaw/vfs
DirectoryListTableModel.java VFSPlugin.java
src/java/org/apache/log4j/chainsaw/help HelpManager.java
HelpLocator.java
src/java/org/apache/log4j/chainsaw/layout
DefaultLayoutFactory.java
src/java/org/apache/log4j/rule RuleFactory.java
Removed: src/java/org/apache/log4j/chainsaw/plugins
ChainsawCentral.java
Log:
LogLog -> logger for Chainsaw package and o.a.l.rule.RuleFactory
Revision Changes Path
1.7 +3 -2
logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java
Index: ReceiversTreeModel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ReceiversTreeModel.java 24 May 2004 22:25:30 -0000 1.6
+++ ReceiversTreeModel.java 21 Nov 2004 07:01:26 -0000 1.7
@@ -27,7 +27,7 @@
import javax.swing.tree.TreeNode;
import org.apache.log4j.LogManager;
-import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.Logger;
import org.apache.log4j.net.SocketReceiver;
import org.apache.log4j.plugins.Plugin;
import org.apache.log4j.plugins.PluginEvent;
@@ -47,6 +47,7 @@
final DefaultMutableTreeNode NoReceiversNode =
new DefaultMutableTreeNode("No Receivers defined");
final DefaultMutableTreeNode RootNode;
+ private final Logger logger =
LogManager.getLogger(ReceiversTreeModel.class);
ReceiversTreeModel() {
super(new DefaultMutableTreeNode(ROOTNODE_LABEL));
@@ -100,7 +101,7 @@
public void propertyChange(PropertyChangeEvent evt)
{
- LogLog.debug(evt.toString());
+ logger.debug(evt.toString());
ReceiversTreeModel.this.fireTreeNodesChanged(item,
receiverNode.getPath(), null, null);
}};
1.4 +9 -12
logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/NewReceiverDialogPanel.java
Index: NewReceiverDialogPanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/NewReceiverDialogPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NewReceiverDialogPanel.java 27 Feb 2004 16:47:31 -0000 1.3
+++ NewReceiverDialogPanel.java 21 Nov 2004 07:01:26 -0000 1.4
@@ -16,24 +16,13 @@
package org.apache.log4j.chainsaw.receivers;
-import org.apache.log4j.chainsaw.help.HelpManager;
-import org.apache.log4j.chainsaw.helper.OkCancelPanel;
-import org.apache.log4j.chainsaw.messages.MessageCenter;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.net.SocketHubReceiver;
-import org.apache.log4j.plugins.Plugin;
-import org.apache.log4j.plugins.Receiver;
-
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-
import java.io.IOException;
-
import java.net.URL;
import javax.swing.JDialog;
@@ -44,6 +33,14 @@
import javax.swing.JSplitPane;
import javax.swing.UIManager;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.chainsaw.help.HelpManager;
+import org.apache.log4j.chainsaw.helper.OkCancelPanel;
+import org.apache.log4j.chainsaw.messages.MessageCenter;
+import org.apache.log4j.net.SocketHubReceiver;
+import org.apache.log4j.plugins.Plugin;
+import org.apache.log4j.plugins.Receiver;
+
/**
* A panel that allows a user to configure a new Plugin, and
@@ -150,7 +147,7 @@
receiverInstance = (Receiver) receiverClass.newInstance();
} catch (Exception e) {
- LogLog.error(
+ LogManager.getLogger(NewReceiverDialogPanel.class).error(
"Failed to create a new Receiver instance, this exception is
unexpected",
e);
}
1.8 +6 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReceiversHelper.java 13 Sep 2004 05:03:44 -0000 1.7
+++ ReceiversHelper.java 21 Nov 2004 07:01:26 -0000 1.8
@@ -24,8 +24,9 @@
import java.util.Collections;
import java.util.List;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.chainsaw.plugins.PluginClassLoaderFactory;
-import org.apache.log4j.helpers.LogLog;
/**
@@ -41,6 +42,7 @@
private static final ReceiversHelper instance = new ReceiversHelper();
+ private final Logger logger =
LogManager.getLogger(ReceiversHelper.class);
private List receiverClassList = new ArrayList();
/**
*
@@ -67,12 +69,12 @@
}
Class receiverClass = classLoader.loadClass(line);
receiverClassList.add(receiverClass);
- LogLog.debug("Located known Receiver class " +
receiverClass.getName());
+ logger.debug("Located known Receiver class " +
receiverClass.getName());
} catch (ClassNotFoundException e) {
- LogLog.warn("Failed to locate Receiver class:" + line);
+ logger.warn("Failed to locate Receiver class:" + line);
}
catch (NoClassDefFoundError e) {
- LogLog.error("Failed to locate Receiver class:" + line
+ ", looks like a dependent class is missing from the classpath", e);
+ logger.error("Failed to locate Receiver class:" + line
+ ", looks like a dependent class is missing from the classpath", e);
}
}
} catch (Exception e) {
1.18 +4 -3
logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
Index: ReceiversPanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ReceiversPanel.java 17 Jun 2004 00:11:58 -0000 1.17
+++ ReceiversPanel.java 21 Nov 2004 07:01:26 -0000 1.18
@@ -59,6 +59,7 @@
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.chainsaw.PopupListener;
import org.apache.log4j.chainsaw.SmallButton;
import org.apache.log4j.chainsaw.help.HelpManager;
@@ -67,7 +68,6 @@
import org.apache.log4j.chainsaw.icons.LevelIconFactory;
import org.apache.log4j.chainsaw.icons.LineIconFactory;
import org.apache.log4j.chainsaw.messages.MessageCenter;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.net.SocketNodeEventListener;
import org.apache.log4j.net.SocketReceiver;
import org.apache.log4j.plugins.Pauseable;
@@ -99,6 +99,7 @@
private final JSplitPane splitter = new JSplitPane();
private final PluginPropertyEditorPanel pluginEditorPanel =
new PluginPropertyEditorPanel();
+ private final Logger logger = LogManager.getLogger(ReceiversPanel.class);
private final PluginRegistry pluginRegistry;
@@ -165,7 +166,7 @@
(node != null) && (node.getUserObject() != null)
&& (node.getUserObject() instanceof Plugin)) {
Plugin p = (Plugin) node.getUserObject();
- LogLog.debug("plugin=" + p);
+ logger.debug("plugin=" + p);
pluginEditorPanel.setPlugin(p);
} else {
pluginEditorPanel.setPlugin(null);
@@ -561,7 +562,7 @@
*
*/
public void updateReceiverTreeInDispatchThread() {
- LogLog.debug(
+ logger.debug(
"updateReceiverTreeInDispatchThread, should not be needed now");
// if (SwingUtilities.isEventDispatchThread()) {
1.6 +16 -16
logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
Index: PluginPropertyEditorPanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PluginPropertyEditorPanel.java 26 Jul 2004 07:39:32 -0000 1.5
+++ PluginPropertyEditorPanel.java 21 Nov 2004 07:01:26 -0000 1.6
@@ -15,26 +15,17 @@
*/
package org.apache.log4j.chainsaw.receivers;
-import org.apache.log4j.Level;
-import org.apache.log4j.chainsaw.Generator;
-import org.apache.log4j.chainsaw.helper.TableCellEditorFactory;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.net.SocketHubReceiver;
-import org.apache.log4j.plugins.Plugin;
-
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -55,6 +46,14 @@
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableModel;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.chainsaw.Generator;
+import org.apache.log4j.chainsaw.helper.TableCellEditorFactory;
+import org.apache.log4j.net.SocketHubReceiver;
+import org.apache.log4j.plugins.Plugin;
+
/**
* A panel that allows the user to edit a particular Plugin, by using
introspection
@@ -71,6 +70,7 @@
private TableModel defaultModel = new DefaultTableModel(
new String[] { "Property", "Value" }, 1);
+ private static final Logger logger =
LogManager.getLogger(PluginPropertyEditorPanel.class);
/**
*
*/
@@ -117,7 +117,7 @@
.setCellEditor(new PluginTableCellEditor());
propertyTable.setEnabled(true);
} catch (Throwable e) {
- LogLog.error("Failed to introspect the Plugin",
e);
+ logger.error("Failed to introspect the Plugin",
e);
}
} else {
propertyTable.setModel(defaultModel);
@@ -214,7 +214,7 @@
DefaultCellEditor editor =
(DefaultCellEditor) editorMap.get(valueClass);
- LogLog.debug("Located CellEditor for " + valueClass);
+ logger.debug("Located CellEditor for " + valueClass);
currentEditor = editor;
return currentEditor.getTableCellEditorComponent(table,
value,
@@ -222,7 +222,7 @@
}
currentEditor = defaultEditor;
- LogLog.debug("Cell value class " + valueClass +
+ logger.debug("Cell value class " + valueClass +
" not know, using default editor");
return defaultEditor.getTableCellEditorComponent(table, value,
@@ -290,7 +290,7 @@
return object;
}
} catch (Exception e) {
- LogLog.error(
+ logger.error(
"Error reading value for PropertyDescriptor " + d);
}
@@ -349,7 +349,7 @@
if (columnIndex == 1) {
aValue = translateValueIfNeeded(rowIndex, aValue);
- LogLog.debug(
+ logger.debug(
"setValueAt, " + rowIndex + ", " + columnIndex +
", value=" + aValue + ", valueClass" +
aValue.getClass());
@@ -360,7 +360,7 @@
} catch (IllegalArgumentException e) {
// ignore
} catch (Exception e) {
- LogLog.error(
+ logger.error(
"Failed to modify the Plugin because of Exception",
e);
}
@@ -383,7 +383,7 @@
return Integer.valueOf(value.toString());
} catch (Exception e) {
- LogLog.error("Failed to convert to Integer type");
+ logger.error("Failed to convert to Integer type");
}
}
1.38 +8 -6
logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
Index: ChainsawCyclicBufferTableModel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChainsawCyclicBufferTableModel.java 10 Sep 2004 20:12:18 -0000
1.37
+++ ChainsawCyclicBufferTableModel.java 21 Nov 2004 07:01:26 -0000
1.38
@@ -33,8 +33,9 @@
import javax.swing.event.EventListenerList;
import javax.swing.table.AbstractTableModel;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.rule.Rule;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.location.LocationInfo;
@@ -68,6 +69,7 @@
private List columnNames = new
ArrayList(ChainsawColumns.getColumnsNames());
private boolean sortEnabled = false;
private boolean reachedCapacity = false;
+ private final Logger logger =
LogManager.getLogger(ChainsawCyclicBufferTableModel.class);
// protected final Object syncLock = new Object();
private LoggerNameModel loggerNameModelDelegate =
@@ -272,7 +274,7 @@
}
public void sortColumn(int col, boolean ascending) {
- LogLog.debug("request to sort col=" + col);
+ logger.debug("request to sort col=" + col);
currentSortAscending = ascending;
currentSortColumn = col;
sortEnabled = true;
@@ -372,7 +374,7 @@
}
if (event == null) {
- LogLog.error("Invalid rowindex=" + rowIndex);
+ logger.error("Invalid rowindex=" + rowIndex);
throw new NullPointerException("Invalid rowIndex=" + rowIndex);
}
@@ -483,7 +485,7 @@
//add all keys except the 'log4jid' key
if (!columnNames.contains(key) &&
!(Constants.LOG4J_ID_KEY.equalsIgnoreCase(key.toString()))) {
columnNames.add(key);
- LogLog.debug("Adding col '" + key + "', columNames=" +
columnNames);
+ logger.debug("Adding col '" + key + "', columNames=" +
columnNames);
fireNewKeyColumnAdded(
new NewKeyEvent(
this, columnNames.indexOf(key), key,
e.getProperty(key.toString())));
@@ -645,7 +647,7 @@
unfilteredList.size() + 1);
monitor.setMillisToDecideToPopup(250);
monitor.setMillisToPopup(100);
- LogLog.debug(
+ logger.debug(
"Changing Model, isCyclic is now " + isCyclic());
List newUnfilteredList = null;
@@ -695,7 +697,7 @@
monitor.close();
}
- LogLog.debug("Model Change completed");
+ logger.debug("Model Change completed");
}
});
thread.setPriority(Thread.MIN_PRIORITY + 1);
1.107 +10 -9
logging-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java
Index: LogUI.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- LogUI.java 17 Nov 2004 21:25:25 -0000 1.106
+++ LogUI.java 21 Nov 2004 07:01:26 -0000 1.107
@@ -87,6 +87,7 @@
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.chainsaw.dnd.FileDnDTarget;
import org.apache.log4j.chainsaw.help.HelpManager;
import org.apache.log4j.chainsaw.help.Tutorial;
@@ -101,7 +102,6 @@
import org.apache.log4j.chainsaw.prefs.SettingsManager;
import org.apache.log4j.chainsaw.receivers.ReceiversPanel;
import org.apache.log4j.chainsaw.version.VersionManager;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.joran.JoranConfigurator;
import org.apache.log4j.net.SocketNodeEventListener;
import org.apache.log4j.plugins.Plugin;
@@ -158,6 +158,7 @@
private final List identifierPanels = new ArrayList();
private int dividerSize;
private int cyclicBufferSize;
+ private static final Logger logger = LogManager.getLogger(LogUI.class);
/**
* Set to true, if and only if the GUI has completed it's full
@@ -278,7 +279,7 @@
}
});
}
- LogLog.info("SecurityManager is now: " + System.getSecurityManager());
+ logger.info("SecurityManager is now: " + System.getSecurityManager());
LogUI logUI = new LogUI();
@@ -306,14 +307,14 @@
if(config!=null && (!(config.trim().equals("")))) {
config = config.trim();
try {
- LogLog.info("Using '" + config + "' for auto-configuration");
+ logger.info("Using '" + config + "' for auto-configuration");
URL configURL = new URL(config);
logUI.loadConfigurationUsingPluginClassLoader(configURL);
}catch(MalformedURLException e) {
- LogLog.error("Failed to convert config string to url", e);
+ logger.error("Failed to convert config string to url", e);
}
}else {
- LogLog.info("No auto-configuration file found within the
ApplicationPreferenceModel");
+ logger.info("No auto-configuration file found within the
ApplicationPreferenceModel");
logUI.ensureChainsawAppenderHandlerAdded();
}
@@ -389,7 +390,7 @@
Thread thread = new Thread(new Runnable() {
public void run() {
- LogLog.debug("Loading files: " + fileList);
+ logger.debug("Loading files: " + fileList);
for (Iterator iter = fileList.iterator();
iter.hasNext();) {
File file = (File) iter.next();
final Decoder decoder = new XMLDecoder();
@@ -399,7 +400,7 @@
.getName(), file.toURL());
} catch (Exception e) {
String errorMsg = "Failed to import a file";
- LogLog.error(errorMsg, e);
+ logger.error(errorMsg, e);
getStatusBar().setMessage(errorMsg);
}
}
@@ -1872,7 +1873,7 @@
ClassLoader previousTCCL =
Thread.currentThread().getContextClassLoader();
if(url!=null) {
- LogLog.info("Using '" + url.toExternalForm()+ "' for
auto-configuration");
+ logger.info("Using '" + url.toExternalForm()+ "' for
auto-configuration");
try {
// we temporarily swap the TCCL so that plugins can find
resources
Thread.currentThread().setContextClassLoader(classLoader);
@@ -1883,7 +1884,7 @@
Thread.currentThread().setContextClassLoader(previousTCCL);
}
}else {
- LogLog.info("auto-configuration file has not been provided");
+ logger.info("auto-configuration file has not been provided");
}
ensureChainsawAppenderHandlerAdded();
}
1.10 +14 -12
logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
Index: LogPanelLoggerTreeModel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LogPanelLoggerTreeModel.java 28 Mar 2004 10:04:30 -0000 1.9
+++ LogPanelLoggerTreeModel.java 21 Nov 2004 07:01:26 -0000 1.10
@@ -18,8 +18,6 @@
*/
package org.apache.log4j.chainsaw;
-import org.apache.log4j.helpers.LogLog;
-
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
@@ -32,6 +30,9 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.MutableTreeNode;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
/**
*
@@ -42,6 +43,7 @@
class LogPanelLoggerTreeModel extends DefaultTreeModel
implements LoggerNameListener {
private Map fullPackageMap = new HashMap();
+ private final Logger logger =
LogManager.getLogger(LogPanelLoggerTreeModel.class);
LogPanelLoggerTreeModel() {
super(new LogPanelTreeNode("Root Logger"));
@@ -116,7 +118,7 @@
}
}
- LogLog.debug("Adding to Map " + fullPackageBuf.toString());
+ logger.debug("Adding to Map " + fullPackageBuf.toString());
fullPackageMap.put(fullPackageBuf.toString(), newChild);
final DefaultMutableTreeNode changedNode = current;
@@ -136,12 +138,12 @@
}
}
- LogPanelTreeNode lookupLogger(String logger) {
- if (fullPackageMap.containsKey(logger)) {
- return (LogPanelTreeNode) fullPackageMap.get(logger);
+ LogPanelTreeNode lookupLogger(String newLogger) {
+ if (fullPackageMap.containsKey(newLogger)) {
+ return (LogPanelTreeNode) fullPackageMap.get(newLogger);
}else{
- LogLog.debug("No logger found matching '" + logger + "'");
- LogLog.debug("Map Dump: " + fullPackageMap);
+ logger.debug("No logger found matching '" + newLogger + "'");
+ logger.debug("Map Dump: " + fullPackageMap);
}
return null;
@@ -185,14 +187,14 @@
}
public void insert(MutableTreeNode newChild, int childIndex) {
- // LogLog.debug("[" + this.getUserObject() + "] inserting child "
+ newChild + " @ index " + childIndex);
- // LogLog.debug("Children now: " + this.children);
+ // logger.debug("[" + this.getUserObject() + "] inserting child "
+ newChild + " @ index " + childIndex);
+ // logger.debug("Children now: " + this.children);
super.insert(newChild, childIndex);
- // LogLog.debug("Children after insert: " + this.children);
+ // logger.debug("Children after insert: " + this.children);
Collections.sort(this.children, nodeComparator);
- // LogLog.debug("Children after sort: " + this.children);
+ // logger.debug("Children after sort: " + this.children);
}
}
}
1.90 +13 -11
logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java
Index: LogPanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- LogPanel.java 31 Jul 2004 18:22:56 -0000 1.89
+++ LogPanel.java 21 Nov 2004 07:01:26 -0000 1.90
@@ -111,6 +111,8 @@
import javax.swing.text.Document;
import org.apache.log4j.Layout;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.chainsaw.color.ColorPanel;
import org.apache.log4j.chainsaw.color.RuleColorizer;
@@ -127,7 +129,6 @@
import org.apache.log4j.chainsaw.prefs.SettingsManager;
import org.apache.log4j.helpers.Constants;
import org.apache.log4j.helpers.ISO8601DateFormat;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.rule.ExpressionRule;
import org.apache.log4j.rule.ExpressionRuleContext;
import org.apache.log4j.rule.Rule;
@@ -231,7 +232,8 @@
static final String COLUMNS_EXTENSION = ".columns";
static final String COLORS_EXTENSION = ".colors";
private int previousLastIndex = -1;
- private final DateFormat timestampExpressionFormat = new
SimpleDateFormat(Constants.TIMESTAMP_RULE_FORMAT);
+ private final DateFormat timestampExpressionFormat = new
SimpleDateFormat(Constants.TIMESTAMP_RULE_FORMAT);
+ private final Logger logger = LogManager.getLogger(LogPanel.class);
/**
* Creates a new LogPanel object. If a LogPanel with this identifier has
@@ -794,7 +796,7 @@
table.getSelectedRow(), table.getSelectedColumn());
if (o == null) {
//no row selected - ignore
- LogLog.debug("no row selected - unable to display throwable
popup");
+ logger.debug("no row selected - unable to display throwable
popup");
return;
}
detailDialog.setTitle(
@@ -2080,7 +2082,7 @@
try {
File f = new
File(SettingsManager.getInstance().getSettingsDirectory(),
URLEncoder.encode(getIdentifier() + COLUMNS_EXTENSION));
- LogLog.debug("writing columns to file: " + f);
+ logger.debug("writing columns to file: " + f);
o = new ObjectOutputStream(
new BufferedOutputStream(new FileOutputStream(f)));
@@ -2095,7 +2097,7 @@
new TableColumnData(
(String) c.getHeaderValue(), c.getModelIndex(), c.getWidth()));
} else {
- LogLog.debug(
+ logger.debug(
"Not saving col ' " + c.getHeaderValue()
+ "' not part of standard columns");
}
@@ -2126,7 +2128,7 @@
try {
File f = new
File(SettingsManager.getInstance().getSettingsDirectory(),
URLEncoder.encode(getIdentifier() + COLORS_EXTENSION));
- LogLog.debug("writing colors to file: " + f);
+ logger.debug("writing colors to file: " + f);
o = new ObjectOutputStream(
new BufferedOutputStream(new FileOutputStream(f)));
@@ -2254,7 +2256,7 @@
int width = Integer.parseInt(element);
if (index > (columnModel.getColumnCount() - 1)) {
- LogLog.warn(
+ logger.warn(
"loadsettings - failed attempt to set width for index " + index
+ ", width " + element);
} else {
@@ -2263,7 +2265,7 @@
index++;
} catch (NumberFormatException e) {
- LogLog.error("Error decoding a Table width", e);
+ logger.error("Error decoding a Table width", e);
}
}
@@ -2389,19 +2391,19 @@
(System.currentTimeMillis() - lastTimeStamp) <
CHECK_PERIOD) {
// They typed something since the last check. we ignor
// this for a sample period
- // LogLog.debug("Typed something since the
last check");
+ // logger.debug("Typed something since the
last check");
} else if (
(System.currentTimeMillis() - lastTimeStamp) < (2 *
CHECK_PERIOD)) {
// they stopped typing recently, but have stopped for at
least
// 1 sample period. lets apply the filter
- // LogLog.debug("Typed something recently
applying filter");
+ // logger.debug("Typed something recently
applying filter");
if (filterText != null &&
(!(filterText.getText().equals(lastFilterText)))) {
lastFilterText = filterText.getText();
setFilter();
}
} else {
// they stopped typing a while ago, let's forget about it
- // LogLog.debug(
+ // logger.debug(
// "They stoppped typing a while ago,
assuming filter has been applied");
}
}
1.10 +10 -9
logging-log4j/src/java/org/apache/log4j/chainsaw/NoReceiversWarningPanel.java
Index: NoReceiversWarningPanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/NoReceiversWarningPanel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NoReceiversWarningPanel.java 28 Mar 2004 10:04:30 -0000 1.9
+++ NoReceiversWarningPanel.java 21 Nov 2004 07:01:26 -0000 1.10
@@ -15,12 +15,6 @@
*/
package org.apache.log4j.chainsaw;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.net.PortBased;
-import org.apache.log4j.net.SocketAppender;
-import org.apache.log4j.net.SocketHubReceiver;
-import org.apache.log4j.net.SocketReceiver;
-
import java.awt.Component;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
@@ -30,9 +24,7 @@
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
-
import java.io.File;
-
import java.net.MalformedURLException;
import java.net.URL;
@@ -57,6 +49,13 @@
import javax.swing.event.ListDataListener;
import javax.swing.filechooser.FileFilter;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.net.PortBased;
+import org.apache.log4j.net.SocketAppender;
+import org.apache.log4j.net.SocketHubReceiver;
+import org.apache.log4j.net.SocketReceiver;
+
/**
* A dialog panel to inform the user that they do not have
@@ -87,6 +86,8 @@
final DefaultComboBoxModel simplePortModel = new DefaultComboBoxModel();
private boolean dontWarnMeAgain = false;
+
+ private final Logger logger =
LogManager.getLogger(NoReceiversWarningPanel.class);
NoReceiversWarningPanel() {
initComponents();
@@ -240,7 +241,7 @@
url);
}
} catch (Exception ex) {
- LogLog.error(
+ logger.error(
"Error browswing for Configuration file",
ex);
}
}
1.32 +16 -14
logging-log4j/src/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
Index: LoggerNameTreePanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- LoggerNameTreePanel.java 31 Jul 2004 18:22:57 -0000 1.31
+++ LoggerNameTreePanel.java 21 Nov 2004 07:01:26 -0000 1.32
@@ -74,9 +74,10 @@
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
import org.apache.log4j.chainsaw.icons.LineIconFactory;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.rule.AbstractRule;
import org.apache.log4j.rule.Rule;
import org.apache.log4j.spi.LoggingEvent;
@@ -122,6 +123,7 @@
private final SmallToggleButton ignoreLoggerButton = new
SmallToggleButton();
private final EventListenerList listenerList = new EventListenerList();
private final JTree logTree;
+ private final Logger logger =
LogManager.getLogger(LoggerNameTreePanel.class);
// private final EventListenerList focusOnActionListeners =
// new EventListenerList();
@@ -394,9 +396,9 @@
* Ensures the Focus is set to a specific logger name
* @param logger
*/
- public void setFocusOn(String logger)
+ public void setFocusOn(String newLogger)
{
- DefaultMutableTreeNode node = logTreeModel.lookupLogger(logger);
+ DefaultMutableTreeNode node = logTreeModel.lookupLogger(newLogger);
if (node != null)
{
@@ -411,7 +413,7 @@
}
else
{
- LogLog.error("failed to lookup logger " + logger);
+ logger.error("failed to lookup logger " + newLogger);
}
}
@@ -542,7 +544,7 @@
return;
}
- LogLog.debug("Collapsing all children of selected node");
+ logger.debug("Collapsing all children of selected node");
for (int i = 0; i < paths.length; i++)
{
@@ -794,7 +796,7 @@
private void ensureRootExpanded()
{
- LogLog.debug("Ensuring Root node is expanded.");
+ logger.debug("Ensuring Root node is expanded.");
final DefaultMutableTreeNode root =
(DefaultMutableTreeNode) logTreeModel.getRoot();
@@ -821,7 +823,7 @@
return;
}
- LogLog.debug("Expanding all children of selected node");
+ logger.debug("Expanding all children of selected node");
for (int i = 0; i < paths.length; i++)
{
@@ -867,7 +869,7 @@
if (maxDepth > WARN_DEPTH)
{
- LogLog.warn("Should warn user, depth=" + maxDepth);
+ logger.warn("Should warn user, depth=" + maxDepth);
}
depthEnum = treeNode.depthFirstEnumeration();
@@ -883,7 +885,7 @@
((DefaultMutableTreeNode) node.getParent()).getPath();
TreePath treePath = new TreePath(nodes);
- LogLog.debug("Expanding path:" + treePath);
+ logger.debug("Expanding path:" + treePath);
logTree.expandPath(treePath);
}
@@ -1036,7 +1038,7 @@
// e.consume();
// } else if (e.getClickCount() > 1) {
// super.mouseClicked(e);
- // LogLog.debug("Ignoring dbl click event " + e);
+ // logger.debug("Ignoring dbl click event " + e);
// }
// }
// });
@@ -1166,11 +1168,11 @@
// component.setIcon(leaf?null:getDefaultOpenIcon());
style = style | Font.ITALIC;
- // LogLog.debug("TreeRenderer: '" + logger + "' is in
hiddenSet, italicizing");
+ // logger.debug("TreeRenderer: '" + logger + "' is in
hiddenSet, italicizing");
}
else
{
- // LogLog.debug("TreeRenderer: '" + logger + "' is NOT in
hiddenSet, leaving plain");
+ // logger.debug("TreeRenderer: '" + logger + "' is NOT in
hiddenSet, leaving plain");
// component.setEnabled(true);
}
@@ -1352,7 +1354,7 @@
*/
public void mouseMoved(MouseEvent e)
{
- // LogLog.debug(e.toString());
+ // logger.debug(e.toString());
if (
((e.getModifiers() & InputEvent.CTRL_MASK) > 0)
&& ((e.getModifiers() & InputEvent.SHIFT_MASK) > 0))
1.20 +6 -6
logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
Index: LogPanelPreferencePanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- LogPanelPreferencePanel.java 27 Mar 2004 06:51:48 -0000 1.19
+++ LogPanelPreferencePanel.java 21 Nov 2004 07:01:26 -0000 1.20
@@ -15,8 +15,6 @@
*/
package org.apache.log4j.chainsaw;
-import org.apache.log4j.helpers.LogLog;
-
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
@@ -24,10 +22,8 @@
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-
import java.util.Iterator;
import javax.swing.BorderFactory;
@@ -48,6 +44,9 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeModel;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
/**
* GUI panel used to manipulate the PreferenceModel for a Log Panel
@@ -62,6 +61,7 @@
private JTextField loggerPrecision = new JTextField(5);
private final LogPanelPreferenceModel uncommittedPreferenceModel =
new LogPanelPreferenceModel();
+ private static final Logger logger =
LogManager.getLogger(LogPanelPreferenceModel.class);
//~ Constructors
============================================================
@@ -108,7 +108,7 @@
{
public void propertyChange(PropertyChangeEvent evt)
{
- LogLog.warn(evt.toString());
+ logger.warn(evt.toString());
}
});
panel.setOkCancelActionListener(new ActionListener()
1.17 +7 -5
logging-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
Index: ApplicationPreferenceModelPanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ApplicationPreferenceModelPanel.java 26 Jul 2004 07:39:31 -0000
1.16
+++ ApplicationPreferenceModelPanel.java 21 Nov 2004 07:01:26 -0000
1.17
@@ -48,7 +48,8 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeModel;
-import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
/**
@@ -65,6 +66,7 @@
private JTextField toolTipDisplayMillis;
private JTextField cyclicBufferSize;
private final JTextField configurationURL = new JTextField(35);
+ private static final Logger logger =
LogManager.getLogger(ApplicationPreferenceModelPanel.class);
ApplicationPreferenceModelPanel(ApplicationPreferenceModel model) {
this.committedPreferenceModel = model;
@@ -111,7 +113,7 @@
model.addPropertyChangeListener(
new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
- LogLog.warn(evt.toString());
+ logger.warn(evt.toString());
}
});
panel.setOkCancelActionListener(
@@ -340,7 +342,7 @@
lookAndFeelGroup.add(lfIGTK);
lfPanel.add(lfIGTK);
} catch (Exception e) {
- LogLog.debug("Can't find new GTK L&F, might be Windows, or
<JDK1.4.2");
+ logger.debug("Can't find new GTK L&F, might be Windows, or
<JDK1.4.2");
}
add(lfPanel);
@@ -523,7 +525,7 @@
if (value >= 1000) {
int newValue = (value - 750) / 1000;
- LogLog.debug(
+ logger.debug(
"Adjusting old Responsiveness value from " + value + " to "
+ newValue);
value = newValue;
@@ -593,7 +595,7 @@
value = 1;
}
- LogLog.debug("Adjust responsiveness to " + value);
+ logger.debug("Adjust responsiveness to " + value);
uncommittedPreferenceModel.setResponsiveness(value);
}
}
1.24 +4 -3
logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
Index: ChainsawAppenderHandler.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChainsawAppenderHandler.java 2 Jul 2004 17:14:38 -0000 1.23
+++ ChainsawAppenderHandler.java 21 Nov 2004 07:01:26 -0000 1.24
@@ -28,8 +28,8 @@
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.net.SocketReceiver;
import org.apache.log4j.rule.ExpressionRule;
import org.apache.log4j.rule.Rule;
@@ -59,6 +59,7 @@
private PropertyChangeSupport propertySupport =
new PropertyChangeSupport(this);
private Map customExpressionRules = new HashMap();
+ private static final Logger logger =
LogManager.getLogger(ChainsawAppenderHandler.class);
public ChainsawAppenderHandler(ChainsawAppender appender) {
appender.setAppender(this);
@@ -143,10 +144,10 @@
public void receiveEventBatch(
String identifier, List eventBatchEntrys) {
- LogLog.debug(
+ logger.debug(
"received batch for '" + identifier + "', list.size()="
+ eventBatchEntrys.size());
- LogLog.debug(eventBatchEntrys.toString());
+ logger.debug(eventBatchEntrys.toString());
}
});
LogManager.getRootLogger().addAppender(handler);
1.4 +6 -4
logging-log4j/src/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java
Index: PluginClassLoaderFactory.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PluginClassLoaderFactory.java 17 Jun 2004 00:14:18 -0000 1.3
+++ PluginClassLoaderFactory.java 21 Nov 2004 07:01:26 -0000 1.4
@@ -8,8 +8,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
-import org.apache.log4j.helpers.LogLog;
/**
* A factory class to create a Classloader that can refenerence
jars/classes/resources
@@ -24,6 +25,7 @@
*/
public class PluginClassLoaderFactory {
private final ClassLoader pluginClassLoader;
+ private static final Logger logger =
LogManager.getLogger(PluginClassLoaderFactory.class);
private static final PluginClassLoaderFactory instance = new
PluginClassLoaderFactory();
@@ -56,7 +58,7 @@
*/
private static final ClassLoader create(File pluginDirectory) {
if(pluginDirectory == null || !pluginDirectory.exists() ||
!pluginDirectory.canRead()) {
- LogLog.error("pluginDirectory cannot be null, and it must exist and
must be readable, using the normal Classloader");
+ logger.error("pluginDirectory cannot be null, and it must exist and
must be readable, using the normal Classloader");
return PluginClassLoaderFactory.class.getClassLoader();
}
@@ -80,10 +82,10 @@
File file = new File(pluginDirectory, name);
try {
list.add(file.toURL());
- LogLog.info("Added " +
file.getAbsolutePath()
+ logger.info("Added " +
file.getAbsolutePath()
+ " to Plugin class
loader list");
} catch (Exception e) {
- LogLog.error("Failed to retrieve the
URL for file: "
+ logger.error("Failed to retrieve the
URL for file: "
+
file.getAbsolutePath());
throw new RuntimeException(e);
}
1.5 +6 -4
logging-log4j/src/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java
Index: LineIconFactory.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LineIconFactory.java 28 Mar 2004 10:04:30 -0000 1.4
+++ LineIconFactory.java 21 Nov 2004 07:01:26 -0000 1.5
@@ -16,8 +16,6 @@
package org.apache.log4j.chainsaw.icons;
-import org.apache.log4j.helpers.LogLog;
-
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Component;
@@ -30,6 +28,9 @@
import javax.swing.Icon;
import javax.swing.ImageIcon;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
/**
* A simple factory/facade for creating some of the standard Icons that are
based
@@ -39,6 +40,7 @@
*
*/
public final class LineIconFactory {
+ private static final Logger logger =
LogManager.getLogger(LineIconFactory.class);
/**
*
*/
@@ -72,7 +74,7 @@
return new ImageIcon(image);
} catch (Exception e) {
- LogLog.error("failed to create a Expand icon", e);
+ logger.error("failed to create a Expand icon", e);
}
return null;
@@ -100,7 +102,7 @@
return new ImageIcon(image);
} catch (Exception e) {
- LogLog.error("failed to create a Collapse icon", e);
+ logger.error("failed to create a Collapse icon", e);
}
return null;
1.5 +6 -5
logging-log4j/src/java/org/apache/log4j/chainsaw/vfs/DirectoryListTableModel.java
Index: DirectoryListTableModel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/vfs/DirectoryListTableModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DirectoryListTableModel.java 22 May 2004 08:03:33 -0000 1.4
+++ DirectoryListTableModel.java 21 Nov 2004 07:01:26 -0000 1.5
@@ -10,10 +10,9 @@
import javax.swing.table.AbstractTableModel;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.chainsaw.SortTableModel;
-import org.apache.log4j.helpers.LogLog;
/**=
* Displays the file objects in a List in a TableModel.
@@ -33,6 +32,8 @@
private boolean sortEnabled;
+ private final Logger logger =
LogManager.getLogger(DirectoryListTableModel.class);
+
/* (non-Javadoc)
* @see javax.swing.table.TableModel#getColumnCount()
@@ -61,7 +62,7 @@
return handleFile(columnIndex, fileObject);
}
} catch (Exception e) {
- LogLog.error("error retrieving value", e);
+ logger.error("error retrieving value", e);
}
return "{Error}";
@@ -195,7 +196,7 @@
break;
}
} catch (Exception e) {
- LogLog.error("Error during sort", e);
+ logger.error("Error during sort", e);
sort = -1;
}
sort = (currentSortAscending)?sort:-sort;
1.9 +6 -9
logging-log4j/src/java/org/apache/log4j/chainsaw/vfs/VFSPlugin.java
Index: VFSPlugin.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/vfs/VFSPlugin.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VFSPlugin.java 22 May 2004 08:06:35 -0000 1.8
+++ VFSPlugin.java 21 Nov 2004 07:01:26 -0000 1.9
@@ -27,16 +27,11 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.SystemInfo;
-import org.apache.commons.vfs.VFS;
-import org.apache.commons.vfs.impl.StandardFileSystemManager;
+import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.chainsaw.PopupListener;
import org.apache.log4j.chainsaw.messages.MessageCenter;
import org.apache.log4j.chainsaw.plugins.GUIPluginSkeleton;
-import org.apache.log4j.helpers.LogLog;
/**
* GUI interface to the Jarkata Commons VFS project.
@@ -74,6 +69,8 @@
private final AOChildDirectorScanner aoDirectoryScanner = new
AOChildDirectorScanner();
private Set supportedSchemes = new HashSet();
+
+ private final Logger logger = LogManager.getLogger(VFSPlugin.class);
public VFSPlugin() {
setName("VFS");
@@ -105,7 +102,7 @@
this.prefModel = new VFSPluginPreferenceModel();
} catch (FileSystemException e) {
- LogLog.error("Failed to initialise VFS", e);
+ logger.error("Failed to initialise VFS", e);
e.printStackTrace();
setActive(false);
return;
@@ -150,7 +147,7 @@
}
} catch (Exception e) {
- LogLog.error("error creating local VFS", e);
+ logger.error("error creating local VFS", e);
}
}
}
@@ -163,7 +160,7 @@
String[] schemes = info.getSchemes();
supportedSchemes.addAll(Arrays.asList(schemes));
- LogLog.info("Supported schemes: " + supportedSchemes);
+ logger.info("Supported schemes: " + supportedSchemes);
}
/**
1.7 +9 -8
logging-log4j/src/java/org/apache/log4j/chainsaw/help/HelpManager.java
Index: HelpManager.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/HelpManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HelpManager.java 27 Feb 2004 16:47:31 -0000 1.6
+++ HelpManager.java 21 Nov 2004 07:01:27 -0000 1.7
@@ -16,16 +16,16 @@
package org.apache.log4j.chainsaw.help;
-import org.apache.log4j.chainsaw.ChainsawConstants;
-import org.apache.log4j.helpers.LogLog;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-
import java.io.File;
import java.net.URL;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.chainsaw.ChainsawConstants;
+
/**
* Singleton help manager where objects can register to display
@@ -44,6 +44,7 @@
private URL helpURL;
private final PropertyChangeSupport propertySupport =
new PropertyChangeSupport(this);
+ private final Logger logger = LogManager.getLogger(HelpManager.class);
private HelpManager() {
@@ -52,16 +53,16 @@
try {
if (System.getProperty("log4j.chainsaw.localDocs") != null) {
- LogLog.info("Adding HelpLocator for localDocs property=" +
+ logger.info("Adding HelpLocator for localDocs property=" +
System.getProperty("log4j.chainsaw.localDocs"));
helpLocator.installLocator(new URL(
System.getProperty("log4j.chainsaw.localDocs")));
}else if(new File("docs/api").exists()) {
File dir = new File("docs/api");
- LogLog.info("Detected Local JavaDocs at " + dir.toString());
+ logger.info("Detected Local JavaDocs at " + dir.toString());
helpLocator.installLocator(dir.toURL());
} else {
- LogLog.warn("Could not find any local JavaDocs, you might want
to consider running 'ant javadoc'. The release version will be able to access
Javadocs from the Apache website.");
+ logger.warn("Could not find any local JavaDocs, you might want
to consider running 'ant javadoc'. The release version will be able to access
Javadocs from the Apache website.");
}
} catch (Exception e) {
// TODO: handle exception
@@ -195,7 +196,7 @@
name = name.replace('.', '/') + ".html";
URL url = helpLocator.findResource(name);
- LogLog.debug("located help resource for '" + name + "' at " +
+ logger.debug("located help resource for '" + name + "' at " +
((url == null) ? "" : url.toExternalForm()));
return (url != null) ? url : ChainsawConstants.URL_PAGE_NOT_FOUND;
1.4 +7 -7
logging-log4j/src/java/org/apache/log4j/chainsaw/help/HelpLocator.java
Index: HelpLocator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/HelpLocator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HelpLocator.java 27 Feb 2004 16:47:31 -0000 1.3
+++ HelpLocator.java 21 Nov 2004 07:01:27 -0000 1.4
@@ -16,18 +16,18 @@
package org.apache.log4j.chainsaw.help;
-import org.apache.log4j.chainsaw.messages.MessageCenter;
-import org.apache.log4j.helpers.LogLog;
-
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.chainsaw.messages.MessageCenter;
+
/**
* A helper class that assists the HelpManager by serving as a collection of
* Class loaders based on URL roots.
@@ -37,7 +37,7 @@
*/
class HelpLocator {
private List classLoaders = new ArrayList();
-
+ private static Logger logger = LogManager.getLogger(HelpLocator.class);
HelpLocator() {
}
@@ -103,8 +103,8 @@
try {
URL resourceURL = new URL(root, name);
URL[] urlArray = new URL[] { root, resourceURL };
- LogLog.debug("Looking for Help resource at:" +
resourceURL.toExternalForm());
- LogLog.debug("urlArray=" + Arrays.asList(urlArray));
+ logger.debug("Looking for Help resource at:" +
resourceURL.toExternalForm());
+ logger.debug("urlArray=" + Arrays.asList(urlArray));
return new URLClassLoader(
urlArray).findResource(
name);
1.4 +4 -5
logging-log4j/src/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java
Index: DefaultLayoutFactory.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLayoutFactory.java 28 Mar 2004 10:04:31 -0000 1.3
+++ DefaultLayoutFactory.java 21 Nov 2004 07:01:27 -0000 1.4
@@ -16,14 +16,13 @@
package org.apache.log4j.chainsaw.layout;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.helpers.LogLog;
-
import java.io.BufferedReader;
import java.io.InputStreamReader;
-
import java.net.URL;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.PatternLayout;
+
/**
* Factory class to load and cache Layout information from resources.
@@ -44,7 +43,7 @@
"org/apache/log4j/chainsaw/layout/DefaultDetailLayout.html");
if (defaultLayoutURL == null) {
- LogLog.warn(
+ LogManager.getLogger(DefaultLayoutFactory.class).warn(
"Could not locate the default Layout for Event Details and
Tooltips");
} else {
try {
1.5 +2 -2
logging-log4j/src/java/org/apache/log4j/rule/RuleFactory.java
Index: RuleFactory.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/rule/RuleFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RuleFactory.java 12 Jun 2004 05:18:20 -0000 1.4
+++ RuleFactory.java 21 Nov 2004 07:01:27 -0000 1.5
@@ -20,7 +20,7 @@
import java.util.LinkedList;
import java.util.Stack;
-import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.LogManager;
/**
* A Factory class which, given a string representation of the rule, and a
context stack, will
@@ -56,7 +56,7 @@
Class.forName("org.apache.oro.text.regex.Perl5Compiler");
rules.add(LIKE_RULE);
} catch (Exception e) {
- LogLog.info("ORO classes not found - Like rule not supported");
+ LogManager.getLogger(RuleFactory.class).info("ORO classes not found -
Like rule not supported");
}
rules.add(EXISTS_RULE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
