diff --git a/build.properties.sample b/build.properties.sample index d6710ee..83348db 100644 --- a/build.properties.sample +++ b/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 , +# The Initial Developer of the Original Code is Eric J. Bowersox , # 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] -servlet.base=/usr/local/java/jakarta-tomcat-4.1.29 +# [Location of Servlet API 2.4] +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] -collections.base=/usr/local/java/commons-collections-2.1 +# [Location of JSP API 2.0] +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] -codec.base=/usr/local/java/commons-codec-1.2 +# [Location of Commons Codec Library 1.3] +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] -httpclient.base=/usr/local/java/commons-httpclient-2.0.2 +# [Location of Commons HTTP Client Library 3.0] +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] -regexp.base=/usr/local/java/jakarta-regexp-1.3 +# [Location of Jakarta Regexp Library 1.4] +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] -log4j.base=/usr/local/java/jakarta-log4j-1.2.8 +# [Location of Log4J 1.2.13] +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] -jacl.base=/usr/local/java/jacl1.3.1 +# [Location of Jacl 1.3.2] +jacl.base=/usr/local/java/jacl1.3.2 # jacl.lib=${jacl.base} # jacl.jarfile=jacl.jar # jacl.tcljarfile=tcljava.jar diff --git a/build.xml b/build.xml index 27e8353..d2a9d54 100644 --- a/build.xml +++ b/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 , + The Initial Developer of the Original Code is Eric J. Bowersox , 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 @@ - + - + - + + + + + + - + - + - + - + - + - + - + - + - + - + @@ -95,6 +100,7 @@ + @@ -119,7 +125,7 @@ + deprecation="${compile.deprecation}" source="1.3" target="1.3"> diff --git a/src/com/silverwrist/util/AnyCharMatcher.java b/src/com/silverwrist/util/AnyCharMatcher.java index 4302e8d..fc658ab 100644 --- a/src/com/silverwrist/util/AnyCharMatcher.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 any of * the specified characters. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see java.lang.String#indexOf(char) * @see java.lang.String#lastIndexOf(char) diff --git a/src/com/silverwrist/util/Base64EncodeInputStream.java b/src/com/silverwrist/util/Base64EncodeInputStream.java index 09823e6..8d74706 100644 --- a/src/com/silverwrist/util/Base64EncodeInputStream.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/util/Country.java b/src/com/silverwrist/util/Country.java index c77e4af..615b387 100644 --- a/src/com/silverwrist/util/Country.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 International that stores a country code and name pair. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see International */ diff --git a/src/com/silverwrist/util/DOMElementHelper.java b/src/com/silverwrist/util/DOMElementHelper.java index 14aece5..cc1235f 100644 --- a/src/com/silverwrist/util/DOMElementHelper.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 <erbo@ricochet.com> - * @version $Id$ + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id: DOMElementHelper.java,v 1.9 2004/12/30 05:55:01 erbo Exp $ * @see org.w3c.dom.Element */ public final class DOMElementHelper diff --git a/src/com/silverwrist/util/IOUtil.java b/src/com/silverwrist/util/IOUtil.java index 72126ea..6f4d264 100644 --- a/src/com/silverwrist/util/IOUtil.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.

