# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430103 -7200
# Node ID 920e95b470368bb1e8a61829a3a878330496ff75
# Parent  3611475f83db5bdd1d264ecbae570d4cf2ee1dc1
2nd batch of polishing of review2

diff -r 3611475f83db -r 920e95b47036 samples/apifest1/boolcircuit/nbproject/project.properties
--- a/samples/apifest1/boolcircuit/nbproject/project.properties	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/apifest1/boolcircuit/nbproject/project.properties	Sat Jun 14 09:55:03 2008 +0200
@@ -1,5 +1,3 @@
-application.title=boolcircuit
-application.vendor=jarda
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -18,7 +16,6 @@
 dist.jar=${dist.dir}/boolcircuit.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
-file.reference.junit-4.4.jar=../../libs/dist/junit-4.4.jar
 includes=**
 jar.compress=false
 javac.classpath=
@@ -30,7 +27,7 @@
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${file.reference.junit-4.4.jar}
+    ${libs.junit.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=
@@ -42,6 +39,9 @@
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
+# Property libs.junit.classpath is set here just to make sharing of project simpler.
+# The library definition has always preference over this property.
+libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
 meta.inf.dir=${src.dir}/META-INF
 platform.active=default_platform
 run.classpath=\
diff -r 3611475f83db -r 920e95b47036 samples/composition/build.xml
--- a/samples/composition/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/composition/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build" depends="-libraries">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/consistency/build.xml
--- a/samples/consistency/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/consistency/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build" depends="-libraries">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/delegatingwriterfinal/build.xml
--- a/samples/delegatingwriterfinal/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/delegatingwriterfinal/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build" depends="-libraries">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/differentreturntype/build.xml
--- a/samples/differentreturntype/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/differentreturntype/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -25,7 +25,6 @@
     </target>
     <!-- END: theory.binary.differentreturntype.ant -->
     
-    <target name="compile" depends="build"/>
     <target name="build" depends="clean">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/extensionpoint/build.xml
--- a/samples/extensionpoint/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/extensionpoint/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build">
         <antcall target="-build-one">
             <param name="version" value="api"/>
@@ -60,7 +59,7 @@
             srcdir="src-${version}" 
             destdir="build/${version}/classes" 
             source="1.5" target="1.5"
-            classpath="${cp}:../libs/dist/org-openide-util.jar"
+            classpath="${cp}"
         />
         <copy todir="build/${version}/classes">
             <fileset dir="src-${version}">
diff -r 3611475f83db -r 920e95b47036 samples/forjoe/build.xml
--- a/samples/forjoe/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/forjoe/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/friendpackage/nbproject/build-impl.xml
--- a/samples/friendpackage/nbproject/build-impl.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/friendpackage/nbproject/build-impl.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -80,10 +80,7 @@
             </and>
         </condition>
         <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
+            <isfalse value="${javadoc.preview}"/>
         </condition>
         <property name="run.jvmargs" value=""/>
         <property name="javac.compilerargs" value=""/>
@@ -97,27 +94,8 @@
         <property name="javadoc.preview" value="true"/>
         <property name="application.args" value=""/>
         <property name="source.encoding" value="${file.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
         <property name="includes" value="**"/>
         <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
-        </condition>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -152,14 +130,15 @@
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="" name="sourcepath"/>
+            <attribute default="${jaxws.endorsed.dir}" name="jaxwsendorsed"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="" srcdir="@{srcdir}" target="${javac.target}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
+                    <compilerarg line="-Djava.endorsed.dirs='@{jaxwsendorsed}'"/>
+                    <compilerarg line="${javac.compilerargs}"/>
                     <customize/>
                 </javac>
             </sequential>
@@ -196,12 +175,11 @@
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
             <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
+                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
+                            <filename name="**/*Test.java"/>
                         </fileset>
                     </batchtest>
                     <classpath>
@@ -316,10 +294,8 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target if="do.depend.true" name="-compile-depend">
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources" name="-do-compile">
         <j2seproject3:depend/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -337,7 +313,7 @@
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -420,10 +396,7 @@
             </customize>
         </j2seproject1:java>
     </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single" name="run-single">
+    <target depends="init,compile" name="run-single">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <j2seproject1:java classname="${run.class}"/>
     </target>
@@ -451,7 +424,7 @@
         <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
         <j2seproject3:debug classname="${debug.class}"/>
     </target>
-    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
     <target depends="init" name="-pre-debug-fix">
         <fail unless="fix.includes">Must set fix.includes</fail>
         <property name="javac.includes" value="${fix.includes}.java"/>
@@ -467,10 +440,11 @@
             -->
     <target depends="init" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" destdir="${dist.javadoc.dir}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
+            <packageset dir="${src.dir}" excludes="${excludes}" includes="${includes}"/>
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -492,10 +466,8 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target if="do.depend.true" name="-compile-test-depend">
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
         <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -513,7 +485,7 @@
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -532,7 +504,7 @@
         <mkdir dir="${build.test.results.dir}"/>
     </target>
     <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
+        <j2seproject3:junit/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
         <fail if="tests.failed">Some tests failed; see details above.</fail>
@@ -550,7 +522,7 @@
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
         <fail if="tests.failed">Some tests failed; see details above.</fail>
     </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
     <!--
                 =======================
                 JUNIT DEBUGGING SECTION
@@ -558,26 +530,20 @@
             -->
     <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
         <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+        <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
             <customize>
                 <syspropertyset>
                     <propertyref prefix="test-sys-prop."/>
                     <mapper from="test-sys-prop.*" to="*" type="glob"/>
                 </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+                <arg line="${test.class}"/>
             </customize>
         </j2seproject3:debug>
     </target>
     <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
         <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
     </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
     <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
         <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     </target>
diff -r 3611475f83db -r 920e95b47036 samples/friendpackage/nbproject/project.properties
--- a/samples/friendpackage/nbproject/project.properties	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/friendpackage/nbproject/project.properties	Sat Jun 14 09:55:03 2008 +0200
@@ -1,5 +1,3 @@
-application.title=friendpackage
-application.vendor=jarda
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -18,7 +16,6 @@
 dist.jar=${dist.dir}/friendpackage.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
-file.reference.junit-4.4.jar=../libs/dist/junit-4.4.jar
 includes=**
 jar.compress=false
 javac.classpath=
@@ -30,7 +27,7 @@
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${file.reference.junit-4.4.jar}
+    ${libs.junit.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=
diff -r 3611475f83db -r 920e95b47036 samples/friendpackage/src/apipkg/Item.java
--- a/samples/friendpackage/src/apipkg/Item.java	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/friendpackage/src/apipkg/Item.java	Sat Jun 14 09:55:03 2008 +0200
@@ -28,7 +28,7 @@
 
     // BEGIN: design.less.friend.Item.static
     static {
-        Accessor.setDefault(new AccessorImpl());
+        Accessor.DEFAULT = new AccessorImpl();
     }
     // END: design.less.friend.Item.static
     
diff -r 3611475f83db -r 920e95b47036 samples/friendpackage/src/implpkg/Accessor.java
--- a/samples/friendpackage/src/implpkg/Accessor.java	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/friendpackage/src/implpkg/Accessor.java	Sat Jun 14 09:55:03 2008 +0200
@@ -22,27 +22,13 @@
  */
 // BEGIN: design.less.friend.Accessor
 public abstract class Accessor {
-    private static volatile Accessor DEFAULT;
-    public static Accessor getDefault() {
-        Accessor a = DEFAULT;
-        if (a != null) {
-            return a;
-        }
-        
+    public static Accessor DEFAULT;
+    static {
         try {
             Class.forName(Item.class.getName(), true, Item.class.getClassLoader());
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-        
-        return DEFAULT;
-    }
-
-    public static void setDefault(Accessor accessor) {
-        if (DEFAULT != null) {
-            throw new IllegalStateException();
-        }
-        DEFAULT = accessor;
     }
     
     public Accessor() {
diff -r 3611475f83db -r 920e95b47036 samples/friendpackage/test/implpkg/AccessorTest.java
--- a/samples/friendpackage/test/implpkg/AccessorTest.java	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/friendpackage/test/implpkg/AccessorTest.java	Sat Jun 14 09:55:03 2008 +0200
@@ -32,12 +32,18 @@
         super(testName);
     }
 
+    protected void setUp() throws Exception {
+    }
+
+    protected void tearDown() throws Exception {
+    }
+    
     public void testGetTheItemAttachListenerChangeValue() {
         // BEGIN: design.less.friend.use
-        Item item = Accessor.getDefault().newItem();
+        Item item = Accessor.DEFAULT.newItem();
         assertNotNull("Some item is really created", item);
         
-        Accessor.getDefault().addChangeListener(item, this);
+        Accessor.DEFAULT.addChangeListener(item, this);
         // END: design.less.friend.use
         
         item.setValue(10);
diff -r 3611475f83db -r 920e95b47036 samples/growingparameters/build.xml
--- a/samples/growingparameters/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/growingparameters/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/insertsuperclass/build.xml
--- a/samples/insertsuperclass/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/insertsuperclass/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/instanceofclass/build.xml
--- a/samples/instanceofclass/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/instanceofclass/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/messagedigest/build.xml
--- a/samples/messagedigest/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/messagedigest/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build" depends="-libraries">
         <antcall target="-build-one">
             <param name="version" value="new-api"/>
diff -r 3611475f83db -r 920e95b47036 samples/preventcyclicdependencies/build.xml
--- a/samples/preventcyclicdependencies/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/preventcyclicdependencies/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build">
         <antcall target="-build-one">
             <param name="version" value="cyclic"/>
@@ -57,7 +56,7 @@
             destdir="build/${version}/classes" 
             source="1.5" target="1.5"
             debug="true"
-            classpath="${cp}:../libs/dist/org-openide-util.jar"
+            classpath="${cp}"
         />
         <copy todir="build/${version}/classes">
             <fileset dir="src-${version}">
diff -r 3611475f83db -r 920e95b47036 samples/primitiveconstants/build.xml
--- a/samples/primitiveconstants/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/primitiveconstants/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
diff -r 3611475f83db -r 920e95b47036 samples/reexport/build.xml
--- a/samples/reexport/build.xml	Sat Jun 14 09:55:02 2008 +0200
+++ b/samples/reexport/build.xml	Sat Jun 14 09:55:03 2008 +0200
@@ -4,7 +4,6 @@
         <delete dir="build"/>
     </target>
     
-    <target name="compile" depends="build"/>
     <target name="build" depends="-libraries">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>