jimwebber · klauern · Apr 20, 2011 · Apr 20, 2011 · Apr 20, 2011 · Apr 21, 2011
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,14 @@
+.shell_history
 .classpath
 .project
 bin
 lib
 target
 .ivy
 .DS_Store
+.ant-eclipse
+.ant-eclipse
+.settings
+.idea
+tools
+neo4j-tutorial.iml
diff --git a/README.markdown b/README.markdown
@@ -1,18 +1,39 @@
 Neo4j Koans
 ===========
 
+![dalek](https://github.com/jimwebber/neo4j-tutorial/raw/master/presentation/Intro%20to%20Neo4j.key/image54.png)
+
 This set of Koans will provide practical guidance for getting to grips with graph data structures and operations using the Neo4j open source graph database. It's part of a more comprehensive tutorial being developed by the [authors](#authors) which will make its way into conference tutorials soon enough.
 
 Prerequisites
 -------------
 
 You'll need to be familiar with the Java programming language, and it'd be helpful if you understood unit testing too. All the graph database knowledge you'll needed will be developed as part of completing the Koans. 
 
+Live Sessions
+-------------
+
+This tutorial is presented at conferences around the world. If you're interested in participating in a class, then it'll be taught at:
+
+[GOTO Amsterdam](http://gotocon.com/amsterdam-2011/training/)
+
+[QCon San Francisco](http://qconsf.com/sf2011/presentations/show_presentation.jsp?oid=3459)
+
+[Skillsmatter](http://skillsmatter.com/course/nosql/neo4j-tutorial)
+
+[Yow! Australia](http://www.yowconference.com.au/index.html)
+
 Authors <a name="authors">
 -------
 
-[Ian Robinson](http://iansrobinson.com)
+[Glen Ford](http://usersource.net/), [@glen_ford](http://twitter.com/glen_ford)
+
+[Tobias Ivarsson](http://www.thobe.org/), [@thobe](http://twitter.com/thobe)
+
+Peter Neubauer, [@peterneubauer](http://twitter.com/peterneubauer)
+
+[Ian Robinson](http://iansrobinson.com), [@iansrobinson](http://twitter.com/iansrobinson)
 
-[Jim Webber](http://jimwebber.org/)
+[Jim Webber](http://jimwebber.org/), [@jimwebber](http://twitter.com/jimwebber)
 
 
diff --git a/build.xml b/build.xml
@@ -1,39 +1,44 @@
-<project name="neo4j-tutorial" default="test" xmlns:ivy="antlib:org.apache.ivy.ant" basedir=".">
+<project name="neo4j-tutorial" default="run.koans" xmlns:ivy="antlib:org.apache.ivy.ant" basedir=".">
 	<property name="settings.dir" location="settings" />
-	<property name="lib.dir" location="lib" />
-
+
+	<import file="${settings.dir}/download-neoclipse.xml" />
+	<import file="${settings.dir}/install-ant-eclipse.xml" />
 	<import file="${settings.dir}/install-ivy.xml" />
 	<import file="${settings.dir}/path.xml" />
-	<import file="${settings.dir}/test.xml" />
-
-	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" />
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="tools/ant/ant-contrib-0.6.jar" />
+	<import file="${settings.dir}/test.xml" />	
 
-	<target name="lib.retrieve" depends="install-ivy">
+	<target name="lib.retrieve" depends="install-ivy" unless="skip.ivy.download">
 		<mkdir dir="${lib.dir}" />
 		<ivy:settings file="${settings.dir}/ivysettings.xml" />
-        <ivy:resolve file="${settings.dir}/ivy.xml" />
-
-		<ivy:retrieve type="jar" pattern="${lib.dir}/[artifact]-[revision].[ext]" />
-	</target>
-
-	<target name="ivy-report" depends="lib.retrieve">
-		<ivy:report todir="target/reports/ivy" />
+		<ivy:resolve file="${settings.dir}/ivy.xml" />
+		<ivy:retrieve type="jar" pattern="${lib.dir}/[artifact](-[classifier]).[ext]" changing="true"/>
+		<ivy:retrieve type="bundle" pattern="${lib.dir}/[artifact].[ext]" changing="true"/>
 	</target>
-
-	<target name="lib.clean-cache">
+
+
+	<target name="clean.dependencies">
 		<delete dir="${lib.dir}" />
+		<delete dir="${ivy.dir}"/>
 	</target>
 
-	<target name="clean" description="Compile production classes">
+	<target name="clean" description="Removes the build directory, but not any cached ivy dependencies">
 		<delete dir="target" />
 		<delete dir="build" />
 	</target>
 
 	<target name="compile" description="Compile production classes" depends="lib.retrieve">
+		<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpath="${lib.dir}/aspectjtools.jar"/>
 		<mkdir dir="${main.target}" />
-		<javac srcdir="${main.src}" destdir="${main.target}" classpathref="path.productionlibs" target="1.6" debug="true" includeAntRuntime="false" />
-		<property environment="cruise" />
+
+		<iajc sourceroots="${main.src}" destDir="${main.target}" classpathref="path.libs" source="1.6">
+			<aspectpath>
+				<pathelement location="${lib.dir}/spring-aspects.jar"/>
+			</aspectpath>
+			<aspectpath>
+				<pathelement location="${lib.dir}/spring-data-neo4j.jar"/>
+			</aspectpath>
+		</iajc>
+
 		<tstamp>
 			<format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>		
@@ -44,32 +49,50 @@
 		</copy>
 	</target>
 
-	<target name="compile-tests" description="Compile unit test classes" depends="compile">
+	<target name="compile.tests" description="Compile unit test classes" depends="compile">
 		<mkdir dir="${test.target}" />
 		<javac srcdir="${test.src}" destdir="${test.target}" classpathref="path.testing" debug="true" target="1.5" />
 	</target>
 
-	<target name="compile-functional-tests" description="Compile functional test classes" depends="compile-tests">
-		<mkdir dir="${functionaltest.target}" />
-		<javac srcdir="${functionaltest.src}" destdir="${functionaltest.target}" classpathref="path.functionaltesting" debug="true" target="1.5" />
-	</target>
-
-
-	<target name="test" depends="clean, compile, compile-tests">
+	<target name="test" depends="clean, compile, compile.tests">
 		<fileset id="unittest.source.files" dir="${test.src}">
 			<include name="**/*Test*.java" />
 		</fileset>
 		<run_junit_tests testclasspath="path.testing" testfileset="unittest.source.files" outputdir="${test.reports}" />
 		<fail if="tests.failed.or.errored" message="Build failed due to Unit test failures or errors" />
 	</target>
-
-	<!--
-	<target name="functional-test" depends="clean, compile-functional-tests">
-		<fileset id="functionaltest.source.files" dir="${functionaltest.src}">
-			<include name="**/functionaltests/*.java" />
+
+	<target name="compile.koans" description="Compile koans">
+		<mkdir dir="${koan.target}" />
+		<javac srcdir="${koan.src}" destdir="${koan.target}" classpathref="path.koan" debug="true" target="1.6" />
+	</target>
+
+	<target name="run.koans" depends="test, compile.koans">
+		<fileset id="koan.source.files" dir="${koan.src}">
+			<include name="**/Koan*.java" />
 		</fileset>
-		<run_junit_tests testclasspath="path.functionaltesting" testfileset="functionaltest.source.files" outputdir="${functionaltest.reports}" />
-		<fail if="tests.failed.or.errored" message="Build failed due to Unit test failures or errors" />
-	</target> -->
+		<run_junit_tests testclasspath="path.koan" testfileset="koan.source.files" outputdir="${koan.reports}" />
+		<fail if="tests.failed.or.errored" message="Build failed due to Koan failures" />
 
+	</target>
+
+	<target name="generate.eclipse.project" depends="-install.ant-eclipse, lib.retrieve">
+		<mkdir dir="${main.target}" />
+		<mkdir dir="${test.target}" />
+		<mkdir dir="${koan.target}" />
+		<eclipse mode="java">
+			<settings>
+	        	<jdtcore compilercompliance="6.0" />
+	      	</settings>
+			<project name="neo4j-tutorial"/>
+			<classpath>
+				<library pathref="path.libs" />
+				<source path="${main.src}" />
+				<source path="${test.src}" />
+				<source path="${koan.src}" />
+				<output path="${target}" />
+			</classpath>
+		</eclipse>
+	</target>
+
 </project>
diff --git a/presentation/.gitignore b/presentation/.gitignore
@@ -0,0 +1,3 @@
+Intro to Neo4j.key/thumbs
+Intro to Neo4j.key/QuickLook
+
diff --git a/presentation/A Programmatic Introduction to Neo4j.pptx b/presentation/A Programmatic Introduction to Neo4j.pptx
diff --git a/presentation/Intro to Neo4j.key/Contents/PkgInfo b/presentation/Intro to Neo4j.key/Contents/PkgInfo
@@ -0,0 +1 @@
+????????
diff --git a/presentation/Intro to Neo4j.key/buildVersionHistory.plist b/presentation/Intro to Neo4j.key/buildVersionHistory.plist
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<string>local build-Jul  1 2011</string>
+</array>
+</plist>
diff --git a/presentation/Intro to Neo4j.key/fault-tolerance.png b/presentation/Intro to Neo4j.key/fault-tolerance.png
diff --git a/presentation/Intro to Neo4j.key/image-1.png b/presentation/Intro to Neo4j.key/image-1.png
diff --git a/presentation/Intro to Neo4j.key/image.png b/presentation/Intro to Neo4j.key/image.png
diff --git a/presentation/Intro to Neo4j.key/image0.png b/presentation/Intro to Neo4j.key/image0.png
diff --git a/presentation/Intro to Neo4j.key/image19.png b/presentation/Intro to Neo4j.key/image19.png
diff --git a/presentation/Intro to Neo4j.key/image2.png b/presentation/Intro to Neo4j.key/image2.png
diff --git a/presentation/Intro to Neo4j.key/image20.png b/presentation/Intro to Neo4j.key/image20.png
diff --git a/presentation/Intro to Neo4j.key/image21.png b/presentation/Intro to Neo4j.key/image21.png
diff --git a/presentation/Intro to Neo4j.key/image22.png b/presentation/Intro to Neo4j.key/image22.png
diff --git a/presentation/Intro to Neo4j.key/image23.png b/presentation/Intro to Neo4j.key/image23.png
diff --git a/presentation/Intro to Neo4j.key/image24.png b/presentation/Intro to Neo4j.key/image24.png
diff --git a/presentation/Intro to Neo4j.key/image25.png b/presentation/Intro to Neo4j.key/image25.png
diff --git a/presentation/Intro to Neo4j.key/image26.png b/presentation/Intro to Neo4j.key/image26.png
diff --git a/presentation/Intro to Neo4j.key/image27.png b/presentation/Intro to Neo4j.key/image27.png
diff --git a/presentation/Intro to Neo4j.key/image28.png b/presentation/Intro to Neo4j.key/image28.png
diff --git a/presentation/Intro to Neo4j.key/image29.png b/presentation/Intro to Neo4j.key/image29.png
diff --git a/presentation/Intro to Neo4j.key/image30.png b/presentation/Intro to Neo4j.key/image30.png
diff --git a/presentation/Intro to Neo4j.key/image31.png b/presentation/Intro to Neo4j.key/image31.png
diff --git a/presentation/Intro to Neo4j.key/image32.png b/presentation/Intro to Neo4j.key/image32.png
diff --git a/presentation/Intro to Neo4j.key/image33.png b/presentation/Intro to Neo4j.key/image33.png
diff --git a/presentation/Intro to Neo4j.key/image34.png b/presentation/Intro to Neo4j.key/image34.png
diff --git a/presentation/Intro to Neo4j.key/image35.png b/presentation/Intro to Neo4j.key/image35.png
diff --git a/presentation/Intro to Neo4j.key/image36.png b/presentation/Intro to Neo4j.key/image36.png
diff --git a/presentation/Intro to Neo4j.key/image37.png b/presentation/Intro to Neo4j.key/image37.png
diff --git a/presentation/Intro to Neo4j.key/image38.png b/presentation/Intro to Neo4j.key/image38.png
diff --git a/presentation/Intro to Neo4j.key/image39.png b/presentation/Intro to Neo4j.key/image39.png
diff --git a/presentation/Intro to Neo4j.key/image40.png b/presentation/Intro to Neo4j.key/image40.png
diff --git a/presentation/Intro to Neo4j.key/image41.png b/presentation/Intro to Neo4j.key/image41.png
diff --git a/presentation/Intro to Neo4j.key/image45.png b/presentation/Intro to Neo4j.key/image45.png
diff --git a/presentation/Intro to Neo4j.key/image46.png b/presentation/Intro to Neo4j.key/image46.png
diff --git a/presentation/Intro to Neo4j.key/image47.png b/presentation/Intro to Neo4j.key/image47.png
diff --git a/presentation/Intro to Neo4j.key/image48.png b/presentation/Intro to Neo4j.key/image48.png
diff --git a/presentation/Intro to Neo4j.key/image49.png b/presentation/Intro to Neo4j.key/image49.png
diff --git a/presentation/Intro to Neo4j.key/image50.png b/presentation/Intro to Neo4j.key/image50.png
diff --git a/presentation/Intro to Neo4j.key/image51.png b/presentation/Intro to Neo4j.key/image51.png
diff --git a/presentation/Intro to Neo4j.key/image52.png b/presentation/Intro to Neo4j.key/image52.png
diff --git a/presentation/Intro to Neo4j.key/image53.png b/presentation/Intro to Neo4j.key/image53.png
diff --git a/presentation/Intro to Neo4j.key/image54.png b/presentation/Intro to Neo4j.key/image54.png
diff --git a/presentation/Intro to Neo4j.key/image55.png b/presentation/Intro to Neo4j.key/image55.png
diff --git a/presentation/Intro to Neo4j.key/image56.png b/presentation/Intro to Neo4j.key/image56.png
diff --git a/presentation/Intro to Neo4j.key/image57.png b/presentation/Intro to Neo4j.key/image57.png
diff --git a/presentation/Intro to Neo4j.key/image58.png b/presentation/Intro to Neo4j.key/image58.png
diff --git a/presentation/Intro to Neo4j.key/image59.png b/presentation/Intro to Neo4j.key/image59.png
diff --git a/presentation/Intro to Neo4j.key/image60.png b/presentation/Intro to Neo4j.key/image60.png
diff --git a/presentation/Intro to Neo4j.key/image61.png b/presentation/Intro to Neo4j.key/image61.png
diff --git a/presentation/Intro to Neo4j.key/image62.png b/presentation/Intro to Neo4j.key/image62.png
diff --git a/presentation/Intro to Neo4j.key/image63.png b/presentation/Intro to Neo4j.key/image63.png
diff --git a/presentation/Intro to Neo4j.key/image64.png b/presentation/Intro to Neo4j.key/image64.png
diff --git a/presentation/Intro to Neo4j.key/image67.png b/presentation/Intro to Neo4j.key/image67.png
diff --git a/presentation/Intro to Neo4j.key/image68.png b/presentation/Intro to Neo4j.key/image68.png
diff --git a/presentation/Intro to Neo4j.key/image69.png b/presentation/Intro to Neo4j.key/image69.png
diff --git a/presentation/Intro to Neo4j.key/image70.png b/presentation/Intro to Neo4j.key/image70.png
diff --git a/presentation/Intro to Neo4j.key/image71.png b/presentation/Intro to Neo4j.key/image71.png
diff --git a/presentation/Intro to Neo4j.key/index.apxl.gz b/presentation/Intro to Neo4j.key/index.apxl.gz
diff --git a/presentation/Intro to Neo4j.key/neo-small.mov b/presentation/Intro to Neo4j.key/neo-small.mov
diff --git a/presentation/Intro to Neo4j.key/neo-small.mp4 b/presentation/Intro to Neo4j.key/neo-small.mp4
diff --git a/presentation/Intro to Neo4j.key/neo-small.png b/presentation/Intro to Neo4j.key/neo-small.png
diff --git a/settings/download-neoclipse.xml b/settings/download-neoclipse.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns:ivy="antlib:org.apache.ivy.ant" basedir="..">
+
+	<property name="neoclipse.version" value="1.4" />
+	<property name="arch" value="${sun.arch.data.model}" />
+	<property name="tools.dir" location="tools/" />
+
+	<property name="mac.installer" value="neoclipse-${neoclipse.version}-macosx.carbon.x86.tar.gz"/>
+	<property name="win.32.installer" value="neoclipse-${neoclipse.version}-win32.win32.x86.zip"/>
+	<property name="win.64.installer" value="neoclipse-${neoclipse.version}-win32.win32.x86_64.zip"/>
+	<property name="linux.32.installer" value="neoclipse-${neoclipse.version}-linux.gtk.x86.tar.gz"/>
+	<property name="linux.64.installer" value="neoclipse-${neoclipse.version}-linux.gtk.x86_64.tar.gz"/>
+
+	<property name="distribution.site" value="http://dist.neo4j.org/"/>
+
+	<condition property="is.mac.intel.x86">
+		<and>
+			<contains string="${os.arch}" substring="x86" />
+			<os family="mac" />
+		</and>
+	</condition>
+
+	<condition property="is.win.32.bit">
+		<and>
+			<equals arg1="${arch}" arg2="32" />
+			<os family="windows" />
+		</and>
+	</condition>
+
+	<condition property="is.win.64.bit">
+		<and>
+			<equals arg1="${arch}" arg2="64" />
+			<os family="windows" />
+		</and>
+	</condition>
+
+	<condition property="is.linux.32.bit">
+		<and>
+			<equals arg1="${arch}" arg2="32" />
+			<os family="unix" />
+			<not>
+				<os family="mac" />
+			</not>
+		</and>
+	</condition>
+
+	<condition property="is.linux.64.bit">
+		<and>
+			<equals arg1="${arch}" arg2="64" />
+			<os family="unix" />
+			<not>
+				<os family="mac" />
+			</not>
+		</and>
+	</condition>
+
+
+	<target name="-get.mac.64" if="is.mac.intel.x86">
+		<echo message="... found Mac OS on Intel x86"/>
+		<get dest="${tools.dir}/${mac.installer}" src="${distribution.site}${mac.installer}" />
+	</target>
+	<target name="-get.win.32" if="is.win.32.bit">
+		<echo message="... found 32-bit Windows"/>
+		<get dest="${tools.dir}/${win.32.installer}" src="${distribution.site}${win.32.installer}" />
+	</target>
+	<target name="-get.win.64" if="is.win.64.bit">
+		<echo message="... found 64-bit Windows"/>
+		<get dest="${tools.dir}/${win.64.installer}" src="${distribution.site}${win.64.installer}" />
+	</target>
+	<target name="-get.linux.32" if="is.linux.32.bit">
+		<echo message="... found 32-bit Linux"/>
+		<get dest="${tools.dir}/${linux.32.installer}" src="${distribution.site}${linux.32.installer}" />
+	</target>
+	<target name="-get.linux.64" if="is.linux.64.bit">
+		<echo message="... found 64-bit Linux"/>
+		<get dest="${tools.dir}/${linux.64.installer}" src="${distribution.site}${linux.64.installer}" />
+	</target>
+
+	<target name="-init">
+		<mkdir dir="${tools.dir}" />
+		<echo message="Determining the best Neoclipse for your platform..."/>
+	</target>
+
+	<target name="get.neoclipse" depends="-init, -get.mac.64, -get.win.32, -get.win.64, -get.linux.32, -get.linux.64" description="Downloads the most appropriate neoclipse version for the current platform"/>
+
+	<target name="get.all.neoclipse.versions" description="Downloads all neoclipse versions which will take a very long time.">
+		<get dest="${tools.dir}/${mac.installer}" src="${distribution.site}${mac.installer}" />
+		<get dest="${tools.dir}/${win.32.installer}" src="${distribution.site}${win.32.installer}" />
+		<get dest="${tools.dir}/${win.64.installer}" src="${distribution.site}${win.64.installer}" />
+		<get dest="${tools.dir}/${linux.32.installer}" src="${distribution.site}${linux.32.installer}" />
+		<get dest="${tools.dir}/${linux.64.installer}" src="${distribution.site}${linux.64.installer}" />
+	</target>
+
+</project>
+
+
+
diff --git a/settings/install-ant-eclipse.xml b/settings/install-ant-eclipse.xml
@@ -0,0 +1,29 @@
+<project xmlns:ivy="antlib:org.apache.ivy.ant" basedir="..">
+
+	<property name="ant-eclipse.install.version" value="1.0" />
+	<property name="ant-eclipse.dir" location="${basedir}/.ant-eclipse" />
+	<property name="ant-eclipse.jar.file" location="${ant-eclipse.dir}/lib/ant-eclipse-1.0-jvm1.2.jar" />
+
+	<target name="-ant-eclipse.jar.available">
+		<available property="skip.ant-eclipse.download" file="${ant-eclipse.jar.file}"/>
+	</target>
+
+	<target name="-download.ant-eclipse" depends="-ant-eclipse.jar.available" unless="skip.ant-eclipse.download">
+
+		<mkdir dir="${ant-eclipse.dir}" />
+		<get dest="${ant-eclipse.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="true" src="http://downloads.sourceforge.net/project/ant-eclipse/ant-eclipse/1.0/ant-eclipse-1.0.bin.tar.bz2" />
+		<untar compression="bzip2" src="${ant-eclipse.dir}/ant-eclipse-1.0.bin.tar.bz2" dest="${ant-eclipse.dir}" />
+	</target>
+
+	<target name="-install.ant-eclipse" depends="-download.ant-eclipse">
+		<path id="ant-eclipse.lib.path">
+			<fileset dir="${ant-eclipse.dir}" includes="**/*.jar" />
+		</path>
+		<taskdef name="eclipse" classname="prantl.ant.eclipse.EclipseTask" classpathref="ant-eclipse.lib.path" />
+	</target>
+
+	<target name="clean-ant-eclipse">
+		<delete dir="${ant-eclipse.dir}" />
+	</target>
+
+</project>
diff --git a/settings/install-ivy.xml b/settings/install-ivy.xml
@@ -1,29 +1,37 @@
-<project xmlns:ivy="antlib:org.apache.ivy.ant">
-
-    <property name="ivy.install.version" value="2.2.0" />
-    <property name="ivy.jar.dir" value="${basedir}/.ivy" />
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-    <property name="ivy.cache.dir" value="${basedir}/.ivy/cache" />
-
-    <target name="download-ivy" unless="skip.download">
-    	<mkdir dir="${ivy.jar.dir}"/>
-    	<get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+<project xmlns:ivy="antlib:org.apache.ivy.ant" basedir="..">
+
+	<property name="ivy.install.version" value="2.2.0" />
+	<property name="ivy.jar.dir" location="${basedir}/.ivy" />
+	<property name="ivy.jar.file" location="${ivy.jar.dir}/ivy.jar" />
+	<property name="ivy.cache.dir" location="${basedir}/.ivy/cache" />
+
+
+	<target name="-create.ivy.dir">
+		<mkdir dir="${ivy.jar.dir}"/>
+	</target>
+
+	<target name="-lib.dir-available" depends="-create.ivy.dir">
+		<available property="skip.ivy.download" file="${lib.dir}"/>
+	</target>
+
+	<target name="download-ivy" depends="-lib.dir-available" unless="skip.ivy.download">
+		<get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
     		 dest="${ivy.jar.file}" usetimestamp="true"/>
-    </target>
-    
-    <target name="install-ivy" depends="download-ivy"> 
-    	<path id="ivy.lib.path">
-    	    <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-    	</path>
-    	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-    </target>    
-	
-    <target name="clean-ivy">
-        <delete dir="${ivy.jar.dir}"/>
-    </target>
-	
-    <target name="clean-ivy-cache" depends="install-ivy">
-        <ivy:cleancache />
-    </target>
+	</target>
+
+	<target name="install-ivy" depends="download-ivy">
+		<path id="ivy.lib.path">
+			<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+		</path>
+		<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+	</target>
+
+	<target name="clean-ivy">
+		<delete dir="${ivy.jar.dir}"/>
+	</target>
+
+	<target name="clean-ivy-cache" depends="install-ivy">
+		<ivy:cleancache />
+	</target>
 
 </project>