--- CircuitBreaker/build.xml	2010/06/10 11:15:14	821
+++ CircuitBreaker/build.xml	2011/10/14 13:38:20	1610
@@ -1,13 +1,10 @@
-<project name="CircuiBreaker" default="jar">
+<project name="CircuiBreaker" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant">
 
 	<property name="builddir" value="antbuild" />
 	<property name="jarfile" value="CircuitBreaker.jar" />
 
 	<path id="path.base">
-		<fileset dir="/home/app/glassfishv3/glassfish/modules/">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="../">
+		<fileset dir="lib/">
 			<include name="*.jar" />
 		</fileset>
 	</path>
@@ -15,19 +12,47 @@
 	<target name="clean">
 		<delete file="${jarfile}" />
 		<delete dir="${builddir}" />
+		<delete dir="lib/" />
 	</target>
 
 	<target name="init">
 		<mkdir dir="${builddir}" />
 	</target>
 
-	<target name="compile" depends="init">
-		<javac srcdir="src/" destdir="${builddir}" debug="off" optimize="on" includeantruntime="false">
+    <target name="resolve" depends="init" description="--> retrieve dependencies with ivy">
+        <ivy:retrieve />
+    </target>
+
+
+	<target name="compile" depends="resolve">
+		<javac srcdir="src/" destdir="${builddir}" debug="off" optimize="on" includeantruntime="false" updatedProperty="didcompile">
+			<classpath refid="path.base" />
+		</javac>
+	</target>
+
+
+	<target name="test" depends="compile" if="didcompile">
+		<javac srcdir="test/" includeantruntime="false">
 			<classpath refid="path.base" />
+			<classpath path="${builddir}"/>	
 		</javac>
+
+		<junit printsummary="on" 
+           fork="false" 
+			haltonfailure="true"
+           showoutput="true" > 
+
+			<classpath refid="path.base" />
+			<classpath path="${builddir}"/>	
+			<classpath path="test"/>	
+
+			<test name="dk.thoerup.circuitbreaker.TestCircuitBreaker" />
+			<test name="dk.thoerup.circuitbreaker.TestAccountingCircuitBreaker" />
+
+		</junit>
 	</target>
 
-	<target name="jar" depends="compile">
+	<target name="jar" depends="test">
 		<jar destfile="${jarfile}" basedir="${builddir}" />
 	</target>