You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2004/02/02 18:03:08 UTC
cvs commit: avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component Logger2LogKitManager.java
leosutic 2004/02/02 09:03:08
Modified: component/src/java/org/apache/avalon/excalibur/component
Logger2LogKitManager.java
Log:
Applied patches for bug 26521
Revision Changes Path
1.3 +42 -52 avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/Logger2LogKitManager.java
Index: Logger2LogKitManager.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/Logger2LogKitManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Logger2LogKitManager.java 5 Dec 2003 15:13:52 -0000 1.2
+++ Logger2LogKitManager.java 2 Feb 2004 17:03:08 -0000 1.3
@@ -1,52 +1,18 @@
/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2003 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 "Jakarta", "Avalon", "Excalibur" 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/>.
-
-*/
+ * Copyright 1997-2004 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.avalon.excalibur.component;
import org.apache.avalon.excalibur.logger.LogKitManager;
@@ -55,6 +21,8 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
+import org.apache.log.Priority;
+
/**
* An adapter between LogkitManager and LoggerManager.
@@ -69,7 +37,7 @@
{
private final Hierarchy m_hierarchy = new Hierarchy();
private final LoggerManager m_loggerManager;
-
+
public Logger2LogKitManager( final LoggerManager loggerManager )
{
m_loggerManager = loggerManager;
@@ -77,7 +45,7 @@
new LogKit2AvalonLoggerAdapter( loggerManager.getDefaultLogger() );
m_hierarchy.setDefaultLogTarget( target );
}
-
+
public org.apache.log.Logger getLogger( final String categoryName )
{
final Logger logger =
@@ -87,9 +55,31 @@
final LogKit2AvalonLoggerAdapter target =
new LogKit2AvalonLoggerAdapter( logger );
logkitLogger.setLogTargets( new LogTarget[ ] { target } );
+
+ if ( logger.isDebugEnabled() )
+ {
+ logkitLogger.setPriority( Priority.DEBUG );
+ }
+ else if ( logger.isInfoEnabled() )
+ {
+ logkitLogger.setPriority( Priority.INFO );
+ }
+ else if ( logger.isWarnEnabled() )
+ {
+ logkitLogger.setPriority( Priority.WARN );
+ }
+ else if ( logger.isErrorEnabled() )
+ {
+ logkitLogger.setPriority( Priority.ERROR );
+ }
+ else if ( logger.isFatalErrorEnabled() )
+ {
+ logkitLogger.setPriority( Priority.FATAL_ERROR );
+ }
+
return logkitLogger;
}
-
+
public Hierarchy getHierarchy()
{
return m_hierarchy;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org