1.1 --- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:06:45 2008 +0200
     1.2 +++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:06:54 2008 +0200
     1.3 @@ -8,28 +8,30 @@
     1.4      <target name="build" depends="-libraries">
     1.5          <antcall target="-build-one">
     1.6              <param name="version" value="api"/>
     1.7 +            <param name="cp" value=""/>
     1.8 +        </antcall>
     1.9 +        <antcall target="-build-one">
    1.10 +            <param name="version" value="word-static"/>
    1.11 +        </antcall>
    1.12 +        <antcall target="-build-one">
    1.13 +            <param name="version" value="scrambler-simple"/>
    1.14 +        </antcall>
    1.15 +        <antcall target="-build-one">
    1.16 +            <param name="version" value="gui"/>
    1.17 +        </antcall>
    1.18 +        <antcall target="-build-one">
    1.19 +            <param name="version" value="app-register"/>
    1.20 +            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
    1.21          </antcall>
    1.22          
    1.23 -        <antcall target="-build-one">
    1.24 -            <param name="version" value="test"/>
    1.25 -            <param name="cp" value="build/new-api/classes:${junit.jar}"/>
    1.26 -        </antcall>
    1.27      </target>
    1.28      
    1.29 -    <target name="test">
    1.30 -        <antcall target="-do-test">
    1.31 -            <param name="nodebug" value="true"/>
    1.32 -        </antcall>
    1.33 -    </target>
    1.34 -        
    1.35 -    <target name="-do-test" depends="build">
    1.36 +    <target name="test" depends="build">
    1.37          <echo level="info" message="Running the tests with bridge enabled. This should succeeds."/>
    1.38          <antcall target="-run-one">
    1.39 -            <param name="test.cp" value="build/new-api/classes:build/bridge/classes"/>
    1.40 -        </antcall>
    1.41 -        <echo level="info" message="Running the tests without bridge module. This should fail."/>
    1.42 -        <antcall target="-run-one">
    1.43 -            <param name="test.cp" value="build/new-api/classes"/>
    1.44 +            <param name="version" value="app-register"/>
    1.45 +            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
    1.46 +            <param name="main" value="org.apidesign.anagram.app.register.Main"/>
    1.47          </antcall>
    1.48      </target>
    1.49      
    1.50 @@ -41,43 +43,15 @@
    1.51          <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
    1.52      </target>
    1.53  
    1.54 -    <target name="-debug-one" if="netbeans.home" unless="nodebug">
    1.55 -        <nbjpdastart addressproperty="jpda.address" name="MessageDigest and Bridges" transport="dt_socket" >
    1.56 -            <sourcepath path="src-new-api:src-bridge:src-test:build/test/classes"/>
    1.57 -            <classpath path="build/new-api/classes:build/bridge/classes:build/test/classes"/>
    1.58 -        </nbjpdastart>
    1.59 -        <property name="debug1" value="-Xdebug"/>
    1.60 -        <property name="debug2" value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
    1.61 -    </target>
    1.62 -    
    1.63 -    <target name="-run-one" depends="-debug-one">
    1.64 -        <property name="debug1" value="-Dn1"/>
    1.65 -        <property name="debug2" value="-Dn2"/>
    1.66 -        <property name="include" value="**/*Test"/>
    1.67 -        <mkdir dir="build/testresults"/>
    1.68 -        <junit dir="build/test/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
    1.69 -            <batchtest todir="build/testresults">
    1.70 -                <fileset dir="build/test/classes">
    1.71 -                    <filename name="${include}.class"/>
    1.72 -                </fileset>
    1.73 -            </batchtest>
    1.74 -            <classpath>
    1.75 -                <path path="${test.cp}"/>
    1.76 -                <path location="build/test/classes"/>
    1.77 -                <path location="${junit.jar}"/>
    1.78 -            </classpath>
    1.79 -            <formatter type="brief" usefile="false"/>
    1.80 -            <formatter type="xml"/>
    1.81 -            <jvmarg value="${debug1}"/>
    1.82 -            <jvmarg value="${debug2}"/>
    1.83 -        </junit>
    1.84 +    <target name="-run-one">
    1.85 +        <java classpath="${cp}:build/${version}/classes" classname="${main}"/>
    1.86      </target>
    1.87      
    1.88      <target name="-build-one">
    1.89          <fail message="You need to specify version number" unless="version"/>
    1.90          
    1.91          <mkdir dir="build/${version}/classes"/>
    1.92 -        <property name="cp" value=""/>
    1.93 +        <property name="cp" value="build/api/classes"/>
    1.94          <javac 
    1.95              srcdir="src-${version}" 
    1.96              destdir="build/${version}/classes"