logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: jakarta-log4j/src/java/org/apache/log4j/varia Log4JAvalonLogger.java
Date Thu, 01 May 2003 18:08:00 GMT
ceki        2003/05/01 11:08:00

  Modified:    .        build.xml
  Added:       src/java/org/apache/log4j/varia Log4JAvalonLogger.java
  Log:
  Log4j now supports Avalon the logger facade.
  
  Revision  Changes    Path
  1.59      +26 -4     jakarta-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/build.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- build.xml	21 Apr 2003 14:59:19 -0000	1.58
  +++ build.xml	1 May 2003 18:08:00 -0000	1.59
  @@ -82,6 +82,7 @@
       <pathelement location="${jms.jar}"/>
       <pathelement location="${jmx.jar}"/>
       <pathelement location="${jmx-extra.jar}"/>
  +    <pathelement location="${avalon-framework.jar}"/>
     </path>
   
     <!-- Construct classpath for building the html pages-->
  @@ -123,6 +124,17 @@
       <echo message="JAXP present."/>
     </target>
   
  +  <target name="avalonFrameworkCheck">
  +    <available classname="org.apache.avalon.framework.logger.Logger"
  +        property="avalonFramework-present">
  +      <classpath>
  +        <pathelement location="${avalon-framework.jar}"/>
  +      </classpath>
  +    </available>
  +  </target>
  +  <target name="avalonFramework" depends="avalonFrameworkCheck" if="avalonFramework-present">
  +    <echo message="Avalon Framework is present."/>
  +  </target>
   
     <target name="jmxCheck">
       <available classname="javax.management.MBeanInfo" property="jmx-present">
  @@ -175,7 +187,7 @@
   
     <target name="build" description="Compile all log4j components."
            depends="init, build.core, build.examples, build.xml,
  -         build.javamail, build.jms, build.jmx"/>
  +         build.javamail, build.jms, build.jmx, build.avalonFramework"/>
   
     <target name="build.core" depends="init">
       <mkdir dir="${javac.dest}" />
  @@ -190,6 +202,7 @@
   		            ${stem}/net/SMTPAppender.java,
                  	    ${stem}/net/JMS*.java,
                  	    ${stem}/jmx/*.java,
  +                    ${stem}/varia/Log4JAvalonLogger.java,
                  	    ${stem}/or/jms/*.java"
     	    deprecation="${deprecation}"
   	    debug="on">
  @@ -237,6 +250,15 @@
   	  tofile="${javac.dest}/${stem}/xml/log4j.dtd" />
     </target>
   
  +  <target name="build.avalonFramework" depends="init, avalonFramework" if="avalonFramework-present">
  +    <javac srcdir="${java.source.dir}"
  +      destdir="${javac.dest}"
  +      deprecation="${deprecation}"
  +      includes="${stem}/varia/Log4JAvalonLogger.java">
  +      <classpath refid="compile.classpath"/>
  +    </javac>
  +  </target>
  +
    <target name="build.javamail" depends="init, javamail"
                  if="javamail-present">
       <javac srcdir="${java.source.dir}"
  @@ -302,7 +324,7 @@
           <include name="*.jar" />
         </fileset>
       </path>
  -    
  +
       <taskdef name="jalopy"
                classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"
                classpathref="jalopy.path" />
  @@ -322,7 +344,7 @@
           <include name="*.jar" />
         </fileset>
       </path>
  -    
  +
       <java classname="de.hunsicker.jalopy.swing.SettingsDialog"
             classpathref="jalopy.path"
             fork="true" />
  @@ -346,7 +368,7 @@
         <!-- allow for lines of 100 chars. These long lines will be
         weeded out by jalopy -->
         <property key="checkstyle.maxlinelen" value="100"/>
  -							
  +
         <property key="checkstyle.allow.protected" value="true" />
         <property key="checkstyle.maxmethodlen" value="500" />
         <property key="checkstyle.maxconstructorlen" value="500" />
  
  
  
  1.1                  jakarta-log4j/src/java/org/apache/log4j/varia/Log4JAvalonLogger.java
  
  Index: Log4JAvalonLogger.java
  ===================================================================
  /*
   * ============================================================================
   *                   The Apache Software License, Version 1.1
   * ============================================================================
   *
   *    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without modifica-
   * tion, are permitted provided that the following conditions are met:
   *
   * 1. Redistributions of  source code must  retain the above copyright  notice,
   *    this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright notice,
   *    this list of conditions and the following disclaimer in the documentation
   *    and/or other materials provided with the distribution.
   *
   * 3. The end-user documentation included with the redistribution, if any, must
   *    include  the following  acknowledgment:  "This product includes  software
   *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
   *    Alternately, this  acknowledgment may  appear in the software itself,  if
   *    and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "log4j" and  "Apache Software Foundation"  must not be used to
   *    endorse  or promote  products derived  from this  software without  prior
   *    written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Products  derived from this software may not  be called "Apache", nor may
   *    "Apache" appear  in their name,  without prior written permission  of the
   *    Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   * FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   * DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   * OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   * ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   * (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   * This software  consists of voluntary contributions made  by many individuals
   * on  behalf of the Apache Software  Foundation.  For more  information on the
   * Apache Software Foundation, please see <http://www.apache.org/>.
   *
   */
  
  package org.apache.log4j.varia;
  
  import org.apache.avalon.framework.logger.Logger;
  
  import org.apache.log4j.Level;
  
  
  /**
   * The default Log4J wrapper class for Avalon Logger.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
   * @version CVS $Revision: 1.1 $ $Date: 2003/05/01 18:08:00 $
   */
  public final class Log4JAvalonLogger implements Logger {
    //underlying implementation
    private final org.apache.log4j.Logger m_logger;
  
    /**
     * Create a logger that delegates to specified category.
     *
     * @param logImpl the category to delegate to
     */
    public Log4JAvalonLogger(final org.apache.log4j.Logger logImpl) {
      m_logger = logImpl;
    }
  
    /**
     * Log a debug message.
     *
     * @param message the message
     */
    public final void debug(final String message) {
      m_logger.debug(message);
    }
  
    /**
     * Log a debug message.
     *
     * @param message the message
     * @param throwable the throwable
     */
    public final void debug(final String message, final Throwable throwable) {
      m_logger.debug(message, throwable);
    }
  
    /**
     * Determine if messages of priority "debug" will be logged.
     *
     * @return true if "debug" messages will be logged
     */
    public final boolean isDebugEnabled() {
      return m_logger.isDebugEnabled();
    }
  
    /**
     * Log a info message.
     *
     * @param message the message
     */
    public final void info(final String message) {
      m_logger.info(message);
    }
  
    /**
     * Log a info message.
     *
     * @param message the message
     * @param throwable the throwable
     */
    public final void info(final String message, final Throwable throwable) {
      m_logger.info(message, throwable);
    }
  
    /**
     * Determine if messages of priority "info" will be logged.
     *
     * @return true if "info" messages will be logged
     */
    public final boolean isInfoEnabled() {
      return m_logger.isInfoEnabled();
    }
  
    /**
     * Log a warn message.
     *
     * @param message the message
     */
    public final void warn(final String message) {
      m_logger.warn(message);
    }
  
    /**
     * Log a warn message.
     *
     * @param message the message
     * @param throwable the throwable
     */
    public final void warn(final String message, final Throwable throwable) {
      m_logger.warn(message, throwable);
    }
  
    /**
     * Determine if messages of priority "warn" will be logged.
     *
     * @return true if "warn" messages will be logged
     */
    public final boolean isWarnEnabled() {
      return m_logger.isEnabledFor(Level.WARN);
    }
  
    /**
     * Log a error message.
     *
     * @param message the message
     */
    public final void error(final String message) {
      m_logger.error(message);
    }
  
    /**
     * Log a error message.
     *
     * @param message the message
     * @param throwable the throwable
     */
    public final void error(final String message, final Throwable throwable) {
      m_logger.error(message, throwable);
    }
  
    /**
     * Determine if messages of priority "error" will be logged.
     *
     * @return true if "error" messages will be logged
     */
    public final boolean isErrorEnabled() {
      return m_logger.isEnabledFor(Level.ERROR);
    }
  
    /**
     * Log a fatalError message.
     *
     * @param message the message
     */
    public final void fatalError(final String message) {
      m_logger.fatal(message);
    }
  
    /**
     * Log a fatalError message.
     *
     * @param message the message
     * @param throwable the throwable
     */
    public final void fatalError(
      final String message, final Throwable throwable) {
      m_logger.fatal(message, throwable);
    }
  
    /**
     * Determine if messages of priority "fatalError" will be logged.
     *
     * @return true if "fatalError" messages will be logged
     */
    public final boolean isFatalErrorEnabled() {
      return m_logger.isEnabledFor(Level.FATAL);
    }
  
    /**
     * Create a new child logger.
     * The name of the child logger is [current-loggers-name].[passed-in-name]
     * Throws <code>IllegalArgumentException</code> if name has an empty element
name
     *
     * @param name the subname of this logger
     * @return the new logger
     */
    public final Logger getChildLogger(final String name) {
      return new Log4JAvalonLogger(
        org.apache.log4j.Logger.getLogger(m_logger.getName() + "." + name));
    }
  }
  
  
  

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


Mime
View raw message