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

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" );