* Some of the concepts in this class have been borrowed from Apache Jakarta Avalon Excalibur 4.0. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public class IOUtil diff --git a/src/com/silverwrist/util/IPv4Util.java b/src/com/silverwrist/util/IPv4Util.java index 73ed43f..f88d523 100644 --- a/src/com/silverwrist/util/IPv4Util.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/util/International.java b/src/com/silverwrist/util/International.java index 5e9c772..9973eb3 100644 --- a/src/com/silverwrist/util/International.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public class International diff --git a/src/com/silverwrist/util/Language.java b/src/com/silverwrist/util/Language.java index de3a279..3dee490 100644 --- a/src/com/silverwrist/util/Language.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 International that stores a language code and name pair. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see International */ diff --git a/src/com/silverwrist/util/OptionSet.java b/src/com/silverwrist/util/OptionSet.java index baf76db..e492355 100644 --- a/src/com/silverwrist/util/OptionSet.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 BitSet 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 OptionSet. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see java.util.BitSet */ diff --git a/src/com/silverwrist/util/ServletMultipartException.java b/src/com/silverwrist/util/ServletMultipartException.java index e5e946a..71acc2b 100644 --- a/src/com/silverwrist/util/ServletMultipartException.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 ServletMultipartHandler in certain circumstances. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see ServletMultipartHandler */ diff --git a/src/com/silverwrist/util/ServletMultipartHandler.java b/src/com/silverwrist/util/ServletMultipartHandler.java index b5cdb51..7c06cfc 100644 --- a/src/com/silverwrist/util/ServletMultipartHandler.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @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 diff --git a/src/com/silverwrist/util/StockMessages.java b/src/com/silverwrist/util/StockMessages.java index 5524924..a220087 100644 --- a/src/com/silverwrist/util/StockMessages.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/util/StringUtil.java b/src/com/silverwrist/util/StringUtil.java index 57a4579..1f2d10c 100644 --- a/src/com/silverwrist/util/StringUtil.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public class StringUtil diff --git a/src/com/silverwrist/util/cache/CacheMap.java b/src/com/silverwrist/util/cache/CacheMap.java index 4e97724..1b8ae6d 100644 --- a/src/com/silverwrist/util/cache/CacheMap.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 CacheMapStrategy object. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see CacheMapStrategy * @see java.util.Map diff --git a/src/com/silverwrist/util/cache/CacheMapEntry.java b/src/com/silverwrist/util/cache/CacheMapEntry.java index 6d7d73e..ffa125b 100644 --- a/src/com/silverwrist/util/cache/CacheMapEntry.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 CacheMapStrategy * interface to compute a "figure of merit" for the entry that decides whether or not it gets discarded. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see CacheMap * @see CacheMapStrategy diff --git a/src/com/silverwrist/util/cache/CacheMapStrategy.java b/src/com/silverwrist/util/cache/CacheMapStrategy.java index fb7aee4..e146f86 100644 --- a/src/com/silverwrist/util/cache/CacheMapStrategy.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 CacheMap * object, in deciding which entries in the map are to be released. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see CacheMap */ diff --git a/src/com/silverwrist/util/cache/ObjectCache.java b/src/com/silverwrist/util/cache/ObjectCache.java index f6bdccb..3c2ac38 100644 --- a/src/com/silverwrist/util/cache/ObjectCache.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 - * ObjectFactory to do the creating. The cache uses SoftReferences which can + * ObjectFactory to do the creating. The cache uses SoftReferences which can * automatically be removed by the garbage collector if necessary. * - * @author Eric J. Bowersox <erbo@silcom.com> - * @version X + * @author Eric J. Bowersox <erbo@users.sf.net> + * @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 - private LRUMap mru_cache; // most-recently-used map - private ObjectFactory factory; // used to create new objects + /** The main data store for the object cache. */ + private ReferenceMap the_data = new ReferenceMap(ReferenceMap.HARD,ReferenceMap.SOFT); + + /** 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 ObjectCache. + * Creates a new ObjectCache. * - * @param factory The factory object used to create new objects when getOrCreate is called. - * @exception java.lang.NullPointerException The object factory passed in is null. + * @param factory The factory object used to create new objects when getOrCreate is called. + * @exception java.lang.NullPointerException The object factory passed in is null. */ public ObjectCache(ObjectFactory factory) { @@ -57,11 +63,11 @@ public class ObjectCache } // end constructor /** - * Creates a new ObjectCache. + * Creates a new ObjectCache. * - * @param factory The factory object used to create new objects when getOrCreate is called. + * @param factory The factory object used to create new objects when getOrCreate is called. * @param lru_size How many objects to maintain hard references to. - * @exception java.lang.NullPointerException The object factory passed in is null. + * @exception java.lang.NullPointerException The object factory passed in is null. */ 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 null if that object isn't in the cache. + * @return The corresponding object value, or null if that object isn't in the cache. */ public synchronized Object get(Object key) { diff --git a/src/com/silverwrist/util/cache/ObjectCacheException.java b/src/com/silverwrist/util/cache/ObjectCacheException.java index 060b609..d834213 100644 --- a/src/com/silverwrist/util/cache/ObjectCacheException.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 ObjectCache 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 <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see ObjectCache#register(java.lang.Object,java.lang.Object) */ diff --git a/src/com/silverwrist/util/cache/ObjectFactory.java b/src/com/silverwrist/util/cache/ObjectFactory.java index 5ec759e..8b6a23e 100644 --- a/src/com/silverwrist/util/cache/ObjectFactory.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/util/cache/ObjectFactoryException.java b/src/com/silverwrist/util/cache/ObjectFactoryException.java index e9900ad..e101a38 100644 --- a/src/com/silverwrist/util/cache/ObjectFactoryException.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 ObjectFactory.newObject, which wraps any exception * that might be thrown by constructors or other method calls within the method. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see ObjectFactory#newObject(java.lang.Object) */ diff --git a/src/com/silverwrist/util/image/ImageLengthPair.java b/src/com/silverwrist/util/image/ImageLengthPair.java index b535e48..66cdfee 100644 --- a/src/com/silverwrist/util/image/ImageLengthPair.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 InputStream containing * its data. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see ImageNormalizer */ diff --git a/src/com/silverwrist/util/image/ImageNormalizer.java b/src/com/silverwrist/util/image/ImageNormalizer.java index 57d06e0..93eed99 100644 --- a/src/com/silverwrist/util/image/ImageNormalizer.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public class ImageNormalizer diff --git a/src/com/silverwrist/util/image/ImageNormalizerException.java b/src/com/silverwrist/util/image/ImageNormalizerException.java index 9c8b146..b6c1fbd 100644 --- a/src/com/silverwrist/util/image/ImageNormalizerException.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 ImageNormalizer when the normalizer encounters an error in * its input image. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see ImageNormalizer */ diff --git a/src/com/silverwrist/util/test/FormDataTest.java b/src/com/silverwrist/util/test/FormDataTest.java index 84830e4..a15644e 100644 --- a/src/com/silverwrist/util/test/FormDataTest.java +++ b/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 diff --git a/src/com/silverwrist/venice/core/ActiveUser.java b/src/com/silverwrist/venice/core/ActiveUser.java index 501714e..7a5507c 100644 --- a/src/com/silverwrist/venice/core/ActiveUser.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/AdminOperations.java b/src/com/silverwrist/venice/core/AdminOperations.java index 971eeca..458262a 100644 --- a/src/com/silverwrist/venice/core/AdminOperations.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/AdminUserContext.java b/src/com/silverwrist/venice/core/AdminUserContext.java index 028ade6..8cd409d 100644 --- a/src/com/silverwrist/venice/core/AdminUserContext.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/AdminUserProperties.java b/src/com/silverwrist/venice/core/AdminUserProperties.java index 4b2e019..79b2fd1 100644 --- a/src/com/silverwrist/venice/core/AdminUserProperties.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/Advertisement.java b/src/com/silverwrist/venice/core/Advertisement.java index cbba8e1..403cf11 100644 --- a/src/com/silverwrist/venice/core/Advertisement.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/AuditData.java b/src/com/silverwrist/venice/core/AuditData.java index 23cb1bf..f7bf214 100644 --- a/src/com/silverwrist/venice/core/AuditData.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/BinaryData.java b/src/com/silverwrist/venice/core/BinaryData.java index c461536..768c30f 100644 --- a/src/com/silverwrist/venice/core/BinaryData.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/CategoryDescriptor.java b/src/com/silverwrist/venice/core/CategoryDescriptor.java index 34aa672..ce85221 100644 --- a/src/com/silverwrist/venice/core/CategoryDescriptor.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/CommunityContext.java b/src/com/silverwrist/venice/core/CommunityContext.java index db9e6b4..5397bbd 100644 --- a/src/com/silverwrist/venice/core/CommunityContext.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/CommunityHideMode.java b/src/com/silverwrist/venice/core/CommunityHideMode.java index 8b73361..94dbec4 100644 --- a/src/com/silverwrist/venice/core/CommunityHideMode.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/CommunityProperties.java b/src/com/silverwrist/venice/core/CommunityProperties.java index 480110b..418becf 100644 --- a/src/com/silverwrist/venice/core/CommunityProperties.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/ConferenceContext.java b/src/com/silverwrist/venice/core/ConferenceContext.java index 700f7cf..d32b568 100644 --- a/src/com/silverwrist/venice/core/ConferenceContext.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/ConferenceHotlistEntry.java b/src/com/silverwrist/venice/core/ConferenceHotlistEntry.java index 226e1be..19272fe 100644 --- a/src/com/silverwrist/venice/core/ConferenceHotlistEntry.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/ConferenceProperties.java b/src/com/silverwrist/venice/core/ConferenceProperties.java index 10f3673..88a74d3 100644 --- a/src/com/silverwrist/venice/core/ConferenceProperties.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/ContactInfo.java b/src/com/silverwrist/venice/core/ContactInfo.java index e6aadea..4bf10a7 100644 --- a/src/com/silverwrist/venice/core/ContactInfo.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/GlobalProperties.java b/src/com/silverwrist/venice/core/GlobalProperties.java index d56c63e..4613804 100644 --- a/src/com/silverwrist/venice/core/GlobalProperties.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/IPBanInfo.java b/src/com/silverwrist/venice/core/IPBanInfo.java index 280c21d..8307933 100644 --- a/src/com/silverwrist/venice/core/IPBanInfo.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/SearchMode.java b/src/com/silverwrist/venice/core/SearchMode.java index 1fe0568..427111d 100644 --- a/src/com/silverwrist/venice/core/SearchMode.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/SecurityInfo.java b/src/com/silverwrist/venice/core/SecurityInfo.java index 8d6679c..9add768 100644 --- a/src/com/silverwrist/venice/core/SecurityInfo.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/ServiceGroup.java b/src/com/silverwrist/venice/core/ServiceGroup.java index d10ba04..9462b75 100644 --- a/src/com/silverwrist/venice/core/ServiceGroup.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/ServiceToken.java b/src/com/silverwrist/venice/core/ServiceToken.java index d386f8a..ba1c3f4 100644 --- a/src/com/silverwrist/venice/core/ServiceToken.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/SideBoxDescriptor.java b/src/com/silverwrist/venice/core/SideBoxDescriptor.java index 4f843f5..08341c0 100644 --- a/src/com/silverwrist/venice/core/SideBoxDescriptor.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/Startup.java b/src/com/silverwrist/venice/core/Startup.java index 44bf698..58467cc 100644 --- a/src/com/silverwrist/venice/core/Startup.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/TopicContext.java b/src/com/silverwrist/venice/core/TopicContext.java index 924c61e..d1063c2 100644 --- a/src/com/silverwrist/venice/core/TopicContext.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/TopicMessageContext.java b/src/com/silverwrist/venice/core/TopicMessageContext.java index 2b8e122..a23a19e 100644 --- a/src/com/silverwrist/venice/core/TopicMessageContext.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/TopicMessageFound.java b/src/com/silverwrist/venice/core/TopicMessageFound.java index 90d1ccd..38c6f1e 100644 --- a/src/com/silverwrist/venice/core/TopicMessageFound.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/UserContext.java b/src/com/silverwrist/venice/core/UserContext.java index 8fb5e1a..b208bbe 100644 --- a/src/com/silverwrist/venice/core/UserContext.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/UserFound.java b/src/com/silverwrist/venice/core/UserFound.java index ba3c2e6..b1fceaf 100644 --- a/src/com/silverwrist/venice/core/UserFound.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/UserProfile.java b/src/com/silverwrist/venice/core/UserProfile.java index 138e19f..9dae968 100644 --- a/src/com/silverwrist/venice/core/UserProfile.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/UserProperties.java b/src/com/silverwrist/venice/core/UserProperties.java index 8b63b3b..c8d2dbc 100644 --- a/src/com/silverwrist/venice/core/UserProperties.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/UserSideBoxDescriptor.java b/src/com/silverwrist/venice/core/UserSideBoxDescriptor.java index baaa0ac..3956f5c 100644 --- a/src/com/silverwrist/venice/core/UserSideBoxDescriptor.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/VeniceEngine.java b/src/com/silverwrist/venice/core/VeniceEngine.java index b1fdec1..8edc6bb 100644 --- a/src/com/silverwrist/venice/core/VeniceEngine.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/ActiveUserImpl.java b/src/com/silverwrist/venice/core/impl/ActiveUserImpl.java index 25441c4..6357842 100644 --- a/src/com/silverwrist/venice/core/impl/ActiveUserImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/AdminOperationsImpl.java b/src/com/silverwrist/venice/core/impl/AdminOperationsImpl.java index 7256ec4..61390ab 100644 --- a/src/com/silverwrist/venice/core/impl/AdminOperationsImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/AdminUserContextImpl.java b/src/com/silverwrist/venice/core/impl/AdminUserContextImpl.java index 694b96c..a47b13f 100644 --- a/src/com/silverwrist/venice/core/impl/AdminUserContextImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/AdvertisementImpl.java b/src/com/silverwrist/venice/core/impl/AdvertisementImpl.java index dce46f4..7fb639a 100644 --- a/src/com/silverwrist/venice/core/impl/AdvertisementImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/BackgroundCommunityPurge.java b/src/com/silverwrist/venice/core/impl/BackgroundCommunityPurge.java index 832b0e5..ac1ce88 100644 --- a/src/com/silverwrist/venice/core/impl/BackgroundCommunityPurge.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/BackgroundConferencePurge.java b/src/com/silverwrist/venice/core/impl/BackgroundConferencePurge.java index a5bc239..2c4b685 100644 --- a/src/com/silverwrist/venice/core/impl/BackgroundConferencePurge.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/BackgroundTopicPurge.java b/src/com/silverwrist/venice/core/impl/BackgroundTopicPurge.java index 19e35c2..2897100 100644 --- a/src/com/silverwrist/venice/core/impl/BackgroundTopicPurge.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/CategoryDescriptorImpl.java b/src/com/silverwrist/venice/core/impl/CategoryDescriptorImpl.java index dfb15d4..4100a56 100644 --- a/src/com/silverwrist/venice/core/impl/CategoryDescriptorImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/CommunityCoreData.java b/src/com/silverwrist/venice/core/impl/CommunityCoreData.java index 92a468e..0fca341 100644 --- a/src/com/silverwrist/venice/core/impl/CommunityCoreData.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/CommunityUserContextImpl.java b/src/com/silverwrist/venice/core/impl/CommunityUserContextImpl.java index 0553675..b7068a0 100644 --- a/src/com/silverwrist/venice/core/impl/CommunityUserContextImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/ConferenceCommunityContextImpl.java b/src/com/silverwrist/venice/core/impl/ConferenceCommunityContextImpl.java index dc6ba59..57abcbe 100644 --- a/src/com/silverwrist/venice/core/impl/ConferenceCommunityContextImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/ConferenceCoreData.java b/src/com/silverwrist/venice/core/impl/ConferenceCoreData.java index 1db499e..68033f0 100644 --- a/src/com/silverwrist/venice/core/impl/ConferenceCoreData.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/ConferenceUserContextImpl.java b/src/com/silverwrist/venice/core/impl/ConferenceUserContextImpl.java index 6f4551e..08134f3 100644 --- a/src/com/silverwrist/venice/core/impl/ConferenceUserContextImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/ConferencingExporter.java b/src/com/silverwrist/venice/core/impl/ConferencingExporter.java index 0e08a49..a90df2a 100644 --- a/src/com/silverwrist/venice/core/impl/ConferencingExporter.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/ConferencingImporter.java b/src/com/silverwrist/venice/core/impl/ConferencingImporter.java index 5277467..21634d1 100644 --- a/src/com/silverwrist/venice/core/impl/ConferencingImporter.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/ContactInfoImpl.java b/src/com/silverwrist/venice/core/impl/ContactInfoImpl.java index d7c7e8f..5113860 100644 --- a/src/com/silverwrist/venice/core/impl/ContactInfoImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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) - private String given_name; // given name ("first name") - private String family_name; // family name ("last name") - private char middle_initial; // middle initial (natch) - private String prefix; // prefix (Mr., Ms., Prof., Dr., etc.) - private String suffix; // suffix (Jr., III, etc.) - private String company; // company name - private String addr1; // address line 1 - private String addr2; // address line 2 - private String locality; // locality ("city") - private String region; // region ("state") - private String postal_code; // postal code ("ZIP code") - private String country; // 2-character ISO 3166 country code - private String phone; // voice phone number - private String fax; // facsimile (fax) number - private String mobile; // mobile phone (cellphone) number - private String email; // email address - private String photo_url; // URL of user photo - private String url; // URL of user's homepage - private boolean private_addr; // are addr1 and addr2 hidden? - private boolean private_phone; // are phone and mobile hidden? - private boolean private_fax; // is fax hidden? - private boolean private_email; // is email hidden? - private int owner_uid; // UID that owns this contact record - private int owner_cid; // community ID this contact record is in (-1 for none) - private java.util.Date last_update; // date of last update - private boolean is_modified = false; // have we modified this ContactInfo? - private ImageHook image_hook = null; // image hook object - private boolean can_set_photo; // can we set the user photo? + /** ID of this contact record, or -1 to indicate a new contact record. */ + private int contactid; + + /** Contact given name ("first name"). */ + private String given_name; + + /** Contact family name ("last name"). */ + private String family_name; + + /** Contact middle initial. */ + private char middle_initial; + + /** Contact name prefix (Mr., Ms., Prof., Dr., etc.). */ + private String prefix; + + /** Contact name suffix (Jr., III, etc.). */ + private String suffix; + + /** Contact company name. */ + private String company; + + /** Contact street address line 1. */ + private String addr1; + + /** Contact street address line 2. */ + private String addr2; + + /** Contact locality ("city"). */ + 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 true, the "street address" fields will be kept private. */ + private boolean private_addr; + + /** If true, the phone number and mobile phone number will be kept private. */ + private boolean private_phone; + + /** If true, the fax number will be kept private. */ + private boolean private_fax; + + /** If true, 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; + + /** true 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; + + /** true 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 ContactInfoImpl object. + * Constructs a new blank ContactInfoImpl object. * * @param owner_uid UID that owns this object. + * @param can_set_photo true if we can set the user photo, false 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 ContactInfoImpl object. + * Constructs a new blank ContactInfoImpl object. * * @param owner_uid UID that owns this object. * @param owner_cid Community ID that owns this object. + * @param can_set_photo true if we can set the user photo, false 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 ContactInfoImpl object out of the database. + * Loads a ContactInfoImpl 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 true if we can set the user photo, false if not. * @exception DataException The contact could not be loaded for some reason. */ ContactInfoImpl(EnvEngine env, int contactid, boolean can_set_photo) throws DataException diff --git a/src/com/silverwrist/venice/core/impl/ImageStore.java b/src/com/silverwrist/venice/core/impl/ImageStore.java index 1713160..21d6fec 100644 --- a/src/com/silverwrist/venice/core/impl/ImageStore.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/MailerAgent.java b/src/com/silverwrist/venice/core/impl/MailerAgent.java index 1c00817..10cbd1a 100644 --- a/src/com/silverwrist/venice/core/impl/MailerAgent.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 - private List recipients; // who gets the message + /** The actual mail sender. */ + 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(); - while (it.hasNext()) + for (Iterator it=recipients.iterator(); 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 diff --git a/src/com/silverwrist/venice/core/impl/PersonalMailSend.java b/src/com/silverwrist/venice/core/impl/PersonalMailSend.java index edfc179..c40f302 100644 --- a/src/com/silverwrist/venice/core/impl/PersonalMailSend.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/PostDeliveryAgent.java b/src/com/silverwrist/venice/core/impl/PostDeliveryAgent.java index b70db0c..323dfd0 100644 --- a/src/com/silverwrist/venice/core/impl/PostDeliveryAgent.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 - private String post_text; // the raw post text - private String post_pseud; // the raw pseud - private List delivery_addresses; // the addresses to deliver to - private Map vars; // the replacement variables for the templates + /** The environment for this object. */ + private EnvEngine env; + + /** The raw text of the post that was made. */ + 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 diff --git a/src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java b/src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java index 2827387..845afce 100644 --- a/src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/PublishedMessageTopicImpl.java b/src/com/silverwrist/venice/core/impl/PublishedMessageTopicImpl.java index c3a10d3..c446f29 100644 --- a/src/com/silverwrist/venice/core/impl/PublishedMessageTopicImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/ServiceControlManager.java b/src/com/silverwrist/venice/core/impl/ServiceControlManager.java index 1903f75..4a145dd 100644 --- a/src/com/silverwrist/venice/core/impl/ServiceControlManager.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/SideBoxDescriptorImpl.java b/src/com/silverwrist/venice/core/impl/SideBoxDescriptorImpl.java index 3d60185..307031e 100644 --- a/src/com/silverwrist/venice/core/impl/SideBoxDescriptorImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/Stashable.java b/src/com/silverwrist/venice/core/impl/Stashable.java index 51ed2bb..8f1caef 100644 --- a/src/com/silverwrist/venice/core/impl/Stashable.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/StaticCommService.java b/src/com/silverwrist/venice/core/impl/StaticCommService.java index 041b3cb..eb94a06 100644 --- a/src/com/silverwrist/venice/core/impl/StaticCommService.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/TopicMessageFoundHelper.java b/src/com/silverwrist/venice/core/impl/TopicMessageFoundHelper.java index f266e0f..bbc7ab1 100644 --- a/src/com/silverwrist/venice/core/impl/TopicMessageFoundHelper.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/TopicMessageFoundImpl.java b/src/com/silverwrist/venice/core/impl/TopicMessageFoundImpl.java index 5d97765..7588a23 100644 --- a/src/com/silverwrist/venice/core/impl/TopicMessageFoundImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java b/src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java index dd99bb6..d42d7e6 100644 --- a/src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/TopicUserContextImpl.java b/src/com/silverwrist/venice/core/impl/TopicUserContextImpl.java index 6de58b9..c11305e 100644 --- a/src/com/silverwrist/venice/core/impl/TopicUserContextImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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, " diff --git a/src/com/silverwrist/venice/core/impl/UserContextImpl.java b/src/com/silverwrist/venice/core/impl/UserContextImpl.java index 1027d59..50f8495 100644 --- a/src/com/silverwrist/venice/core/impl/UserContextImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 = '|'; diff --git a/src/com/silverwrist/venice/core/impl/UserFoundImpl.java b/src/com/silverwrist/venice/core/impl/UserFoundImpl.java index 0c7012b..1e4b15c 100644 --- a/src/com/silverwrist/venice/core/impl/UserFoundImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/impl/UserProfileImpl.java b/src/com/silverwrist/venice/core/impl/UserProfileImpl.java index 0e3c61f..2ad9238 100644 --- a/src/com/silverwrist/venice/core/impl/UserProfileImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 diff --git a/src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java b/src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java index fba47f3..54f4479 100644 --- a/src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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); /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/core/internals/BaseMailSend.java b/src/com/silverwrist/venice/core/internals/BaseMailSend.java index 92a5374..a2bd4cb 100644 --- a/src/com/silverwrist/venice/core/internals/BaseMailSend.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/CommunityBackend.java b/src/com/silverwrist/venice/core/internals/CommunityBackend.java index accb095..b109273 100644 --- a/src/com/silverwrist/venice/core/internals/CommunityBackend.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/CommunityData.java b/src/com/silverwrist/venice/core/internals/CommunityData.java index 5ab9ba7..eb8f0f1 100644 --- a/src/com/silverwrist/venice/core/internals/CommunityData.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/ConferenceBackend.java b/src/com/silverwrist/venice/core/internals/ConferenceBackend.java index 34c8962..b8d63a0 100644 --- a/src/com/silverwrist/venice/core/internals/ConferenceBackend.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/ConferenceCommunityContext.java b/src/com/silverwrist/venice/core/internals/ConferenceCommunityContext.java index d5c4f0a..03354d1 100644 --- a/src/com/silverwrist/venice/core/internals/ConferenceCommunityContext.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/ConferenceData.java b/src/com/silverwrist/venice/core/internals/ConferenceData.java index 3447220..1c00d33 100644 --- a/src/com/silverwrist/venice/core/internals/ConferenceData.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/EngineBackend.java b/src/com/silverwrist/venice/core/internals/EngineBackend.java index 30225c8..20c2653 100644 --- a/src/com/silverwrist/venice/core/internals/EngineBackend.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/EnvCommunity.java b/src/com/silverwrist/venice/core/internals/EnvCommunity.java index dbe3571..370e864 100644 --- a/src/com/silverwrist/venice/core/internals/EnvCommunity.java +++ b/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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/EnvCommunityData.java b/src/com/silverwrist/venice/core/internals/EnvCommunityData.java index b95f5f2..ebdad39 100644 --- a/src/com/silverwrist/venice/core/internals/EnvCommunityData.java +++ b/src/com/silverwrist/venice/core/internals/EnvCommunityData.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/EnvConference.java b/src/com/silverwrist/venice/core/internals/EnvConference.java index 93d9a6b..536d023 100644 --- a/src/com/silverwrist/venice/core/internals/EnvConference.java +++ b/src/com/silverwrist/venice/core/internals/EnvConference.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/EnvConferenceCommunity.java b/src/com/silverwrist/venice/core/internals/EnvConferenceCommunity.java index 6d147ce..4e68f3d 100644 --- a/src/com/silverwrist/venice/core/internals/EnvConferenceCommunity.java +++ b/src/com/silverwrist/venice/core/internals/EnvConferenceCommunity.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/EnvConferenceData.java b/src/com/silverwrist/venice/core/internals/EnvConferenceData.java index cca5517..761b2c1 100644 --- a/src/com/silverwrist/venice/core/internals/EnvConferenceData.java +++ b/src/com/silverwrist/venice/core/internals/EnvConferenceData.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/EnvEngine.java b/src/com/silverwrist/venice/core/internals/EnvEngine.java index c79db1b..70e19bc 100644 --- a/src/com/silverwrist/venice/core/internals/EnvEngine.java +++ b/src/com/silverwrist/venice/core/internals/EnvEngine.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.internals; import java.sql.Connection; import java.sql.SQLException; import java.util.List; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.core.SecurityInfo; import com.silverwrist.venice.db.*; import com.silverwrist.venice.except.AccessError; @@ -37,7 +37,8 @@ public class EnvEngine *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(EnvEngine.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(EnvEngine.class); /*-------------------------------------------------------------------------------- * Attributes diff --git a/src/com/silverwrist/venice/core/internals/EnvUser.java b/src/com/silverwrist/venice/core/internals/EnvUser.java index 84ca288..579e1a5 100644 --- a/src/com/silverwrist/venice/core/internals/EnvUser.java +++ b/src/com/silverwrist/venice/core/internals/EnvUser.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.internals; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.except.AccessError; import com.silverwrist.venice.security.AuditRecord; import com.silverwrist.venice.security.Role; @@ -32,7 +32,8 @@ public class EnvUser extends EnvEngine *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(EnvUser.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(EnvUser.class); public static final String PERM_SHOWHIDDENCATS = "Global.ShowHiddenCategories"; public static final String PERM_NOEMAILVERIFY = "Global.NoEmailVerify"; diff --git a/src/com/silverwrist/venice/core/internals/GlobalSiteImpl.java b/src/com/silverwrist/venice/core/internals/GlobalSiteImpl.java index 8896e57..e96d65b 100644 --- a/src/com/silverwrist/venice/core/internals/GlobalSiteImpl.java +++ b/src/com/silverwrist/venice/core/internals/GlobalSiteImpl.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/ReturnConfSeq.java b/src/com/silverwrist/venice/core/internals/ReturnConfSeq.java index ebd1ceb..07fee9a 100644 --- a/src/com/silverwrist/venice/core/internals/ReturnConfSeq.java +++ b/src/com/silverwrist/venice/core/internals/ReturnConfSeq.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/ReturnNewUser.java b/src/com/silverwrist/venice/core/internals/ReturnNewUser.java index 6c77444..f49ba07 100644 --- a/src/com/silverwrist/venice/core/internals/ReturnNewUser.java +++ b/src/com/silverwrist/venice/core/internals/ReturnNewUser.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/ReturnTopicInfo.java b/src/com/silverwrist/venice/core/internals/ReturnTopicInfo.java index 29dafc4..48f6b10 100644 --- a/src/com/silverwrist/venice/core/internals/ReturnTopicInfo.java +++ b/src/com/silverwrist/venice/core/internals/ReturnTopicInfo.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/core/internals/SecurityInfoWrapper.java b/src/com/silverwrist/venice/core/internals/SecurityInfoWrapper.java index 247d6de..9a91fad 100644 --- a/src/com/silverwrist/venice/core/internals/SecurityInfoWrapper.java +++ b/src/com/silverwrist/venice/core/internals/SecurityInfoWrapper.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/db/DataPool.java b/src/com/silverwrist/venice/db/DataPool.java index 7bc7605..a466900 100644 --- a/src/com/silverwrist/venice/db/DataPool.java +++ b/src/com/silverwrist/venice/db/DataPool.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.util.*; import java.sql.*; import javax.naming.*; import javax.sql.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.w3c.dom.*; import com.silverwrist.util.DOMElementHelper; import com.silverwrist.venice.except.ConfigException; @@ -33,8 +33,8 @@ import com.silverwrist.venice.except.ConfigException; * Based on some code from Marty Hall's Core Servlets and Java Server Pages (Prentice Hall/ * Sun Microsystems, 2000). * - * @author Eric J. Bowersox <erbo@silcom.com> - * @version X + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id$ */ public class DataPool implements Runnable { @@ -43,24 +43,46 @@ public class DataPool implements Runnable *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(DataPool.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(DataPool.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ - private DataSource m_dsource = null; // JCA DataSource (overrides everything else) - private String driver; // name of JDBC driver class - private String url; // URL for JDBC connection - private String username; // username for JDBC connection - private String password; // password for JDBC connection - private int max_conns; // maximum number of possible connections - private boolean wait_if_busy; // do we wait for a connection if none is available? - private boolean pending = false; // pending connection being created? - private Vector avail_connections; // connections which are available for use - private Vector busy_connections; // connections which are currently in use - private int thread_counter = 1; // counter for data pool threads + /** The {@link javax.sql.DataSource DataSource} that Venice will use, if configured to do so. */ + private DataSource m_dsource = null; + + /** The name of the JDBC driver class to be loaded. */ + private String driver; + + /** The URL for the JDBC connection. */ + private String url; + + /** The user name for JDBC connections. */ + private String username; + + /** The password for JDBC connections. */ + private String password; + + /** The maximum number of connections that we allow. */ + private int max_conns; + + /** true if we wait for a connection when there are none available. */ + private boolean wait_if_busy; + + /** true if a connection is in the middle of being created. */ + private boolean pending = false; + + /** The list of connections which are available for use. */ + private Vector avail_connections; + + /** The list of connections which are presently in use. */ + private Vector busy_connections; + + /** The counter for database pool background threads. */ + private int thread_counter = 1; /*-------------------------------------------------------------------------------- * Constructor diff --git a/src/com/silverwrist/venice/db/PostLinkDecoder.java b/src/com/silverwrist/venice/db/PostLinkDecoder.java index eda30bd..610f6cd 100644 --- a/src/com/silverwrist/venice/db/PostLinkDecoder.java +++ b/src/com/silverwrist/venice/db/PostLinkDecoder.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/db/PostLinkDecoderContext.java b/src/com/silverwrist/venice/db/PostLinkDecoderContext.java index 9982c61..b8083cc 100644 --- a/src/com/silverwrist/venice/db/PostLinkDecoderContext.java +++ b/src/com/silverwrist/venice/db/PostLinkDecoderContext.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/db/PostLinkRewriter.java b/src/com/silverwrist/venice/db/PostLinkRewriter.java index f60d034..0248e6c 100644 --- a/src/com/silverwrist/venice/db/PostLinkRewriter.java +++ b/src/com/silverwrist/venice/db/PostLinkRewriter.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/db/SQLUtil.java b/src/com/silverwrist/venice/db/SQLUtil.java index 5657a27..1782a09 100644 --- a/src/com/silverwrist/venice/db/SQLUtil.java +++ b/src/com/silverwrist/venice/db/SQLUtil.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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,15 +19,15 @@ package com.silverwrist.venice.db; import java.sql.*; import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.util.AnyCharMatcher; import com.silverwrist.util.StringUtil; /** * Utility functions commonly used for passing string values to SQL commands, and interpreting the results. * - * @author Eric J. Bowersox <erbo@silcom.com> - * @version X + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id$ * @see com.silverwrist.util.StringUtil */ public class SQLUtil @@ -37,12 +37,14 @@ public class SQLUtil *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(SQLUtil.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(SQLUtil.class); + /** The set of wildcard characters in SQL. */ private static final String SQL_WILDCARD_CHARS = "%_'"; - // used to convert dates and times to UTC for sending to SQL - private static SimpleTimeZone utc = new SimpleTimeZone(0,"UTC"); + /** Used to convert dates and times to UTC for sending to SQL. */ + private static final SimpleTimeZone utc = new SimpleTimeZone(0,"UTC"); /*-------------------------------------------------------------------------------- * Internal functions @@ -90,9 +92,9 @@ public class SQLUtil * Performs SQL encoding of an arbitrary string. When a string is SQL-encoded, all single-quote * characters are doubled, and all other characters are left untouched. * - * @param str The string to be SQL-encoded. May be null. - * @return The SQL-encoded equivalent of str. If str is - * null, returns null. + * @param str The string to be SQL-encoded. May be null. + * @return The SQL-encoded equivalent of str. If str is + * null, returns null. * @see com.silverwrist.util.StringUtil#encodeStringSQL(java.lang.String) */ public static final String encodeString(String str) @@ -106,9 +108,9 @@ public class SQLUtil * argument in an SQL statement. When a string is SQL-encoded, all single-quote characters are doubled, * and all other characters are left untouched. * - * @param str The string to be SQL-encoded. May be null. - * @return The SQL-encoded equivalent of str, in quotes. If str is - * null, returns "NULL". + * @param str The string to be SQL-encoded. May be null. + * @return The SQL-encoded equivalent of str, in quotes. If str is + * null, returns "NULL". * @see com.silverwrist.util.StringUtil#encodeStringSQL(java.lang.String) */ public static final String encodeStringArg(String str) @@ -126,9 +128,9 @@ public class SQLUtil * wildcard characters are escaped with '\', and the single-quote characters are doubled, but all other * characters are left untouched. * - * @param str The string to be SQL-encoded. May be null. - * @return The SQL-encoded equivalent of str. If str is - * null, returns null. + * @param str The string to be SQL-encoded. May be null. + * @return The SQL-encoded equivalent of str. If str is + * null, returns null. */ public static final String encodeStringWildcards(String str) { diff --git a/src/com/silverwrist/venice/db/UserNameRewriter.java b/src/com/silverwrist/venice/db/UserNameRewriter.java index 1bc1505..74cc8ee 100644 --- a/src/com/silverwrist/venice/db/UserNameRewriter.java +++ b/src/com/silverwrist/venice/db/UserNameRewriter.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/db/WrappedConnection.java b/src/com/silverwrist/venice/db/WrappedConnection.java index dcea151..02a3af0 100644 --- a/src/com/silverwrist/venice/db/WrappedConnection.java +++ b/src/com/silverwrist/venice/db/WrappedConnection.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/except/AccessError.java b/src/com/silverwrist/venice/except/AccessError.java index c061432..6894230 100644 --- a/src/com/silverwrist/venice/except/AccessError.java +++ b/src/com/silverwrist/venice/except/AccessError.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/except/ConfigException.java b/src/com/silverwrist/venice/except/ConfigException.java index 3d60802..f865c35 100644 --- a/src/com/silverwrist/venice/except/ConfigException.java +++ b/src/com/silverwrist/venice/except/ConfigException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/except/DataException.java b/src/com/silverwrist/venice/except/DataException.java index f7c5676..1806790 100644 --- a/src/com/silverwrist/venice/except/DataException.java +++ b/src/com/silverwrist/venice/except/DataException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/except/EmailException.java b/src/com/silverwrist/venice/except/EmailException.java index c5a708d..b4477d5 100644 --- a/src/com/silverwrist/venice/except/EmailException.java +++ b/src/com/silverwrist/venice/except/EmailException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/except/InternalStateError.java b/src/com/silverwrist/venice/except/InternalStateError.java index be460b3..f8aefba 100644 --- a/src/com/silverwrist/venice/except/InternalStateError.java +++ b/src/com/silverwrist/venice/except/InternalStateError.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/except/NoSuchServiceException.java b/src/com/silverwrist/venice/except/NoSuchServiceException.java index 09e93b4..695521a 100644 --- a/src/com/silverwrist/venice/except/NoSuchServiceException.java +++ b/src/com/silverwrist/venice/except/NoSuchServiceException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -21,7 +21,7 @@ package com.silverwrist.venice.except; * An exception thrown by objects that implement ServiceProvider when they * don't implement a service of a specified class and ID. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see com.silverwrist.venice.util.ServiceProvider */ diff --git a/src/com/silverwrist/venice/except/PropertyNotFoundException.java b/src/com/silverwrist/venice/except/PropertyNotFoundException.java index 90f33b2..dc69e5f 100644 --- a/src/com/silverwrist/venice/except/PropertyNotFoundException.java +++ b/src/com/silverwrist/venice/except/PropertyNotFoundException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -21,7 +21,7 @@ package com.silverwrist.venice.except; * An exception thrown by objects that implement PropertyProvider when they * don't implement a specified property. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X * @see com.silverwrist.venice.util.PropertyProvider */ diff --git a/src/com/silverwrist/venice/except/SupplyFaultCode.java b/src/com/silverwrist/venice/except/SupplyFaultCode.java index 87f6084..5fc4502 100644 --- a/src/com/silverwrist/venice/except/SupplyFaultCode.java +++ b/src/com/silverwrist/venice/except/SupplyFaultCode.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -20,8 +20,8 @@ package com.silverwrist.venice.except; /** * An interface allowing exceptions to be turned into XML-RPC "fault codes." * - * @author Eric J. Bowersox <erbo@ricochet.com> - * @version $Id$ + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id: SupplyFaultCode.java,v 1.2 2004/12/30 05:55:01 erbo Exp $ */ public interface SupplyFaultCode { diff --git a/src/com/silverwrist/venice/except/TrackbackException.java b/src/com/silverwrist/venice/except/TrackbackException.java index 426673e..d4c5983 100644 --- a/src/com/silverwrist/venice/except/TrackbackException.java +++ b/src/com/silverwrist/venice/except/TrackbackException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -20,8 +20,8 @@ package com.silverwrist.venice.except; /** * An exception thrown by trackback operations. * - * @author Eric J. Bowersox <erbo@ricochet.com> - * @version $Id$ + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id: TrackbackException.java,v 1.1 2004/12/30 05:55:01 erbo Exp $ */ public class TrackbackException extends VeniceException { diff --git a/src/com/silverwrist/venice/except/ValidationException.java b/src/com/silverwrist/venice/except/ValidationException.java index e653f83..dfa8215 100644 --- a/src/com/silverwrist/venice/except/ValidationException.java +++ b/src/com/silverwrist/venice/except/ValidationException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.venice.except; * An exception that is commonly thrown when a particular piece of data retrieved from the user is * not valid. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public class ValidationException extends VeniceException diff --git a/src/com/silverwrist/venice/except/VeniceException.java b/src/com/silverwrist/venice/except/VeniceException.java index 25a7878..2ed9301 100644 --- a/src/com/silverwrist/venice/except/VeniceException.java +++ b/src/com/silverwrist/venice/except/VeniceException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -24,8 +24,8 @@ import java.io.PrintWriter; * The root exception of all exceptions thrown by the Venice core code. It is capable of "wrapping" * another exception within it. (Predating the support for this in JDK 1.4, of course.) * - * @author Eric J. Bowersox <erbo@ricochet.com> - * @version $Id$ + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id: VeniceException.java,v 1.4 2004/12/30 05:55:01 erbo Exp $ */ public class VeniceException extends Exception implements SupplyFaultCode { diff --git a/src/com/silverwrist/venice/except/VeniceRuntimeException.java b/src/com/silverwrist/venice/except/VeniceRuntimeException.java index fb7c462..d29c832 100644 --- a/src/com/silverwrist/venice/except/VeniceRuntimeException.java +++ b/src/com/silverwrist/venice/except/VeniceRuntimeException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -24,7 +24,7 @@ import java.io.PrintWriter; * The root exception of all runtime exceptions thrown by the Venice core code. It is capable of * "wrapping" another exception within it. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public class VeniceRuntimeException extends RuntimeException implements SupplyFaultCode diff --git a/src/com/silverwrist/venice/htmlcheck/AlreadyFinishedException.java b/src/com/silverwrist/venice/htmlcheck/AlreadyFinishedException.java index 86dc578..7d1f236 100644 --- a/src/com/silverwrist/venice/htmlcheck/AlreadyFinishedException.java +++ b/src/com/silverwrist/venice/htmlcheck/AlreadyFinishedException.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/HTMLChecker.java b/src/com/silverwrist/venice/htmlcheck/HTMLChecker.java index f24e783..dd33ce6 100644 --- a/src/com/silverwrist/venice/htmlcheck/HTMLChecker.java +++ b/src/com/silverwrist/venice/htmlcheck/HTMLChecker.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/HTMLCheckerConfig.java b/src/com/silverwrist/venice/htmlcheck/HTMLCheckerConfig.java index ac712b6..f50d39b 100644 --- a/src/com/silverwrist/venice/htmlcheck/HTMLCheckerConfig.java +++ b/src/com/silverwrist/venice/htmlcheck/HTMLCheckerConfig.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/HTMLCheckerCreator.java b/src/com/silverwrist/venice/htmlcheck/HTMLCheckerCreator.java index d30fb06..15fd2cc 100644 --- a/src/com/silverwrist/venice/htmlcheck/HTMLCheckerCreator.java +++ b/src/com/silverwrist/venice/htmlcheck/HTMLCheckerCreator.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/HTMLCheckerException.java b/src/com/silverwrist/venice/htmlcheck/HTMLCheckerException.java index 19d3c15..4c38491 100644 --- a/src/com/silverwrist/venice/htmlcheck/HTMLCheckerException.java +++ b/src/com/silverwrist/venice/htmlcheck/HTMLCheckerException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/HTMLTagSets.java b/src/com/silverwrist/venice/htmlcheck/HTMLTagSets.java index 244d097..8ce346a 100644 --- a/src/com/silverwrist/venice/htmlcheck/HTMLTagSets.java +++ b/src/com/silverwrist/venice/htmlcheck/HTMLTagSets.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/MarkupData.java b/src/com/silverwrist/venice/htmlcheck/MarkupData.java index cac3c09..6b13d9f 100644 --- a/src/com/silverwrist/venice/htmlcheck/MarkupData.java +++ b/src/com/silverwrist/venice/htmlcheck/MarkupData.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/ModSpellingDictionary.java b/src/com/silverwrist/venice/htmlcheck/ModSpellingDictionary.java index 1f0e860..42c5bc9 100644 --- a/src/com/silverwrist/venice/htmlcheck/ModSpellingDictionary.java +++ b/src/com/silverwrist/venice/htmlcheck/ModSpellingDictionary.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/NotYetFinishedException.java b/src/com/silverwrist/venice/htmlcheck/NotYetFinishedException.java index f3e5374..7ac26d7 100644 --- a/src/com/silverwrist/venice/htmlcheck/NotYetFinishedException.java +++ b/src/com/silverwrist/venice/htmlcheck/NotYetFinishedException.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/OutputFilter.java b/src/com/silverwrist/venice/htmlcheck/OutputFilter.java index 12c270c..74a3255 100644 --- a/src/com/silverwrist/venice/htmlcheck/OutputFilter.java +++ b/src/com/silverwrist/venice/htmlcheck/OutputFilter.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/Rewriter.java b/src/com/silverwrist/venice/htmlcheck/Rewriter.java index de3c9a7..c231b87 100644 --- a/src/com/silverwrist/venice/htmlcheck/Rewriter.java +++ b/src/com/silverwrist/venice/htmlcheck/Rewriter.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/RewriterServices.java b/src/com/silverwrist/venice/htmlcheck/RewriterServices.java index 7c98bb4..b1055ac 100644 --- a/src/com/silverwrist/venice/htmlcheck/RewriterServices.java +++ b/src/com/silverwrist/venice/htmlcheck/RewriterServices.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/SpellingDictionary.java b/src/com/silverwrist/venice/htmlcheck/SpellingDictionary.java index 861bb0e..ecdc863 100644 --- a/src/com/silverwrist/venice/htmlcheck/SpellingDictionary.java +++ b/src/com/silverwrist/venice/htmlcheck/SpellingDictionary.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/dict/DictNode.java b/src/com/silverwrist/venice/htmlcheck/dict/DictNode.java index b27642e..51925da 100644 --- a/src/com/silverwrist/venice/htmlcheck/dict/DictNode.java +++ b/src/com/silverwrist/venice/htmlcheck/dict/DictNode.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/dict/LazyLexicon.java b/src/com/silverwrist/venice/htmlcheck/dict/LazyLexicon.java index 1d9b31a..ab8243a 100644 --- a/src/com/silverwrist/venice/htmlcheck/dict/LazyLexicon.java +++ b/src/com/silverwrist/venice/htmlcheck/dict/LazyLexicon.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -18,7 +18,7 @@ package com.silverwrist.venice.htmlcheck.dict; import java.io.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.htmlcheck.SpellingDictionary; public class LazyLexicon implements Runnable, SpellingDictionary @@ -28,15 +28,19 @@ public class LazyLexicon implements Runnable, SpellingDictionary *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(LazyLexicon.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(LazyLexicon.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ + /** The {@link com.silverwrist.venice.htmlcheck.dict.Lexicon Lexicon} being loaded by this object. */ private volatile Lexicon inner_lex = null; - private String[] filenames; + + /** The names of the files that will be loaded. */ + private final String[] filenames; /*-------------------------------------------------------------------------------- * Constructor diff --git a/src/com/silverwrist/venice/htmlcheck/dict/LazyTreeLexicon.java b/src/com/silverwrist/venice/htmlcheck/dict/LazyTreeLexicon.java index 50deed7..da8d15d 100644 --- a/src/com/silverwrist/venice/htmlcheck/dict/LazyTreeLexicon.java +++ b/src/com/silverwrist/venice/htmlcheck/dict/LazyTreeLexicon.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.htmlcheck.dict; import java.io.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.htmlcheck.SpellingDictionary; public class LazyTreeLexicon implements Runnable, SpellingDictionary @@ -28,15 +28,19 @@ public class LazyTreeLexicon implements Runnable, SpellingDictionary *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(LazyTreeLexicon.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(LazyTreeLexicon.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ + /** The actual lexicon loaded by this class. */ volatile TreeLexicon inner_lex = null; - private String[] filenames; + + /** The file names to be loaded. */ + private final String[] filenames; /*-------------------------------------------------------------------------------- * Constructor diff --git a/src/com/silverwrist/venice/htmlcheck/dict/Lexicon.java b/src/com/silverwrist/venice/htmlcheck/dict/Lexicon.java index 4c56a58..b20f33b 100644 --- a/src/com/silverwrist/venice/htmlcheck/dict/Lexicon.java +++ b/src/com/silverwrist/venice/htmlcheck/dict/Lexicon.java @@ -9,9 +9,9 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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): */ @@ -20,7 +20,7 @@ package com.silverwrist.venice.htmlcheck.dict; import java.io.*; import java.util.*; import java.util.zip.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.htmlcheck.ModSpellingDictionary; public class Lexicon implements ModSpellingDictionary, Serializable @@ -30,23 +30,27 @@ public class Lexicon implements ModSpellingDictionary, Serializable *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(Lexicon.class.getName()); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(Lexicon.class.getName()); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ - private HashSet[] sets; // 26 word sets, one for each letter of the alphabet + /** 26 word sets, one for each letter of the alphabet. */ + private final HashSet[] sets = new HashSet[26]; /*-------------------------------------------------------------------------------- * Constructor *-------------------------------------------------------------------------------- */ + /** + * Creates a new instance of Lexicon. + */ public Lexicon() { - sets = new HashSet[26]; for (int i=0; i<26; i++) sets[i] = new HashSet(500,0.9F); diff --git a/src/com/silverwrist/venice/htmlcheck/dict/LexiconBuilder.java b/src/com/silverwrist/venice/htmlcheck/dict/LexiconBuilder.java index 1068821..4a198b0 100644 --- a/src/com/silverwrist/venice/htmlcheck/dict/LexiconBuilder.java +++ b/src/com/silverwrist/venice/htmlcheck/dict/LexiconBuilder.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/dict/LexiconTest.java b/src/com/silverwrist/venice/htmlcheck/dict/LexiconTest.java index 90342c1..ed632f6 100644 --- a/src/com/silverwrist/venice/htmlcheck/dict/LexiconTest.java +++ b/src/com/silverwrist/venice/htmlcheck/dict/LexiconTest.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/dict/TernaryLexicon.java b/src/com/silverwrist/venice/htmlcheck/dict/TernaryLexicon.java index 8d6aba5..d1053e1 100644 --- a/src/com/silverwrist/venice/htmlcheck/dict/TernaryLexicon.java +++ b/src/com/silverwrist/venice/htmlcheck/dict/TernaryLexicon.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/dict/TreeLexicon.java b/src/com/silverwrist/venice/htmlcheck/dict/TreeLexicon.java index 13e057c..0bcac2b 100644 --- a/src/com/silverwrist/venice/htmlcheck/dict/TreeLexicon.java +++ b/src/com/silverwrist/venice/htmlcheck/dict/TreeLexicon.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/filters/EmailRewriter.java b/src/com/silverwrist/venice/htmlcheck/filters/EmailRewriter.java index 0b4fe95..beef5bc 100644 --- a/src/com/silverwrist/venice/htmlcheck/filters/EmailRewriter.java +++ b/src/com/silverwrist/venice/htmlcheck/filters/EmailRewriter.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/filters/EmoticonRewriter.java b/src/com/silverwrist/venice/htmlcheck/filters/EmoticonRewriter.java index 402bcbd..90d44fb 100644 --- a/src/com/silverwrist/venice/htmlcheck/filters/EmoticonRewriter.java +++ b/src/com/silverwrist/venice/htmlcheck/filters/EmoticonRewriter.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/filters/EmoticonTagHandler.java b/src/com/silverwrist/venice/htmlcheck/filters/EmoticonTagHandler.java index cf419be..83bfe3a 100644 --- a/src/com/silverwrist/venice/htmlcheck/filters/EmoticonTagHandler.java +++ b/src/com/silverwrist/venice/htmlcheck/filters/EmoticonTagHandler.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/filters/HTMLEncodingFilter.java b/src/com/silverwrist/venice/htmlcheck/filters/HTMLEncodingFilter.java index f70348d..1f40ecc 100644 --- a/src/com/silverwrist/venice/htmlcheck/filters/HTMLEncodingFilter.java +++ b/src/com/silverwrist/venice/htmlcheck/filters/HTMLEncodingFilter.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -28,7 +28,7 @@ import com.silverwrist.venice.htmlcheck.OutputFilter; *

  • & - &amp;
    • * * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @see HTMLOutputFilter * @see HTMLChecker#addOutputFilter */ diff --git a/src/com/silverwrist/venice/htmlcheck/filters/SQLEncodingFilter.java b/src/com/silverwrist/venice/htmlcheck/filters/SQLEncodingFilter.java index 17ad1cf..ceff276 100644 --- a/src/com/silverwrist/venice/htmlcheck/filters/SQLEncodingFilter.java +++ b/src/com/silverwrist/venice/htmlcheck/filters/SQLEncodingFilter.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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 com.silverwrist.venice.htmlcheck.OutputFilter; * An output filter for HTMLChecker that escapes the apostrophe character * (the SQL quote character) by doubling it. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @see OutputFilter * @see HTMLChecker#addOutputFilter */ diff --git a/src/com/silverwrist/venice/htmlcheck/filters/SpellingRewriter.java b/src/com/silverwrist/venice/htmlcheck/filters/SpellingRewriter.java index c7061bb..db3ecad 100644 --- a/src/com/silverwrist/venice/htmlcheck/filters/SpellingRewriter.java +++ b/src/com/silverwrist/venice/htmlcheck/filters/SpellingRewriter.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/filters/URLRewriter.java b/src/com/silverwrist/venice/htmlcheck/filters/URLRewriter.java index f65fc86..514e55f 100644 --- a/src/com/silverwrist/venice/htmlcheck/filters/URLRewriter.java +++ b/src/com/silverwrist/venice/htmlcheck/filters/URLRewriter.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/BalancedTag.java b/src/com/silverwrist/venice/htmlcheck/impl/BalancedTag.java index d64c831..b3eaf93 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/BalancedTag.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/BalancedTag.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerBackend.java b/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerBackend.java index eb7be49..1617b75 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerBackend.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerBackend.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerConfigImpl.java b/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerConfigImpl.java index 2ae89de..445642d 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerConfigImpl.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerConfigImpl.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerImpl.java b/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerImpl.java index c8adee4..d93e97c 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerImpl.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/HTMLCheckerImpl.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/ListElementTag.java b/src/com/silverwrist/venice/htmlcheck/impl/ListElementTag.java index 90919e3..f1374ec 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/ListElementTag.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/ListElementTag.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/OpenCloseTag.java b/src/com/silverwrist/venice/htmlcheck/impl/OpenCloseTag.java index c69451c..01f5148 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/OpenCloseTag.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/OpenCloseTag.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/SimpleTag.java b/src/com/silverwrist/venice/htmlcheck/impl/SimpleTag.java index ba7d5df..55302c6 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/SimpleTag.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/SimpleTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/TagA.java b/src/com/silverwrist/venice/htmlcheck/impl/TagA.java index 03343ba..4d0667a 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/TagA.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/TagA.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/TagNOBR.java b/src/com/silverwrist/venice/htmlcheck/impl/TagNOBR.java index 57db212..ec29832 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/TagNOBR.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/TagNOBR.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/TagRepository.java b/src/com/silverwrist/venice/htmlcheck/impl/TagRepository.java index 9de1603..e713409 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/TagRepository.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/TagRepository.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/htmlcheck/impl/TagWBR.java b/src/com/silverwrist/venice/htmlcheck/impl/TagWBR.java index 1ddfb95..ca6e50f 100644 --- a/src/com/silverwrist/venice/htmlcheck/impl/TagWBR.java +++ b/src/com/silverwrist/venice/htmlcheck/impl/TagWBR.java @@ -9,7 +9,7 @@ * * The Original Code is the Venice Web Community System. * - * The Initial Developer of the Original Code is Eric J. Bowersox , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/security/Audit.java b/src/com/silverwrist/venice/security/Audit.java index 97785f7..11d8f6f 100644 --- a/src/com/silverwrist/venice/security/Audit.java +++ b/src/com/silverwrist/venice/security/Audit.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/security/AuditRecord.java b/src/com/silverwrist/venice/security/AuditRecord.java index f2fa022..ff2e4ce 100644 --- a/src/com/silverwrist/venice/security/AuditRecord.java +++ b/src/com/silverwrist/venice/security/AuditRecord.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.security; import java.sql.*; import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.db.SQLUtil; import com.silverwrist.venice.core.AuditData; import com.silverwrist.venice.except.DataException; @@ -122,7 +122,8 @@ public class AuditRecord implements AuditData *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(AuditRecord.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(AuditRecord.class); /*-------------------------------------------------------------------------------- * Attributes diff --git a/src/com/silverwrist/venice/security/Generator.java b/src/com/silverwrist/venice/security/Generator.java index 5c21635..f471237 100644 --- a/src/com/silverwrist/venice/security/Generator.java +++ b/src/com/silverwrist/venice/security/Generator.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/security/PrimordialSecurityMonitor.java b/src/com/silverwrist/venice/security/PrimordialSecurityMonitor.java index 0cf4c38..217f869 100644 --- a/src/com/silverwrist/venice/security/PrimordialSecurityMonitor.java +++ b/src/com/silverwrist/venice/security/PrimordialSecurityMonitor.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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,16 +19,16 @@ package com.silverwrist.venice.security; import java.io.IOException; import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.except.AccessError; /** * The security monitor "below the root" of the security monitor tree, which defines the three roles - * which are "outside the standard scopes." Calls delegated to this instance of SecurityMonitor - * generally fail or return null, except when returning the three defined roles. + * which are "outside the standard scopes." Calls delegated to this instance of SecurityMonitor + * generally fail or return null, except when returning the three defined roles. * - * @author Eric J. Bowersox <erbo@silcom.com> - * @version X + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id$ */ public class PrimordialSecurityMonitor implements SecurityMonitor { @@ -37,13 +37,19 @@ public class PrimordialSecurityMonitor implements SecurityMonitor *-------------------------------------------------------------------------------- */ + /** Singleton instance of this class. */ private static PrimordialSecurityMonitor self = null; - private static Category logger = Category.getInstance(PrimordialSecurityMonitor.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(PrimordialSecurityMonitor.class); - // default human readable names + /** Human readable name for the "not in list" defined role. */ private static final String NAME_NOT_IN_LIST = "(not in list)"; + + /** Human readable name for the "no access" defined role. */ private static final String NAME_NO_ACCESS = "No Access"; + + /** Human readable name for the "unrestricted user" defined role. */ private static final String NAME_UNRESTRICTED = "'Unrestricted' User"; /** @@ -72,9 +78,14 @@ public class PrimordialSecurityMonitor implements SecurityMonitor *-------------------------------------------------------------------------------- */ - private Role not_in_list; // the "not in list" role - private Role no_access; // the "no access" role - private Role unrestricted_user; // the "unrestricted user" role + /** Role reference for the "not in list" role. */ + private final Role not_in_list; + + /** Role reference for the "no access" role. */ + private final Role no_access; + + /** Role reference for the "unrestricted user" role. */ + private final Role unrestricted_user; /*-------------------------------------------------------------------------------- * Constructor @@ -121,16 +132,16 @@ public class PrimordialSecurityMonitor implements SecurityMonitor /** * Tests a specified permission within this security monitor. If the supplied security level is less * than the defined security level for this permission, an exception is thrown. - * (PrimordialSecurityMonitor always throws this exception.) + * (PrimordialSecurityMonitor always throws this exception.) * * @param symbol The programmatic symbol of the permission to test. * @param level The security level to supply for the test. - * @param errormsg The error message to be thrown if the test fails. May be null, in + * @param errormsg The error message to be thrown if the test fails. May be null, in * which case the security monitor will throw an appropriate default, if applicable. - * @return true if the specified permission was defined and satisfied; false + * @return true if the specified permission was defined and satisfied; false * if the specified permission was not defined within this security monitor. * @exception com.silverwrist.venice.except.AccessError If the specified permission was defined but - * not satisfied. (Always thrown by PrimordialSecurityMonitor.) + * not satisfied. (Always thrown by PrimordialSecurityMonitor.) * @see #testPermission(java.lang.String,int) */ public boolean testPermission(String symbol, int level, String errormsg) throws AccessError @@ -144,14 +155,14 @@ public class PrimordialSecurityMonitor implements SecurityMonitor /** * Tests a specified permission within this security monitor. If the supplied security level is greater - * than or equal to the defined security level for this permission, true is returned. - * (PrimordialSecurityMonitor always returns false.) + * than or equal to the defined security level for this permission, true is returned. + * (PrimordialSecurityMonitor always returns false.) * * @param symbol The programmatic symbol of the permission to test. * @param level The security level to supply for the test. - * @return true if the specified permission was defined and satisfied; false + * @return true if the specified permission was defined and satisfied; false * if the specified permission was not defined within this security monitor, or was defined but - * not satisfied. (PrimordialSecurityMonitor always returns false.) + * not satisfied. (PrimordialSecurityMonitor always returns false.) * @see #testPermission(java.lang.String,int,java.lang.String) */ public boolean testPermission(String symbol, int level) @@ -164,15 +175,15 @@ public class PrimordialSecurityMonitor implements SecurityMonitor } // end testPermission /** - * Determines whether this SecurityMonitor defines the specified permission symbol. - * (PrimordialSecurityMonitor always returns false.) + * Determines whether this SecurityMonitor defines the specified permission symbol. + * (PrimordialSecurityMonitor always returns false.) * * @param symbol The programmatic symbol of the permission to look up. - * @param no_follow If this is true, we look only in this SecurityMonitor - * for the specified permission, and not in any "parent" SecurityMonitor + * @param no_follow If this is true, we look only in this SecurityMonitor + * for the specified permission, and not in any "parent" SecurityMonitor * objects. - * @return true if this is a defined permission symbol, false if not. - * (PrimordialSecurityMonitor always returns false.) + * @return true if this is a defined permission symbol, false if not. + * (PrimordialSecurityMonitor always returns false.) */ public boolean permissionDefined(String symbol, boolean no_follow) { @@ -183,12 +194,12 @@ public class PrimordialSecurityMonitor implements SecurityMonitor } // end permissionDefined /** - * Returns a defined list of roles for this SecurityMonitor. - * (PrimordialSecurityMonitor always returns null.) + * Returns a defined list of roles for this SecurityMonitor. + * (PrimordialSecurityMonitor always returns null.) * * @param symbol The programmatic symbol of the role list to look up. - * @return The associated role list, or null if the role list name was not defined. - * (PrimordialSecurityMonitor always returns null.) + * @return The associated role list, or null if the role list name was not defined. + * (PrimordialSecurityMonitor always returns null.) * @see Role */ public List getRoleList(String symbol) @@ -201,10 +212,10 @@ public class PrimordialSecurityMonitor implements SecurityMonitor } // end getRoleList /** - * Returns a defined role for this SecurityMonitor. + * Returns a defined role for this SecurityMonitor. * * @param symbol The programmatic symbol of the role to look up. - * @return The associated role, or null if the role name was not defined. + * @return The associated role, or null if the role name was not defined. * @see Role */ public Role getRole(String symbol) @@ -226,7 +237,7 @@ public class PrimordialSecurityMonitor implements SecurityMonitor * Returns the defined role that has the given level. * * @param level The level value to look up. - * @return The associated role, or null if no such role could be found. + * @return The associated role, or null if no such role could be found. * @see Role */ public Role getRoleForLevel(int level) @@ -243,12 +254,12 @@ public class PrimordialSecurityMonitor implements SecurityMonitor } // end getRoleForLevel /** - * Returns a defined default role for this SecurityMonitor. - * (PrimordialSecurityMonitor always returns null.) + * Returns a defined default role for this SecurityMonitor. + * (PrimordialSecurityMonitor always returns null.) * * @param symbol The programmatic symbol of the default role to look up. - * @return The associated role, or null if the default role name was not defined. - * (PrimordialSecurityMonitor always returns null.) + * @return The associated role, or null if the default role name was not defined. + * (PrimordialSecurityMonitor always returns null.) * @see Role */ public Role getDefaultRole(String symbol) @@ -259,11 +270,11 @@ public class PrimordialSecurityMonitor implements SecurityMonitor } // end getDefaultRole /** - * Returns the ScopeInfo associated with this SecurityMonitor. - * (PrimordialSecurityMonitor always returns null.) + * Returns the ScopeInfo associated with this SecurityMonitor. + * (PrimordialSecurityMonitor always returns null.) * - * @return The ScopeInfo associated with this SecurityMonitor. - * (PrimordialSecurityMonitor always returns null.) + * @return The ScopeInfo associated with this SecurityMonitor. + * (PrimordialSecurityMonitor always returns null.) * @see ScopeInfo */ public ScopeInfo getScopeInfo() @@ -273,11 +284,11 @@ public class PrimordialSecurityMonitor implements SecurityMonitor } // end getScopeInfo /** - * Returns the identifier for this SecurityMonitor. (PrimordialSecurityMonitor - * always returns null.) + * Returns the identifier for this SecurityMonitor. (PrimordialSecurityMonitor + * always returns null.) * - * @return The identifier for this SecurityMonitor. (PrimordialSecurityMonitor - * always returns null.) + * @return The identifier for this SecurityMonitor. (PrimordialSecurityMonitor + * always returns null.) */ public String getID() { @@ -291,9 +302,9 @@ public class PrimordialSecurityMonitor implements SecurityMonitor */ /** - * Returns the singleton instance of the PrimordialSecurityMonitor. + * Returns the singleton instance of the PrimordialSecurityMonitor. * - * @return The singleton instance of the PrimordialSecurityMonitor. + * @return The singleton instance of the PrimordialSecurityMonitor. */ public static synchronized SecurityMonitor get() { diff --git a/src/com/silverwrist/venice/security/Role.java b/src/com/silverwrist/venice/security/Role.java index 07bc044..bc9c53b 100644 --- a/src/com/silverwrist/venice/security/Role.java +++ b/src/com/silverwrist/venice/security/Role.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -36,7 +36,7 @@ import java.util.*; * Roles are created as part of a {@link SecurityMonitor}, such as {@link StaticSecurityMonitor}, and * are managed by it. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public final class Role implements Comparable, Cloneable diff --git a/src/com/silverwrist/venice/security/ScopeInfo.java b/src/com/silverwrist/venice/security/ScopeInfo.java index 295fe20..9aee36d 100644 --- a/src/com/silverwrist/venice/security/ScopeInfo.java +++ b/src/com/silverwrist/venice/security/ScopeInfo.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -33,7 +33,7 @@ package com.silverwrist.venice.security; * defined within the highband of their scope, allowing administrators to exert control over any enclosed * objects as well.) * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public final class ScopeInfo implements Cloneable, Comparable diff --git a/src/com/silverwrist/venice/security/SecurityMonitor.java b/src/com/silverwrist/venice/security/SecurityMonitor.java index 1209457..0b4ade5 100644 --- a/src/com/silverwrist/venice/security/SecurityMonitor.java +++ b/src/com/silverwrist/venice/security/SecurityMonitor.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -25,7 +25,7 @@ import com.silverwrist.venice.except.AccessError; * particular type of object within Venice, and defines the security scope used to deal with that * object, the roles used, lists of roles, default role values, and permissions that may be tested. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public interface SecurityMonitor diff --git a/src/com/silverwrist/venice/security/StaticSecurityMonitor.java b/src/com/silverwrist/venice/security/StaticSecurityMonitor.java index 51332de..f6f81f1 100644 --- a/src/com/silverwrist/venice/security/StaticSecurityMonitor.java +++ b/src/com/silverwrist/venice/security/StaticSecurityMonitor.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.security; import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.w3c.dom.*; import com.silverwrist.util.DOMElementHelper; import com.silverwrist.venice.except.AccessError; @@ -27,12 +27,12 @@ import com.silverwrist.venice.svc.SecurityMonitorEnvironment; import com.silverwrist.venice.util.XMLLoader; /** - * A SecurityMonitor which is configured by means of XML data, supplied by means of a Venice + * A SecurityMonitor which is configured by means of XML data, supplied by means of a Venice * configuration file. The configuration file defines roles, role lists, defaults, and permissions within * the security monitor's scope. * - * @author Eric J. Bowersox <erbo@silcom.com> - * @version X + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id$ */ public class StaticSecurityMonitor implements SecurityMonitor { @@ -81,8 +81,10 @@ public class StaticSecurityMonitor implements SecurityMonitor *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(StaticSecurityMonitor.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(StaticSecurityMonitor.class); + /** The reference to the root security monitor. */ private static volatile SecurityMonitor root_monitor = null; private static final int DEFAULT_SCOPE_OFFSET = 3; @@ -92,15 +94,32 @@ public class StaticSecurityMonitor implements SecurityMonitor *-------------------------------------------------------------------------------- */ - private String id; // the identity of this security monitor - private ScopeInfo scope; // the scope of this security monitor - private SecurityMonitor parent; // the parent of this security monitor - private Map sym_to_role; // mapping of role symbols to roles - private Map level_to_role; // mapping of role levels to roles - private Map lists; // mapping of list symbols to lists - private Map default_roles; // mapping of symbols to default values - private Map static_permissions; // mapping of symbols to static permissions - private Set dynamic_permissions; // set of defined dynamic permission names + /** The identity of this security monitor. */ + private String id; + + /** The scope of this security monitor. */ + private ScopeInfo scope; + + /** The parent of this security monitor. */ + private SecurityMonitor parent; + + /** A mapping from role symbols to roles. */ + private Map sym_to_role; + + /** A mapping of role levels to roles. */ + private Map level_to_role; + + /** A mapping of list symbols to lists. */ + private Map lists; + + /** A mapping from symbols to default values. */ + private Map default_roles; + + /** A mapping from symbols to static permissions. */ + private Map static_permissions; + + /** The set of defined dynamic permission names. */ + private Set dynamic_permissions; /*-------------------------------------------------------------------------------- * Constructor @@ -108,10 +127,10 @@ public class StaticSecurityMonitor implements SecurityMonitor */ /** - * Creates a new StaticSecurityMonitor from information stored as XML in a configuration file. + * Creates a new StaticSecurityMonitor from information stored as XML in a configuration file. * * @param cfg The root element of the security monitor configuration, which must be a - * <security-definition/> element. + * <security-definition/> element. * @param env A mapping of all previously-known security monitors. This one will be added to * it on success. * @exception com.silverwrist.venice.except.ConfigException The XML configuration data was incorrect in @@ -564,9 +583,9 @@ public class StaticSecurityMonitor implements SecurityMonitor * * @param symbol The programmatic symbol of the permission to test. * @param level The security level to supply for the test. - * @param errormsg The error message to be thrown if the test fails. May be null, in + * @param errormsg The error message to be thrown if the test fails. May be null, in * which case the security monitor will throw an appropriate default, if applicable. - * @return true if the specified permission was defined and satisfied; false + * @return true if the specified permission was defined and satisfied; false * if the specified permission was not defined within this security monitor. * @exception com.silverwrist.venice.except.AccessError If the specified permission was defined but * not satisfied. @@ -594,11 +613,11 @@ public class StaticSecurityMonitor implements SecurityMonitor /** * Tests a specified permission within this security monitor. If the supplied security level is greater - * than or equal to the defined security level for this permission, true is returned. + * than or equal to the defined security level for this permission, true is returned. * * @param symbol The programmatic symbol of the permission to test. * @param level The security level to supply for the test. - * @return true if the specified permission was defined and satisfied; false + * @return true if the specified permission was defined and satisfied; false * if the specified permission was not defined within this security monitor, or was defined but * not satisfied. * @see #testPermission(java.lang.String,int,java.lang.String) @@ -623,13 +642,13 @@ public class StaticSecurityMonitor implements SecurityMonitor } // end testPermission /** - * Determines whether this SecurityMonitor defines the specified permission symbol. + * Determines whether this SecurityMonitor defines the specified permission symbol. * * @param symbol The programmatic symbol of the permission to look up. - * @param no_follow If this is true, we look only in this SecurityMonitor - * for the specified permission, and not in any "parent" SecurityMonitor + * @param no_follow If this is true, we look only in this SecurityMonitor + * for the specified permission, and not in any "parent" SecurityMonitor * objects. - * @return true if this is a defined permission symbol, false if not. + * @return true if this is a defined permission symbol, false if not. */ public boolean permissionDefined(String symbol, boolean no_follow) { @@ -644,10 +663,10 @@ public class StaticSecurityMonitor implements SecurityMonitor } // end permissionDefined /** - * Returns a defined list of roles for this SecurityMonitor. + * Returns a defined list of roles for this SecurityMonitor. * * @param symbol The programmatic symbol of the role list to look up. - * @return The associated role list, or null if the role list name was not defined. + * @return The associated role list, or null if the role list name was not defined. * @see Role */ public List getRoleList(String symbol) @@ -662,10 +681,10 @@ public class StaticSecurityMonitor implements SecurityMonitor } // end getRoleList /** - * Returns a defined role for this SecurityMonitor. + * Returns a defined role for this SecurityMonitor. * * @param symbol The programmatic symbol of the role to look up. - * @return The associated role, or null if the role name was not defined. + * @return The associated role, or null if the role name was not defined. * @see Role */ public Role getRole(String symbol) @@ -683,7 +702,7 @@ public class StaticSecurityMonitor implements SecurityMonitor * Returns the defined role that has the given level. * * @param level The level value to look up. - * @return The associated role, or null if no such role could be found. + * @return The associated role, or null if no such role could be found. * @see Role */ public Role getRoleForLevel(int level) @@ -696,10 +715,10 @@ public class StaticSecurityMonitor implements SecurityMonitor } // end getRoleForLevel /** - * Returns a defined default role for this SecurityMonitor. + * Returns a defined default role for this SecurityMonitor. * * @param symbol The programmatic symbol of the default role to look up. - * @return The associated role, or null if the default role name was not defined. + * @return The associated role, or null if the default role name was not defined. * @see Role */ public Role getDefaultRole(String symbol) @@ -714,9 +733,9 @@ public class StaticSecurityMonitor implements SecurityMonitor } // end getDefaultRole /** - * Returns the ScopeInfo associated with this SecurityMonitor. + * Returns the ScopeInfo associated with this SecurityMonitor. * - * @return The ScopeInfo associated with this SecurityMonitor. + * @return The ScopeInfo associated with this SecurityMonitor. * @see ScopeInfo */ public ScopeInfo getScopeInfo() @@ -726,9 +745,9 @@ public class StaticSecurityMonitor implements SecurityMonitor } // end getScopeInfo /** - * Returns the identifier for this SecurityMonitor. + * Returns the identifier for this SecurityMonitor. * - * @return The identifier for this SecurityMonitor. + * @return The identifier for this SecurityMonitor. */ public String getID() { diff --git a/src/com/silverwrist/venice/std/TrackbackItem.java b/src/com/silverwrist/venice/std/TrackbackItem.java index ed0eb63..bb1970c 100644 --- a/src/com/silverwrist/venice/std/TrackbackItem.java +++ b/src/com/silverwrist/venice/std/TrackbackItem.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -26,8 +26,8 @@ import com.silverwrist.venice.except.TrackbackException; * A class representing a trackback item found on an external Web page via RDF auto-discovery. This * conforms to the Moveable Type Trackback Protocol, Version 1.1. * - * @author Eric J. Bowersox <erbo@ricochet.com> - * @version $Id$ + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id: TrackbackItem.java,v 1.1 2004/12/30 05:55:01 erbo Exp $ */ public abstract class TrackbackItem { diff --git a/src/com/silverwrist/venice/std/TrackbackManager.java b/src/com/silverwrist/venice/std/TrackbackManager.java index aa48b58..5169320 100644 --- a/src/com/silverwrist/venice/std/TrackbackManager.java +++ b/src/com/silverwrist/venice/std/TrackbackManager.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are - * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. + * Copyright (C) 2004-2006 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * * Contributor(s): */ @@ -25,6 +25,7 @@ import javax.mail.internet.ContentType; import javax.xml.parsers.*; import org.apache.commons.httpclient.*; import org.apache.commons.httpclient.methods.*; +import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.commons.httpclient.util.*; import org.apache.log4j.Logger; import org.apache.regexp.*; @@ -37,8 +38,8 @@ import com.silverwrist.venice.except.TrackbackException; * A Singleton class which implements the management of trackback items. The implementation conforms to * the Moveable Type Trackback Protocol, Version 1.1. * - * @author Eric J. Bowersox <erbo@ricochet.com> - * @version $Id$ + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id: TrackbackManager.java,v 1.1 2004/12/30 05:55:01 erbo Exp $ */ public class TrackbackManager { @@ -50,8 +51,8 @@ public class TrackbackManager /** * Internal class which caches information about a particular page read via HTTP. * - * @author Eric J. Bowersox <erbo@ricochet.com> - * @version $Id$ + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id: TrackbackManager.java,v 1.1 2004/12/30 05:55:01 erbo Exp $ */ private class PageAttributes { @@ -89,7 +90,7 @@ public class TrackbackManager { // get the Last-Modified date from the response hdr = response.getResponseHeader("Last-Modified"); if (hdr!=null) - m_last_modified = DateParser.parseDate(hdr.getValue()); + m_last_modified = DateUtil.parseDate(hdr.getValue()); else m_last_modified = null; @@ -134,7 +135,7 @@ public class TrackbackManager { // get the Expires date from the response hdr = response.getResponseHeader("Expires"); if (hdr!=null) - d = DateParser.parseDate(hdr.getValue()); + d = DateUtil.parseDate(hdr.getValue()); } // end try catch (DateParseException e) @@ -199,7 +200,7 @@ public class TrackbackManager try { // attempt to parse this date if (s!=null) - d = DateParser.parseDate(s); + d = DateUtil.parseDate(s); } // end try catch (DateParseException e) @@ -219,7 +220,7 @@ public class TrackbackManager try { // attempt to parse this date if (s!=null) - d = DateParser.parseDate(s); + d = DateUtil.parseDate(s); } // end try catch (DateParseException e) @@ -285,8 +286,8 @@ public class TrackbackManager /** * Internal implementation of {@link com.silverwrist.venice.std.TrackbackItem TrackbackItem}. * - * @author Eric J. Bowersox <erbo@ricochet.com> - * @version $Id$ + * @author Eric J. Bowersox <erbo@users.sf.net> + * @version $Id: TrackbackManager.java,v 1.1 2004/12/30 05:55:01 erbo Exp $ */ private class MyTrackbackItem extends TrackbackItem { @@ -391,8 +392,16 @@ public class TrackbackManager } // end catch finally { // release the connection if possible - if (get_resp) - meth.getResponseBody(); + try + { // need to get the response body + if (get_resp) + meth.getResponseBody(); + + } // end try + catch (IOException e) + { // ignore these here + } // end catch + meth.releaseConnection(); } // end finally @@ -712,12 +721,14 @@ public class TrackbackManager if (x>=0) s = s.substring(0,x); GetMethod getter = new GetMethod(s); + HttpMethodParams params = getter.getParams(); getter.setDoAuthentication(false); getter.setFollowRedirects(true); - getter.setMethodRetryHandler(new DefaultMethodRetryHandler()); getter.setRequestHeader("User-Agent",USER_AGENT); getter.setRequestHeader("Accept","text/*"); getter.setRequestHeader("Accept-Encoding","identity"); + params.setParameter(HttpMethodParams.RETRY_HANDLER,new DefaultHttpMethodRetryHandler()); + getter.setParams(params); boolean get_resp = false; PageAttributes newattrs = null; @@ -772,8 +783,16 @@ public class TrackbackManager } // end catch finally { // release the connection if possible - if (get_resp) - getter.getResponseBody(); + try + { // need to get the message body + if (get_resp) + getter.getResponseBody(); + + } // end try + catch (IOException e) + { // ignore these + } // end catch + getter.releaseConnection(); } // end finally @@ -1060,7 +1079,7 @@ public class TrackbackManager static { // initialize date format for output - DateFormat foo = new SimpleDateFormat(DateParser.PATTERN_RFC1123); + DateFormat foo = new SimpleDateFormat(DateUtil.PATTERN_RFC1123); foo.setTimeZone(TimeZone.getTimeZone("GMT")); s_httpdate_format = foo; try diff --git a/src/com/silverwrist/venice/svc/AcceptGlobalSite.java b/src/com/silverwrist/venice/svc/AcceptGlobalSite.java index ebc7d5f..74052fb 100644 --- a/src/com/silverwrist/venice/svc/AcceptGlobalSite.java +++ b/src/com/silverwrist/venice/svc/AcceptGlobalSite.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/svc/CommService.java b/src/com/silverwrist/venice/svc/CommService.java index 84633aa..4da7cf4 100644 --- a/src/com/silverwrist/venice/svc/CommService.java +++ b/src/com/silverwrist/venice/svc/CommService.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/svc/GlobalSite.java b/src/com/silverwrist/venice/svc/GlobalSite.java index da454d3..483b0ed 100644 --- a/src/com/silverwrist/venice/svc/GlobalSite.java +++ b/src/com/silverwrist/venice/svc/GlobalSite.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/svc/SecurityMonitorEnvironment.java b/src/com/silverwrist/venice/svc/SecurityMonitorEnvironment.java index 715c412..30c3b2d 100644 --- a/src/com/silverwrist/venice/svc/SecurityMonitorEnvironment.java +++ b/src/com/silverwrist/venice/svc/SecurityMonitorEnvironment.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/svc/Service.java b/src/com/silverwrist/venice/svc/Service.java index 2e1f2a9..3a83101 100644 --- a/src/com/silverwrist/venice/svc/Service.java +++ b/src/com/silverwrist/venice/svc/Service.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/svc/ServiceControl.java b/src/com/silverwrist/venice/svc/ServiceControl.java index 429647c..fef8d61 100644 --- a/src/com/silverwrist/venice/svc/ServiceControl.java +++ b/src/com/silverwrist/venice/svc/ServiceControl.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/svc/internals/CommServiceInternal.java b/src/com/silverwrist/venice/svc/internals/CommServiceInternal.java index b99296d..2bd1ee4 100644 --- a/src/com/silverwrist/venice/svc/internals/CommServiceInternal.java +++ b/src/com/silverwrist/venice/svc/internals/CommServiceInternal.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/svc/internals/ServiceInternal.java b/src/com/silverwrist/venice/svc/internals/ServiceInternal.java index e00ab8f..bd2e90b 100644 --- a/src/com/silverwrist/venice/svc/internals/ServiceInternal.java +++ b/src/com/silverwrist/venice/svc/internals/ServiceInternal.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/AutoCleanup.java b/src/com/silverwrist/venice/ui/AutoCleanup.java index ad350bc..29cc2c4 100644 --- a/src/com/silverwrist/venice/ui/AutoCleanup.java +++ b/src/com/silverwrist/venice/ui/AutoCleanup.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/ColorSelectors.java b/src/com/silverwrist/venice/ui/ColorSelectors.java index 1d24262..23f92be 100644 --- a/src/com/silverwrist/venice/ui/ColorSelectors.java +++ b/src/com/silverwrist/venice/ui/ColorSelectors.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/Content.java b/src/com/silverwrist/venice/ui/Content.java index 5695493..f3b3266 100644 --- a/src/com/silverwrist/venice/ui/Content.java +++ b/src/com/silverwrist/venice/ui/Content.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/ContentDirect.java b/src/com/silverwrist/venice/ui/ContentDirect.java index 8b996ea..43228a3 100644 --- a/src/com/silverwrist/venice/ui/ContentDirect.java +++ b/src/com/silverwrist/venice/ui/ContentDirect.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/ContentExecute.java b/src/com/silverwrist/venice/ui/ContentExecute.java index 1f9ac08..150ace6 100644 --- a/src/com/silverwrist/venice/ui/ContentExecute.java +++ b/src/com/silverwrist/venice/ui/ContentExecute.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/ContentJSP.java b/src/com/silverwrist/venice/ui/ContentJSP.java index 89bc6e2..39c101a 100644 --- a/src/com/silverwrist/venice/ui/ContentJSP.java +++ b/src/com/silverwrist/venice/ui/ContentJSP.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/ContentMetadata.java b/src/com/silverwrist/venice/ui/ContentMetadata.java index 6a1d5ea..908400e 100644 --- a/src/com/silverwrist/venice/ui/ContentMetadata.java +++ b/src/com/silverwrist/venice/ui/ContentMetadata.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/LinkTypes.java b/src/com/silverwrist/venice/ui/LinkTypes.java index d91f5f5..5a0bed1 100644 --- a/src/com/silverwrist/venice/ui/LinkTypes.java +++ b/src/com/silverwrist/venice/ui/LinkTypes.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/NullSession.java b/src/com/silverwrist/venice/ui/NullSession.java index a1e8ec3..49dc96c 100644 --- a/src/com/silverwrist/venice/ui/NullSession.java +++ b/src/com/silverwrist/venice/ui/NullSession.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/RenderDirect.java b/src/com/silverwrist/venice/ui/RenderDirect.java index 69a7332..105aa12 100644 --- a/src/com/silverwrist/venice/ui/RenderDirect.java +++ b/src/com/silverwrist/venice/ui/RenderDirect.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/RequestExec.java b/src/com/silverwrist/venice/ui/RequestExec.java index 9a92344..ceafecb 100644 --- a/src/com/silverwrist/venice/ui/RequestExec.java +++ b/src/com/silverwrist/venice/ui/RequestExec.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/RequestInput.java b/src/com/silverwrist/venice/ui/RequestInput.java index 5cf1a95..6121f53 100644 --- a/src/com/silverwrist/venice/ui/RequestInput.java +++ b/src/com/silverwrist/venice/ui/RequestInput.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/RequestOutput.java b/src/com/silverwrist/venice/ui/RequestOutput.java index 6a7ca88..a35e0e6 100644 --- a/src/com/silverwrist/venice/ui/RequestOutput.java +++ b/src/com/silverwrist/venice/ui/RequestOutput.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/VeniceUISession.java b/src/com/silverwrist/venice/ui/VeniceUISession.java index 76877b7..5980d8b 100644 --- a/src/com/silverwrist/venice/ui/VeniceUISession.java +++ b/src/com/silverwrist/venice/ui/VeniceUISession.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/VeniceUISessionFactory.java b/src/com/silverwrist/venice/ui/VeniceUISessionFactory.java index fdf998d..d67dbfd 100644 --- a/src/com/silverwrist/venice/ui/VeniceUISessionFactory.java +++ b/src/com/silverwrist/venice/ui/VeniceUISessionFactory.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/VeniceUISessionList.java b/src/com/silverwrist/venice/ui/VeniceUISessionList.java index daa0975..d6b14e2 100644 --- a/src/com/silverwrist/venice/ui/VeniceUISessionList.java +++ b/src/com/silverwrist/venice/ui/VeniceUISessionList.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/AttachmentContent.java b/src/com/silverwrist/venice/ui/conf/AttachmentContent.java index a203d70..1b53bc2 100644 --- a/src/com/silverwrist/venice/ui/conf/AttachmentContent.java +++ b/src/com/silverwrist/venice/ui/conf/AttachmentContent.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/CurrentConference.java b/src/com/silverwrist/venice/ui/conf/CurrentConference.java index 18ea589..9782313 100644 --- a/src/com/silverwrist/venice/ui/conf/CurrentConference.java +++ b/src/com/silverwrist/venice/ui/conf/CurrentConference.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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): */ @@ -19,7 +19,7 @@ package com.silverwrist.venice.ui.conf; import java.util.*; import javax.servlet.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.core.*; import com.silverwrist.venice.except.*; import com.silverwrist.venice.ui.*; @@ -33,10 +33,16 @@ public class CurrentConference implements AutoCleanup *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(CurrentConference.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(CurrentConference.class); + /** The request attribute name used to refer to an instance of this object. */ private static final String ATTR_NAME = "HELPER.CurrentConference"; + + /** The session attribute name used to hold the topic sort order. */ private static final String TOPIC_SORT_HOLDER_ATTR = "conference.topic.TopicSortHolder"; + + /** The session attribute name used to hold the topic visit order. */ private static final String TOPIC_VISIT_ORDER_ATTR = "conference.topic.TopicVisitOrder"; /*-------------------------------------------------------------------------------- @@ -44,9 +50,16 @@ public class CurrentConference implements AutoCleanup *-------------------------------------------------------------------------------- */ + /** The request object for the current request. */ private RequestInput rinput; + + /** The reference to the current conference. */ private ConferenceContext conf = null; + + /** The reference to the current topic. */ private TopicContext topic = null; + + /** The reference to the sort order for the topics in the current conference. */ private TopicSortHolder topic_sort = null; /*-------------------------------------------------------------------------------- @@ -103,7 +116,7 @@ public class CurrentConference implements AutoCleanup */ public final ConferenceContext getConferenceParam(String param_name, boolean required, String on_error) - throws ErrorBox, LogInOrCreate + throws ErrorBox, LogInOrCreate { CommunityContext comm = rinput.getCommunity(required,on_error); ConferenceContext rc = null; diff --git a/src/com/silverwrist/venice/ui/conf/PostInterval.java b/src/com/silverwrist/venice/ui/conf/PostInterval.java index 8184e6a..60d9209 100644 --- a/src/com/silverwrist/venice/ui/conf/PostInterval.java +++ b/src/com/silverwrist/venice/ui/conf/PostInterval.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/PostShortcutServlet.java b/src/com/silverwrist/venice/ui/conf/PostShortcutServlet.java index 77064e5..2138fca 100644 --- a/src/com/silverwrist/venice/ui/conf/PostShortcutServlet.java +++ b/src/com/silverwrist/venice/ui/conf/PostShortcutServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/TopicSortHolder.java b/src/com/silverwrist/venice/ui/conf/TopicSortHolder.java index 7e973ee..6985c89 100644 --- a/src/com/silverwrist/venice/ui/conf/TopicSortHolder.java +++ b/src/com/silverwrist/venice/ui/conf/TopicSortHolder.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/TopicVisitOrder.java b/src/com/silverwrist/venice/ui/conf/TopicVisitOrder.java index 02f76b8..0a731d1 100644 --- a/src/com/silverwrist/venice/ui/conf/TopicVisitOrder.java +++ b/src/com/silverwrist/venice/ui/conf/TopicVisitOrder.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/TrackbackServlet.java b/src/com/silverwrist/venice/ui/conf/TrackbackServlet.java index 6725158..0205093 100644 --- a/src/com/silverwrist/venice/ui/conf/TrackbackServlet.java +++ b/src/com/silverwrist/venice/ui/conf/TrackbackServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanAddToHotlistTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanAddToHotlistTag.java index 34b8471..382eb42 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanAddToHotlistTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanAddToHotlistTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanCreateTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanCreateTag.java index 69f3bd5..b22ce37 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanCreateTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanCreateTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanManageTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanManageTag.java index 4a1cb5e..2030105 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanManageTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanManageTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanPostTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanPostTag.java index 7d01327..7d34020 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanPostTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanPostTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanReadNewTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanReadNewTag.java index 8a638ea..2a65ac1 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanReadNewTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanReadNewTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanSendInviteTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanSendInviteTag.java index 62e2f11..bb0b283 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanSendInviteTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceCanSendInviteTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceDefaultPseudTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceDefaultPseudTag.java index 5d2d1fd..006e4eb 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceDefaultPseudTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceDefaultPseudTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceIDTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceIDTag.java index 4e055df..7b47c41 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceIDTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceIDTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceNameTag.java b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceNameTag.java index 592c081..ead2bd4 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/ConferenceNameTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/ConferenceNameTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostAttachTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostAttachTag.java index 1ba682a..cbe8746 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/PostAttachTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/PostAttachTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostBoxTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostBoxTag.java index e339072..7095d78 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/PostBoxTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/PostBoxTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostButtonTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostButtonTag.java index 0c6b454..ee9e341 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/PostButtonTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/PostButtonTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostNewTopicTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostNewTopicTag.java index d49b23f..1b3feab 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/PostNewTopicTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/PostNewTopicTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostParamTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostParamTag.java index ad7bae3..3df59d7 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/PostParamTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/PostParamTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostPseudTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostPseudTag.java index eb75e45..d48bf47 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/PostPseudTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/PostPseudTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostRewriteTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostRewriteTag.java index 67e5536..2e98fd6 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/PostRewriteTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/PostRewriteTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/PostTextTag.java b/src/com/silverwrist/venice/ui/conf/jsp/PostTextTag.java index 0a4e19c..3078429 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/PostTextTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/PostTextTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.conf.jsp; import java.io.IOException; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.ui.*; public class PostTextTag extends VeniceConfBodyTagSupport @@ -30,14 +30,18 @@ public class PostTextTag extends VeniceConfBodyTagSupport *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(PostTextTag.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(PostTextTag.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ + /** The name of the text field. */ private String name = null; + + /** The body text to be included. */ private String bodytext = null; /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanArchiveTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanArchiveTag.java index f609011..fabeda7 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanArchiveTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanArchiveTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanCreateTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanCreateTag.java index 986516f..ba26f06 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanCreateTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanCreateTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanDeleteTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanDeleteTag.java index 149d8f6..6512d57 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanDeleteTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanDeleteTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanFreezeTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanFreezeTag.java index a714983..f94cf49 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanFreezeTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanFreezeTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanPostTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanPostTag.java index 3bae6ac..063d627 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanPostTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanPostTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanSendInvitationTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanSendInvitationTag.java index b89bef4..dc39cc5 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicCanSendInvitationTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicCanSendInvitationTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicIDTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicIDTag.java index 6255213..efef2ce 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicIDTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicIDTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsArchivedTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsArchivedTag.java index eec08d7..01d6f4d 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsArchivedTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsArchivedTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsFrozenTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsFrozenTag.java index a79224b..fa68030 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsFrozenTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsFrozenTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsHiddenTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsHiddenTag.java index 83ccedd..647d8e1 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsHiddenTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsHiddenTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotArchivedTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotArchivedTag.java index fe31192..3954615 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotArchivedTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotArchivedTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotFrozenTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotFrozenTag.java index 83ab9af..3741ff3 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotFrozenTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotFrozenTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotHiddenTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotHiddenTag.java index 7527143..194628d 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotHiddenTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicIsNotHiddenTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicLastMessageTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicLastMessageTag.java index 547f712..615c3bf 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicLastMessageTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicLastMessageTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicNameTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicNameTag.java index 9404fec..6639a86 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicNameTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicNameTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicNotSpecifiedTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicNotSpecifiedTag.java index 7dad274..265a1c1 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicNotSpecifiedTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicNotSpecifiedTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicNotSubscribedTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicNotSubscribedTag.java index cd2c81f..271cf6e 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicNotSubscribedTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicNotSubscribedTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicNumberTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicNumberTag.java index 5177d97..0aab081 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicNumberTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicNumberTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicSpecifiedTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicSpecifiedTag.java index 945d1e4..4c417a7 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicSpecifiedTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicSpecifiedTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/TopicSubscribedTag.java b/src/com/silverwrist/venice/ui/conf/jsp/TopicSubscribedTag.java index c248efc..d0860da 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/TopicSubscribedTag.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/TopicSubscribedTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/VeniceConfBodyTagSupport.java b/src/com/silverwrist/venice/ui/conf/jsp/VeniceConfBodyTagSupport.java index 8444a8f..e00372d 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/VeniceConfBodyTagSupport.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/VeniceConfBodyTagSupport.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/jsp/VeniceConfTagSupport.java b/src/com/silverwrist/venice/ui/conf/jsp/VeniceConfTagSupport.java index d927e26..4626977 100644 --- a/src/com/silverwrist/venice/ui/conf/jsp/VeniceConfTagSupport.java +++ b/src/com/silverwrist/venice/ui/conf/jsp/VeniceConfTagSupport.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/view/ConfMemberView.java b/src/com/silverwrist/venice/ui/conf/view/ConfMemberView.java index 7b3dd21..3ab7c65 100644 --- a/src/com/silverwrist/venice/ui/conf/view/ConfMemberView.java +++ b/src/com/silverwrist/venice/ui/conf/view/ConfMemberView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/view/FindPostView.java b/src/com/silverwrist/venice/ui/conf/view/FindPostView.java index b14e405..fd4b42b 100644 --- a/src/com/silverwrist/venice/ui/conf/view/FindPostView.java +++ b/src/com/silverwrist/venice/ui/conf/view/FindPostView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/conf/view/PostsView.java b/src/com/silverwrist/venice/ui/conf/view/PostsView.java index 2d1f4f8..d8767fc 100644 --- a/src/com/silverwrist/venice/ui/conf/view/PostsView.java +++ b/src/com/silverwrist/venice/ui/conf/view/PostsView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.conf.view; import java.awt.Dimension; import java.util.*; import javax.servlet.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; import com.silverwrist.venice.except.*; @@ -36,33 +36,69 @@ public class PostsView implements ContentJSP *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(PostsView.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(PostsView.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ - private CommunityContext comm; - private ConferenceContext conf; - private TopicContext topic; + /** The community in which these posts reside. */ + private final CommunityContext comm; + + /** The conference in which these posts reside. */ + private final ConferenceContext conf; + + /** The topic in which these posts reside. */ + private final TopicContext topic; + + /** The "quick ID" for this page. */ private String qid = null; + + /** The index of the first post to display. */ private int first = 0; + + /** The index of the last post to display. */ private int last; + + /** The number of unread messages in this topic. */ private int unread; + + /** true to show the "advanced controls" for the posts in this view. */ private boolean show_advanced = false; + + /** true to override the "bozo filter" for this display. */ private boolean no_bozos = false; + + /** Request object for the current request. */ private RequestInput rinput = null; + + /** Instance of the HTML rendering utility interface. */ private HTMLRendering html = null; + + /** The actual list of messages to be displayed. */ private List messages = Collections.EMPTY_LIST; + private TopicVisitOrder tvo = null; private String topic_stem = ""; + + /** Top custom block to be displayed. */ private String top_custom = ""; + + /** Bottom custom block to be displayed. */ private String bottom_custom = ""; + private Dimension photo_dims = null; private Map photo_map = null; - private Set bozo_uids = new HashSet(); + + /** The user IDs of all the users who have been bozo-filtered in this topic. */ + private final Set bozo_uids = new HashSet(); + + /** The title for this view. */ private String title = ""; + + /** The subtitle for this view. */ private String subtitle = ""; /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/ui/config/ButtonHolder.java b/src/com/silverwrist/venice/ui/config/ButtonHolder.java index 320120c..b998e3a 100644 --- a/src/com/silverwrist/venice/ui/config/ButtonHolder.java +++ b/src/com/silverwrist/venice/ui/config/ButtonHolder.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/config/ColorPalette.java b/src/com/silverwrist/venice/ui/config/ColorPalette.java index d0ba4a5..7a5501b 100644 --- a/src/com/silverwrist/venice/ui/config/ColorPalette.java +++ b/src/com/silverwrist/venice/ui/config/ColorPalette.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/config/DialogManager.java b/src/com/silverwrist/venice/ui/config/DialogManager.java index 5c85e69..7960322 100644 --- a/src/com/silverwrist/venice/ui/config/DialogManager.java +++ b/src/com/silverwrist/venice/ui/config/DialogManager.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/config/EmoticonManager.java b/src/com/silverwrist/venice/ui/config/EmoticonManager.java index dd3b14a..5c0329c 100644 --- a/src/com/silverwrist/venice/ui/config/EmoticonManager.java +++ b/src/com/silverwrist/venice/ui/config/EmoticonManager.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/config/Remapper.java b/src/com/silverwrist/venice/ui/config/Remapper.java index 57fd473..8a1500b 100644 --- a/src/com/silverwrist/venice/ui/config/Remapper.java +++ b/src/com/silverwrist/venice/ui/config/Remapper.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/config/RootConfig.java b/src/com/silverwrist/venice/ui/config/RootConfig.java index 1652d64..025481e 100644 --- a/src/com/silverwrist/venice/ui/config/RootConfig.java +++ b/src/com/silverwrist/venice/ui/config/RootConfig.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -41,7 +41,7 @@ public class RootConfig implements LinkTypes, ColorSelectors *-------------------------------------------------------------------------------- */ - private static final String VENICE_URL = "http://venice.sourceforge.net"; + private static final String VENICE_URL = "http://venice.users.sf.net"; private static final String VENICE_IMAGE = "powered-by-venice.gif"; private static final int VENICE_IMAGE_WIDTH = 129; private static final int VENICE_IMAGE_HEIGHT = 103; diff --git a/src/com/silverwrist/venice/ui/config/SideBoxManager.java b/src/com/silverwrist/venice/ui/config/SideBoxManager.java index 24ee4bf..828730f 100644 --- a/src/com/silverwrist/venice/ui/config/SideBoxManager.java +++ b/src/com/silverwrist/venice/ui/config/SideBoxManager.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.venice.ui.config; 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.VeniceEngine; @@ -36,13 +36,15 @@ public class SideBoxManager *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(SideBoxManager.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(SideBoxManager.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ + /** Map of factories for sidebox objects. */ private Map factories; /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/ui/dlg/BaseDialogField.java b/src/com/silverwrist/venice/ui/dlg/BaseDialogField.java index d32e5c6..d14529a 100644 --- a/src/com/silverwrist/venice/ui/dlg/BaseDialogField.java +++ b/src/com/silverwrist/venice/ui/dlg/BaseDialogField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/CategoryHeader.java b/src/com/silverwrist/venice/ui/dlg/CategoryHeader.java index 86df273..4e07687 100644 --- a/src/com/silverwrist/venice/ui/dlg/CategoryHeader.java +++ b/src/com/silverwrist/venice/ui/dlg/CategoryHeader.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/CheckBoxField.java b/src/com/silverwrist/venice/ui/dlg/CheckBoxField.java index 3b3d787..26a27f0 100644 --- a/src/com/silverwrist/venice/ui/dlg/CheckBoxField.java +++ b/src/com/silverwrist/venice/ui/dlg/CheckBoxField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/CommunityLogoField.java b/src/com/silverwrist/venice/ui/dlg/CommunityLogoField.java index dfa509f..62485a7 100644 --- a/src/com/silverwrist/venice/ui/dlg/CommunityLogoField.java +++ b/src/com/silverwrist/venice/ui/dlg/CommunityLogoField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/CountryListField.java b/src/com/silverwrist/venice/ui/dlg/CountryListField.java index e18f35a..c6bcfeb 100644 --- a/src/com/silverwrist/venice/ui/dlg/CountryListField.java +++ b/src/com/silverwrist/venice/ui/dlg/CountryListField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/DateField.java b/src/com/silverwrist/venice/ui/dlg/DateField.java index 5a3994f..099fd9b 100644 --- a/src/com/silverwrist/venice/ui/dlg/DateField.java +++ b/src/com/silverwrist/venice/ui/dlg/DateField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/Dialog.java b/src/com/silverwrist/venice/ui/dlg/Dialog.java index 4bece94..9786a2c 100644 --- a/src/com/silverwrist/venice/ui/dlg/Dialog.java +++ b/src/com/silverwrist/venice/ui/dlg/Dialog.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/DialogCommandButton.java b/src/com/silverwrist/venice/ui/dlg/DialogCommandButton.java index 2b2ed8a..975e674 100644 --- a/src/com/silverwrist/venice/ui/dlg/DialogCommandButton.java +++ b/src/com/silverwrist/venice/ui/dlg/DialogCommandButton.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/DialogElementLoader.java b/src/com/silverwrist/venice/ui/dlg/DialogElementLoader.java index f66ed1b..18292fd 100644 --- a/src/com/silverwrist/venice/ui/dlg/DialogElementLoader.java +++ b/src/com/silverwrist/venice/ui/dlg/DialogElementLoader.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/DialogField.java b/src/com/silverwrist/venice/ui/dlg/DialogField.java index 978048c..dbce5d5 100644 --- a/src/com/silverwrist/venice/ui/dlg/DialogField.java +++ b/src/com/silverwrist/venice/ui/dlg/DialogField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/EMailAddressField.java b/src/com/silverwrist/venice/ui/dlg/EMailAddressField.java index 73d1c9e..4472e34 100644 --- a/src/com/silverwrist/venice/ui/dlg/EMailAddressField.java +++ b/src/com/silverwrist/venice/ui/dlg/EMailAddressField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/EnumPickListField.java b/src/com/silverwrist/venice/ui/dlg/EnumPickListField.java index b1586e1..9df9e14 100644 --- a/src/com/silverwrist/venice/ui/dlg/EnumPickListField.java +++ b/src/com/silverwrist/venice/ui/dlg/EnumPickListField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -107,11 +107,11 @@ public class EnumPickListField extends PickListField } // end isInstance - final String getNameFromEnum(Object enum) + final String getNameFromEnum(Object en) { try { // invoke the method to return the name - return (String)(m_getname.invoke(enum,NO_ARGS)); + return (String)(m_getname.invoke(en,NO_ARGS)); } // end try catch (IllegalAccessException e) diff --git a/src/com/silverwrist/venice/ui/dlg/HiddenField.java b/src/com/silverwrist/venice/ui/dlg/HiddenField.java index 248177a..6099d67 100644 --- a/src/com/silverwrist/venice/ui/dlg/HiddenField.java +++ b/src/com/silverwrist/venice/ui/dlg/HiddenField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/IPAddressField.java b/src/com/silverwrist/venice/ui/dlg/IPAddressField.java index 82b0140..f66faf5 100644 --- a/src/com/silverwrist/venice/ui/dlg/IPAddressField.java +++ b/src/com/silverwrist/venice/ui/dlg/IPAddressField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/ImageButton.java b/src/com/silverwrist/venice/ui/dlg/ImageButton.java index a9c781f..4f0a20d 100644 --- a/src/com/silverwrist/venice/ui/dlg/ImageButton.java +++ b/src/com/silverwrist/venice/ui/dlg/ImageButton.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/IntegerField.java b/src/com/silverwrist/venice/ui/dlg/IntegerField.java index 775d85c..386430d 100644 --- a/src/com/silverwrist/venice/ui/dlg/IntegerField.java +++ b/src/com/silverwrist/venice/ui/dlg/IntegerField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/LanguageListField.java b/src/com/silverwrist/venice/ui/dlg/LanguageListField.java index eaffe8e..ba925e2 100644 --- a/src/com/silverwrist/venice/ui/dlg/LanguageListField.java +++ b/src/com/silverwrist/venice/ui/dlg/LanguageListField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/LocaleListField.java b/src/com/silverwrist/venice/ui/dlg/LocaleListField.java index 3ef56ff..f356d49 100644 --- a/src/com/silverwrist/venice/ui/dlg/LocaleListField.java +++ b/src/com/silverwrist/venice/ui/dlg/LocaleListField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/PasswordField.java b/src/com/silverwrist/venice/ui/dlg/PasswordField.java index 49b9ce1..c352e81 100644 --- a/src/com/silverwrist/venice/ui/dlg/PasswordField.java +++ b/src/com/silverwrist/venice/ui/dlg/PasswordField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/PickListField.java b/src/com/silverwrist/venice/ui/dlg/PickListField.java index e23baef..b63ffcc 100644 --- a/src/com/silverwrist/venice/ui/dlg/PickListField.java +++ b/src/com/silverwrist/venice/ui/dlg/PickListField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/RoleListField.java b/src/com/silverwrist/venice/ui/dlg/RoleListField.java index a742ed5..b5aa8d4 100644 --- a/src/com/silverwrist/venice/ui/dlg/RoleListField.java +++ b/src/com/silverwrist/venice/ui/dlg/RoleListField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/StaticPickListField.java b/src/com/silverwrist/venice/ui/dlg/StaticPickListField.java index 6d949cc..ab35da7 100644 --- a/src/com/silverwrist/venice/ui/dlg/StaticPickListField.java +++ b/src/com/silverwrist/venice/ui/dlg/StaticPickListField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/TextField.java b/src/com/silverwrist/venice/ui/dlg/TextField.java index 75adeb4..abf7906 100644 --- a/src/com/silverwrist/venice/ui/dlg/TextField.java +++ b/src/com/silverwrist/venice/ui/dlg/TextField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/TimeZoneListField.java b/src/com/silverwrist/venice/ui/dlg/TimeZoneListField.java index 61e7150..cb8f38e 100644 --- a/src/com/silverwrist/venice/ui/dlg/TimeZoneListField.java +++ b/src/com/silverwrist/venice/ui/dlg/TimeZoneListField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/UserPhotoField.java b/src/com/silverwrist/venice/ui/dlg/UserPhotoField.java index 34785bf..429a5f5 100644 --- a/src/com/silverwrist/venice/ui/dlg/UserPhotoField.java +++ b/src/com/silverwrist/venice/ui/dlg/UserPhotoField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/dlg/VeniceIDField.java b/src/com/silverwrist/venice/ui/dlg/VeniceIDField.java index b28ff21..30cfe82 100644 --- a/src/com/silverwrist/venice/ui/dlg/VeniceIDField.java +++ b/src/com/silverwrist/venice/ui/dlg/VeniceIDField.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/BinaryDataContent.java b/src/com/silverwrist/venice/ui/helpers/BinaryDataContent.java index 35a3873..6c5c69a 100644 --- a/src/com/silverwrist/venice/ui/helpers/BinaryDataContent.java +++ b/src/com/silverwrist/venice/ui/helpers/BinaryDataContent.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/BrowserInformation.java b/src/com/silverwrist/venice/ui/helpers/BrowserInformation.java index e84c068..e8348d7 100644 --- a/src/com/silverwrist/venice/ui/helpers/BrowserInformation.java +++ b/src/com/silverwrist/venice/ui/helpers/BrowserInformation.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/ConfirmBox.java b/src/com/silverwrist/venice/ui/helpers/ConfirmBox.java index 991276f..44a0bde 100644 --- a/src/com/silverwrist/venice/ui/helpers/ConfirmBox.java +++ b/src/com/silverwrist/venice/ui/helpers/ConfirmBox.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/CookieControl.java b/src/com/silverwrist/venice/ui/helpers/CookieControl.java index 2c3fa3e..0271414 100644 --- a/src/com/silverwrist/venice/ui/helpers/CookieControl.java +++ b/src/com/silverwrist/venice/ui/helpers/CookieControl.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/ErrorBox.java b/src/com/silverwrist/venice/ui/helpers/ErrorBox.java index 8d7920a..2fd9174 100644 --- a/src/com/silverwrist/venice/ui/helpers/ErrorBox.java +++ b/src/com/silverwrist/venice/ui/helpers/ErrorBox.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/HTMLRendering.java b/src/com/silverwrist/venice/ui/helpers/HTMLRendering.java index 59eea16..21062b3 100644 --- a/src/com/silverwrist/venice/ui/helpers/HTMLRendering.java +++ b/src/com/silverwrist/venice/ui/helpers/HTMLRendering.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/HTTPError.java b/src/com/silverwrist/venice/ui/helpers/HTTPError.java index 385a98c..11effd4 100644 --- a/src/com/silverwrist/venice/ui/helpers/HTTPError.java +++ b/src/com/silverwrist/venice/ui/helpers/HTTPError.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/ImageHandler.java b/src/com/silverwrist/venice/ui/helpers/ImageHandler.java index 7526d56..258afcb 100644 --- a/src/com/silverwrist/venice/ui/helpers/ImageHandler.java +++ b/src/com/silverwrist/venice/ui/helpers/ImageHandler.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/ImportHelper.java b/src/com/silverwrist/venice/ui/helpers/ImportHelper.java index d6263bc..2b87edf 100644 --- a/src/com/silverwrist/venice/ui/helpers/ImportHelper.java +++ b/src/com/silverwrist/venice/ui/helpers/ImportHelper.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.helpers; import java.io.*; 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.*; @@ -34,15 +34,21 @@ public class ImportHelper *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(ImportHelper.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(ImportHelper.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ + /** The number of records processed by this class. */ private int processed = 0; + + /** The number of errors reported. */ private int errors = 0; + + /** The error message to be displayed. */ private String message = null; /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/ui/helpers/LogInOrCreate.java b/src/com/silverwrist/venice/ui/helpers/LogInOrCreate.java index 2ea7b3b..499d0a9 100644 --- a/src/com/silverwrist/venice/ui/helpers/LogInOrCreate.java +++ b/src/com/silverwrist/venice/ui/helpers/LogInOrCreate.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/NullResponse.java b/src/com/silverwrist/venice/ui/helpers/NullResponse.java index cc429a4..32c4b62 100644 --- a/src/com/silverwrist/venice/ui/helpers/NullResponse.java +++ b/src/com/silverwrist/venice/ui/helpers/NullResponse.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/Redirect.java b/src/com/silverwrist/venice/ui/helpers/Redirect.java index 0811d85..50bd314 100644 --- a/src/com/silverwrist/venice/ui/helpers/Redirect.java +++ b/src/com/silverwrist/venice/ui/helpers/Redirect.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/ResourceLoader.java b/src/com/silverwrist/venice/ui/helpers/ResourceLoader.java index 4fecf5b..49f800f 100644 --- a/src/com/silverwrist/venice/ui/helpers/ResourceLoader.java +++ b/src/com/silverwrist/venice/ui/helpers/ResourceLoader.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/SessionControl.java b/src/com/silverwrist/venice/ui/helpers/SessionControl.java index 278afc3..5ea3d5d 100644 --- a/src/com/silverwrist/venice/ui/helpers/SessionControl.java +++ b/src/com/silverwrist/venice/ui/helpers/SessionControl.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/SessionKiller.java b/src/com/silverwrist/venice/ui/helpers/SessionKiller.java index cee2a55..bb34fa4 100644 --- a/src/com/silverwrist/venice/ui/helpers/SessionKiller.java +++ b/src/com/silverwrist/venice/ui/helpers/SessionKiller.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/helpers/ThrowableContent.java b/src/com/silverwrist/venice/ui/helpers/ThrowableContent.java index 35201f9..e0eeea0 100644 --- a/src/com/silverwrist/venice/ui/helpers/ThrowableContent.java +++ b/src/com/silverwrist/venice/ui/helpers/ThrowableContent.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -31,7 +31,7 @@ import com.silverwrist.venice.except.VeniceException; * {@link com.silverwrist.venice.ui.ContentDirect ContentDirect} or * {@link com.silverwrist.venice.ui.ContentJSP ContentJSP}. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public abstract class ThrowableContent extends Throwable diff --git a/src/com/silverwrist/venice/ui/helpers/UserExportHelper.java b/src/com/silverwrist/venice/ui/helpers/UserExportHelper.java index db1778e..9187033 100644 --- a/src/com/silverwrist/venice/ui/helpers/UserExportHelper.java +++ b/src/com/silverwrist/venice/ui/helpers/UserExportHelper.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunityAliasTag.java b/src/com/silverwrist/venice/ui/jsp/CommunityAliasTag.java index 2f12b60..67f24b0 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunityAliasTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunityAliasTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunityCanJoinTag.java b/src/com/silverwrist/venice/ui/jsp/CommunityCanJoinTag.java index 737f139..bbd1714 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunityCanJoinTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunityCanJoinTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunityCanSendInvitationTag.java b/src/com/silverwrist/venice/ui/jsp/CommunityCanSendInvitationTag.java index b741140..bafa8ba 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunityCanSendInvitationTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunityCanSendInvitationTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunityCannotJoinTag.java b/src/com/silverwrist/venice/ui/jsp/CommunityCannotJoinTag.java index 45be615..2bc2803 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunityCannotJoinTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunityCannotJoinTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunityIDTag.java b/src/com/silverwrist/venice/ui/jsp/CommunityIDTag.java index e19650b..37e8dc6 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunityIDTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunityIDTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunityIsPrivateTag.java b/src/com/silverwrist/venice/ui/jsp/CommunityIsPrivateTag.java index 1399a52..e5d5208 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunityIsPrivateTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunityIsPrivateTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunityIsPublicTag.java b/src/com/silverwrist/venice/ui/jsp/CommunityIsPublicTag.java index 1acf4a0..c68631c 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunityIsPublicTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunityIsPublicTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunityNameTag.java b/src/com/silverwrist/venice/ui/jsp/CommunityNameTag.java index 9f75b02..5eec3dc 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunityNameTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunityNameTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/CommunitySynopsisTag.java b/src/com/silverwrist/venice/ui/jsp/CommunitySynopsisTag.java index 600cce7..366143e 100644 --- a/src/com/silverwrist/venice/ui/jsp/CommunitySynopsisTag.java +++ b/src/com/silverwrist/venice/ui/jsp/CommunitySynopsisTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameBannerAdTag.java b/src/com/silverwrist/venice/ui/jsp/FrameBannerAdTag.java index ecfa57f..d7c50bf 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameBannerAdTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameBannerAdTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameBodyTag.java b/src/com/silverwrist/venice/ui/jsp/FrameBodyTag.java index 36b991a..4dc7f46 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameBodyTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameBodyTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameContentHereTag.java b/src/com/silverwrist/venice/ui/jsp/FrameContentHereTag.java index 2fe743a..1b0d8c2 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameContentHereTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameContentHereTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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): */ @@ -21,7 +21,7 @@ import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.ui.*; public class FrameContentHereTag extends VeniceTagSupport @@ -31,7 +31,8 @@ public class FrameContentHereTag extends VeniceTagSupport *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(FrameContentHereTag.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(FrameContentHereTag.class); /*-------------------------------------------------------------------------------- * Overrides from class TagSupport diff --git a/src/com/silverwrist/venice/ui/jsp/FrameCurrentMenuTag.java b/src/com/silverwrist/venice/ui/jsp/FrameCurrentMenuTag.java index 4984f6a..a220732 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameCurrentMenuTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameCurrentMenuTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameDisplayLoginTag.java b/src/com/silverwrist/venice/ui/jsp/FrameDisplayLoginTag.java index e4c7481..5cd1ef5 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameDisplayLoginTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameDisplayLoginTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameHeadTag.java b/src/com/silverwrist/venice/ui/jsp/FrameHeadTag.java index 2e59832..a6b04ba 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameHeadTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameHeadTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameIfQIDTag.java b/src/com/silverwrist/venice/ui/jsp/FrameIfQIDTag.java index 1d55938..c62b892 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameIfQIDTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameIfQIDTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameLeftMenuTag.java b/src/com/silverwrist/venice/ui/jsp/FrameLeftMenuTag.java index 874e61f..efe10af 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameLeftMenuTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameLeftMenuTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameNoDisplayLoginTag.java b/src/com/silverwrist/venice/ui/jsp/FrameNoDisplayLoginTag.java index 97749c5..e7080a6 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameNoDisplayLoginTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameNoDisplayLoginTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameQIDTag.java b/src/com/silverwrist/venice/ui/jsp/FrameQIDTag.java index 8377b3f..73a98df 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameQIDTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameQIDTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameSiteLogoTag.java b/src/com/silverwrist/venice/ui/jsp/FrameSiteLogoTag.java index b4ca1e8..3e92136 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameSiteLogoTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameSiteLogoTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/FrameVeniceLogoTag.java b/src/com/silverwrist/venice/ui/jsp/FrameVeniceLogoTag.java index 1c0475f..3df09cf 100644 --- a/src/com/silverwrist/venice/ui/jsp/FrameVeniceLogoTag.java +++ b/src/com/silverwrist/venice/ui/jsp/FrameVeniceLogoTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/GlobalCategoriesDisabledTag.java b/src/com/silverwrist/venice/ui/jsp/GlobalCategoriesDisabledTag.java index 5b61689..75a958b 100644 --- a/src/com/silverwrist/venice/ui/jsp/GlobalCategoriesDisabledTag.java +++ b/src/com/silverwrist/venice/ui/jsp/GlobalCategoriesDisabledTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/GlobalCategoriesEnabledTag.java b/src/com/silverwrist/venice/ui/jsp/GlobalCategoriesEnabledTag.java index a1029af..fa44749 100644 --- a/src/com/silverwrist/venice/ui/jsp/GlobalCategoriesEnabledTag.java +++ b/src/com/silverwrist/venice/ui/jsp/GlobalCategoriesEnabledTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UserIsLoggedInTag.java b/src/com/silverwrist/venice/ui/jsp/UserIsLoggedInTag.java index 2796148..f7e95be 100644 --- a/src/com/silverwrist/venice/ui/jsp/UserIsLoggedInTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UserIsLoggedInTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UserIsNotLoggedInTag.java b/src/com/silverwrist/venice/ui/jsp/UserIsNotLoggedInTag.java index 6bdb3d5..9495cf7 100644 --- a/src/com/silverwrist/venice/ui/jsp/UserIsNotLoggedInTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UserIsNotLoggedInTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UserIsNotVerifiedTag.java b/src/com/silverwrist/venice/ui/jsp/UserIsNotVerifiedTag.java index 212d3a1..47d6742 100644 --- a/src/com/silverwrist/venice/ui/jsp/UserIsNotVerifiedTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UserIsNotVerifiedTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UserIsVerifiedTag.java b/src/com/silverwrist/venice/ui/jsp/UserIsVerifiedTag.java index 8f2dc40..2dd3aef 100644 --- a/src/com/silverwrist/venice/ui/jsp/UserIsVerifiedTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UserIsVerifiedTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UserNameTag.java b/src/com/silverwrist/venice/ui/jsp/UserNameTag.java index 8c8c77d..0c43abc 100644 --- a/src/com/silverwrist/venice/ui/jsp/UserNameTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UserNameTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilAltTag.java b/src/com/silverwrist/venice/ui/jsp/UtilAltTag.java index c5f5d38..8987a88 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilAltTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilAltTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilButtonTag.java b/src/com/silverwrist/venice/ui/jsp/UtilButtonTag.java index 3030b29..05a0adb 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilButtonTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilButtonTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilCallJSPTag.java b/src/com/silverwrist/venice/ui/jsp/UtilCallJSPTag.java index a14a20f..ad80d0d 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilCallJSPTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilCallJSPTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilColorTag.java b/src/com/silverwrist/venice/ui/jsp/UtilColorTag.java index 721b67a..e5be724 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilColorTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilColorTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilCommentTag.java b/src/com/silverwrist/venice/ui/jsp/UtilCommentTag.java index 77e3963..14afa3e 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilCommentTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilCommentTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilEscapeTag.java b/src/com/silverwrist/venice/ui/jsp/UtilEscapeTag.java index c4b24ba..85bb897 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilEscapeTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilEscapeTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilExpandServletTag.java b/src/com/silverwrist/venice/ui/jsp/UtilExpandServletTag.java index 1740a80..a9bb66c 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilExpandServletTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilExpandServletTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilFontTag.java b/src/com/silverwrist/venice/ui/jsp/UtilFontTag.java index 48a5480..d4df9da 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilFontTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilFontTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilFormTag.java b/src/com/silverwrist/venice/ui/jsp/UtilFormTag.java index 5112378..2d0f3dc 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilFormTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilFormTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.java b/src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.java index 0192b6d..cd6f28b 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilHrefTag.java b/src/com/silverwrist/venice/ui/jsp/UtilHrefTag.java index 529689f..0ed4635 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilHrefTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilHrefTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilImageTag.java b/src/com/silverwrist/venice/ui/jsp/UtilImageTag.java index 226c64a..58f700b 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilImageTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilImageTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilLinkTag.java b/src/com/silverwrist/venice/ui/jsp/UtilLinkTag.java index 94b515f..bcfdbb1 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilLinkTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilLinkTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilLinkTitleTag.java b/src/com/silverwrist/venice/ui/jsp/UtilLinkTitleTag.java index accc6b4..0bdc5d2 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilLinkTitleTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilLinkTitleTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderItemTag.java b/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderItemTag.java index 5c4c538..442d6e9 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderItemTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderItemTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderTag.java b/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderTag.java index 2bcbba4..191f064 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilMenuHeaderTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilStdBulletTag.java b/src/com/silverwrist/venice/ui/jsp/UtilStdBulletTag.java index a2d1043..ef3fe58 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilStdBulletTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilStdBulletTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilStockMessageTag.java b/src/com/silverwrist/venice/ui/jsp/UtilStockMessageTag.java index 1bc0c73..ae94260 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilStockMessageTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilStockMessageTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilSubtitleTag.java b/src/com/silverwrist/venice/ui/jsp/UtilSubtitleTag.java index e90b3ae..31b96ce 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilSubtitleTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilSubtitleTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilTargetTag.java b/src/com/silverwrist/venice/ui/jsp/UtilTargetTag.java index 5928d74..267075a 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilTargetTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilTargetTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilTextTag.java b/src/com/silverwrist/venice/ui/jsp/UtilTextTag.java index 53cc69f..7acad95 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilTextTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilTextTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilTitleTag.java b/src/com/silverwrist/venice/ui/jsp/UtilTitleTag.java index af64be9..f4d3cf6 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilTitleTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilTitleTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilURLEncodeTag.java b/src/com/silverwrist/venice/ui/jsp/UtilURLEncodeTag.java index 5ae5004..f2e520f 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilURLEncodeTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilURLEncodeTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/UtilXLinkTag.java b/src/com/silverwrist/venice/ui/jsp/UtilXLinkTag.java index 3d08938..6a73204 100644 --- a/src/com/silverwrist/venice/ui/jsp/UtilXLinkTag.java +++ b/src/com/silverwrist/venice/ui/jsp/UtilXLinkTag.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/VeniceBodyTagSupport.java b/src/com/silverwrist/venice/ui/jsp/VeniceBodyTagSupport.java index e477c73..b2f3f1d 100644 --- a/src/com/silverwrist/venice/ui/jsp/VeniceBodyTagSupport.java +++ b/src/com/silverwrist/venice/ui/jsp/VeniceBodyTagSupport.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/jsp/VeniceTagSupport.java b/src/com/silverwrist/venice/ui/jsp/VeniceTagSupport.java index 923da57..52bff44 100644 --- a/src/com/silverwrist/venice/ui/jsp/VeniceTagSupport.java +++ b/src/com/silverwrist/venice/ui/jsp/VeniceTagSupport.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/CommunityMenu.java b/src/com/silverwrist/venice/ui/menus/CommunityMenu.java index 6fc8e50..cace68a 100644 --- a/src/com/silverwrist/venice/ui/menus/CommunityMenu.java +++ b/src/com/silverwrist/venice/ui/menus/CommunityMenu.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/CommunityMenuEntry.java b/src/com/silverwrist/venice/ui/menus/CommunityMenuEntry.java index d62a83c..1fcf01d 100644 --- a/src/com/silverwrist/venice/ui/menus/CommunityMenuEntry.java +++ b/src/com/silverwrist/venice/ui/menus/CommunityMenuEntry.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/CommunityMenuFactory.java b/src/com/silverwrist/venice/ui/menus/CommunityMenuFactory.java index 57fe8fe..06fbef7 100644 --- a/src/com/silverwrist/venice/ui/menus/CommunityMenuFactory.java +++ b/src/com/silverwrist/venice/ui/menus/CommunityMenuFactory.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/HeaderItem.java b/src/com/silverwrist/venice/ui/menus/HeaderItem.java index 40e1673..edae8d5 100644 --- a/src/com/silverwrist/venice/ui/menus/HeaderItem.java +++ b/src/com/silverwrist/venice/ui/menus/HeaderItem.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/ImageItem.java b/src/com/silverwrist/venice/ui/menus/ImageItem.java index 5137bf2..47e4ed0 100644 --- a/src/com/silverwrist/venice/ui/menus/ImageItem.java +++ b/src/com/silverwrist/venice/ui/menus/ImageItem.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/LinkItem.java b/src/com/silverwrist/venice/ui/menus/LinkItem.java index cdf69d5..5435600 100644 --- a/src/com/silverwrist/venice/ui/menus/LinkItem.java +++ b/src/com/silverwrist/venice/ui/menus/LinkItem.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/Menu.java b/src/com/silverwrist/venice/ui/menus/Menu.java index 03aa1f1..9797952 100644 --- a/src/com/silverwrist/venice/ui/menus/Menu.java +++ b/src/com/silverwrist/venice/ui/menus/Menu.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/MenuComponent.java b/src/com/silverwrist/venice/ui/menus/MenuComponent.java index cc2ea48..b4fa6a6 100644 --- a/src/com/silverwrist/venice/ui/menus/MenuComponent.java +++ b/src/com/silverwrist/venice/ui/menus/MenuComponent.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/MenuTemplate.java b/src/com/silverwrist/venice/ui/menus/MenuTemplate.java index 48660a9..3158c0e 100644 --- a/src/com/silverwrist/venice/ui/menus/MenuTemplate.java +++ b/src/com/silverwrist/venice/ui/menus/MenuTemplate.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/SeparatorItem.java b/src/com/silverwrist/venice/ui/menus/SeparatorItem.java index a235127..61c29dc 100644 --- a/src/com/silverwrist/venice/ui/menus/SeparatorItem.java +++ b/src/com/silverwrist/venice/ui/menus/SeparatorItem.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/menus/TextItem.java b/src/com/silverwrist/venice/ui/menus/TextItem.java index 97b4a6c..808168b 100644 --- a/src/com/silverwrist/venice/ui/menus/TextItem.java +++ b/src/com/silverwrist/venice/ui/menus/TextItem.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/rpc/RpcSessionBroker.java b/src/com/silverwrist/venice/ui/rpc/RpcSessionBroker.java index 5ddbdfa..493b124 100644 --- a/src/com/silverwrist/venice/ui/rpc/RpcSessionBroker.java +++ b/src/com/silverwrist/venice/ui/rpc/RpcSessionBroker.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are - * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. + * Copyright (C) 2002-2006 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * * Contributor(s): */ @@ -19,7 +19,7 @@ package com.silverwrist.venice.ui.rpc; import java.util.*; import javax.servlet.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.core.*; import com.silverwrist.venice.except.*; import com.silverwrist.venice.ui.*; @@ -76,27 +76,43 @@ class RpcSessionBroker *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(RpcSessionBroker.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(RpcSessionBroker.class); + /** The attribute where a reference to this object is kept. */ private static final String ATTRIBUTE = "ui.rpc.SessionBroker"; + /** Interval between checks for session inactivity. */ private static final long INTERVAL = 1000; + /** The prefix for RPC session names. */ private static final String PREFIX = "rpcsess:"; + + /** The alphabet from which we pick characters to be used in session IDs. */ private static final String ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890"; + + /** The length of session IDs that are generated. */ private static final int ID_LENGTH = 40; - private static Random rng = new Random(); // random number generator + /** Our private random number generator instance. */ + private static Random rng = new Random(); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ - private HashMap sessions = new HashMap(); // the actual sessions - private VeniceEngine engine; // the Venice engine - private int timeout_value; // the timeout value - private Timer timer = new Timer(true); // the interval timer used to schedule sweeps + /** Container for all sessions this object manages. */ + private final HashMap sessions = new HashMap(); + + /** Reference to the Venice engine. */ + private final VeniceEngine engine; + + /** The session timeout value. */ + private final int timeout_value; + + /** The internal timer used to schedule sweeps. */ + private final Timer timer = new Timer(true); /*-------------------------------------------------------------------------------- * Constructor diff --git a/src/com/silverwrist/venice/ui/rpc/RpcVeniceUISession.java b/src/com/silverwrist/venice/ui/rpc/RpcVeniceUISession.java index 7dfd469..2b4f829 100644 --- a/src/com/silverwrist/venice/ui/rpc/RpcVeniceUISession.java +++ b/src/com/silverwrist/venice/ui/rpc/RpcVeniceUISession.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcCreateSession.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcCreateSession.java index 0858a43..e5b6af3 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcCreateSession.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcCreateSession.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are - * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. + * Copyright (C) 2002-2006 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * * Contributor(s): */ package com.silverwrist.venice.ui.rpc; import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.ui.*; public class XmlRpcCreateSession implements XmlRpcDispatch @@ -28,7 +28,8 @@ public class XmlRpcCreateSession implements XmlRpcDispatch *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(XmlRpcCreateSession.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(XmlRpcCreateSession.class); /*-------------------------------------------------------------------------------- * Implementations from interface XmlRpcDispatch diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcDispatch.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcDispatch.java index 4935d19..612665c 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcDispatch.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcDispatch.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcFault.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcFault.java index 00cd70a..a5b23a8 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcFault.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcFault.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcLibrary.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcLibrary.java index aeaccd7..b0cec05 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcLibrary.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcLibrary.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcMethod.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcMethod.java index 16baad4..6dce790 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcMethod.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcMethod.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are - * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. + * Copyright (C) 2002-2006 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * * Contributor(s): */ @@ -19,7 +19,7 @@ package com.silverwrist.venice.ui.rpc; import java.io.*; import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.apache.regexp.*; import org.w3c.dom.*; import com.silverwrist.util.*; @@ -39,17 +39,23 @@ public class XmlRpcMethod *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(XmlRpcMethod.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(XmlRpcMethod.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ - private REProgram method_pgm; // regular expression program to match method name + /** Regular expression program to match the method name. */ + private REProgram method_pgm; + private String remap_value = null; // remap value private Class obj_class = null; // "class" handler for object - private String script_name = null; // script name to use as a handler + + /** The name of the script that handles this method. */ + private String script_name = null; + private Map raw_env; // "raw" environment private int session_param = -1; // session parameter diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcMulticall.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcMulticall.java index e6ed55d..5c815a6 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcMulticall.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcMulticall.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcRequest.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcRequest.java index 4d6d8de..b08d125 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcRequest.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcRequest.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcSelfSerializer.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcSelfSerializer.java index c4194b9..741c8ed 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcSelfSerializer.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcSelfSerializer.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcSerializer.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcSerializer.java index 3ccc926..f91c50c 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcSerializer.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcSerializer.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are - * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. + * Copyright (C) 2002-2006 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * * Contributor(s): */ @@ -24,7 +24,7 @@ import java.lang.reflect.*; import java.util.*; import javax.mail.*; import javax.mail.internet.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.util.*; public class XmlRpcSerializer @@ -34,17 +34,23 @@ public class XmlRpcSerializer *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(XmlRpcSerializer.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(XmlRpcSerializer.class); - private static XmlRpcSerializer self = null; + /** Singleton instance of this class. */ + private static XmlRpcSerializer _self = null; - private static SimpleTimeZone utc = new SimpleTimeZone(0,"UTC"); + /** Simple time zone for converting times. */ + private static final SimpleTimeZone utc = new SimpleTimeZone(0,"UTC"); /*-------------------------------------------------------------------------------- * Constructor *-------------------------------------------------------------------------------- */ + /** + * Creates the singleton instance of XmlRpcSerializer. + */ private XmlRpcSerializer() { // do nothing } // end constructor @@ -388,11 +394,11 @@ public class XmlRpcSerializer } // end serializeDate - public final String serializeEnumeration(Enumeration enum) throws XmlRpcFault + public final String serializeEnumeration(Enumeration en) throws XmlRpcFault { StringBuffer b = new StringBuffer("\r\n\r\n"); - while (enum.hasMoreElements()) - b.append("").append(this.serialize(enum.nextElement())).append(""); + while (en.hasMoreElements()) + b.append("").append(this.serialize(en.nextElement())).append(""); b.append("\r\n"); return b.toString(); @@ -484,11 +490,16 @@ public class XmlRpcSerializer *-------------------------------------------------------------------------------- */ + /** + * Returns the singleton instance of XmlRpcSerializer, creating it if necessary. + * + * @return The singleton instance of XmlRpcSerializer. + */ public static final synchronized XmlRpcSerializer get() { - if (self==null) - self = new XmlRpcSerializer(); - return self; + if (_self==null) + _self = new XmlRpcSerializer(); + return _self; } // end get diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcServlet.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcServlet.java index a4cdca7..f1efb75 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcServlet.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are - * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. + * Copyright (C) 2002-2006 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * * Contributor(s): */ @@ -21,7 +21,7 @@ import java.io.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.apache.regexp.*; import org.w3c.dom.Document; import com.silverwrist.util.*; @@ -78,10 +78,13 @@ public class XmlRpcServlet extends BaseServlet *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(XmlRpcServlet.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(XmlRpcServlet.class); + /** Context attribute name for the method list. */ private static final String METHOD_LIST_ATTR = "ui.xmlrpc.MethodList"; + /** Context attribute name for the object class cache. */ public static final String OBJECT_CLASS_CACHE_ATTR = "ui.xmlrpc.class.ObjectCache"; /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/ui/rpc/XmlRpcTestHandler.java b/src/com/silverwrist/venice/ui/rpc/XmlRpcTestHandler.java index 0ddc02e..b05d594 100644 --- a/src/com/silverwrist/venice/ui/rpc/XmlRpcTestHandler.java +++ b/src/com/silverwrist/venice/ui/rpc/XmlRpcTestHandler.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/script/ScriptExit.java b/src/com/silverwrist/venice/ui/script/ScriptExit.java index 7c69595..00485ba 100644 --- a/src/com/silverwrist/venice/ui/script/ScriptExit.java +++ b/src/com/silverwrist/venice/ui/script/ScriptExit.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/script/ScriptLibrary.java b/src/com/silverwrist/venice/ui/script/ScriptLibrary.java index 913c196..b3dee1c 100644 --- a/src/com/silverwrist/venice/ui/script/ScriptLibrary.java +++ b/src/com/silverwrist/venice/ui/script/ScriptLibrary.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/script/ScriptManager.java b/src/com/silverwrist/venice/ui/script/ScriptManager.java index 95f315f..7bf4b1f 100644 --- a/src/com/silverwrist/venice/ui/script/ScriptManager.java +++ b/src/com/silverwrist/venice/ui/script/ScriptManager.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/script/ScriptManagerContainer.java b/src/com/silverwrist/venice/ui/script/ScriptManagerContainer.java index e9130f4..36f1ab6 100644 --- a/src/com/silverwrist/venice/ui/script/ScriptManagerContainer.java +++ b/src/com/silverwrist/venice/ui/script/ScriptManagerContainer.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/script/ScriptReturn.java b/src/com/silverwrist/venice/ui/script/ScriptReturn.java index 8d2567a..16afbc1 100644 --- a/src/com/silverwrist/venice/ui/script/ScriptReturn.java +++ b/src/com/silverwrist/venice/ui/script/ScriptReturn.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/script/ScriptSupport.java b/src/com/silverwrist/venice/ui/script/ScriptSupport.java index 3e3b4ae..0f1c6f6 100644 --- a/src/com/silverwrist/venice/ui/script/ScriptSupport.java +++ b/src/com/silverwrist/venice/ui/script/ScriptSupport.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/script/ScriptingException.java b/src/com/silverwrist/venice/ui/script/ScriptingException.java index c792749..7c92f34 100644 --- a/src/com/silverwrist/venice/ui/script/ScriptingException.java +++ b/src/com/silverwrist/venice/ui/script/ScriptingException.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/servlet/BaseServlet.java b/src/com/silverwrist/venice/ui/servlet/BaseServlet.java index 0e66463..e79a680 100644 --- a/src/com/silverwrist/venice/ui/servlet/BaseServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/BaseServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/servlet/BrowserDatabase.java b/src/com/silverwrist/venice/ui/servlet/BrowserDatabase.java index 75cd73d..6f4b4b8 100644 --- a/src/com/silverwrist/venice/ui/servlet/BrowserDatabase.java +++ b/src/com/silverwrist/venice/ui/servlet/BrowserDatabase.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/servlet/CommunityDispatchServlet.java b/src/com/silverwrist/venice/ui/servlet/CommunityDispatchServlet.java index c14bda6..661c32f 100644 --- a/src/com/silverwrist/venice/ui/servlet/CommunityDispatchServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/CommunityDispatchServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.venice.ui.servlet; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.core.*; import com.silverwrist.venice.except.*; import com.silverwrist.venice.ui.*; @@ -30,7 +30,8 @@ public class CommunityDispatchServlet extends BaseServlet *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(CommunityDispatchServlet.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(CommunityDispatchServlet.class); /*-------------------------------------------------------------------------------- * Implementations from class BaseServlet diff --git a/src/com/silverwrist/venice/ui/servlet/FrameServlet.java b/src/com/silverwrist/venice/ui/servlet/FrameServlet.java index 3cc034c..3e86bcb 100644 --- a/src/com/silverwrist/venice/ui/servlet/FrameServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/FrameServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.servlet; import java.io.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.util.IOUtil; import com.silverwrist.util.cache.CacheMap; import com.silverwrist.venice.ui.*; @@ -144,7 +144,8 @@ public class FrameServlet extends BaseServlet *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(FrameServlet.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(FrameServlet.class); /*-------------------------------------------------------------------------------- * Attributes diff --git a/src/com/silverwrist/venice/ui/servlet/GatewayServlet.java b/src/com/silverwrist/venice/ui/servlet/GatewayServlet.java index 293605e..b05e375 100644 --- a/src/com/silverwrist/venice/ui/servlet/GatewayServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/GatewayServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.servlet; import java.io.*; import java.net.URLEncoder; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.core.*; import com.silverwrist.venice.except.*; import com.silverwrist.venice.ui.*; @@ -34,7 +34,8 @@ public class GatewayServlet extends BaseServlet *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(GatewayServlet.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(GatewayServlet.class); /*-------------------------------------------------------------------------------- * Implementations from class BaseServlet diff --git a/src/com/silverwrist/venice/ui/servlet/GetImageServlet.java b/src/com/silverwrist/venice/ui/servlet/GetImageServlet.java index 811317b..718589f 100644 --- a/src/com/silverwrist/venice/ui/servlet/GetImageServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/GetImageServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.servlet; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.core.*; import com.silverwrist.venice.except.*; import com.silverwrist.venice.ui.*; @@ -31,7 +31,8 @@ public class GetImageServlet extends BaseServlet *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(GetImageServlet.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(GetImageServlet.class); /*-------------------------------------------------------------------------------- * Implementations from class BaseServlet diff --git a/src/com/silverwrist/venice/ui/servlet/HttpVeniceUISession.java b/src/com/silverwrist/venice/ui/servlet/HttpVeniceUISession.java index 6041daa..4e8698e 100644 --- a/src/com/silverwrist/venice/ui/servlet/HttpVeniceUISession.java +++ b/src/com/silverwrist/venice/ui/servlet/HttpVeniceUISession.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are - * Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. + * Copyright (C) 2002-2006 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * * Contributor(s): */ @@ -21,7 +21,7 @@ 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.venice.core.*; import com.silverwrist.venice.except.*; import com.silverwrist.venice.ui.*; @@ -35,18 +35,27 @@ class HttpVeniceUISession implements VeniceUISession, HttpSessionBindingListener *-------------------------------------------------------------------------------- */ + /** "Stem" string for all session attributes. */ private static final String SESSION_ATTRIBUTE_STEM = "venice.vars."; - private static Category logger = Category.getInstance(HttpVeniceUISession.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(HttpVeniceUISession.class); /*-------------------------------------------------------------------------------- * Attributes *-------------------------------------------------------------------------------- */ - private HttpSession session; // HTTP session value - private UserContext user; // user context associated with this session - private boolean new_session = true; // is this a new session? + /** The {@link javax.servlet.http.HttpSession HttpSession} assicated with this object. */ + private HttpSession session; + + /** The user context associated with this session. */ + private UserContext user; + + /** true if this is a new session. */ + private boolean new_session = true; + + /** Reference to the global session list. */ private HttpVeniceUISessionList m_session_list = null; /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/ui/servlet/HttpVeniceUISessionList.java b/src/com/silverwrist/venice/ui/servlet/HttpVeniceUISessionList.java index b5ec062..d00ce27 100644 --- a/src/com/silverwrist/venice/ui/servlet/HttpVeniceUISessionList.java +++ b/src/com/silverwrist/venice/ui/servlet/HttpVeniceUISessionList.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/servlet/PasswordRecoveryServlet.java b/src/com/silverwrist/venice/ui/servlet/PasswordRecoveryServlet.java index f59d479..d257036 100644 --- a/src/com/silverwrist/venice/ui/servlet/PasswordRecoveryServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/PasswordRecoveryServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.servlet; import java.io.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.core.*; import com.silverwrist.venice.except.*; import com.silverwrist.venice.ui.*; @@ -32,7 +32,8 @@ public class PasswordRecoveryServlet extends BaseServlet *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(PasswordRecoveryServlet.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(PasswordRecoveryServlet.class); /*-------------------------------------------------------------------------------- * Implementations from class BaseServlet diff --git a/src/com/silverwrist/venice/ui/servlet/RemapperServlet.java b/src/com/silverwrist/venice/ui/servlet/RemapperServlet.java index 6035b1a..784f69c 100644 --- a/src/com/silverwrist/venice/ui/servlet/RemapperServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/RemapperServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.servlet; import javax.servlet.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.core.*; import com.silverwrist.venice.ui.*; import com.silverwrist.venice.ui.config.*; @@ -30,8 +30,10 @@ public class RemapperServlet extends BaseServlet *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(RemapperServlet.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(RemapperServlet.class); + /** Context attribute for the instance of Remapper. */ private static final String REMAPPER_ATTR = "servlets.remapper.Remapper"; /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/ui/servlet/RequestImpl.java b/src/com/silverwrist/venice/ui/servlet/RequestImpl.java index 2226abd..08a0ca3 100644 --- a/src/com/silverwrist/venice/ui/servlet/RequestImpl.java +++ b/src/com/silverwrist/venice/ui/servlet/RequestImpl.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/servlet/ScriptExecServlet.java b/src/com/silverwrist/venice/ui/servlet/ScriptExecServlet.java index 7368d61..14a9937 100644 --- a/src/com/silverwrist/venice/ui/servlet/ScriptExecServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/ScriptExecServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-04 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/servlet/StyleSheetServlet.java b/src/com/silverwrist/venice/ui/servlet/StyleSheetServlet.java index bba0076..068b7f2 100644 --- a/src/com/silverwrist/venice/ui/servlet/StyleSheetServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/StyleSheetServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/servlet/UserServlet.java b/src/com/silverwrist/venice/ui/servlet/UserServlet.java index 06df5d4..d5c91de 100644 --- a/src/com/silverwrist/venice/ui/servlet/UserServlet.java +++ b/src/com/silverwrist/venice/ui/servlet/UserServlet.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.ui.servlet; import java.io.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import com.silverwrist.venice.ui.*; import com.silverwrist.venice.ui.helpers.*; import com.silverwrist.venice.ui.script.*; @@ -30,8 +30,10 @@ public class UserServlet extends BaseServlet *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(UserServlet.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(UserServlet.class); + /** The name of the script to be executed. */ private static final String SCRIPT_EXEC = "showuser.js"; /*-------------------------------------------------------------------------------- diff --git a/src/com/silverwrist/venice/ui/sidebox/CommunityBox.java b/src/com/silverwrist/venice/ui/sidebox/CommunityBox.java index bb718aa..76df321 100644 --- a/src/com/silverwrist/venice/ui/sidebox/CommunityBox.java +++ b/src/com/silverwrist/venice/ui/sidebox/CommunityBox.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/sidebox/ConferenceBox.java b/src/com/silverwrist/venice/ui/sidebox/ConferenceBox.java index 303c849..da7de78 100644 --- a/src/com/silverwrist/venice/ui/sidebox/ConferenceBox.java +++ b/src/com/silverwrist/venice/ui/sidebox/ConferenceBox.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/sidebox/JSPSideBox.java b/src/com/silverwrist/venice/ui/sidebox/JSPSideBox.java index aeb361a..00c0380 100644 --- a/src/com/silverwrist/venice/ui/sidebox/JSPSideBox.java +++ b/src/com/silverwrist/venice/ui/sidebox/JSPSideBox.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/sidebox/JSPSideBoxFactory.java b/src/com/silverwrist/venice/ui/sidebox/JSPSideBoxFactory.java index a216e60..0868513 100644 --- a/src/com/silverwrist/venice/ui/sidebox/JSPSideBoxFactory.java +++ b/src/com/silverwrist/venice/ui/sidebox/JSPSideBoxFactory.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/sidebox/SideBox.java b/src/com/silverwrist/venice/ui/sidebox/SideBox.java index ca3739e..d7c8e6a 100644 --- a/src/com/silverwrist/venice/ui/sidebox/SideBox.java +++ b/src/com/silverwrist/venice/ui/sidebox/SideBox.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/sidebox/SideBoxFactory.java b/src/com/silverwrist/venice/ui/sidebox/SideBoxFactory.java index 456de91..e8ebd77 100644 --- a/src/com/silverwrist/venice/ui/sidebox/SideBoxFactory.java +++ b/src/com/silverwrist/venice/ui/sidebox/SideBoxFactory.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/sidebox/UserListBox.java b/src/com/silverwrist/venice/ui/sidebox/UserListBox.java index 8101114..9b51182 100644 --- a/src/com/silverwrist/venice/ui/sidebox/UserListBox.java +++ b/src/com/silverwrist/venice/ui/sidebox/UserListBox.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/velocity/ContentVelocity.java b/src/com/silverwrist/venice/ui/velocity/ContentVelocity.java index b8532ec..4d2bcd7 100644 --- a/src/com/silverwrist/venice/ui/velocity/ContentVelocity.java +++ b/src/com/silverwrist/venice/ui/velocity/ContentVelocity.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/velocity/ContentVelocityOwnTemplate.java b/src/com/silverwrist/venice/ui/velocity/ContentVelocityOwnTemplate.java index 660444b..602af16 100644 --- a/src/com/silverwrist/venice/ui/velocity/ContentVelocityOwnTemplate.java +++ b/src/com/silverwrist/venice/ui/velocity/ContentVelocityOwnTemplate.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/velocity/ContextWrapper.java b/src/com/silverwrist/venice/ui/velocity/ContextWrapper.java index c9c575f..0d2413f 100644 --- a/src/com/silverwrist/venice/ui/velocity/ContextWrapper.java +++ b/src/com/silverwrist/venice/ui/velocity/ContextWrapper.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/velocity/ParamMapWrapper.java b/src/com/silverwrist/venice/ui/velocity/ParamMapWrapper.java index 8497455..7f12f9c 100644 --- a/src/com/silverwrist/venice/ui/velocity/ParamMapWrapper.java +++ b/src/com/silverwrist/venice/ui/velocity/ParamMapWrapper.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/velocity/StdObject.java b/src/com/silverwrist/venice/ui/velocity/StdObject.java index 2d122ce..a7ff396 100644 --- a/src/com/silverwrist/venice/ui/velocity/StdObject.java +++ b/src/com/silverwrist/venice/ui/velocity/StdObject.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/velocity/VelocityRenderer.java b/src/com/silverwrist/venice/ui/velocity/VelocityRenderer.java index 1f6d548..6dd9ee9 100644 --- a/src/com/silverwrist/venice/ui/velocity/VelocityRenderer.java +++ b/src/com/silverwrist/venice/ui/velocity/VelocityRenderer.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/velocity/VelocitySupplyParams.java b/src/com/silverwrist/venice/ui/velocity/VelocitySupplyParams.java index 1b7b9fc..62a3b6d 100644 --- a/src/com/silverwrist/venice/ui/velocity/VelocitySupplyParams.java +++ b/src/com/silverwrist/venice/ui/velocity/VelocitySupplyParams.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -22,7 +22,7 @@ import java.util.Collection; /** * Common interface for all output objects that supply parameters to Velocity. * - * @author Eric J. Bowersox <erbo@ricochet.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public interface VelocitySupplyParams diff --git a/src/com/silverwrist/venice/ui/view/AdminFindUserView.java b/src/com/silverwrist/venice/ui/view/AdminFindUserView.java index d236729..3b0ce3e 100644 --- a/src/com/silverwrist/venice/ui/view/AdminFindUserView.java +++ b/src/com/silverwrist/venice/ui/view/AdminFindUserView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/AuditView.java b/src/com/silverwrist/venice/ui/view/AuditView.java index 03effff..2226a91 100644 --- a/src/com/silverwrist/venice/ui/view/AuditView.java +++ b/src/com/silverwrist/venice/ui/view/AuditView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/FindView.java b/src/com/silverwrist/venice/ui/view/FindView.java index 58fc0aa..5e69853 100644 --- a/src/com/silverwrist/venice/ui/view/FindView.java +++ b/src/com/silverwrist/venice/ui/view/FindView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/JSPView.java b/src/com/silverwrist/venice/ui/view/JSPView.java index e7e30d9..8df243d 100644 --- a/src/com/silverwrist/venice/ui/view/JSPView.java +++ b/src/com/silverwrist/venice/ui/view/JSPView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/MembersView.java b/src/com/silverwrist/venice/ui/view/MembersView.java index a303c41..8db2893 100644 --- a/src/com/silverwrist/venice/ui/view/MembersView.java +++ b/src/com/silverwrist/venice/ui/view/MembersView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/MenuView.java b/src/com/silverwrist/venice/ui/view/MenuView.java index 63c7840..122a705 100644 --- a/src/com/silverwrist/venice/ui/view/MenuView.java +++ b/src/com/silverwrist/venice/ui/view/MenuView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/NestedJSPView.java b/src/com/silverwrist/venice/ui/view/NestedJSPView.java index 330ae0a..d9216c7 100644 --- a/src/com/silverwrist/venice/ui/view/NestedJSPView.java +++ b/src/com/silverwrist/venice/ui/view/NestedJSPView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/PhotoUploader.java b/src/com/silverwrist/venice/ui/view/PhotoUploader.java index 5f95e1a..919e514 100644 --- a/src/com/silverwrist/venice/ui/view/PhotoUploader.java +++ b/src/com/silverwrist/venice/ui/view/PhotoUploader.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/SetMemberView.java b/src/com/silverwrist/venice/ui/view/SetMemberView.java index f23b883..01817e2 100644 --- a/src/com/silverwrist/venice/ui/view/SetMemberView.java +++ b/src/com/silverwrist/venice/ui/view/SetMemberView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/SideBoxNestedView.java b/src/com/silverwrist/venice/ui/view/SideBoxNestedView.java index 5619ffa..ac5ef5d 100644 --- a/src/com/silverwrist/venice/ui/view/SideBoxNestedView.java +++ b/src/com/silverwrist/venice/ui/view/SideBoxNestedView.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/ui/view/TextMessage.java b/src/com/silverwrist/venice/ui/view/TextMessage.java index a81067a..c1c5af2 100644 --- a/src/com/silverwrist/venice/ui/view/TextMessage.java +++ b/src/com/silverwrist/venice/ui/view/TextMessage.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/BuildVCard.java b/src/com/silverwrist/venice/util/BuildVCard.java index be04384..36b1da4 100644 --- a/src/com/silverwrist/venice/util/BuildVCard.java +++ b/src/com/silverwrist/venice/util/BuildVCard.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/BuildVCardAddress.java b/src/com/silverwrist/venice/util/BuildVCardAddress.java index 97d009d..8cee36c 100644 --- a/src/com/silverwrist/venice/util/BuildVCardAddress.java +++ b/src/com/silverwrist/venice/util/BuildVCardAddress.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/BuildVCardEmail.java b/src/com/silverwrist/venice/util/BuildVCardEmail.java index d0f327e..705d18b 100644 --- a/src/com/silverwrist/venice/util/BuildVCardEmail.java +++ b/src/com/silverwrist/venice/util/BuildVCardEmail.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/BuildVCardPhone.java b/src/com/silverwrist/venice/util/BuildVCardPhone.java index 1a8e460..ac19951 100644 --- a/src/com/silverwrist/venice/util/BuildVCardPhone.java +++ b/src/com/silverwrist/venice/util/BuildVCardPhone.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/IDUtils.java b/src/com/silverwrist/venice/util/IDUtils.java index 7bd7242..5ff8f06 100644 --- a/src/com/silverwrist/venice/util/IDUtils.java +++ b/src/com/silverwrist/venice/util/IDUtils.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/MailSend.java b/src/com/silverwrist/venice/util/MailSend.java index b92e36c..b66b626 100644 --- a/src/com/silverwrist/venice/util/MailSend.java +++ b/src/com/silverwrist/venice/util/MailSend.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/PropertyProvider.java b/src/com/silverwrist/venice/util/PropertyProvider.java index c7b0e2f..55f4e31 100644 --- a/src/com/silverwrist/venice/util/PropertyProvider.java +++ b/src/com/silverwrist/venice/util/PropertyProvider.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -20,7 +20,7 @@ package com.silverwrist.venice.util; /** * An interface that is implemented by objects that wish to provide data values as read-only properties. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public interface PropertyProvider diff --git a/src/com/silverwrist/venice/util/ServiceProvider.java b/src/com/silverwrist/venice/util/ServiceProvider.java index 61b7a51..167be3b 100644 --- a/src/com/silverwrist/venice/util/ServiceProvider.java +++ b/src/com/silverwrist/venice/util/ServiceProvider.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2002 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * @@ -21,7 +21,7 @@ package com.silverwrist.venice.util; * An interface that is implemented by objects that wish to provide other interfaces or objects as * services, instead of through inheritance or interface implementation. * - * @author Eric J. Bowersox <erbo@silcom.com> + * @author Eric J. Bowersox <erbo@users.sf.net> * @version X */ public interface ServiceProvider diff --git a/src/com/silverwrist/venice/util/VCard.java b/src/com/silverwrist/venice/util/VCard.java index 11cb6b4..78c11cc 100644 --- a/src/com/silverwrist/venice/util/VCard.java +++ b/src/com/silverwrist/venice/util/VCard.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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.util; import java.io.*; import java.text.*; import java.util.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.w3c.dom.*; import com.silverwrist.util.*; import com.silverwrist.venice.except.*; @@ -32,7 +32,8 @@ public class VCard *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(VCard.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(VCard.class); private static final DateFormat ISO_EXTENDED = new SimpleDateFormat("yyyy-MM-dd"); private static final DateFormat ISO_STD = new SimpleDateFormat("yyyyMMdd"); diff --git a/src/com/silverwrist/venice/util/VCardAddress.java b/src/com/silverwrist/venice/util/VCardAddress.java index 06a28b7..37f023e 100644 --- a/src/com/silverwrist/venice/util/VCardAddress.java +++ b/src/com/silverwrist/venice/util/VCardAddress.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/VCardEmail.java b/src/com/silverwrist/venice/util/VCardEmail.java index 00c3933..42da76d 100644 --- a/src/com/silverwrist/venice/util/VCardEmail.java +++ b/src/com/silverwrist/venice/util/VCardEmail.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/VCardPhone.java b/src/com/silverwrist/venice/util/VCardPhone.java index 3364881..de874fb 100644 --- a/src/com/silverwrist/venice/util/VCardPhone.java +++ b/src/com/silverwrist/venice/util/VCardPhone.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are * Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved. * diff --git a/src/com/silverwrist/venice/util/XMLLoader.java b/src/com/silverwrist/venice/util/XMLLoader.java index 92be19a..b018a86 100644 --- a/src/com/silverwrist/venice/util/XMLLoader.java +++ b/src/com/silverwrist/venice/util/XMLLoader.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 , + * The Initial Developer of the Original Code is Eric J. Bowersox , * 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): */ @@ -19,7 +19,7 @@ package com.silverwrist.venice.util; import java.io.*; import javax.xml.parsers.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; import org.w3c.dom.*; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -34,8 +34,10 @@ public class XMLLoader *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(XMLLoader.class); + /** Instance of {@link org.apache.log4j.Logger Logger} for this class. */ + private static final Logger logger = Logger.getLogger(XMLLoader.class); + /** Singleton instance of this class. */ private static XMLLoader self = null; /*-------------------------------------------------------------------------------- @@ -43,6 +45,9 @@ public class XMLLoader *-------------------------------------------------------------------------------- */ + /** + * Create the singleton instance of XMLLoader. + */ private XMLLoader() { // do nothing } // end constructor