1.1 --- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:25 2008 +0200
     1.2 +++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:35 2008 +0200
     1.3 @@ -47,14 +47,10 @@
     1.4              <param name="version" value="app-serviceloader"/>
     1.5              <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
     1.6          </antcall>
     1.7 -        <antcall target="-build-one">
     1.8 -            <param name="version" value="test"/>
     1.9 -            <param name="cp" value="build/api/classes:build/gui/classes:build/app-serviceloader/classes:build/app-lookup/classes:${junit.jar}:${nbjunit.jar}:${insane.jar}"/>
    1.10 -        </antcall>
    1.11          
    1.12      </target>
    1.13      
    1.14 -    <target name="run" depends="build">
    1.15 +    <target name="test" depends="build">
    1.16          <echo level="info" message="Running registerXYZ version"/>
    1.17          <antcall target="-run-one">
    1.18              <param name="version" value="app-register"/>
    1.19 @@ -93,27 +89,17 @@
    1.20          </antcall>
    1.21          <antcall target="-run-one">
    1.22              <param name="version" value="app-serviceloader"/>
    1.23 -            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:${junit.jar}:${nbjunit.jar}:${insane.jar}"/>
    1.24 +            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
    1.25              <param name="main" value="org.apidesign.anagram.app.serviceloader.Main"/>
    1.26          </antcall>
    1.27      </target>
    1.28 -
    1.29 -    <target name="test" depends="build">
    1.30 -        <echo level="info" message="Testing using MockServices"/>
    1.31 -        <antcall target="-test-one">
    1.32 -            <param name="version" value="app-test"/>
    1.33 -            <param name="cp" value="build/api/classes:build/gui/classes:build/app-serviceloader/classes:build/app-lookup/classes:${junit.jar}:${nbjunit.jar}:${insane.jar}:../../libs/dist/org-openide-util.jar"/>
    1.34 -        </antcall>
    1.35 -    </target>
    1.36 -        
    1.37 +    
    1.38      <!-- support methods -->
    1.39      
    1.40      <target name="-libraries">
    1.41          <ant dir="../../libs/"/>
    1.42          
    1.43          <property name="junit.jar" location="../../libs/dist/junit-4.4.jar"/>
    1.44 -        <property name="nbjunit.jar" location="../../libs/dist/org-netbeans-modules-nbjunit.jar"/>
    1.45 -        <property name="insane.jar" location="../../libs/dist/org-netbeans-insane.jar"/>
    1.46      </target>
    1.47  
    1.48      <target name="-run-one">
    1.49 @@ -140,22 +126,4 @@
    1.50              </fileset>
    1.51          </copy>
    1.52      </target>
    1.53 -    <target name="-test-one">
    1.54 -        <fail message="You need to specify API version number" unless="version"/>
    1.55 -        <mkdir dir="build/testresults"/>
    1.56 -        <junit dir="build/test/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
    1.57 -            <batchtest todir="build/testresults">
    1.58 -                <fileset dir="build/test/classes">
    1.59 -                    <filename name="**/*Test.class"/>
    1.60 -                </fileset>
    1.61 -            </batchtest>
    1.62 -            <classpath>
    1.63 -                <path path="${cp}"/>
    1.64 -                <path location="build/test/classes"/>
    1.65 -                <path location="${junit.jar}"/>
    1.66 -            </classpath>
    1.67 -            <formatter type="brief" usefile="false"/>
    1.68 -            <formatter type="xml"/>
    1.69 -        </junit>
    1.70 -    </target>
    1.71  </project>