1.1 --- a/samples/apifest1/boolcircuit/nbproject/project.properties Sat Jun 14 09:55:03 2008 +0200
1.2 +++ b/samples/apifest1/boolcircuit/nbproject/project.properties Sat Jun 14 09:55:04 2008 +0200
1.3 @@ -1,3 +1,5 @@
1.4 +application.title=boolcircuit
1.5 +application.vendor=jarda
1.6 build.classes.dir=${build.dir}/classes
1.7 build.classes.excludes=**/*.java,**/*.form
1.8 # This directory is removed when the project is cleaned:
1.9 @@ -16,6 +18,7 @@
1.10 dist.jar=${dist.dir}/boolcircuit.jar
1.11 dist.javadoc.dir=${dist.dir}/javadoc
1.12 excludes=
1.13 +file.reference.junit-4.4.jar=../../libs/dist/junit-4.4.jar
1.14 includes=**
1.15 jar.compress=false
1.16 javac.classpath=
1.17 @@ -27,7 +30,7 @@
1.18 javac.test.classpath=\
1.19 ${javac.classpath}:\
1.20 ${build.classes.dir}:\
1.21 - ${libs.junit.classpath}
1.22 + ${file.reference.junit-4.4.jar}
1.23 javadoc.additionalparam=
1.24 javadoc.author=false
1.25 javadoc.encoding=
1.26 @@ -39,9 +42,6 @@
1.27 javadoc.use=true
1.28 javadoc.version=false
1.29 javadoc.windowtitle=
1.30 -# Property libs.junit.classpath is set here just to make sharing of project simpler.
1.31 -# The library definition has always preference over this property.
1.32 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
1.33 meta.inf.dir=${src.dir}/META-INF
1.34 platform.active=default_platform
1.35 run.classpath=\
2.1 --- a/samples/composition/build.xml Sat Jun 14 09:55:03 2008 +0200
2.2 +++ b/samples/composition/build.xml Sat Jun 14 09:55:04 2008 +0200
2.3 @@ -4,6 +4,7 @@
2.4 <delete dir="build"/>
2.5 </target>
2.6
2.7 + <target name="compile" depends="build"/>
2.8 <target name="build" depends="-libraries">
2.9 <antcall target="-build-one">
2.10 <param name="version" value="api1.0"/>
3.1 --- a/samples/consistency/build.xml Sat Jun 14 09:55:03 2008 +0200
3.2 +++ b/samples/consistency/build.xml Sat Jun 14 09:55:04 2008 +0200
3.3 @@ -4,6 +4,7 @@
3.4 <delete dir="build"/>
3.5 </target>
3.6
3.7 + <target name="compile" depends="build"/>
3.8 <target name="build" depends="-libraries">
3.9 <antcall target="-build-one">
3.10 <param name="version" value="api1.0"/>
4.1 --- a/samples/delegatingwriterfinal/build.xml Sat Jun 14 09:55:03 2008 +0200
4.2 +++ b/samples/delegatingwriterfinal/build.xml Sat Jun 14 09:55:04 2008 +0200
4.3 @@ -4,6 +4,7 @@
4.4 <delete dir="build"/>
4.5 </target>
4.6
4.7 + <target name="compile" depends="build"/>
4.8 <target name="build" depends="-libraries">
4.9 <antcall target="-build-one">
4.10 <param name="version" value="api1.0"/>
5.1 --- a/samples/differentreturntype/build.xml Sat Jun 14 09:55:03 2008 +0200
5.2 +++ b/samples/differentreturntype/build.xml Sat Jun 14 09:55:04 2008 +0200
5.3 @@ -25,6 +25,7 @@
5.4 </target>
5.5 <!-- END: theory.binary.differentreturntype.ant -->
5.6
5.7 + <target name="compile" depends="build"/>
5.8 <target name="build" depends="clean">
5.9 <antcall target="-build-one">
5.10 <param name="version" value="api1.0"/>
6.1 --- a/samples/extensionpoint/build.xml Sat Jun 14 09:55:03 2008 +0200
6.2 +++ b/samples/extensionpoint/build.xml Sat Jun 14 09:55:04 2008 +0200
6.3 @@ -4,6 +4,7 @@
6.4 <delete dir="build"/>
6.5 </target>
6.6
6.7 + <target name="compile" depends="build"/>
6.8 <target name="build">
6.9 <antcall target="-build-one">
6.10 <param name="version" value="api"/>
6.11 @@ -59,7 +60,7 @@
6.12 srcdir="src-${version}"
6.13 destdir="build/${version}/classes"
6.14 source="1.5" target="1.5"
6.15 - classpath="${cp}"
6.16 + classpath="${cp}:../libs/dist/org-openide-util.jar"
6.17 />
6.18 <copy todir="build/${version}/classes">
6.19 <fileset dir="src-${version}">
7.1 --- a/samples/forjoe/build.xml Sat Jun 14 09:55:03 2008 +0200
7.2 +++ b/samples/forjoe/build.xml Sat Jun 14 09:55:04 2008 +0200
7.3 @@ -4,6 +4,7 @@
7.4 <delete dir="build"/>
7.5 </target>
7.6
7.7 + <target name="compile" depends="build"/>
7.8 <target name="build">
7.9 <antcall target="-build-one">
7.10 <param name="version" value="api1.0"/>
8.1 --- a/samples/friendpackage/nbproject/build-impl.xml Sat Jun 14 09:55:03 2008 +0200
8.2 +++ b/samples/friendpackage/nbproject/build-impl.xml Sat Jun 14 09:55:04 2008 +0200
8.3 @@ -80,7 +80,10 @@
8.4 </and>
8.5 </condition>
8.6 <condition property="no.javadoc.preview">
8.7 - <isfalse value="${javadoc.preview}"/>
8.8 + <and>
8.9 + <isset property="javadoc.preview"/>
8.10 + <isfalse value="${javadoc.preview}"/>
8.11 + </and>
8.12 </condition>
8.13 <property name="run.jvmargs" value=""/>
8.14 <property name="javac.compilerargs" value=""/>
8.15 @@ -94,8 +97,27 @@
8.16 <property name="javadoc.preview" value="true"/>
8.17 <property name="application.args" value=""/>
8.18 <property name="source.encoding" value="${file.encoding}"/>
8.19 + <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
8.20 + <and>
8.21 + <isset property="javadoc.encoding"/>
8.22 + <not>
8.23 + <equals arg1="${javadoc.encoding}" arg2=""/>
8.24 + </not>
8.25 + </and>
8.26 + </condition>
8.27 + <property name="javadoc.encoding.used" value="${source.encoding}"/>
8.28 <property name="includes" value="**"/>
8.29 <property name="excludes" value=""/>
8.30 + <property name="do.depend" value="false"/>
8.31 + <condition property="do.depend.true">
8.32 + <istrue value="${do.depend}"/>
8.33 + </condition>
8.34 + <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
8.35 + <and>
8.36 + <isset property="jaxws.endorsed.dir"/>
8.37 + <available file="nbproject/jaxws-build.xml"/>
8.38 + </and>
8.39 + </condition>
8.40 </target>
8.41 <target name="-post-init">
8.42 <!-- Empty placeholder for easier customization. -->
8.43 @@ -130,15 +152,14 @@
8.44 <attribute default="${includes}" name="includes"/>
8.45 <attribute default="${excludes}" name="excludes"/>
8.46 <attribute default="${javac.debug}" name="debug"/>
8.47 - <attribute default="${jaxws.endorsed.dir}" name="jaxwsendorsed"/>
8.48 + <attribute default="" name="sourcepath"/>
8.49 <element name="customize" optional="true"/>
8.50 <sequential>
8.51 - <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}">
8.52 + <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}">
8.53 <classpath>
8.54 <path path="@{classpath}"/>
8.55 </classpath>
8.56 - <compilerarg line="-Djava.endorsed.dirs='@{jaxwsendorsed}'"/>
8.57 - <compilerarg line="${javac.compilerargs}"/>
8.58 + <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
8.59 <customize/>
8.60 </javac>
8.61 </sequential>
8.62 @@ -175,11 +196,12 @@
8.63 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
8.64 <attribute default="${includes}" name="includes"/>
8.65 <attribute default="${excludes}" name="excludes"/>
8.66 + <attribute default="**" name="testincludes"/>
8.67 <sequential>
8.68 - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
8.69 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
8.70 <batchtest todir="${build.test.results.dir}">
8.71 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
8.72 - <filename name="**/*Test.java"/>
8.73 + <filename name="@{testincludes}"/>
8.74 </fileset>
8.75 </batchtest>
8.76 <classpath>
8.77 @@ -294,8 +316,10 @@
8.78 <!-- Empty placeholder for easier customization. -->
8.79 <!-- You can override this target in the ../build.xml file. -->
8.80 </target>
8.81 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources" name="-do-compile">
8.82 + <target if="do.depend.true" name="-compile-depend">
8.83 <j2seproject3:depend/>
8.84 + </target>
8.85 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
8.86 <j2seproject3:javac/>
8.87 <copy todir="${build.classes.dir}">
8.88 <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
8.89 @@ -313,7 +337,7 @@
8.90 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
8.91 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
8.92 <j2seproject3:force-recompile/>
8.93 - <j2seproject3:javac excludes="" includes="${javac.includes}"/>
8.94 + <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
8.95 </target>
8.96 <target name="-post-compile-single">
8.97 <!-- Empty placeholder for easier customization. -->
8.98 @@ -396,7 +420,10 @@
8.99 </customize>
8.100 </j2seproject1:java>
8.101 </target>
8.102 - <target depends="init,compile" name="run-single">
8.103 + <target name="-do-not-recompile">
8.104 + <property name="javac.includes.binary" value=""/>
8.105 + </target>
8.106 + <target depends="init,-do-not-recompile,compile-single" name="run-single">
8.107 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
8.108 <j2seproject1:java classname="${run.class}"/>
8.109 </target>
8.110 @@ -424,7 +451,7 @@
8.111 <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
8.112 <j2seproject3:debug classname="${debug.class}"/>
8.113 </target>
8.114 - <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
8.115 + <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
8.116 <target depends="init" name="-pre-debug-fix">
8.117 <fail unless="fix.includes">Must set fix.includes</fail>
8.118 <property name="javac.includes" value="${fix.includes}.java"/>
8.119 @@ -440,11 +467,10 @@
8.120 -->
8.121 <target depends="init" name="-javadoc-build">
8.122 <mkdir dir="${dist.javadoc.dir}"/>
8.123 - <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}">
8.124 + <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}">
8.125 <classpath>
8.126 <path path="${javac.classpath}"/>
8.127 </classpath>
8.128 - <packageset dir="${src.dir}" excludes="${excludes}" includes="${includes}"/>
8.129 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
8.130 <filename name="**/*.java"/>
8.131 </fileset>
8.132 @@ -466,8 +492,10 @@
8.133 <!-- Empty placeholder for easier customization. -->
8.134 <!-- You can override this target in the ../build.xml file. -->
8.135 </target>
8.136 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
8.137 + <target if="do.depend.true" name="-compile-test-depend">
8.138 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
8.139 + </target>
8.140 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
8.141 <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
8.142 <copy todir="${build.test.classes.dir}">
8.143 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
8.144 @@ -485,7 +513,7 @@
8.145 <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
8.146 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
8.147 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
8.148 - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
8.149 + <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}"/>
8.150 <copy todir="${build.test.classes.dir}">
8.151 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
8.152 </copy>
8.153 @@ -504,7 +532,7 @@
8.154 <mkdir dir="${build.test.results.dir}"/>
8.155 </target>
8.156 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
8.157 - <j2seproject3:junit/>
8.158 + <j2seproject3:junit testincludes="**/*Test.java"/>
8.159 </target>
8.160 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
8.161 <fail if="tests.failed">Some tests failed; see details above.</fail>
8.162 @@ -522,7 +550,7 @@
8.163 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
8.164 <fail if="tests.failed">Some tests failed; see details above.</fail>
8.165 </target>
8.166 - <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"/>
8.167 + <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"/>
8.168 <!--
8.169 =======================
8.170 JUNIT DEBUGGING SECTION
8.171 @@ -530,20 +558,26 @@
8.172 -->
8.173 <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
8.174 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
8.175 - <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
8.176 + <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
8.177 + <delete file="${test.report.file}"/>
8.178 + <mkdir dir="${build.test.results.dir}"/>
8.179 + <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}">
8.180 <customize>
8.181 <syspropertyset>
8.182 <propertyref prefix="test-sys-prop."/>
8.183 <mapper from="test-sys-prop.*" to="*" type="glob"/>
8.184 </syspropertyset>
8.185 - <arg line="${test.class}"/>
8.186 + <arg value="${test.class}"/>
8.187 + <arg value="showoutput=true"/>
8.188 + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
8.189 + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
8.190 </customize>
8.191 </j2seproject3:debug>
8.192 </target>
8.193 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
8.194 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
8.195 </target>
8.196 - <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
8.197 + <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
8.198 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
8.199 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
8.200 </target>
9.1 --- a/samples/friendpackage/nbproject/project.properties Sat Jun 14 09:55:03 2008 +0200
9.2 +++ b/samples/friendpackage/nbproject/project.properties Sat Jun 14 09:55:04 2008 +0200
9.3 @@ -1,3 +1,5 @@
9.4 +application.title=friendpackage
9.5 +application.vendor=jarda
9.6 build.classes.dir=${build.dir}/classes
9.7 build.classes.excludes=**/*.java,**/*.form
9.8 # This directory is removed when the project is cleaned:
9.9 @@ -16,6 +18,7 @@
9.10 dist.jar=${dist.dir}/friendpackage.jar
9.11 dist.javadoc.dir=${dist.dir}/javadoc
9.12 excludes=
9.13 +file.reference.junit-4.4.jar=../libs/dist/junit-4.4.jar
9.14 includes=**
9.15 jar.compress=false
9.16 javac.classpath=
9.17 @@ -27,7 +30,7 @@
9.18 javac.test.classpath=\
9.19 ${javac.classpath}:\
9.20 ${build.classes.dir}:\
9.21 - ${libs.junit.classpath}
9.22 + ${file.reference.junit-4.4.jar}
9.23 javadoc.additionalparam=
9.24 javadoc.author=false
9.25 javadoc.encoding=
10.1 --- a/samples/friendpackage/src/apipkg/Item.java Sat Jun 14 09:55:03 2008 +0200
10.2 +++ b/samples/friendpackage/src/apipkg/Item.java Sat Jun 14 09:55:04 2008 +0200
10.3 @@ -28,7 +28,7 @@
10.4
10.5 // BEGIN: design.less.friend.Item.static
10.6 static {
10.7 - Accessor.DEFAULT = new AccessorImpl();
10.8 + Accessor.setDefault(new AccessorImpl());
10.9 }
10.10 // END: design.less.friend.Item.static
10.11
11.1 --- a/samples/friendpackage/src/implpkg/Accessor.java Sat Jun 14 09:55:03 2008 +0200
11.2 +++ b/samples/friendpackage/src/implpkg/Accessor.java Sat Jun 14 09:55:04 2008 +0200
11.3 @@ -22,13 +22,27 @@
11.4 */
11.5 // BEGIN: design.less.friend.Accessor
11.6 public abstract class Accessor {
11.7 - public static Accessor DEFAULT;
11.8 - static {
11.9 + private static volatile Accessor DEFAULT;
11.10 + public static Accessor getDefault() {
11.11 + Accessor a = DEFAULT;
11.12 + if (a != null) {
11.13 + return a;
11.14 + }
11.15 +
11.16 try {
11.17 Class.forName(Item.class.getName(), true, Item.class.getClassLoader());
11.18 } catch (Exception ex) {
11.19 ex.printStackTrace();
11.20 }
11.21 +
11.22 + return DEFAULT;
11.23 + }
11.24 +
11.25 + public static void setDefault(Accessor accessor) {
11.26 + if (DEFAULT != null) {
11.27 + throw new IllegalStateException();
11.28 + }
11.29 + DEFAULT = accessor;
11.30 }
11.31
11.32 public Accessor() {
12.1 --- a/samples/friendpackage/test/implpkg/AccessorTest.java Sat Jun 14 09:55:03 2008 +0200
12.2 +++ b/samples/friendpackage/test/implpkg/AccessorTest.java Sat Jun 14 09:55:04 2008 +0200
12.3 @@ -32,18 +32,12 @@
12.4 super(testName);
12.5 }
12.6
12.7 - protected void setUp() throws Exception {
12.8 - }
12.9 -
12.10 - protected void tearDown() throws Exception {
12.11 - }
12.12 -
12.13 public void testGetTheItemAttachListenerChangeValue() {
12.14 // BEGIN: design.less.friend.use
12.15 - Item item = Accessor.DEFAULT.newItem();
12.16 + Item item = Accessor.getDefault().newItem();
12.17 assertNotNull("Some item is really created", item);
12.18
12.19 - Accessor.DEFAULT.addChangeListener(item, this);
12.20 + Accessor.getDefault().addChangeListener(item, this);
12.21 // END: design.less.friend.use
12.22
12.23 item.setValue(10);
13.1 --- a/samples/growingparameters/build.xml Sat Jun 14 09:55:03 2008 +0200
13.2 +++ b/samples/growingparameters/build.xml Sat Jun 14 09:55:04 2008 +0200
13.3 @@ -4,6 +4,7 @@
13.4 <delete dir="build"/>
13.5 </target>
13.6
13.7 + <target name="compile" depends="build"/>
13.8 <target name="build">
13.9 <antcall target="-build-one">
13.10 <param name="version" value="api1.0"/>
14.1 --- a/samples/insertsuperclass/build.xml Sat Jun 14 09:55:03 2008 +0200
14.2 +++ b/samples/insertsuperclass/build.xml Sat Jun 14 09:55:04 2008 +0200
14.3 @@ -4,6 +4,7 @@
14.4 <delete dir="build"/>
14.5 </target>
14.6
14.7 + <target name="compile" depends="build"/>
14.8 <target name="build">
14.9 <antcall target="-build-one">
14.10 <param name="version" value="api1.0"/>
15.1 --- a/samples/instanceofclass/build.xml Sat Jun 14 09:55:03 2008 +0200
15.2 +++ b/samples/instanceofclass/build.xml Sat Jun 14 09:55:04 2008 +0200
15.3 @@ -4,6 +4,7 @@
15.4 <delete dir="build"/>
15.5 </target>
15.6
15.7 + <target name="compile" depends="build"/>
15.8 <target name="build">
15.9 <antcall target="-build-one">
15.10 <param name="version" value="api1.0"/>
16.1 --- a/samples/messagedigest/build.xml Sat Jun 14 09:55:03 2008 +0200
16.2 +++ b/samples/messagedigest/build.xml Sat Jun 14 09:55:04 2008 +0200
16.3 @@ -4,6 +4,7 @@
16.4 <delete dir="build"/>
16.5 </target>
16.6
16.7 + <target name="compile" depends="build"/>
16.8 <target name="build" depends="-libraries">
16.9 <antcall target="-build-one">
16.10 <param name="version" value="new-api"/>
17.1 --- a/samples/preventcyclicdependencies/build.xml Sat Jun 14 09:55:03 2008 +0200
17.2 +++ b/samples/preventcyclicdependencies/build.xml Sat Jun 14 09:55:04 2008 +0200
17.3 @@ -4,6 +4,7 @@
17.4 <delete dir="build"/>
17.5 </target>
17.6
17.7 + <target name="compile" depends="build"/>
17.8 <target name="build">
17.9 <antcall target="-build-one">
17.10 <param name="version" value="cyclic"/>
17.11 @@ -56,7 +57,7 @@
17.12 destdir="build/${version}/classes"
17.13 source="1.5" target="1.5"
17.14 debug="true"
17.15 - classpath="${cp}"
17.16 + classpath="${cp}:../libs/dist/org-openide-util.jar"
17.17 />
17.18 <copy todir="build/${version}/classes">
17.19 <fileset dir="src-${version}">
18.1 --- a/samples/primitiveconstants/build.xml Sat Jun 14 09:55:03 2008 +0200
18.2 +++ b/samples/primitiveconstants/build.xml Sat Jun 14 09:55:04 2008 +0200
18.3 @@ -4,6 +4,7 @@
18.4 <delete dir="build"/>
18.5 </target>
18.6
18.7 + <target name="compile" depends="build"/>
18.8 <target name="build">
18.9 <antcall target="-build-one">
18.10 <param name="version" value="api1.0"/>
19.1 --- a/samples/reexport/build.xml Sat Jun 14 09:55:03 2008 +0200
19.2 +++ b/samples/reexport/build.xml Sat Jun 14 09:55:04 2008 +0200
19.3 @@ -4,6 +4,7 @@
19.4 <delete dir="build"/>
19.5 </target>
19.6
19.7 + <target name="compile" depends="build"/>
19.8 <target name="build" depends="-libraries">
19.9 <antcall target="-build-one">
19.10 <param name="version" value="api1.0"/>