Author: ceki Date: Sat Jul 8 18:43:57 2006 New Revision: 51 Modified: logback/core/trunk/src/test/build.xml Log: package prefix changed from com.logback to ch.qos.logback Modified: logback/core/trunk/src/test/build.xml ============================================================================== --- logback/core/trunk/src/test/build.xml (original) +++ logback/core/trunk/src/test/build.xml Sat Jul 8 18:43:57 2006 @@ -5,17 +5,20 @@ <!-- The base directory relative to which most targets are built --> <property name="base" value="." /> + <property name="target" value="../../target" /> + <!-- The directory where source files are stored. --> - <property name="project.source.home" value="../src/java/" /> - <property name="project.classes.home" value="../classes/" /> - <property name="tests.source.home" value="./src/java/" /> + <property name="project.source.home" value="../src/main/java/" /> + <property name="project.classes.home" value="${target}/classes/" /> + + <property name="tests.source.home" value="./java/" /> <!-- The stem where most LB core source code is located. --> <property name="stem" value="com/logback/core" /> <!-- Destination for compiled files --> - <property name="javac.dest" value="./classes" /> + <property name="javac.dest" value="${target}/test-classes/" /> <path id="tests.classpath"> @@ -24,7 +27,7 @@ <pathelement location="${tests.source.home}" /> <pathelement location="${javac.dest}" /> <pathelement location="./resources" /> - <fileset dir="./lib/"> + <fileset dir="../../lib/"> <include name="*.jar" /> </fileset> </path> @@ -87,13 +90,13 @@ <!-- Build the parent project --> <!-- ================================================================= --> <target name="parentBuild"> - <ant dir=".." target="build" inheritRefs="true" /> + <ant dir="../.." target="build" inheritRefs="false" /> </target> <!-- ================================================================= --> <!-- Compile test cases and related source files. --> <!-- ================================================================= --> - <target name="build" depends="parentBuild, prepare"> + <target name="build" depends="prepare"> <property name="haltonfailure" value="yes" /> <javac srcdir="${tests.source.home}" destdir="${javac.dest}" excludes="${stem}/xynz/toto.java" deprecation="${deprecation}" debug="on"> <classpath refid="tests.classpath" /> @@ -127,7 +130,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath" /> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.AllTest" /> + <test name="ch.qos.logback.core.AllTest" /> </junit> </target> @@ -140,7 +143,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath" /> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.rolling.helper.CompressTest" /> + <test name="ch.qos.logback.core.rolling.helper.CompressTest" /> </junit> </target> @@ -148,7 +151,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath" /> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.rolling.RenamingTest" /> + <test name="ch.qos.logback.core.rolling.RenamingTest" /> </junit> </target> @@ -156,7 +159,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath" /> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.rolling.TimeBasedRollingTest" /> + <test name="ch.qos.logback.core.rolling.TimeBasedRollingTest" /> </junit> </target> @@ -164,7 +167,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath"/> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.joran.SkippingInInterpreterTest" /> + <test name="ch.qos.logback.core.joran.SkippingInInterpreterTest" /> </junit> </target>