diff -r 43b122711ae1 -r 3fb53f65db57 samples/componentinjection/anagram-modular/build.xml
--- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:06:45 2008 +0200
+++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:06:54 2008 +0200
@@ -8,28 +8,30 @@
     <target name="build" depends="-libraries">
         <antcall target="-build-one">
             <param name="version" value="api"/>
+            <param name="cp" value=""/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="word-static"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="scrambler-simple"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="gui"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="app-register"/>
+            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
         </antcall>
         
-        <antcall target="-build-one">
-            <param name="version" value="test"/>
-            <param name="cp" value="build/new-api/classes:${junit.jar}"/>
-        </antcall>
     </target>
     
-    <target name="test">
-        <antcall target="-do-test">
-            <param name="nodebug" value="true"/>
-        </antcall>
-    </target>
-        
-    <target name="-do-test" depends="build">
+    <target name="test" depends="build">
         <echo level="info" message="Running the tests with bridge enabled. This should succeeds."/>
         <antcall target="-run-one">
-            <param name="test.cp" value="build/new-api/classes:build/bridge/classes"/>
-        </antcall>
-        <echo level="info" message="Running the tests without bridge module. This should fail."/>
-        <antcall target="-run-one">
-            <param name="test.cp" value="build/new-api/classes"/>
+            <param name="version" value="app-register"/>
+            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
+            <param name="main" value="org.apidesign.anagram.app.register.Main"/>
         </antcall>
     </target>
     
@@ -41,43 +43,15 @@
         <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
     </target>
 
-    <target name="-debug-one" if="netbeans.home" unless="nodebug">
-        <nbjpdastart addressproperty="jpda.address" name="MessageDigest and Bridges" transport="dt_socket" >
-            <sourcepath path="src-new-api:src-bridge:src-test:build/test/classes"/>
-            <classpath path="build/new-api/classes:build/bridge/classes:build/test/classes"/>
-        </nbjpdastart>
-        <property name="debug1" value="-Xdebug"/>
-        <property name="debug2" value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-    </target>
-    
-    <target name="-run-one" depends="-debug-one">
-        <property name="debug1" value="-Dn1"/>
-        <property name="debug2" value="-Dn2"/>
-        <property name="include" value="**/*Test"/>
-        <mkdir dir="build/testresults"/>
-        <junit dir="build/test/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-            <batchtest todir="build/testresults">
-                <fileset dir="build/test/classes">
-                    <filename name="${include}.class"/>
-                </fileset>
-            </batchtest>
-            <classpath>
-                <path path="${test.cp}"/>
-                <path location="build/test/classes"/>
-                <path location="${junit.jar}"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-            <jvmarg value="${debug1}"/>
-            <jvmarg value="${debug2}"/>
-        </junit>
+    <target name="-run-one">
+        <java classpath="${cp}:build/${version}/classes" classname="${main}"/>
     </target>
     
     <target name="-build-one">
         <fail message="You need to specify version number" unless="version"/>
         
         <mkdir dir="build/${version}/classes"/>
-        <property name="cp" value=""/>
+        <property name="cp" value="build/api/classes"/>
         <javac 
             srcdir="src-${version}" 
             destdir="build/${version}/classes"