svn commit: r532885 [2/3] - in /logging/sandbox/log4j/formatter: ./ src/main/java/org/apache/log4j/ src/main/java/org/apache/log4j/formatter/ src/main/resources/ src/main/resources/META-INF/ src/site/ src/test/java/org/apache/log4j/ src/test/java/org/a...

[ca...@apache.org]

Copied: logging/sandbox/log4j/formatter/src/main/java/org/apache/log4j/LogMF.java (from r532798, logging/sandbox/log4j/formatter/src/main/java/org/apache/log4j/formatter/LogMF.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/log4j/formatter/src/main/java/org/apache/log4j/LogMF.java?view=diff&rev=532885&p1=logging/sandbox/log4j/formatter/src/main/java/org/apache/log4j/formatter/LogMF.java&r1=532798&p2=logging/sandbox/log4j/formatter/src/main/java/org/apache/log4j/LogMF.java&r2=532885
==============================================================================
--- logging/sandbox/log4j/formatter/src/main/java/org/apache/log4j/formatter/LogMF.java (original)
+++ logging/sandbox/log4j/formatter/src/main/java/org/apache/log4j/LogMF.java Thu Apr 26 15:07:15 2007
@@ -1,2342 +1,2439 @@
-/*
- * Copyright 1999,2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.log4j.formatter;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import java.text.NumberFormat;
-import java.text.DateFormat;
-import java.util.Date;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-
-/**
- * This class provides static methods to
- * format log messages using java.text.MessageFormat.
- * 
- * @author Curt Arnold
- *
- */
-public final class LogMF {
-	/**
-	 * private constructor.
-	 *
-	 */
-	private LogMF() {
-	}
-
-	/**
-	 * Formats arguments using a minimal subset
-	 * of MessageFormat syntax.
-	 * @param pattern pattern, may not be null.
-	 * @param arg0 argument, may be null.
-	 * @return Message string or null if pattern
-	 * is not supported.
-	 */
-	private static String subsetFormat(final String pattern,
-			final Object arg0) {
-		//
-		//  find position of first brace
-		//    if none then format is a literal
-		int bracePos = pattern.indexOf("{");
-		//
-		//  if the first format is {0} 
-		//    and there are no other format specifiers
-		//    and no quotes then substitute for {0}
-		if (bracePos != -1) {
-			if(pattern.indexOf("{0}", bracePos) == bracePos 
-					&& pattern.indexOf("{", bracePos + 1) == -1
-					&& pattern.indexOf("'") == -1) {
-				String replacement;
-				if (arg0 instanceof String) {
-					replacement = arg0.toString();
-				} else if (arg0 instanceof Number) {
-					replacement = NumberFormat.getInstance().format(arg0);	
-				} else if(arg0 instanceof Date) {
-					replacement = DateFormat.getDateTimeInstance(DateFormat.SHORT,
-							DateFormat.SHORT).format(arg0);
-				} else {
-					replacement = String.valueOf(arg0);
-				}
-				final StringBuffer buf = new StringBuffer(pattern);
-				buf.replace(bracePos, bracePos + 3, replacement);
-				return buf.toString();
-			}
-		} else {
-			//
-			//   pattern is a literal with no braces
-			//    and not quotes, return pattern.
-			if (pattern.indexOf("'") == -1) {
-				return pattern;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Formats arguments using MessageFormat.
-	 * @param pattern pattern, may be malformed.
-	 * @param arguments arguments, may be null or mismatched.
-	 * @return Message string
-	 */
-	private static String format(final String pattern, final Object[] arguments) {
-		try {
-			return MessageFormat.format(pattern, arguments);
-		} catch (IllegalArgumentException ex) {
-			return pattern;
-		}
-	}
-
-	/**
-	 * Formats arguments using MessageFormat.
-	 * @param pattern pattern, may be malformed.
-	 * @param arg0 argument, may be null or mismatched.
-	 * @return Message string
-	 */
-	private static String format(final String pattern, final Object arg0) {
-		String msg = subsetFormat(pattern, arg0);
-		if (msg == null) {
-			try {
-				msg = MessageFormat.format(pattern, new Object[] { arg0 });
-			} catch (IllegalArgumentException ex) {
-				msg = pattern;
-			}
-		}
-		return msg;
-	}
-
-    /**
-     * Gets a message format pattern from a resource bundle by key.
-     * @param bundle bundle, may not be null.
-     * @param key key, may not be null.
-     * @return pattern retrieved pattern or
-     */
-    private static String getPattern(final ResourceBundle bundle,
-                                     final String key) {
-        String pattern = bundle.getString(key);
-        if (pattern == null) {
-            pattern = "Unable to find key \"" + key + "\" in bundle " + bundle.toString();
-        }
-        return pattern;
-    }
-
-    /**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final Object[] arguments) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final Object[] arguments) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final Object[] arguments) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final Object[] arguments) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final Object[] arguments) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final Object[] arguments) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final boolean argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final char argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final byte argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final short argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final int argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final long argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final float argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final double argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final Object argument) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final String pattern,
-			final Object arg0, 
-			final Object arg1, 
-			final Object arg2,
-			final Object arg3) {
-		if (pattern != null && logger.isTraceEnabled()) {
-			logger.trace(format(pattern, 
-					new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-	
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final boolean argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final char argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final byte argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final short argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final int argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final long argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final float argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final double argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final Object argument) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, 
-			final Object arg2, final Object arg3) {
-		if (pattern != null && logger.isDebugEnabled()) {
-			logger.debug(format(pattern, new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-	
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final boolean argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final char argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final byte argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final short argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final int argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final long argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final float argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final double argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final Object argument) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, final Object arg2, final Object arg3) {
-		if (pattern != null && logger.isInfoEnabled()) {
-			logger.info(format(pattern, new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-	
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final boolean argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final char argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final byte argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final short argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final int argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final long argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final float argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final double argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final Object argument) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, 
-			final Object arg2, final Object arg3) {
-		if (pattern != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(pattern, new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-	
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final boolean argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final char argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final byte argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final short argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final int argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final long argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final float argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final double argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final Object argument) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, 
-			final Object arg2, final Object arg3) {
-		if (pattern != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(pattern, new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-	
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final boolean argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final char argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final byte argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final short argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final int argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final long argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final float argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final double argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final Object argument) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param pattern pattern, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final String pattern,
-			final Object arg0, final Object arg1, 
-			final Object arg2, final Object arg3) {
-		if (pattern != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(pattern, new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-
-
-    /**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object[] arguments) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object[] arguments) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object[] arguments) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object[] arguments) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object[] arguments) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arguments an array of arguments to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object[] arguments) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), arguments));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final boolean argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final char argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final byte argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final short argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final int argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final long argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final float argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final double argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object argument) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at trace level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void trace(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0,
-			final Object arg1,
-			final Object arg2,
-			final Object arg3) {
-		if (bundle != null && key != null && logger.isTraceEnabled()) {
-			logger.trace(format(getPattern(bundle, key),
-					new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final boolean argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final char argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final byte argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final short argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final int argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final long argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final float argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final double argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object argument) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at debug level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void debug(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1,
-			final Object arg2, final Object arg3) {
-		if (bundle != null && key != null && logger.isDebugEnabled()) {
-			logger.debug(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final boolean argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final char argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final byte argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final short argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final int argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final long argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final float argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final double argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object argument) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at info level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void info(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1, final Object arg2, final Object arg3) {
-		if (bundle != null && key != null && logger.isInfoEnabled()) {
-			logger.info(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final boolean argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final char argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final byte argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final short argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final int argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final long argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final float argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final double argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at warn level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void warn(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1,
-			final Object arg2, final Object arg3) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.WARN)) {
-			logger.warn(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final boolean argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final char argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final byte argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final short argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final int argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final long argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final float argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final double argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at error level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 * @param arg3 a value to be formatted and substituted.
-	 */
-	public static void error(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1,
-			final Object arg2, final Object arg3) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.ERROR)) {
-			logger.error(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2, arg3 }));
-		}
-	}
-
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final boolean argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), argument ? Boolean.TRUE : Boolean.FALSE));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final char argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Character(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final byte argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Byte(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final short argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Short(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final int argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Integer(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final long argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Long(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final float argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Float(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final double argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Double(argument)));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param argument a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object argument) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), argument));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Object[] { arg0, arg1 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.
-     * @param key key for pattern in resource bundle, may be null.
-	 * @param arg0 a value to be formatted and substituted.
-	 * @param arg1 a value to be formatted and substituted.
-	 * @param arg2 a value to be formatted and substituted.
-	 */
-	public static void fatal(final Logger logger, final ResourceBundle bundle, final String key,
-			final Object arg0, final Object arg1, final Object arg2) {
-		if (bundle != null && key != null && logger.isEnabledFor(Level.FATAL)) {
-			logger.fatal(format(getPattern(bundle, key), new Object[] { arg0, arg1, arg2 }));
-		}
-	}
-
-	/**
-	 * Log a parameterized message at fatal level.
-	 * @param logger logger, may not be null.
-	 * @param bundle resource bundle, may be null.

[... 2455 lines stripped ...]


---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org