From d173ca5ecded583343462527f47c994f30a7bb8e Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Fri, 24 May 2013 11:25:51 -0700
Subject: [PATCH] Provide per-package loggers.

I also made them package private where possible. It's too easy for code that
depends on samskivert to accidentally import com.samskivert.Log rather than
define its own logger.

Unfortunately Java doesn't have "this package and subpackages" protection, so
some of the package loggers have to be public to allow sub-packages to access
them. I didn't really want to have to define loggers for half a dozen
subpackages as well.
---
 src/main/java/com/samskivert/io/Log.java           | 14 ++++++++++++++
 src/main/java/com/samskivert/io/StreamUtil.java    |  2 +-
 .../com/samskivert/net/AttachableURLFactory.java   |  2 +-
 src/main/java/com/samskivert/net/Log.java          | 14 ++++++++++++++
 .../servlet/JDBCTableSiteIdentifier.java           |  2 +-
 .../java/com/samskivert/{ => servlet}/Log.java     | 13 +++++--------
 .../com/samskivert/servlet/MessageManager.java     |  2 +-
 .../com/samskivert/servlet/SiteResourceLoader.java |  2 +-
 .../com/samskivert/servlet/user/UserManager.java   |  2 +-
 .../com/samskivert/servlet/util/ExceptionMap.java  |  3 ++-
 .../java/com/samskivert/swing/AbsoluteLayout.java  |  2 +-
 src/main/java/com/samskivert/swing/Controller.java |  2 +-
 .../java/com/samskivert/swing/EnablingAdapter.java |  2 +-
 src/main/java/com/samskivert/swing/Label.java      |  2 +-
 src/main/java/com/samskivert/swing/Log.java        | 14 ++++++++++++++
 .../com/samskivert/swing/ObjectEditorTable.java    |  2 +-
 .../java/com/samskivert/swing/RuntimeAdjust.java   |  2 +-
 .../java/com/samskivert/swing/dnd/DnDManager.java  |  2 +-
 .../java/com/samskivert/swing/util/MenuUtil.java   |  2 +-
 .../java/com/samskivert/swing/util/SwingUtil.java  |  2 +-
 .../java/com/samskivert/swing/util/TaskMaster.java |  2 +-
 src/main/java/com/samskivert/test/Log.java         | 14 ++++++++++++++
 src/main/java/com/samskivert/test/TestUtil.java    |  2 +-
 src/main/java/com/samskivert/util/AuditLogger.java |  2 +-
 .../java/com/samskivert/util/BasicRunQueue.java    |  2 +-
 src/main/java/com/samskivert/util/Config.java      |  2 +-
 src/main/java/com/samskivert/util/ConfigUtil.java  |  2 +-
 src/main/java/com/samskivert/util/DebugChords.java |  2 +-
 src/main/java/com/samskivert/util/FileUtil.java    |  2 +-
 src/main/java/com/samskivert/util/Interval.java    |  2 +-
 src/main/java/com/samskivert/util/Invoker.java     |  2 +-
 src/main/java/com/samskivert/util/Lifecycle.java   |  2 +-
 .../java/com/samskivert/util/LoopingThread.java    |  2 +-
 .../java/com/samskivert/util/ObserverList.java     |  2 +-
 src/main/java/com/samskivert/util/PrefsConfig.java |  4 ++--
 src/main/java/com/samskivert/util/RandomUtil.java  |  2 +-
 .../com/samskivert/util/RepeatCallTracker.java     |  2 +-
 src/main/java/com/samskivert/util/RunAnywhere.java |  2 +-
 src/main/java/com/samskivert/util/Runnables.java   |  2 +-
 .../java/com/samskivert/util/SerialExecutor.java   |  2 +-
 src/main/java/com/samskivert/util/UtilLog.java     | 12 ++++++++++++
 .../java/com/samskivert/velocity/Application.java  |  2 +-
 .../com/samskivert/velocity/DispatcherServlet.java |  2 +-
 .../samskivert/velocity/SiteJarResourceLoader.java |  3 ++-
 src/main/java/com/samskivert/velocity/SiteKey.java |  2 +-
 .../samskivert/velocity/SiteResourceManager.java   |  3 ++-
 .../java/com/samskivert/velocity/VelocityUtil.java |  2 +-
 .../java/com/samskivert/xml/CheckVersionRule.java  |  2 +-
 src/main/java/com/samskivert/xml/Log.java          | 14 ++++++++++++++
 src/main/java/com/samskivert/xml/SimpleParser.java |  2 +-
 50 files changed, 134 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/com/samskivert/io/Log.java
 create mode 100644 src/main/java/com/samskivert/net/Log.java
 rename src/main/java/com/samskivert/{ => servlet}/Log.java (59%)
 create mode 100644 src/main/java/com/samskivert/swing/Log.java
 create mode 100644 src/main/java/com/samskivert/test/Log.java
 create mode 100644 src/main/java/com/samskivert/util/UtilLog.java
 create mode 100644 src/main/java/com/samskivert/xml/Log.java

