ceki 2005/01/08 05:14:03
Modified: tests build.xml
Added: tests/input/ugli basic.xml
Log:
- log4j.jar now confoms to the UGLI model.
- Minor changes.
The problem discovered by Scott is still not fixed.
Revision Changes Path
1.89 +9 -4 logging-log4j/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/build.xml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- build.xml 6 Jan 2005 23:15:53 -0000 1.88
+++ build.xml 8 Jan 2005 13:14:03 -0000 1.89
@@ -22,12 +22,16 @@
<!-- The stem where most log4j source code is located. -->
<property name="stem" value="org/apache/log4j"/>
+
+ <!-- Destination for compiled files -->
+ <property name="javac.dest" value="./classes"/>
+
<path id="tests.classpath">
<pathelement location="${project.source.home}"/>
<pathelement location="${project.classes.home}"/>
<pathelement location="${tests.source.home}"/>
- <pathelement location="./classes"/>
+ <pathelement location="${javac.dest}"/>
<pathelement location="./resources"/>
<pathelement location="${jakarta-oro.jar}"/>
<fileset dir="./lib/">
@@ -63,7 +67,7 @@
</target>
<target name="prepare">
- <mkdir dir="./classes" />
+ <mkdir dir="${javac.dest}" />
<mkdir dir="./output" />
<delete file="classes/log4j.xml"/>
<delete file="classes/log4j.properties"/>
@@ -124,7 +128,7 @@
<!-- default value unless overriden in with.clover task -->
<property name="haltonfailure" value="yes"/>
<javac srcdir="${tests.source.home}"
- destdir="./classes"
+ destdir="${javac.dest}"
excludes="${stem}/chainsaw/receivers/*.java,
${stem}/selector/PassByJNDI.java,
${stem}/ugli/**.java,
@@ -140,12 +144,13 @@
<!-- case output. -->
<!-- ================================================================= -->
<target name="clean">
- <delete dir="./classes/" />
+ <delete dir="${javac.dest}/" />
<delete dir="./output/" />
<delete dir="./coverage/"/>
<delete>
<fileset dir="." includes="log4j.db*"/>
</delete>
+ <delete dir="${javac.dest}/log4j.xml" />
</target>
<target name="cleanOutputDir">
1.1 logging-log4j/tests/input/ugli/basic.xml
Index: basic.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration>
<configuration xmlns='http://logging.apache.org/' debug="true">
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%sn %d %c - %m%n"/>
</layout>
</appender>
<root>
<level value="DEBUG" />
<appender-ref ref="CONSOLE" />
</root>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
