code now clean compiles using newer versions of various libraries - this will

all get documented properly soon, need to update this for the new server...
also changed all the E-mail addresses in the old java source to match present
reality

build.properties.sample

@@ -8,9 +8,9 @@
 #
 # The Original Code is the Venice Web Communities System.
 #
-# The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+# The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
 # for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-# Copyright (C) 2003-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+# Copyright (C) 2003-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 #
 # Contributor(s): 
 #########################################################################################
@@ -25,43 +25,48 @@
 deploy.home=/home/erbo/venice
 # javadoc.home=${deploy.home}/javadoc
 
-# [Location of Servlet API 2.3]
+# [Location of Servlet API 2.4]
-servlet.base=/usr/local/java/jakarta-tomcat-4.1.29
+servlet.base=/usr/local/java/apache-tomcat-5.5.15
 servlet.lib=${servlet.base}/common/lib
-# servlet.jarfile=servlet.jar
+# servlet.jarfile=servlet-api.jar
 
-# [Location of Commons Collections Library 2.1]
+# [Location of JSP API 2.0]
-collections.base=/usr/local/java/commons-collections-2.1
+jsp.base=/usr/local/java/apache-tomcat-5.5.15
+jsp.lib=${jsp.base}/common/lib
+# jsp.jarfile=jsp-api.jar
+
+# [Location of Commons Collections Library 3.1]
+collections.base=/usr/local/java/commons-collections-3.1
 # collections.lib=${collections.base}
-# collections.jarfile=commons-collections.jar
+# collections.jarfile=commons-collections-3.1.jar
 
-# [Location of Commons Codec Library 1.2]
+# [Location of Commons Codec Library 1.3]
-codec.base=/usr/local/java/commons-codec-1.2
+codec.base=/usr/local/java/commons-codec-1.3
 # codec.lib=${codec.base}
-# codec.jarfile=commons-codec-1.2.jar
+# codec.jarfile=commons-codec-1.3.jar
 
-# [Location of Commons HTTP Client Library 2.0.2]
+# [Location of Commons HTTP Client Library 3.0]
-httpclient.base=/usr/local/java/commons-httpclient-2.0.2
+httpclient.base=/usr/local/java/commons-httpclient-3.0
 # httpclient.lib=${httpclient.base}
-# httpclient.jarfile=commons-httpclient-2.0.2.jar
+# httpclient.jarfile=commons-httpclient-3.0.jar
 
-# [Location of Jakarta Regexp Library 1.3]
+# [Location of Jakarta Regexp Library 1.4]
-regexp.base=/usr/local/java/jakarta-regexp-1.3
+regexp.base=/usr/local/java/jakarta-regexp-1.4
 # regexp.lib=${regexp.base}
-# regexp.jarfile=jakarta-regexp-1.3.jar
+# regexp.jarfile=jakarta-regexp-1.4.jar
 
-# [Location of Log4J 1.2.8]
+# [Location of Log4J 1.2.13]
-log4j.base=/usr/local/java/jakarta-log4j-1.2.8
+log4j.base=/usr/local/java/logging-log4j-1.2.13
 # log4j.lib=${log4j.base}/dist/lib
-# log4j.jarfile=log4j-1.2.8.jar
+# log4j.jarfile=log4j-1.2.13.jar
 
 # [Location of Bean Scripting Framework 2.3]
 bsf.base=/usr/local/java/bsf-2.3.0
 # bsf.lib=${bsf.base}/lib
 # bsf.jarfile=bsf.jar
 
-# [Location of Jacl 1.3.1]
+# [Location of Jacl 1.3.2]
-jacl.base=/usr/local/java/jacl1.3.1
+jacl.base=/usr/local/java/jacl1.3.2
 # jacl.lib=${jacl.base}
 # jacl.jarfile=jacl.jar
 # jacl.tcljarfile=tcljava.jar

build.xml

@@ -10,9 +10,9 @@
 
     The Original Code is the Venice Web Communities System.
 
-    The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+    The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
@@ -38,42 +38,47 @@
   <property name="deploy.home" value="../venice"/>
   <property name="javadoc.home" value="${deploy.home}/javadoc"/>
 
-  <!-- [Location of Servlet API 2.3] -->
+  <!-- [Location of Servlet API 2.4] -->
   <property name="servlet.base" value="../servletapi"/>
   <property name="servlet.lib" value="${servlet.base}/lib"/>
-  <property name="servlet.jarfile" value="servlet.jar"/>
+  <property name="servlet.jarfile" value="servlet-api.jar"/>
 
-  <!-- [Location of Commons Collections Library 2.1] -->
+  <!-- [Location of JSP API 2.0] -->
+  <property name="jsp.base" value="../jspapi"/>
+  <property name="jsp.lib" value="${jsp.base}/lib"/>
+  <property name="jsp.jarfile" value="jsp-api.jar"/>
+
+  <!-- [Location of Commons Collections Library 3.1] -->
   <property name="collections.base" value="../commons-collections"/>
   <property name="collections.lib" value="${collections.base}"/>
