You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/11/18 21:00:28 UTC

cvs commit: logging-log4j/tests/input/xml DOMTestCase1.xml

ceki        2004/11/18 12:00:28

  Modified:    tests/src/java/org/apache/log4j/xml DOMTestCase.java
               tests/src/java/org/apache/log4j/db DBPerfTest.java
                        BindDataSourceToJNDIAction.java
               tests/input/xml DOMTestCase1.xml
  Removed:     tests/input patternLayout6.properties
                        patternLayout12.properties
                        patternLayout14.properties
                        patternLayout4.properties patternLayout1.properties
                        patternLayout13.properties
                        patternLayout3.properties
                        patternLayout10.properties
                        patternLayout5.properties patternLayout7.properties
                        patternLayout2.properties patternLayout9.properties
                        patternLayout.mdc.1.properties
                        patternLayout11.properties
                        patternLayout8.properties
  Log:
  - LogLog -> Logger
  - moved patternLayout related properties files to their own folder
  
  Revision  Changes    Path
  1.10      +19 -10    logging-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
  
  Index: DOMTestCase.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DOMTestCase.java	26 May 2004 17:19:37 -0000	1.9
  +++ DOMTestCase.java	18 Nov 2004 20:00:28 -0000	1.10
  @@ -1,14 +1,14 @@
   
   package org.apache.log4j.xml;
   
  +import java.util.List;
  +
   import junit.framework.TestCase;
  -import junit.framework.TestSuite;
  -import junit.framework.Test;
   
   import org.apache.log4j.LogManager;
   import org.apache.log4j.Logger;
   import org.apache.log4j.Level;
  -import org.apache.log4j.helpers.LogLog;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.joran.JoranConfigurator;
   import org.apache.log4j.util.Filter;
   import org.apache.log4j.util.JunitTestRunnerFilter;
  @@ -61,7 +61,7 @@
       //org.apache.log4j.BasicConfigurator.configure();
       JoranConfigurator jc = new JoranConfigurator();
       jc.doConfigure("input/xml/DOMTestCase1.xml", LogManager.getLoggerRepository());
  -    LogLog.info(""+jc.getExecutionContext().getErrorList());
  +    dumpErrors(jc.getErrorList());
       common();
   
       ControlFilter cf1 = new ControlFilter(new String[]{TEST1_1A_PAT, TEST1_1B_PAT, 
  @@ -107,13 +107,22 @@
       
       logger.error("Message " + ++i, e);
       root.error("Message " + i, e);    
  -
     }
   
  -  public static Test suite() {
  -    TestSuite suite = new TestSuite();
  -    suite.addTest(new DOMTestCase("test1"));
  -    return suite;
  -  }
  +  void dumpErrors(List errorList) {
  +    for(int i = 0; i < errorList.size(); i++) {
  +      ErrorItem ei = (ErrorItem) errorList.get(i);
  +      System.out.println(ei);
  +      Throwable t = ei.getException();
  +      if(t != null) {
  +        t.printStackTrace(System.out);
  +      }
  +    }
  +  }
  +//  public static Test suite() {
  +//    TestSuite suite = new TestSuite();
  +//    suite.addTest(new DOMTestCase("test1"));
  +//    return suite;
  +//  }
   
   }
  
  
  
  1.3       +2 -3      logging-log4j/tests/src/java/org/apache/log4j/db/DBPerfTest.java
  
  Index: DBPerfTest.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/db/DBPerfTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBPerfTest.java	24 May 2004 16:14:34 -0000	1.2
  +++ DBPerfTest.java	18 Nov 2004 20:00:28 -0000	1.3
  @@ -9,7 +9,6 @@
   import org.apache.log4j.LogManager;
   import org.apache.log4j.Logger;
   import org.apache.log4j.MDC;
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.joran.JoranConfigurator;
   
   import junit.framework.TestCase;
  @@ -55,7 +54,7 @@
         logger.debug("message "+i);
       }
       long endTime = System.currentTimeMillis();
  -    LogLog.info("writing "+i+" events took "+(endTime-startTime)+" millis.");
  -    LogLog.info("or "+(double)(endTime-startTime)/i+" millis per event.");
  +    System.out.println("writing "+i+" events took "+(endTime-startTime)+" millis.");
  +    System.out.println("or "+(double)(endTime-startTime)/i+" millis per event.");
     }
   }
  
  
  
  1.4       +1 -2      logging-log4j/tests/src/java/org/apache/log4j/db/BindDataSourceToJNDIAction.java
  
  Index: BindDataSourceToJNDIAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/db/BindDataSourceToJNDIAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BindDataSourceToJNDIAction.java	17 Nov 2004 21:25:25 -0000	1.3
  +++ BindDataSourceToJNDIAction.java	18 Nov 2004 20:00:28 -0000	1.4
  @@ -23,7 +23,6 @@
   import org.apache.log4j.Logger;
   import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.config.PropertySetter;
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.helpers.OptionConverter;
   
   import org.xml.sax.Attributes;
  @@ -59,7 +58,7 @@
       String dsClassName = ec.getSubstitutionProperty(DATA_SOURCE_CLASS);
   
       if (Option.isEmpty(dsClassName)) {
  -      LogLog.warn("dsClassName is a required parameter");
  +      getLogger().warn("dsClassName is a required parameter");
         ec.addError(new ErrorItem("dsClassName is a required parameter"));
   
         return;
  
  
  
  1.4       +7 -2      logging-log4j/tests/input/xml/DOMTestCase1.xml
  
  Index: DOMTestCase1.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/xml/DOMTestCase1.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DOMTestCase1.xml	26 May 2004 17:56:17 -0000	1.3
  +++ DOMTestCase1.xml	18 Nov 2004 20:00:28 -0000	1.4
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="UTF-8" ?>
  -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
  +<!DOCTYPE log4j:configuration>
   
  -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
  +<log4j:configuration>
     <appender name="A1" class="org.apache.log4j.FileAppender">
       
       <param name="File"   value="output/temp.A1" />
  @@ -19,6 +19,11 @@
         <param name="DateFormat" value="ISO8601" />
       </layout>		
     </appender>
  +
  +  <!-- Turn off internal DEBUG messages -->
  +  <logger name="org.apache.log4j.joran"><level value="INFO" /></logger>
  +  <logger name="org.apache.log4j.config"><level value="INFO" /></logger>
  +  <logger name="org.apache.log4j.FileAppender"><level value="INFO" /></logger>
     
     <logger name="org.apache.log4j.xml">
       <level value="debug" />
  
  
  

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