diff --git a/src/main/java/com/samskivert/io/Log.java b/src/main/java/com/samskivert/io/Log.java
new file mode 100644
index 00000000..6cea7752
--- /dev/null
+++ b/src/main/java/com/samskivert/io/Log.java
@@ -0,0 +1,14 @@
+//
+// samskivert library - useful routines for java programs
+// Copyright (C) 2001-2012 Michael Bayne, et al.
+// http://github.com/samskivert/samskivert/blob/master/COPYING
+
+package com.samskivert.io;
+
+import com.samskivert.util.Logger;
+
+/** Provides a log instance for this package. */
+class Log {
+
+    static final Logger log = Logger.getLogger("com.samskivert.io");
+}
diff --git a/src/main/java/com/samskivert/io/StreamUtil.java b/src/main/java/com/samskivert/io/StreamUtil.java
index 152a08b7..d9ba43cf 100644
--- a/src/main/java/com/samskivert/io/StreamUtil.java
+++ b/src/main/java/com/samskivert/io/StreamUtil.java
@@ -13,7 +13,7 @@ import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.Charset;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.io.Log.log;
 
 /**
  * Convenience methods for streams.
diff --git a/src/main/java/com/samskivert/net/AttachableURLFactory.java b/src/main/java/com/samskivert/net/AttachableURLFactory.java
index fc8bee16..69aedc3e 100644
--- a/src/main/java/com/samskivert/net/AttachableURLFactory.java
+++ b/src/main/java/com/samskivert/net/AttachableURLFactory.java
@@ -11,7 +11,7 @@ import java.net.URLStreamHandlerFactory;
 
 import java.util.HashMap;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.net.Log.log;
 
 /**
  * Allows other entities in an application to register URLStreamHandler
diff --git a/src/main/java/com/samskivert/net/Log.java b/src/main/java/com/samskivert/net/Log.java
new file mode 100644
index 00000000..77dd75c1
--- /dev/null
+++ b/src/main/java/com/samskivert/net/Log.java
@@ -0,0 +1,14 @@
+//
+// samskivert library - useful routines for java programs
+// Copyright (C) 2001-2012 Michael Bayne, et al.
+// http://github.com/samskivert/samskivert/blob/master/COPYING
+
+package com.samskivert.net;
+
+import com.samskivert.util.Logger;
+
+/** Provides a log instance for this package. */
+class Log {
+
+    static final Logger log = Logger.getLogger("com.samskivert.net");
+}
diff --git a/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java b/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
index dc55d588..30d9377c 100644
--- a/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
+++ b/src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java
@@ -29,7 +29,7 @@ import com.samskivert.jdbc.SimpleRepository;
 import com.samskivert.util.ArrayUtil;
 import com.samskivert.util.HashIntMap;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.servlet.Log.log;
 
 /**
  * Accomplishes the process of site identification based on a mapping from domains (e.g.
diff --git a/src/main/java/com/samskivert/Log.java b/src/main/java/com/samskivert/servlet/Log.java
similarity index 59%
rename from src/main/java/com/samskivert/Log.java
rename to src/main/java/com/samskivert/servlet/Log.java
index 422ab9e4..b9f74866 100644
--- a/src/main/java/com/samskivert/Log.java
+++ b/src/main/java/com/samskivert/servlet/Log.java
@@ -3,15 +3,12 @@
 // Copyright (C) 2001-2012 Michael Bayne, et al.
 // http://github.com/samskivert/samskivert/blob/master/COPYING
 
-package com.samskivert;
+package com.samskivert.servlet;
 
 import com.samskivert.util.Logger;
 
-/**
- * Contains a reference to the log object used by the samskivert package.
- */
-public class Log
-{
-    /** We dispatch our log messages through this logger. */
-    public static final Logger log = Logger.getLogger("com.samskivert");
+/** Provides a log instance for this package (and sub-packages). */
+public class Log {
+
+    public static final Logger log = Logger.getLogger("com.samskivert.servlet");
 }
diff --git a/src/main/java/com/samskivert/servlet/MessageManager.java b/src/main/java/com/samskivert/servlet/MessageManager.java
index bd62ec32..92b7b554 100644
--- a/src/main/java/com/samskivert/servlet/MessageManager.java
+++ b/src/main/java/com/samskivert/servlet/MessageManager.java
@@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import com.samskivert.text.MessageUtil;
 import com.samskivert.util.StringUtil;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.servlet.Log.log;
 
 /**
  * The message manager handles the translation messages for a web application. The webapp should
diff --git a/src/main/java/com/samskivert/servlet/SiteResourceLoader.java b/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
index 8e12b7ff..432d5feb 100644
--- a/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
+++ b/src/main/java/com/samskivert/servlet/SiteResourceLoader.java
@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.samskivert.util.HashIntMap;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.servlet.Log.log;
 
 /**
  * Web applications may wish to load resources in such a way that the site
diff --git a/src/main/java/com/samskivert/servlet/user/UserManager.java b/src/main/java/com/samskivert/servlet/user/UserManager.java
index 6046090c..5536d5c7 100644
--- a/src/main/java/com/samskivert/servlet/user/UserManager.java
+++ b/src/main/java/com/samskivert/servlet/user/UserManager.java
@@ -20,7 +20,7 @@ import com.samskivert.util.RunQueue;
 import com.samskivert.util.StringUtil;
 import com.samskivert.util.Tuple;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.servlet.Log.log;
 
 /**
  * The user manager provides easy access to user objects for servlets. It takes care of cookie
diff --git a/src/main/java/com/samskivert/servlet/util/ExceptionMap.java b/src/main/java/com/samskivert/servlet/util/ExceptionMap.java
index 96486161..c782397f 100644
--- a/src/main/java/com/samskivert/servlet/util/ExceptionMap.java
+++ b/src/main/java/com/samskivert/servlet/util/ExceptionMap.java
@@ -9,7 +9,8 @@ import java.io.*;
 import java.util.*;
 
 import com.samskivert.util.ConfigUtil;
-import static com.samskivert.Log.log;
+
+import static com.samskivert.servlet.Log.log;
 
 /**
  * The exception map is used to map exceptions to error messages based on
diff --git a/src/main/java/com/samskivert/swing/AbsoluteLayout.java b/src/main/java/com/samskivert/swing/AbsoluteLayout.java
index b1ca14d9..76897b9c 100644
--- a/src/main/java/com/samskivert/swing/AbsoluteLayout.java
+++ b/src/main/java/com/samskivert/swing/AbsoluteLayout.java
@@ -15,7 +15,7 @@ import java.awt.Rectangle;
 
 import java.util.HashMap;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * Used to lay out components at absolute coordinates. This layout manager
diff --git a/src/main/java/com/samskivert/swing/Controller.java b/src/main/java/com/samskivert/swing/Controller.java
index 965c5792..e0912c6e 100644
--- a/src/main/java/com/samskivert/swing/Controller.java
+++ b/src/main/java/com/samskivert/swing/Controller.java
@@ -21,7 +21,7 @@ import java.awt.event.HierarchyListener;
 
 import com.samskivert.swing.event.CommandEvent;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * The controller class provides a basis for the separation of user interface
diff --git a/src/main/java/com/samskivert/swing/EnablingAdapter.java b/src/main/java/com/samskivert/swing/EnablingAdapter.java
index 93085d38..33de8148 100644
--- a/src/main/java/com/samskivert/swing/EnablingAdapter.java
+++ b/src/main/java/com/samskivert/swing/EnablingAdapter.java
@@ -10,7 +10,7 @@ import java.beans.PropertyChangeListener;
 
 import javax.swing.JComponent;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * Used to enable or disable a source component based on some
diff --git a/src/main/java/com/samskivert/swing/Label.java b/src/main/java/com/samskivert/swing/Label.java
index 99d02956..c9a1b7e1 100644
--- a/src/main/java/com/samskivert/swing/Label.java
+++ b/src/main/java/com/samskivert/swing/Label.java
@@ -37,7 +37,7 @@ import com.samskivert.util.Tuple;
 
 import com.samskivert.swing.util.SwingUtil;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * The label is a multipurpose text display mechanism that can display small amounts of text
diff --git a/src/main/java/com/samskivert/swing/Log.java b/src/main/java/com/samskivert/swing/Log.java
new file mode 100644
index 00000000..6476931e
--- /dev/null
+++ b/src/main/java/com/samskivert/swing/Log.java
@@ -0,0 +1,14 @@
+//
+// samskivert library - useful routines for java programs
+// Copyright (C) 2001-2012 Michael Bayne, et al.
+// http://github.com/samskivert/samskivert/blob/master/COPYING
+
+package com.samskivert.swing;
+
+import com.samskivert.util.Logger;
+
+/** Provides a log instance for this package (and sub-packages). */
+public class Log {
+
+    public static final Logger log = Logger.getLogger("com.samskivert.swing");
+}
diff --git a/src/main/java/com/samskivert/swing/ObjectEditorTable.java b/src/main/java/com/samskivert/swing/ObjectEditorTable.java
index ab3a0eb9..841e6188 100644
--- a/src/main/java/com/samskivert/swing/ObjectEditorTable.java
+++ b/src/main/java/com/samskivert/swing/ObjectEditorTable.java
@@ -24,7 +24,7 @@ import com.samskivert.util.ClassUtil;
 import com.samskivert.util.ListUtil;
 import com.samskivert.util.ObjectUtil;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * Allows simple displaying and editing of Objects in a table format.
diff --git a/src/main/java/com/samskivert/swing/RuntimeAdjust.java b/src/main/java/com/samskivert/swing/RuntimeAdjust.java
index 7c19c63f..176aa130 100644
--- a/src/main/java/com/samskivert/swing/RuntimeAdjust.java
+++ b/src/main/java/com/samskivert/swing/RuntimeAdjust.java
@@ -37,7 +37,7 @@ import com.samskivert.util.DebugChords;
 import com.samskivert.util.ListUtil;
 import com.samskivert.util.StringUtil;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * Provides a service where named variables can be registered as adjustable by the developer at
diff --git a/src/main/java/com/samskivert/swing/dnd/DnDManager.java b/src/main/java/com/samskivert/swing/dnd/DnDManager.java
index 3697576d..bd3173f3 100644
--- a/src/main/java/com/samskivert/swing/dnd/DnDManager.java
+++ b/src/main/java/com/samskivert/swing/dnd/DnDManager.java
@@ -30,7 +30,7 @@ import javax.swing.event.MouseInputAdapter;
 
 import com.samskivert.swing.event.AncestorAdapter;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * A custom Drag and Drop manager for use within a single JVM. Does what we
diff --git a/src/main/java/com/samskivert/swing/util/MenuUtil.java b/src/main/java/com/samskivert/swing/util/MenuUtil.java
index 61fa868d..728fc6fc 100644
--- a/src/main/java/com/samskivert/swing/util/MenuUtil.java
+++ b/src/main/java/com/samskivert/swing/util/MenuUtil.java
@@ -15,7 +15,7 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * The menu util class provides miscellaneous useful utility routines for
diff --git a/src/main/java/com/samskivert/swing/util/SwingUtil.java b/src/main/java/com/samskivert/swing/util/SwingUtil.java
index b9c29212..e351905a 100644
--- a/src/main/java/com/samskivert/swing/util/SwingUtil.java
+++ b/src/main/java/com/samskivert/swing/util/SwingUtil.java
@@ -53,7 +53,7 @@ import javax.swing.table.TableModel;
 
 import com.samskivert.util.SortableArrayList;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * Miscellaneous useful Swing-related utility functions.
diff --git a/src/main/java/com/samskivert/swing/util/TaskMaster.java b/src/main/java/com/samskivert/swing/util/TaskMaster.java
index c00efe23..fda4a3ce 100644
--- a/src/main/java/com/samskivert/swing/util/TaskMaster.java
+++ b/src/main/java/com/samskivert/swing/util/TaskMaster.java
@@ -9,7 +9,7 @@ import java.lang.reflect.Method;
 import java.util.Hashtable;
 import javax.swing.SwingUtilities;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.swing.Log.log;
 
 /**
  * The task master provides the ability for swing applications to invoke
diff --git a/src/main/java/com/samskivert/test/Log.java b/src/main/java/com/samskivert/test/Log.java
new file mode 100644
index 00000000..29afc0ad
--- /dev/null
+++ b/src/main/java/com/samskivert/test/Log.java
@@ -0,0 +1,14 @@
+//
+// samskivert library - useful routines for java programs
+// Copyright (C) 2001-2012 Michael Bayne, et al.
+// http://github.com/samskivert/samskivert/blob/master/COPYING
+
+package com.samskivert.test;
+
+import com.samskivert.util.Logger;
+
+/** Provides a log instance for this package. */
+class Log {
+
+    static final Logger log = Logger.getLogger("com.samskivert.test");
+}
diff --git a/src/main/java/com/samskivert/test/TestUtil.java b/src/main/java/com/samskivert/test/TestUtil.java
index d21c96ab..58b35092 100644
--- a/src/main/java/com/samskivert/test/TestUtil.java
+++ b/src/main/java/com/samskivert/test/TestUtil.java
@@ -9,7 +9,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.test.Log.log;
 
 /**
  * Utilities used by unit tests for the samskivert library which are
diff --git a/src/main/java/com/samskivert/util/AuditLogger.java b/src/main/java/com/samskivert/util/AuditLogger.java
index 8446f623..ce681311 100644
--- a/src/main/java/com/samskivert/util/AuditLogger.java
+++ b/src/main/java/com/samskivert/util/AuditLogger.java
@@ -18,7 +18,7 @@ import java.text.FieldPosition;
 import java.util.Calendar;
 import java.util.Date;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Used by various services to generate audit logs which can be useful for auditing, debugging and
diff --git a/src/main/java/com/samskivert/util/BasicRunQueue.java b/src/main/java/com/samskivert/util/BasicRunQueue.java
index 29c8e3b5..e47cd5b6 100644
--- a/src/main/java/com/samskivert/util/BasicRunQueue.java
+++ b/src/main/java/com/samskivert/util/BasicRunQueue.java
@@ -5,7 +5,7 @@
 
 package com.samskivert.util;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * A very basic implementation of RunQueue for general purpose use.
diff --git a/src/main/java/com/samskivert/util/Config.java b/src/main/java/com/samskivert/util/Config.java
index 1eae1338..e4dea2dd 100644
--- a/src/main/java/com/samskivert/util/Config.java
+++ b/src/main/java/com/samskivert/util/Config.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Properties;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * The config class provides a unified interaface to application configuration information. See
diff --git a/src/main/java/com/samskivert/util/ConfigUtil.java b/src/main/java/com/samskivert/util/ConfigUtil.java
index f898c891..0537dcf9 100644
--- a/src/main/java/com/samskivert/util/ConfigUtil.java
+++ b/src/main/java/com/samskivert/util/ConfigUtil.java
@@ -13,7 +13,7 @@ import java.util.Map;
 
 import com.samskivert.io.StreamUtil;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * The config util class provides routines for loading configuration information.
diff --git a/src/main/java/com/samskivert/util/DebugChords.java b/src/main/java/com/samskivert/util/DebugChords.java
index 6c7722c1..6fc83bf1 100644
--- a/src/main/java/com/samskivert/util/DebugChords.java
+++ b/src/main/java/com/samskivert/util/DebugChords.java
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import com.samskivert.util.HashIntMap;
 import com.samskivert.util.Tuple;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Provides a mechanism for causing code to be invoked when a particular
diff --git a/src/main/java/com/samskivert/util/FileUtil.java b/src/main/java/com/samskivert/util/FileUtil.java
index 02f8351e..96496e9a 100644
--- a/src/main/java/com/samskivert/util/FileUtil.java
+++ b/src/main/java/com/samskivert/util/FileUtil.java
@@ -16,7 +16,7 @@ import java.util.jar.JarFile;
 
 import com.samskivert.io.StreamUtil;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Utility methods for files.
diff --git a/src/main/java/com/samskivert/util/Interval.java b/src/main/java/com/samskivert/util/Interval.java
index b0edceb6..18a6e340 100644
--- a/src/main/java/com/samskivert/util/Interval.java
+++ b/src/main/java/com/samskivert/util/Interval.java
@@ -9,7 +9,7 @@ import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * An interface for doing operations after some delay. Allows expiration to occur on a specific
diff --git a/src/main/java/com/samskivert/util/Invoker.java b/src/main/java/com/samskivert/util/Invoker.java
index d73b4e5d..b90dc9cf 100644
--- a/src/main/java/com/samskivert/util/Invoker.java
+++ b/src/main/java/com/samskivert/util/Invoker.java
@@ -9,7 +9,7 @@ import java.util.HashMap;
 
 import java.util.concurrent.Executor;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * The invoker is used to invoke self-contained units of code on an invoking thread. Each invoker
diff --git a/src/main/java/com/samskivert/util/Lifecycle.java b/src/main/java/com/samskivert/util/Lifecycle.java
index 1e338b27..87158633 100644
--- a/src/main/java/com/samskivert/util/Lifecycle.java
+++ b/src/main/java/com/samskivert/util/Lifecycle.java
@@ -5,7 +5,7 @@
 
 package com.samskivert.util;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Manages the lifecycle (initialization and shutdown) of a collection of components.
diff --git a/src/main/java/com/samskivert/util/LoopingThread.java b/src/main/java/com/samskivert/util/LoopingThread.java
index 8032f7ce..81aa4cbe 100644
--- a/src/main/java/com/samskivert/util/LoopingThread.java
+++ b/src/main/java/com/samskivert/util/LoopingThread.java
@@ -5,7 +5,7 @@
 
 package com.samskivert.util;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * The looping thread provides the basic functionality for a thread that does its processing in a
diff --git a/src/main/java/com/samskivert/util/ObserverList.java b/src/main/java/com/samskivert/util/ObserverList.java
index 5e5d3054..b15752e9 100644
--- a/src/main/java/com/samskivert/util/ObserverList.java
+++ b/src/main/java/com/samskivert/util/ObserverList.java
@@ -10,7 +10,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Provides a simplified mechanism for maintaining a list of observers (or listeners or whatever
diff --git a/src/main/java/com/samskivert/util/PrefsConfig.java b/src/main/java/com/samskivert/util/PrefsConfig.java
index a34c33a1..066df836 100644
--- a/src/main/java/com/samskivert/util/PrefsConfig.java
+++ b/src/main/java/com/samskivert/util/PrefsConfig.java
@@ -16,7 +16,7 @@ import java.util.prefs.AbstractPreferences;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Extends the {@link Config} mechanism to allow the modification of configuration values, which
@@ -51,7 +51,7 @@ public class PrefsConfig extends Config
      */
     public PrefsConfig (String path, Properties props)
     {
-        super(path, props);
+        super(props);
 
         try {
             _prefs = Preferences.userRoot().node(path);
diff --git a/src/main/java/com/samskivert/util/RandomUtil.java b/src/main/java/com/samskivert/util/RandomUtil.java
index 5d61e356..af21106c 100644
--- a/src/main/java/com/samskivert/util/RandomUtil.java
+++ b/src/main/java/com/samskivert/util/RandomUtil.java
@@ -13,7 +13,7 @@ import java.util.Random;
 
 import com.samskivert.annotation.ReplacedBy;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Provides miscellaneous utility routines to simplify obtaining useful random number values and to
diff --git a/src/main/java/com/samskivert/util/RepeatCallTracker.java b/src/main/java/com/samskivert/util/RepeatCallTracker.java
index bfdc7996..5f1c35f7 100644
--- a/src/main/java/com/samskivert/util/RepeatCallTracker.java
+++ b/src/main/java/com/samskivert/util/RepeatCallTracker.java
@@ -8,7 +8,7 @@ package com.samskivert.util;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * A class used to debug situations where a method that should be called
diff --git a/src/main/java/com/samskivert/util/RunAnywhere.java b/src/main/java/com/samskivert/util/RunAnywhere.java
index 6c345d00..ef0f6836 100644
--- a/src/main/java/com/samskivert/util/RunAnywhere.java
+++ b/src/main/java/com/samskivert/util/RunAnywhere.java
@@ -7,7 +7,7 @@ package com.samskivert.util;
 
 import java.awt.event.InputEvent;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * <cite>Write once, run anywhere.</cite> Well, at least that's what it
diff --git a/src/main/java/com/samskivert/util/Runnables.java b/src/main/java/com/samskivert/util/Runnables.java
index d95227bc..8721bb7e 100644
--- a/src/main/java/com/samskivert/util/Runnables.java
+++ b/src/main/java/com/samskivert/util/Runnables.java
@@ -9,7 +9,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Runnable related utility methods.
diff --git a/src/main/java/com/samskivert/util/SerialExecutor.java b/src/main/java/com/samskivert/util/SerialExecutor.java
index 3302221a..fee9d2b3 100644
--- a/src/main/java/com/samskivert/util/SerialExecutor.java
+++ b/src/main/java/com/samskivert/util/SerialExecutor.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 
 import java.util.concurrent.Executor;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.util.UtilLog.log;
 
 /**
  * Executes tasks serially, but each one on a separate thread. If a task times
diff --git a/src/main/java/com/samskivert/util/UtilLog.java b/src/main/java/com/samskivert/util/UtilLog.java
new file mode 100644
index 00000000..72554734
--- /dev/null
+++ b/src/main/java/com/samskivert/util/UtilLog.java
@@ -0,0 +1,12 @@
+//
+// samskivert library - useful routines for java programs
+// Copyright (C) 2001-2012 Michael Bayne, et al.
+// http://github.com/samskivert/samskivert/blob/master/COPYING
+
+package com.samskivert.util;
+
+/** Provides a log instance for this package. */
+class UtilLog {
+
+    static final Logger log = Logger.getLogger("com.samskivert");
+}
diff --git a/src/main/java/com/samskivert/velocity/Application.java b/src/main/java/com/samskivert/velocity/Application.java
index cd59d853..a5c6109b 100644
--- a/src/main/java/com/samskivert/velocity/Application.java
+++ b/src/main/java/com/samskivert/velocity/Application.java
@@ -25,7 +25,7 @@ import com.samskivert.servlet.util.FriendlyException;
 import com.samskivert.servlet.util.RequestUtils;
 import com.samskivert.util.StringUtil;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.servlet.Log.log;
 
 /**
  * The servlet API defines the concept of a web application and associates certain attributes with
diff --git a/src/main/java/com/samskivert/velocity/DispatcherServlet.java b/src/main/java/com/samskivert/velocity/DispatcherServlet.java
index 85c840ef..f88c0c55 100644
--- a/src/main/java/com/samskivert/velocity/DispatcherServlet.java
+++ b/src/main/java/com/samskivert/velocity/DispatcherServlet.java
@@ -42,7 +42,7 @@ import com.samskivert.servlet.util.FriendlyException;
 import com.samskivert.util.ConfigUtil;
 import com.samskivert.util.StringUtil;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.servlet.Log.log;
 
 /**
  * The dispatcher servlet builds upon Velocity's architecture. It does so in the following ways:
diff --git a/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java b/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java
index 498a08a6..a19cde64 100644
--- a/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java
+++ b/src/main/java/com/samskivert/velocity/SiteJarResourceLoader.java
@@ -13,7 +13,8 @@ import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.resource.Resource;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
 
-import com.samskivert.Log;
+// we can't static import log because ResourceLoader defines a log that shadows it
+import com.samskivert.servlet.Log;
 import com.samskivert.servlet.SiteIdentifier;
 import com.samskivert.servlet.SiteResourceLoader;
 
diff --git a/src/main/java/com/samskivert/velocity/SiteKey.java b/src/main/java/com/samskivert/velocity/SiteKey.java
index d1767c1b..9847f109 100644
--- a/src/main/java/com/samskivert/velocity/SiteKey.java
+++ b/src/main/java/com/samskivert/velocity/SiteKey.java
@@ -5,7 +5,7 @@
 
 package com.samskivert.velocity;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.servlet.Log.log;
 
 /**
  * Decodes a compound Velocity resource name plus site identifier.
diff --git a/src/main/java/com/samskivert/velocity/SiteResourceManager.java b/src/main/java/com/samskivert/velocity/SiteResourceManager.java
index e33fd634..9615ade4 100644
--- a/src/main/java/com/samskivert/velocity/SiteResourceManager.java
+++ b/src/main/java/com/samskivert/velocity/SiteResourceManager.java
@@ -15,7 +15,8 @@ import org.apache.velocity.runtime.resource.ResourceFactory;
 import org.apache.velocity.runtime.resource.ResourceManagerImpl;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
 
-import com.samskivert.Log;
+// we can't static import log because ResourceManagerImpl defines a log that shadows it
+import com.samskivert.servlet.Log;
 import com.samskivert.servlet.SiteIdentifier;
 import com.samskivert.servlet.SiteResourceLoader;
 
diff --git a/src/main/java/com/samskivert/velocity/VelocityUtil.java b/src/main/java/com/samskivert/velocity/VelocityUtil.java
index 123e8b04..1db89728 100644
--- a/src/main/java/com/samskivert/velocity/VelocityUtil.java
+++ b/src/main/java/com/samskivert/velocity/VelocityUtil.java
@@ -9,7 +9,7 @@ import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.log.LogChute;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.servlet.Log.log;
 
 /**
  * Handy Velocity-related routines.
diff --git a/src/main/java/com/samskivert/xml/CheckVersionRule.java b/src/main/java/com/samskivert/xml/CheckVersionRule.java
index f8d7fc31..12c49a96 100644
--- a/src/main/java/com/samskivert/xml/CheckVersionRule.java
+++ b/src/main/java/com/samskivert/xml/CheckVersionRule.java
@@ -7,7 +7,7 @@ package com.samskivert.xml;
 
 import org.apache.commons.digester.Rule;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.xml.Log.log;
 
 /**
  * Used to compare a file format version number in an XML file with the
diff --git a/src/main/java/com/samskivert/xml/Log.java b/src/main/java/com/samskivert/xml/Log.java
new file mode 100644
index 00000000..ff459124
--- /dev/null
+++ b/src/main/java/com/samskivert/xml/Log.java
@@ -0,0 +1,14 @@
+//
+// samskivert library - useful routines for java programs
+// Copyright (C) 2001-2012 Michael Bayne, et al.
+// http://github.com/samskivert/samskivert/blob/master/COPYING
+
+package com.samskivert.xml;
+
+import com.samskivert.util.Logger;
+
+/** Provides a log instance for this package. */
+class Log {
+
+    static final Logger log = Logger.getLogger("com.samskivert.xml");
+}
diff --git a/src/main/java/com/samskivert/xml/SimpleParser.java b/src/main/java/com/samskivert/xml/SimpleParser.java
index 2233a422..aaab4247 100644
--- a/src/main/java/com/samskivert/xml/SimpleParser.java
+++ b/src/main/java/com/samskivert/xml/SimpleParser.java
@@ -11,7 +11,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.xml.sax.*;
 import org.xml.sax.helpers.DefaultHandler;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.xml.Log.log;
 
 /**
  * The simple parser class provides an extensible object that is