-  <property name="collections.jarfile" value="commons-collections.jar"/>
+  <property name="collections.jarfile" value="commons-collections-3.1.jar"/>
 
-  <!-- [Location of Commons Codec Library 1.2] -->
+  <!-- [Location of Commons Codec Library 1.3] -->
   <property name="codec.base" value="../commons-codec"/>
   <property name="codec.lib" value="${codec.base}"/>
-  <property name="codec.jarfile" value="commons-codec-1.2.jar"/>
+  <property name="codec.jarfile" value="commons-codec-1.3.jar"/>
 
-  <!-- [Location of Commons HTTP Client Library 2.0.2] -->
+  <!-- [Location of Commons HTTP Client Library 3.0] -->
   <property name="httpclient.base" value="../commons-httpclient"/>
   <property name="httpclient.lib" value="${httpclient.base}"/>
-  <property name="httpclient.jarfile" value="commons-httpclient-2.0.2.jar"/>
+  <property name="httpclient.jarfile" value="commons-httpclient-3.0.jar"/>
 
-  <!-- [Location of Jakarta Regexp Library 1.3] -->
+  <!-- [Location of Jakarta Regexp Library 1.4] -->
   <property name="regexp.base" value="../jakarta-regexp"/>
   <property name="regexp.lib" value="${regexp.base}"/>
-  <property name="regexp.jarfile" value="jakarta-regexp-1.3.jar"/>
+  <property name="regexp.jarfile" value="jakarta-regexp-1.4.jar"/>
 
-  <!-- [Location of Log4J 1.2.8] -->
+  <!-- [Location of Log4J 1.2.13] -->
   <property name="log4j.base" value="../log4j"/>
   <property name="log4j.lib" value="${log4j.base}/dist/lib"/>
-  <property name="log4j.jarfile" value="log4j-1.2.8.jar"/>
+  <property name="log4j.jarfile" value="log4j-1.2.13.jar"/>
 
   <!-- [Location of Bean Scripting Framework 2.3] -->
   <property name="bsf.base" value="../bsf"/>
   <property name="bsf.lib" value="${bsf.base}/lib"/>
   <property name="bsf.jarfile" value="bsf.jar"/>
 
-  <!-- [Location of Jacl 1.3.1] -->
+  <!-- [Location of Jacl 1.3.2] -->
   <property name="jacl.base" value="../jacl"/>
   <property name="jacl.lib" value="${jacl.base}"/>
   <property name="jacl.jarfile" value="jacl.jar"/>
@@ -95,6 +100,7 @@
 
   <path id="base.build.path">
     <fileset dir="${servlet.lib}" includes="${servlet.jarfile}"/>
+    <fileset dir="${jsp.lib}" includes="${jsp.jarfile}"/>
     <fileset dir="${collections.lib}" includes="${collections.jarfile}"/>
     <fileset dir="${codec.lib}" includes="${codec.jarfile}"/>
     <fileset dir="${httpclient.lib}" includes="${httpclient.jarfile}"/>
@@ -119,7 +125,7 @@
 
   <target name="compile" depends="buildprep">
     <javac srcdir="src" destdir="buildwork" debug="${compile.debug}" optimize="${compile.optimize}"
-           deprecation="${compile.deprecation}">
+           deprecation="${compile.deprecation}" source="1.3" target="1.3">
       <classpath>
 	<pathelement location="buildwork"/>
         <path refid="base.build.path"/>

src/com/silverwrist/util/AnyCharMatcher.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -22,7 +22,7 @@ package com.silverwrist.util;
  * multiple characters.  It locates the first instance within a string of <EM>any</EM> of
  * the specified characters.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see java.lang.String#indexOf(char)
  * @see java.lang.String#lastIndexOf(char)

src/com/silverwrist/util/Base64EncodeInputStream.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/util/Country.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -20,7 +20,7 @@ package com.silverwrist.util;
 /**
  * A utility class used by <CODE>International</CODE> that stores a country code and name pair.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see International
  */

src/com/silverwrist/util/DOMElementHelper.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -23,8 +23,8 @@ import org.w3c.dom.*;
  * A class which wraps around the DOM {@link org.w3c.dom.Element Element} class, providing some
  * additional functionality.
  *
- * @author Eric J. Bowersox &lt;erbo@ricochet.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
- * @version $Id$
+ * @version $Id: DOMElementHelper.java,v 1.9 2004/12/30 05:55:01 erbo Exp $
  * @see org.w3c.dom.Element
  */
 public final class DOMElementHelper

