From 6178cba159cc218142178bd384942e7cb5b8b868 Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 2 Mar 2001 01:22:07 +0000
Subject: [PATCH] Moved shared Log instance to top-level so that all classes in
 the samskivert package can make use of it. Having one log instance for the
 whole samskivert package seems more reasonable at present than one log
 instance for each of the subpackages.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@68 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../src/java/com/samskivert/{webmacro => }/Log.java       | 8 ++++----
 projects/samskivert/src/java/com/samskivert/Makefile      | 3 ++-
 .../java/com/samskivert/webmacro/DispatcherServlet.java   | 3 ++-
 .../src/java/com/samskivert/webmacro/ExceptionMap.java    | 3 ++-
 .../src/java/com/samskivert/webmacro/FormUtil.java        | 3 ++-
 .../samskivert/src/java/com/samskivert/webmacro/Makefile  | 3 +--
 6 files changed, 13 insertions(+), 10 deletions(-)
 rename projects/samskivert/src/java/com/samskivert/{webmacro => }/Log.java (79%)

diff --git a/projects/samskivert/src/java/com/samskivert/webmacro/Log.java b/projects/samskivert/src/java/com/samskivert/Log.java
similarity index 79%
rename from projects/samskivert/src/java/com/samskivert/webmacro/Log.java
rename to projects/samskivert/src/java/com/samskivert/Log.java
index eed018a1..723be594 100644
--- a/projects/samskivert/src/java/com/samskivert/webmacro/Log.java
+++ b/projects/samskivert/src/java/com/samskivert/Log.java
@@ -1,16 +1,16 @@
 //
-// $Id: Log.java,v 1.3 2001/03/01 21:06:22 mdb Exp $
+// $Id: Log.java,v 1.1 2001/03/02 01:22:07 mdb Exp $
 
-package com.samskivert.webmacro;
+package com.samskivert;
 
 /**
  * A placeholder class that contains a reference to the log object used by
- * the webmacro package.
+ * the samskivert package.
  */
 public class Log
 {
     public static com.samskivert.util.Log log =
-	new com.samskivert.util.Log("com.samskivert.webmacro");
+	new com.samskivert.util.Log("samskivert");
 
     /** Convenience function. */
     public static void debug (String message)
diff --git a/projects/samskivert/src/java/com/samskivert/Makefile b/projects/samskivert/src/java/com/samskivert/Makefile
index e3bc7cb2..a44bdabf 100644
--- a/projects/samskivert/src/java/com/samskivert/Makefile
+++ b/projects/samskivert/src/java/com/samskivert/Makefile
@@ -1,8 +1,9 @@
 #
-# $Id: Makefile,v 1.1 2001/02/15 01:47:55 mdb Exp $
+# $Id: Makefile,v 1.2 2001/03/02 01:22:07 mdb Exp $
 
 ROOT = ../..
 
 SRCS = \
+	Log.java \
 
 include $(ROOT)/build/Makefile.java
diff --git a/projects/samskivert/src/java/com/samskivert/webmacro/DispatcherServlet.java b/projects/samskivert/src/java/com/samskivert/webmacro/DispatcherServlet.java
index 403d2aad..2be63f60 100644
--- a/projects/samskivert/src/java/com/samskivert/webmacro/DispatcherServlet.java
+++ b/projects/samskivert/src/java/com/samskivert/webmacro/DispatcherServlet.java
@@ -1,5 +1,5 @@
 //
-// $Id: DispatcherServlet.java,v 1.4 2001/03/01 21:09:54 mdb Exp $
+// $Id: DispatcherServlet.java,v 1.5 2001/03/02 01:22:07 mdb Exp $
 
 package com.samskivert.webmacro;
 
@@ -16,6 +16,7 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
+import com.samskivert.Log;
 import com.samskivert.util.ConfigUtil;
 import com.samskivert.util.StringUtil;
 import org.webmacro.*;
diff --git a/projects/samskivert/src/java/com/samskivert/webmacro/ExceptionMap.java b/projects/samskivert/src/java/com/samskivert/webmacro/ExceptionMap.java
index 7c88c566..56b67d40 100644
--- a/projects/samskivert/src/java/com/samskivert/webmacro/ExceptionMap.java
+++ b/projects/samskivert/src/java/com/samskivert/webmacro/ExceptionMap.java
@@ -1,11 +1,12 @@
 //
-// $Id: ExceptionMap.java,v 1.3 2001/02/16 03:27:54 mdb Exp $
+// $Id: ExceptionMap.java,v 1.4 2001/03/02 01:22:07 mdb Exp $
 
 package com.samskivert.webmacro;
 
 import java.io.*;
 import java.util.*;
 
+import com.samskivert.Log;
 import com.samskivert.util.ConfigUtil;
 import com.samskivert.util.StringUtil;
 
diff --git a/projects/samskivert/src/java/com/samskivert/webmacro/FormUtil.java b/projects/samskivert/src/java/com/samskivert/webmacro/FormUtil.java
index 93884fef..21e27068 100644
--- a/projects/samskivert/src/java/com/samskivert/webmacro/FormUtil.java
+++ b/projects/samskivert/src/java/com/samskivert/webmacro/FormUtil.java
@@ -1,5 +1,5 @@
 //
-// $Id: FormUtil.java,v 1.2 2001/03/01 21:06:22 mdb Exp $
+// $Id: FormUtil.java,v 1.3 2001/03/02 01:22:07 mdb Exp $
 
 package com.samskivert.webmacro;
 
@@ -7,6 +7,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.samskivert.Log;
 import com.samskivert.util.StringUtil;
 import org.webmacro.servlet.WebContext;
 
diff --git a/projects/samskivert/src/java/com/samskivert/webmacro/Makefile b/projects/samskivert/src/java/com/samskivert/webmacro/Makefile
index 5b81698d..8d4eadc8 100644
--- a/projects/samskivert/src/java/com/samskivert/webmacro/Makefile
+++ b/projects/samskivert/src/java/com/samskivert/webmacro/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 2001/03/01 21:06:22 mdb Exp $
+# $Id: Makefile,v 1.5 2001/03/02 01:22:07 mdb Exp $
 
 ROOT = ../../..
 
@@ -10,7 +10,6 @@ SRCS = \
 	ExceptionMap.java \
 	FormUtil.java \
 	FriendlyException.java \
-	Log.java \
 	Logic.java \
 
 include $(ROOT)/build/Makefile.java