[LOGBack-dev] svn commit: r79 - in logback/classic/trunk/src/test: input input/joran java java/ch/qos/logback/classic/joran

[noreply.seb at qos.ch]

Author: seb
Date: Fri Jul 14 17:34:40 2006
New Revision: 79

Added:
   logback/classic/trunk/src/test/input/
      - copied from r72, logback/classic/trunk/test/input/
   logback/classic/trunk/src/test/java/
      - copied from r72, logback/classic/trunk/test/src/java/
Modified:
   logback/classic/trunk/src/test/input/joran/callerData.xml
   logback/classic/trunk/src/test/input/joran/ignore.xml
   logback/classic/trunk/src/test/input/joran/simple2.xml
   logback/classic/trunk/src/test/input/joran/simpleList.xml
   logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java
   logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java
Log:
moved files according to Maven conventions

Modified: logback/classic/trunk/src/test/input/joran/callerData.xml
==============================================================================
--- logback/classic/trunk/test/input/joran/callerData.xml	(original)
+++ logback/classic/trunk/src/test/input/joran/callerData.xml	Fri Jul 14 17:34:40 2006
@@ -11,8 +11,8 @@
     </matcher>  
   </evaluator>
 
-  <appender name="CONSOLE" class="com.logback.core.ConsoleAppender">
-    <layout class="com.logback.classic.PatternLayout">
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <layout class="ch.qos.logback.classic.PatternLayout">
       <Pattern>%caller{4, helloEval}%d %level - %m%n</Pattern>
     </layout>
   </appender>

Modified: logback/classic/trunk/src/test/input/joran/ignore.xml
==============================================================================
--- logback/classic/trunk/test/input/joran/ignore.xml	(original)
+++ logback/classic/trunk/src/test/input/joran/ignore.xml	Fri Jul 14 17:34:40 2006
@@ -6,8 +6,8 @@
    <Expression>(marker.contains("IGNORE"))</Expression>
   </evaluator>
 
- <appender name="CONSOLE" class="com.logback.core.ConsoleAppender">
-    <layout class="com.logback.classic.PatternLayout">
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <layout class="ch.qos.logback.classic.PatternLayout">
       <Pattern>%date %level - %m%n%ex{full, IGNORE_EVAL}</Pattern>
     </layout>
   </appender>

Modified: logback/classic/trunk/src/test/input/joran/simple2.xml
==============================================================================
--- logback/classic/trunk/test/input/joran/simple2.xml	(original)
+++ logback/classic/trunk/src/test/input/joran/simple2.xml	Fri Jul 14 17:34:40 2006
@@ -3,8 +3,8 @@
 
 <configuration xmlns:log4j='http://com.logback.com/' debug="true">
 
-  <appender name="CONSOLE" class="com.logback.core.ConsoleAppender">
-    <layout class="com.logback.classic.PatternLayout">
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <layout class="ch.qos.logback.classic.PatternLayout">
       <param name="Pattern"  value="%d - %m%n"/>  
     </layout>
   </appender>

Modified: logback/classic/trunk/src/test/input/joran/simpleList.xml
==============================================================================
--- logback/classic/trunk/test/input/joran/simpleList.xml	(original)
+++ logback/classic/trunk/src/test/input/joran/simpleList.xml	Fri Jul 14 17:34:40 2006
@@ -3,7 +3,7 @@
 
 <configuration xmlns:logback='http://com.logback.com/' debug="true">
 
-  <appender name="LIST" class="com.logback.core.appender.ListAppender">
+  <appender name="LIST" class="ch.qos.logback.core.appender.ListAppender">
     <layout class="com.logback.classic.PatternLayout">
       <param name="Pattern"  value="%d - %m%n"/>  
     </layout>

Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java
==============================================================================
--- logback/classic/trunk/test/src/java/ch/qos/logback/classic/joran/BasicJoranTest.java	(original)
+++ logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java	Fri Jul 14 17:34:40 2006
@@ -10,22 +10,20 @@
 package ch.qos.logback.classic.joran;
 
 import junit.framework.TestCase;
-
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.classic.util.Constants;
 import ch.qos.logback.core.appender.ListAppender;
 import ch.qos.logback.core.util.StatusPrinter;
 
-
 public class BasicJoranTest extends TestCase {
 
   public void test() {
     JoranConfigurator jc = new JoranConfigurator();
     LoggerContext loggerContext = new LoggerContext();
     jc.setContext(loggerContext);
-    jc.doConfigure("./input/joran/simpleList.xml");
+    jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/simpleList.xml");
 
     StatusPrinter.print(loggerContext.getStatusManager());
   
@@ -45,7 +43,7 @@
     JoranConfigurator jc = new JoranConfigurator();
     LoggerContext loggerContext = new LoggerContext();
     jc.setContext(loggerContext);
-    jc.doConfigure("./input/joran/callerData.xml");
+    jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/callerData.xml");
 
     StatusPrinter.print(loggerContext.getStatusManager());
   

Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java
==============================================================================
--- logback/classic/trunk/test/src/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java	(original)
+++ logback/classic/trunk/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java	Fri Jul 14 17:34:40 2006
@@ -22,6 +22,7 @@
 import ch.qos.logback.classic.boolex.JaninoEventEvaluator;
 import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.classic.util.Constants;
 import ch.qos.logback.core.CoreGlobal;
 import ch.qos.logback.core.boolex.EvaluationException;
 import ch.qos.logback.core.util.StatusPrinter;
@@ -33,7 +34,7 @@
     JoranConfigurator jc = new JoranConfigurator();
     LoggerContext loggerContext = new LoggerContext();
     jc.setContext(loggerContext);
-    jc.doConfigure("./input/joran/simpleEvaluator.xml");
+    jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/simpleEvaluator.xml");
     
     
     Map evalMap = (Map) loggerContext.getObject(CoreGlobal.EVALUATOR_MAP);
@@ -54,7 +55,7 @@
     JoranConfigurator jc = new JoranConfigurator();
     LoggerContext loggerContext = new LoggerContext();
     jc.setContext(loggerContext);
-    jc.doConfigure("./input/joran/ignore.xml");
+    jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/ignore.xml");