src/com/silverwrist/util/IOUtil.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -23,7 +23,7 @@ import java.io.*;
  * A collection of IO-related static methods which are useful in various contexts.<P>
  * Some of the concepts in this class have been borrowed from Apache Jakarta Avalon Excalibur 4.0.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  */
 public class IOUtil

src/com/silverwrist/util/IPv4Util.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/util/International.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -24,7 +24,7 @@ import java.util.*;
  * A class which centralizes a number of "international" resources, such as locales,
  * country lists, and language lists.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  */
 public class International

src/com/silverwrist/util/Language.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -20,7 +20,7 @@ package com.silverwrist.util;
 /**
  * A utility class used by <CODE>International</CODE> that stores a language code and name pair.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see International
  */

src/com/silverwrist/util/OptionSet.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -23,7 +23,7 @@ import java.util.BitSet;
  * A variant of the <CODE>BitSet</CODE> that can express itself as a character string, where each
  * character represents a flag that is "set."  Up to 91 flags can be specified pre <CODE>OptionSet</CODE>.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see java.util.BitSet
  */

src/com/silverwrist/util/ServletMultipartException.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -23,7 +23,7 @@ import java.io.PrintWriter;
 /**
  * An exception thrown by <CODE>ServletMultipartHandler</CODE> in certain circumstances.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see ServletMultipartHandler
  */

src/com/silverwrist/util/ServletMultipartHandler.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -25,7 +25,7 @@ import javax.activation.DataSource;
 import javax.mail.*;
 import javax.mail.internet.*;
 import javax.servlet.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 
 // This class was built in a process I call "Java Junkyard Wars," in which I put together
 // a bunch of APIs in ways that their designers would never have anticipated.  It's
@@ -42,7 +42,7 @@ import org.apache.log4j.*;
  * pass the request to the constructor of this class, and then use the methods of this class to extract both
  * file and non-file parameters.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see ServletMultipartException
  * @see javax.servlet.ServletRequest
