diff -r 019f1e9f7741 -r 130e099942d8 samples/messagedigest/build.xml
--- a/samples/messagedigest/build.xml	Sat Jun 14 09:52:26 2008 +0200
+++ b/samples/messagedigest/build.xml	Sat Jun 14 09:52:26 2008 +0200
@@ -9,28 +9,30 @@
             <param name="version" value="new-api"/>
         </antcall>
         <antcall target="-build-one">
-            <param name="version" value="new-spi"/>
+            <param name="version" value="bridge"/>
             <param name="cp" value="build/new-api/classes"/>
         </antcall>
-        <antcall target="-build-one">
-            <param name="version" value="bridge"/>
-            <param name="cp" value="build/new-api/classes:build/new-spi/classes"/>
-        </antcall>
         
         <antcall target="-build-one">
             <param name="version" value="test"/>
-            <param name="cp" value="build/new-api/classes:build/new-spi/classes:${junit.jar}"/>
+            <param name="cp" value="build/new-api/classes:${junit.jar}"/>
         </antcall>
     </target>
     
-    <target name="test" depends="build">
+    <target name="test">
+        <antcall target="-do-test">
+            <param name="nodebug" value="true"/>
+        </antcall>
+    </target>
+        
+    <target name="-do-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/new-spi/classes:build/bridge/classes"/>
+            <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:build/new-spi/classes"/>
+            <param name="test.cp" value="build/new-api/classes"/>
         </antcall>
     </target>
     
@@ -41,13 +43,25 @@
         
         <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">
+    <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="**/*Test.class"/>
+                    <filename name="${include}.class"/>
                 </fileset>
             </batchtest>
             <classpath>
@@ -57,6 +71,8 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
             <formatter type="xml"/>
+            <jvmarg value="${debug1}"/>
+            <jvmarg value="${debug2}"/>
         </junit>
     </target>
     
@@ -70,6 +86,7 @@
             destdir="build/${version}/classes" 
             source="1.5" target="1.5"
             classpath="${cp}"
+            debug="true" debuglevel="lines,vars,source"
         />
         <copy todir="build/${version}/classes">
             <fileset dir="src-${version}">