1.1 --- a/samples/composition/build.xml	Sat Jun 14 09:51:04 2008 +0200
     1.2 +++ b/samples/composition/build.xml	Sat Jun 14 09:51:05 2008 +0200
     1.3 @@ -4,9 +4,7 @@
     1.4          <delete dir="build"/>
     1.5      </target>
     1.6      
     1.7 -    <target name="build">
     1.8 -        <ant dir="../libs/"/>
     1.9 -        
    1.10 +    <target name="build" depends="-libraries">
    1.11          <antcall target="-build-one">
    1.12              <param name="version" value="api1.0"/>
    1.13          </antcall>
    1.14 @@ -16,7 +14,7 @@
    1.15          
    1.16          <antcall target="-build-one">
    1.17              <param name="version" value="test"/>
    1.18 -            <param name="cp" value="build/api1.0/classes:../libs/dist/junit-4.1.jar"/>
    1.19 +            <param name="cp" value="build/api1.0/classes:${junit.jar}"/>
    1.20          </antcall>
    1.21      </target>
    1.22      
    1.23 @@ -30,10 +28,15 @@
    1.24              <param name="version" value="api2.0"/>
    1.25          </antcall>
    1.26      </target>
    1.27 -
    1.28      
    1.29      <!-- support methods -->
    1.30      
    1.31 +    <target name="-libraries">
    1.32 +        <ant dir="../libs/"/>
    1.33 +        
    1.34 +        <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
    1.35 +    </target>
    1.36 +    
    1.37      <target name="-run-one">
    1.38          <fail message="You need to specify API version number" unless="version"/>
    1.39          <mkdir dir="build/testresults"/>
    1.40 @@ -46,7 +49,7 @@
    1.41              <classpath>
    1.42                  <path location="build/${version}/classes"/>
    1.43                  <path location="build/test/classes"/>
    1.44 -                <path location="../libs/dist/junit-4.1.jar"/>
    1.45 +                <path location="${junit.jar}"/>
    1.46              </classpath>
    1.47              <formatter type="brief" usefile="false"/>
    1.48              <formatter type="xml"/>