@@ -365,7 +365,8 @@ public final class ServletMultipartHandler
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(ServletMultipartHandler.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(ServletMultipartHandler.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/util/StockMessages.java

@@ -9,16 +9,16 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.util;
 
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import org.w3c.dom.*;
 
 public final class StockMessages
@@ -28,7 +28,8 @@ public final class StockMessages
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(StockMessages.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(StockMessages.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/util/StringUtil.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -22,7 +22,7 @@ import java.util.*;
 /**
  * A collection of string-related static methods which are useful in various contexts.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  */
 public class StringUtil

src/com/silverwrist/util/cache/CacheMap.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -26,7 +26,7 @@ import java.util.*;
  * more memory; also, if too many entries are added to the map, certain entries will be removed in
  * accordance with the supplied or default <CODE>CacheMapStrategy</CODE> object.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see CacheMapStrategy
  * @see java.util.Map

src/com/silverwrist/util/cache/CacheMapEntry.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -26,7 +26,7 @@ import java.util.*;
  * The latter two values are frequently used by an object implementing the <CODE>CacheMapStrategy</CODE>
  * interface to compute a "figure of merit" for the entry that decides whether or not it gets discarded.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see CacheMap
  * @see CacheMapStrategy

src/com/silverwrist/util/cache/CacheMapStrategy.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -21,7 +21,7 @@ package com.silverwrist.util.cache;
  * An interface which allows external code to define a "strategy" for use with the <CODE>CacheMap</CODE>
  * object, in deciding which entries in the map are to be released.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see CacheMap
  */

src/com/silverwrist/util/cache/ObjectCache.java

@@ -9,23 +9,24 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.util.cache;
 
-import org.apache.commons.collections.*;
+import org.apache.commons.collections.map.LRUMap;
+import org.apache.commons.collections.map.ReferenceMap;
 
 /**
  * A chache which stores objects by key value, and is capable of creating them given an instance of
- * <CODE>ObjectFactory</CODE> to do the creating.  The cache uses <CODE>SoftReferences</CODE> which can
+ * <code>ObjectFactory</code> to do the creating.  The cache uses <code>SoftReferences</code> which can
  * automatically be removed by the garbage collector if necessary.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
- * @version X
+ * @version $Id$
  * @see ObjectFactory
  */
 public class ObjectCache
@@ -35,9 +36,14 @@ public class ObjectCache
    *--------------------------------------------------------------------------------
    */
 
-  private ReferenceMap the_data = new ReferenceMap(ReferenceMap.HARD,ReferenceMap.SOFT); // actual main data store
+  /** The main data store for the object cache. */
-  private LRUMap mru_cache;                                // most-recently-used map
+  private ReferenceMap the_data = new ReferenceMap(ReferenceMap.HARD,ReferenceMap.SOFT);
-  private ObjectFactory factory;                           // used to create new objects
+
+  /** Holds the most-recently-used objects. */
+  private LRUMap mru_cache;
+
+  /** Factory object which creates new objects. */
+  private ObjectFactory factory;
 
   /*--------------------------------------------------------------------------------
    * Constructor
@@ -45,10 +51,10 @@ public class ObjectCache
    */
 
   /**
-   * Creates a new <CODE>ObjectCache</CODE>.
+   * Creates a new <code>ObjectCache</code>.
    *
-   * @param factory The factory object used to create new objects when <CODE>getOrCreate</CODE> is called.
+   * @param factory The factory object used to create new objects when <code>getOrCreate</code> is called.
-   * @exception java.lang.NullPointerException The object factory passed in is <CODE>null</CODE>.
+   * @exception java.lang.NullPointerException The object factory passed in is <code>null</code>.
    */
   public ObjectCache(ObjectFactory factory)
   {
@@ -57,11 +63,11 @@ public class ObjectCache
   } // end constructor
 
   /**
-   * Creates a new <CODE>ObjectCache</CODE>.
+   * Creates a new <code>ObjectCache</code>.
    *
-   * @param factory The factory object used to create new objects when <CODE>getOrCreate</CODE> is called.
+   * @param factory The factory object used to create new objects when <code>getOrCreate</code> is called.
    * @param lru_size How many objects to maintain hard references to.
-   * @exception java.lang.NullPointerException The object factory passed in is <CODE>null</CODE>.
+   * @exception java.lang.NullPointerException The object factory passed in is <code>null</code>.
    */
   public ObjectCache(ObjectFactory factory, int lru_size)
   {
@@ -81,7 +87,7 @@ public class ObjectCache
    * Retrieves an object from the cache.
    *
    * @param key The key value of the object to look up.
-   * @return The corresponding object value, or <CODE>null</CODE> if that object isn't in the cache.
+   * @return The corresponding object value, or <code>null</code> if that object isn't in the cache.
    */
   public synchronized Object get(Object key)
   {

src/com/silverwrist/util/cache/ObjectCacheException.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -21,7 +21,7 @@ package com.silverwrist.util.cache;
  * An exception thrown by the <CODE>ObjectCache</CODE> in unusual circumstances.  The main reason why this
  * exception would be thrown is if some code tried to register an object that was already in the cache.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see ObjectCache#register(java.lang.Object,java.lang.Object)
  */

src/com/silverwrist/util/cache/ObjectFactory.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/util/cache/ObjectFactoryException.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -24,7 +24,7 @@ import java.io.PrintWriter;
  * The exception which may be thrown by <CODE>ObjectFactory.newObject</CODE>, which wraps any exception
  * that might be thrown by constructors or other method calls within the method.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see ObjectFactory#newObject(java.lang.Object)
  */

src/com/silverwrist/util/image/ImageLengthPair.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -23,7 +23,7 @@ import java.io.InputStream;
  * A class used to return both an image's length in bytes and an <CODE>InputStream</CODE> containing
  * its data.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see ImageNormalizer
  */

src/com/silverwrist/util/image/ImageNormalizer.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -30,7 +30,7 @@ import com.sun.media.jai.codec.*;
  * a black backdrop (so the image will be "letterboxed" if it has a larger H:V aspect ratio than the bounding
  * box, or "pillarboxed" if it has a smaller H:V aspect ratio than the bounding box).
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  */
 public class ImageNormalizer

src/com/silverwrist/util/image/ImageNormalizerException.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
@@ -24,7 +24,7 @@ import java.io.PrintWriter;
  * An exception thrown by <CODE>ImageNormalizer</CODE> when the normalizer encounters an error in
  * its input image.
  *
- * @author Eric J. Bowersox &lt;erbo@silcom.com&gt;
+ * @author Eric J. Bowersox &lt;erbo@users.sf.net&gt;
  * @version X
  * @see ImageNormalizer
  */

src/com/silverwrist/util/test/FormDataTest.java

@@ -4,12 +4,12 @@ import java.io.*;
 import java.util.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.*;
 
 public class FormDataTest extends HttpServlet
 {
-  private static Category logger = Category.getInstance(FormDataTest.class.getName());
+  private static final Logger logger = Logger.getLogger(FormDataTest.class);
 
   public void doGet(HttpServletRequest request, HttpServletResponse response)
     throws IOException, ServletException

src/com/silverwrist/venice/core/ActiveUser.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/AdminOperations.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/AdminUserContext.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/AdminUserProperties.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/Advertisement.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/AuditData.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/BinaryData.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/CategoryDescriptor.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/CommunityContext.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/CommunityHideMode.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/CommunityProperties.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/ConferenceContext.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/ConferenceHotlistEntry.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/ConferenceProperties.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/ContactInfo.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/GlobalProperties.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/IPBanInfo.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/SearchMode.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/SecurityInfo.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/ServiceGroup.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/ServiceToken.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/SideBoxDescriptor.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/Startup.java

@@ -9,15 +9,15 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.venice.core;
 
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import org.w3c.dom.*;
 import com.silverwrist.util.DOMElementHelper;
 import com.silverwrist.venice.except.*;
@@ -30,7 +30,8 @@ public class Startup
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(Startup.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(Startup.class);
 
   /*--------------------------------------------------------------------------------
    * Constructor

src/com/silverwrist/venice/core/TopicContext.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/TopicMessageContext.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/TopicMessageFound.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/UserContext.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/UserFound.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/UserProfile.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/UserProperties.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/UserSideBoxDescriptor.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/VeniceEngine.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/ActiveUserImpl.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/AdminOperationsImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.*;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.*;
@@ -143,7 +143,8 @@ class AdminOperationsImpl implements AdminOperations
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(AdminOperationsImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(AdminOperationsImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/AdminUserContextImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,7 +20,7 @@ package com.silverwrist.venice.core.impl;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.*;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.*;
@@ -37,7 +37,8 @@ class AdminUserContextImpl implements AdminUserContext
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(AdminUserContextImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(AdminUserContextImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/AdvertisementImpl.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/BackgroundCommunityPurge.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.cache.ObjectCache;
 import com.silverwrist.venice.core.internals.*;
 import com.silverwrist.venice.db.*;
@@ -34,7 +34,8 @@ class BackgroundCommunityPurge implements Runnable
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(BackgroundCommunityPurge.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(BackgroundCommunityPurge.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/BackgroundConferencePurge.java

@@ -9,16 +9,16 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.venice.db.*;
 import com.silverwrist.venice.except.InternalStateError;
 import com.silverwrist.venice.core.internals.*;
@@ -31,7 +31,8 @@ class BackgroundConferencePurge implements Runnable
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(BackgroundConferencePurge.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(BackgroundConferencePurge.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/BackgroundTopicPurge.java

@@ -9,16 +9,16 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.venice.db.*;
 import com.silverwrist.venice.core.internals.*;
 import com.silverwrist.venice.svc.*;
@@ -30,7 +30,8 @@ class BackgroundTopicPurge implements Runnable
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(BackgroundTopicPurge.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(BackgroundTopicPurge.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/CategoryDescriptorImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.venice.db.*;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.EnvEngine;
@@ -63,7 +63,8 @@ class CategoryDescriptorImpl implements CategoryDescriptor, Cloneable
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(CategoryDescriptorImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(CategoryDescriptorImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/CommunityCoreData.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.OptionSet;
 import com.silverwrist.util.StringUtil;
 import com.silverwrist.util.cache.*;
@@ -76,7 +76,8 @@ class CommunityCoreData implements CommunityData, PropertyProvider
 
   private static final BitSet ALL_PROPS;        // BitSet representing all properties
 
-  private static Category logger = Category.getInstance(CommunityCoreData.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(CommunityCoreData.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/CommunityUserContextImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.*;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.*;
@@ -68,7 +68,8 @@ class CommunityUserContextImpl implements CommunityContext, CommunityBackend
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(CommunityUserContextImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(CommunityUserContextImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/ConferenceCommunityContextImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.*;
 import com.silverwrist.venice.db.*;
@@ -73,7 +73,8 @@ class ConferenceCommunityContextImpl implements ConferenceCommunityContext
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(ConferenceCommunityContextImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(ConferenceCommunityContextImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/ConferenceCoreData.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,7 +20,7 @@ package com.silverwrist.venice.core.impl;
 import java.lang.ref.*;
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.OptionSet;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.*;
@@ -44,7 +44,8 @@ class ConferenceCoreData implements ConferenceData
   // Boolean property selectors
   private static final int BP_POSTPICTURES = 0;
 
-  private static Category logger = Category.getInstance(ConferenceCoreData.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(ConferenceCoreData.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/ConferenceUserContextImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,7 +20,7 @@ package com.silverwrist.venice.core.impl;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.*;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.*;
@@ -159,7 +159,8 @@ class ConferenceUserContextImpl implements ConferenceContext, ConferenceBackend
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(ConferenceUserContextImpl.class);
+  /** instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(ConferenceUserContextImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/ConferencingExporter.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/ConferencingImporter.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/ContactInfoImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,7 +20,7 @@ package com.silverwrist.venice.core.impl;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.StringUtil;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.EnvEngine;
@@ -103,42 +103,100 @@ class ContactInfoImpl implements ContactInfo, Stashable
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(ContactInfoImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(ContactInfoImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes
    *--------------------------------------------------------------------------------
    */
 
-  private int contactid;                 // ID of this contact record (-1 = new)
+  /** ID of this contact record, or -1 to indicate a new contact record. */
-  private String given_name;             // given name ("first name")
+  private int contactid;
-  private String family_name;            // family name ("last name")
+
-  private char middle_initial;           // middle initial (natch)
+  /** Contact given name ("first name"). */
-  private String prefix;                 // prefix (Mr., Ms., Prof., Dr., etc.)
+  private String given_name;
-  private String suffix;                 // suffix (Jr., III, etc.)
+
-  private String company;                // company name
+  /** Contact family name ("last name"). */
-  private String addr1;                  // address line 1
+  private String family_name;
-  private String addr2;                  // address line 2
+
-  private String locality;               // locality ("city")
+  /** Contact middle initial. */
-  private String region;                 // region ("state")
+  private char middle_initial;
-  private String postal_code;            // postal code ("ZIP code")
+
-  private String country;                // 2-character ISO 3166 country code
+  /** Contact name prefix (Mr., Ms., Prof., Dr., etc.). */
-  private String phone;                  // voice phone number
+  private String prefix;
-  private String fax;                    // facsimile (fax) number
+
-  private String mobile;                 // mobile phone (cellphone) number
+  /** Contact name suffix (Jr., III, etc.). */
-  private String email;                  // email address
+  private String suffix;
-  private String photo_url;              // URL of user photo
+
-  private String url;                    // URL of user's homepage
+  /** Contact company name. */
-  private boolean private_addr;          // are addr1 and addr2 hidden?
+  private String company;
-  private boolean private_phone;         // are phone and mobile hidden?
+
-  private boolean private_fax;           // is fax hidden?
+  /** Contact street address line 1. */
-  private boolean private_email;         // is email hidden?
+  private String addr1;
-  private int owner_uid;                 // UID that owns this contact record
+
-  private int owner_cid;                 // community ID this contact record is in (-1 for none)
+  /** Contact street address line 2. */
-  private java.util.Date last_update;    // date of last update
+  private String addr2;
-  private boolean is_modified = false;   // have we modified this ContactInfo?
+
-  private ImageHook image_hook = null;   // image hook object
+  /** Contact locality ("city"). */
-  private boolean can_set_photo;         // can we set the user photo?
+  private String locality;
+
+  /** Contact region ("state," "province"). */
+  private String region;
+
+  /** Contact postal code ("ZIP code"). */
+  private String postal_code;
+
+  /** Contact country, specified as a 2-letter country code as defined by ISO 3166. */
+  private String country;
+
+  /** Contact voice phone number. */
+  private String phone;
+
+  /** Contact facsimile (FAX) phone number. */
+  private String fax;
+
+  /** Contact mobile phone number. */
+  private String mobile;
+
+  /** Contact E-mail address. */
+  private String email;
+
+  /** URL to contact's photo. */
+  private String photo_url;
+
+  /** URL to contact's homepage. */
+  private String url;
+
+  /** If <code>true</code>, the "street address" fields will be kept private. */
+  private boolean private_addr;
+
+  /** If <code>true</code>, the phone number and mobile phone number will be kept private. */
+  private boolean private_phone;
+
+  /** If <code>true</code>, the fax number will be kept private. */
+  private boolean private_fax;
+
+  /** If <code>true</code>, the E-mail address will be kept private. */
+  private boolean private_email;
+
+  /** The ID of the user that "owns" this contact record. */
+  private int owner_uid;
+
+  /** The ID of the community this contact record is associated with, or -1 if it is not so associated. */
+  private int owner_cid;
+
+  /** The date and time this record was last updated. */
+  private java.util.Date last_update;
+
+  /** <code>true</code> if this contact information has been modified. */
+  private boolean is_modified = false;
+
+  /** "Hook" object that is called when the user photo is set. */
+  private ImageHook image_hook = null;
+
+  /** <code>true</code> if we can set the user photo. */
+  private boolean can_set_photo;
 
   /*--------------------------------------------------------------------------------
    * Constructors
@@ -146,9 +204,10 @@ class ContactInfoImpl implements ContactInfo, Stashable
    */
 
   /**
-   * Constructs a new blank <CODE>ContactInfoImpl</CODE> object.
+   * Constructs a new blank <code>ContactInfoImpl</code> object.
    *
    * @param owner_uid UID that owns this object.
+   * @param can_set_photo <code>true</code> if we can set the user photo, <code>false</code> if not.
    */
   ContactInfoImpl(int owner_uid, boolean can_set_photo)
   {
@@ -160,10 +219,11 @@ class ContactInfoImpl implements ContactInfo, Stashable
   } // end constructor
 
   /**
-   * Constructs a new blank <CODE>ContactInfoImpl</CODE> object.
+   * Constructs a new blank <code>ContactInfoImpl</code> object.
    *
    * @param owner_uid UID that owns this object.
    * @param owner_cid Community ID that owns this object.
+   * @param can_set_photo <code>true</code> if we can set the user photo, <code>false</code> if not.
    */
   ContactInfoImpl(int owner_uid, int owner_cid, boolean can_set_photo)
   {
@@ -175,10 +235,11 @@ class ContactInfoImpl implements ContactInfo, Stashable
   } // end constructor
 
   /**
-   * Loads a <CODE>ContactInfoImpl</CODE> object out of the database.
+   * Loads a <code>ContactInfoImpl</code> object out of the database.
    *
    * @param env Engine environment to get a database connection from.
    * @param contactid ID of the contact to load.
+   * @param can_set_photo <code>true</code> if we can set the user photo, <code>false</code> if not.
    * @exception DataException The contact could not be loaded for some reason.
    */
   ContactInfoImpl(EnvEngine env, int contactid, boolean can_set_photo) throws DataException

src/com/silverwrist/venice/core/impl/ImageStore.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,7 +20,7 @@ package com.silverwrist.venice.core.impl;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.IOUtil;
 import com.silverwrist.venice.db.*;
 import com.silverwrist.venice.core.*;
@@ -34,10 +34,14 @@ class ImageStore implements BinaryData
    *--------------------------------------------------------------------------------
    */
 
+  /** Indicates a user photo image type. */
   public static final short TYPE_USER_PHOTO = 1;
+
+  /** Indicates a community logo image type. */
   public static final short TYPE_COMMUNITY_LOGO = 2;
 
-  private static Category logger = Category.getInstance(ImageStore.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(ImageStore.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/MailerAgent.java

@@ -9,16 +9,17 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.venice.core.impl;
 
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
+import org.apache.log4j.NDC;
 import com.silverwrist.util.StringUtil;
 import com.silverwrist.venice.core.internals.*;
 import com.silverwrist.venice.except.*;
@@ -32,15 +33,19 @@ class MailerAgent implements Runnable
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(MailerAgent.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(MailerAgent.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes
    *--------------------------------------------------------------------------------
    */
 
-  private MailSend msend;                   // the mail sender
+  /** The actual mail sender. */
-  private List recipients;                  // who gets the message
+  private MailSend msend;
+
+  /** The list of recipients for this message. */
+  private List recipients;
 
   /*--------------------------------------------------------------------------------
    * Constructor
@@ -65,8 +70,7 @@ class MailerAgent implements Runnable
 
     try
     { // Deliver the mail to each of the target addresses in turn.
-      Iterator it = recipients.iterator();
+      for (Iterator it=recipients.iterator(); it.hasNext(); )
-      while (it.hasNext())
       { // get ready to deliver the mail...
 	String addr = (String)(it.next());
 	if (logger.isDebugEnabled())
@@ -85,7 +89,7 @@ class MailerAgent implements Runnable
 
 	} // end catch
 
-      } // end while
+      } // end for
 
     } // end try
     finally

src/com/silverwrist/venice/core/impl/PersonalMailSend.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/PostDeliveryAgent.java

@@ -9,16 +9,17 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.venice.core.impl;
 
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
+import org.apache.log4j.NDC;
 import com.silverwrist.util.StringUtil;
 import com.silverwrist.venice.core.internals.*;
 import com.silverwrist.venice.except.*;
@@ -32,18 +33,28 @@ class PostDeliveryAgent implements Runnable
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(PostDeliveryAgent.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(PostDeliveryAgent.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes
    *--------------------------------------------------------------------------------
    */
 
-  private EnvEngine env;                    // the environment
+  /** The environment for this object. */
-  private String post_text;                 // the raw post text
+  private EnvEngine env;
-  private String post_pseud;                // the raw pseud
+
-  private List delivery_addresses;          // the addresses to deliver to
+  /** The raw text of the post that was made. */
-  private Map vars;                         // the replacement variables for the templates
+  private String post_text;
+
+  /** The raw pseud of the post that was made. */
+  private String post_pseud;
+
+  /** The list of addresses to which this post must be delivered. */
+  private List delivery_addresses;
+
+  /** The replacement variables for the message templates. */
+  private Map vars;
 
   /*--------------------------------------------------------------------------------
    * Constructor

src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,7 +20,7 @@ package com.silverwrist.venice.core.impl;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.StringUtil;
 import com.silverwrist.venice.db.*;
 import com.silverwrist.venice.core.*;
@@ -34,7 +34,8 @@ class PublishedMessageImpl implements TopicMessageContext
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(PublishedMessageImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(PublishedMessageImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/PublishedMessageTopicImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.EnvEngine;
 import com.silverwrist.venice.db.*;
@@ -33,7 +33,8 @@ class PublishedMessageTopicImpl implements TopicContext
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(PublishedMessageTopicImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(PublishedMessageTopicImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/ServiceControlManager.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.lang.ref.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import org.w3c.dom.*;
 import com.silverwrist.util.*;
 import com.silverwrist.venice.core.ServiceGroup;
@@ -63,7 +63,8 @@ class ServiceControlManager implements ServiceControl
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(ServiceControlManager.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(ServiceControlManager.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/SideBoxDescriptorImpl.java

@@ -9,16 +9,16 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
 package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.*;
 import com.silverwrist.venice.db.*;
@@ -31,7 +31,8 @@ class SideBoxDescriptorImpl implements UserSideBoxDescriptor
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(SideBoxDescriptorImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(SideBoxDescriptorImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/Stashable.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/StaticCommService.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/TopicMessageFoundHelper.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/TopicMessageFoundImpl.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -21,7 +21,7 @@ import java.io.*;
 import java.sql.*;
 import java.util.*;
 import java.util.zip.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.IOUtil;
 import com.silverwrist.util.StringUtil;
 import com.silverwrist.venice.core.*;
@@ -37,7 +37,8 @@ class TopicMessageUserContextImpl implements TopicMessageContext
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(TopicMessageUserContextImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(TopicMessageUserContextImpl.class);
 
   private static final int MAX_ATTACH = 1048576;  // TODO: should be a configurable parameter
 

src/com/silverwrist/venice/core/impl/TopicUserContextImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.OptionSet;
 import com.silverwrist.util.StringUtil;
 import com.silverwrist.venice.core.*;
@@ -38,7 +38,8 @@ class TopicUserContextImpl implements TopicContext
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(TopicUserContextImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(TopicUserContextImpl.class);
 
   private static final String BY_TOPIC_QUERY =
       "SELECT topics.topicid, topics.num, topics.creator_uid, topics.top_message, topics.frozen, topics.archived, "

src/com/silverwrist/venice/core/impl/UserContextImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.util.*;
 import java.sql.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.*;
 import com.silverwrist.venice.*;
 import com.silverwrist.venice.core.*;
@@ -48,7 +48,8 @@ class UserContextImpl implements UserContext, ServiceProvider, PropertyProvider
   static final int BF_ADM_NOPHOTO = 1;
   static final int BF_MASSMAIL_OPTOUT = 2;
 
-  private static Category logger = Category.getInstance(UserContextImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(UserContextImpl.class);
 
   private static final String AUTH_TOKEN_PREFIX = "VQAT:";
   private static final char AUTH_TOKEN_SEP = '|';

src/com/silverwrist/venice/core/impl/UserFoundImpl.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/impl/UserProfileImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl;
 
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import com.silverwrist.util.*;
 import com.silverwrist.venice.core.*;
 import com.silverwrist.venice.core.internals.*;
@@ -34,7 +34,8 @@ class UserProfileImpl implements UserProfile
    *--------------------------------------------------------------------------------
    */
 
-  private static Category logger = Category.getInstance(UserProfileImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(UserProfileImpl.class);
 
   /*--------------------------------------------------------------------------------
    * Attributes

src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java

@@ -9,9 +9,9 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
- * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * Copyright (C) 2001-2006 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 
  * Contributor(s): 
  */
@@ -20,7 +20,7 @@ package com.silverwrist.venice.core.impl;
 import java.awt.Dimension;
 import java.sql.*;
 import java.util.*;
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
 import org.w3c.dom.*;
 import com.silverwrist.util.*;
 import com.silverwrist.util.cache.*;
@@ -239,9 +239,13 @@ public class VeniceEngineImpl implements VeniceEngine, ServiceProvider, EngineBa
   private static final BitSet IP_PROPS;          // BitSet representing the "integer parameter" properties
   private static final BitSet ALL_PROPS;         // BitSet representing all properties
 
-  private static Category logger = Category.getInstance(VeniceEngineImpl.class);
+  /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */
+  private static final Logger logger = Logger.getLogger(VeniceEngineImpl.class);
 
+  /** The default dimension of user photos. */
   private static final Dimension DEFAULT_DIM_USERPHOTO = new Dimension(100,100);
+
+  /** The default dimension of community logos. */
   private static final Dimension DEFAULT_DIM_COMMUNITYLOGO = new Dimension(110,65);
 
   /*--------------------------------------------------------------------------------

src/com/silverwrist/venice/core/internals/BaseMailSend.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/internals/CommunityBackend.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/internals/CommunityData.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/internals/ConferenceBackend.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/internals/ConferenceCommunityContext.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/internals/ConferenceData.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/internals/EngineBackend.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  * 

src/com/silverwrist/venice/core/internals/EnvCommunity.java

@@ -9,7 +9,7 @@
  * 
  * The Original Code is the Venice Web Communities System.
  * 
- * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@users.sf.net>,
  * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
  * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
  *