Return-Path: 
 <cvs-return-25233-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@www.apache.org
Received: (qmail 61227 invoked from network); 15 Sep 2004 19:42:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 15 Sep 2004 19:42:14 -0000
Received: (qmail 33001 invoked by uid 500); 15 Sep 2004 19:42:13 -0000
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 32916 invoked by uid 500); 15 Sep 2004 19:42:12 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 32832 invoked by uid 99); 15 Sep 2004 19:42:11 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 15 Sep 2004 12:42:11 -0700
Received: (qmail 61089 invoked by uid 65534); 15 Sep 2004 19:42:10 -0000
Date: 15 Sep 2004 19:42:10 -0000
Message-ID: <20040915194210.61083.qmail@minotaur.apache.org>
From: niclas@apache.org
To: cvs@avalon.apache.org
Subject: svn commit: rev 46128 - in avalon/trunk/runtime/logging:
 log4j/src/java/org/apache/avalon/logging/log4j test/etc/test/log4j
 test/src/test/org/apache/avalon/logging/log4j/test
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: niclas
Date: Wed Sep 15 12:42:08 2004
New Revision: 46128

Modified:
   avalon/trunk/runtime/logging/log4j/src/java/org/apache/avalon/logging/log4j/Log4JLoggingFactory.java
   avalon/trunk/runtime/logging/test/etc/test/log4j/log4j.properties
   avalon/trunk/runtime/logging/test/etc/test/log4j/log4j.xml
   avalon/trunk/runtime/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java
Log:
Fix for the Log4J provider.

Modified: avalon/trunk/runtime/logging/log4j/src/java/org/apache/avalon/logging/log4j/Log4JLoggingFactory.java
==============================================================================
--- avalon/trunk/runtime/logging/log4j/src/java/org/apache/avalon/logging/log4j/Log4JLoggingFactory.java	(original)
+++ avalon/trunk/runtime/logging/log4j/src/java/org/apache/avalon/logging/log4j/Log4JLoggingFactory.java	Wed Sep 15 12:42:08 2004
@@ -166,7 +166,7 @@
         if( src.startsWith( "file:" ) )
         {
             src = src.substring( 5 );
-            while( src.startsWith( "/" ) )
+            while( src.startsWith( "//" ) )
                 src = src.substring( 1 );
             configureFile( src, interval );
         }

Modified: avalon/trunk/runtime/logging/test/etc/test/log4j/log4j.properties
==============================================================================
--- avalon/trunk/runtime/logging/test/etc/test/log4j/log4j.properties	(original)
+++ avalon/trunk/runtime/logging/test/etc/test/log4j/log4j.properties	Wed Sep 15 12:42:08 2004
@@ -1,7 +1,7 @@
 
 log4j.rootLogger=DEBUG, A1
 log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.file=alt-output.log
+log4j.appender.A1.file=${user.dir}/alt-output.log
 
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 

Modified: avalon/trunk/runtime/logging/test/etc/test/log4j/log4j.xml
==============================================================================
--- avalon/trunk/runtime/logging/test/etc/test/log4j/log4j.xml	(original)
+++ avalon/trunk/runtime/logging/test/etc/test/log4j/log4j.xml	Wed Sep 15 12:42:08 2004
@@ -12,7 +12,7 @@
   </appender>
 
   <appender name="FILE" class="org.apache.log4j.FileAppender">
-    <param name="File" value="output.log"/>
+    <param name="File" value="${user.dir}/output.log"/>
     <layout class="org.apache.log4j.PatternLayout">
       <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
     </layout>

Modified: avalon/trunk/runtime/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java
==============================================================================
--- avalon/trunk/runtime/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java	(original)
+++ avalon/trunk/runtime/logging/test/src/test/org/apache/avalon/logging/log4j/test/AlternateLoggingManagerTestCase.java	Wed Sep 15 12:42:08 2004
@@ -58,6 +58,7 @@
 
     protected void setUp() throws Exception
     {
+        System.out.println( System.getProperty( "user.dir" ) );
         m_manager = 
           LoggingManagerHelper.setUpLoggingManager( 
             "avalon-logging-log4j", "log4j/log4j.properties" );

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org