# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213429865 -7200
# Node ID 0aee50e597da2d35e47cffdf9dda2e00c6613ab6
# Parent  afae7be94b2551c40d21617b4a94318b494e3274
Really downloading junit from their site

diff -r afae7be94b25 -r 0aee50e597da samples/composition/build.xml
--- a/samples/composition/build.xml	Sat Jun 14 09:51:05 2008 +0200
+++ b/samples/composition/build.xml	Sat Jun 14 09:51:05 2008 +0200
@@ -4,9 +4,7 @@
         <delete dir="build"/>
     </target>
     
-    <target name="build">
-        <ant dir="../libs/"/>
-        
+    <target name="build" depends="-libraries">
         <antcall target="-build-one">
             <param name="version" value="api1.0"/>
         </antcall>
@@ -16,7 +14,7 @@
         
         <antcall target="-build-one">
             <param name="version" value="test"/>
-            <param name="cp" value="build/api1.0/classes:../libs/dist/junit-4.1.jar"/>
+            <param name="cp" value="build/api1.0/classes:${junit.jar}"/>
         </antcall>
     </target>
     
@@ -30,10 +28,15 @@
             <param name="version" value="api2.0"/>
         </antcall>
     </target>
-
     
     <!-- support methods -->
     
+    <target name="-libraries">
+        <ant dir="../libs/"/>
+        
+        <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
+    </target>
+    
     <target name="-run-one">
         <fail message="You need to specify API version number" unless="version"/>
         <mkdir dir="build/testresults"/>
@@ -46,7 +49,7 @@
             <classpath>
                 <path location="build/${version}/classes"/>
                 <path location="build/test/classes"/>
-                <path location="../libs/dist/junit-4.1.jar"/>
+                <path location="${junit.jar}"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
             <formatter type="xml"/>
diff -r afae7be94b25 -r 0aee50e597da samples/composition/src-api1.0/api/Arithmetica.java
--- a/samples/composition/src-api1.0/api/Arithmetica.java	Sat Jun 14 09:51:05 2008 +0200
+++ b/samples/composition/src-api1.0/api/Arithmetica.java	Sat Jun 14 09:51:05 2008 +0200
@@ -5,6 +5,7 @@
  * @author Jaroslav Tulach <jtulach@netbeans.org>
  * @version 1.0
  */
+// BEGIN: design.composition.arith1.0
 public class Arithmetica {
     public int sumTwo(int one, int second) {
         return one + second;
@@ -27,3 +28,4 @@
         return sumAll(array);
     }
 }
+// END: design.composition.arith1.0
diff -r afae7be94b25 -r 0aee50e597da samples/libs/build.xml
--- a/samples/libs/build.xml	Sat Jun 14 09:51:05 2008 +0200
+++ b/samples/libs/build.xml	Sat Jun 14 09:51:05 2008 +0200
@@ -6,8 +6,8 @@
     
     <target name="libraries">
         <antcall target="-library">
-            <param name="library" value="junit-4.1"/>
-            <param name="url" value="junit"/>
+            <param name="library" value="junit-4.4"/>
+            <param name="url" value="http://switch.dl.sourceforge.net/sourceforge/junit/junit-4.4.jar"/>
         </antcall>
     </target>
     
@@ -17,16 +17,18 @@
         <fail message="You need to specify library name" unless="library"/>
         <fail message="You need to specify url" unless="url"/>
         
-        <echo message="Checking for dist/${library}.jar"/>
-        <available file="dist/${library}.jar" property="library.available"/>
+        <property name="library.jar" location="dist/${library}.jar"/>
+        
+        <echo message="Checking for ${library.jar}"/>
+        <available file="${library.jar}" property="library.available"/>
     </target>
     <target name="-library" depends="-library-check" unless="library.available">
         <mkdir dir="dist"/>
-        <get dest="dist/${library}" src="${url}"/>
+        <get dest="${library.jar}" src="${url}"/>
         
         <fail message="Now the library ${library} should be downloaded">
             <condition>
-                <available file="dist/${library}.jar"/>
+                <not><available file="${library.jar}"/></not>
             </condition>
         </fail>
     </target>