# HG changeset patch
# User smith@nwoca.org
# Date 1292700032 18000
# Node ID 26a4d8410fdf7033f973ea508e69e99316405a5a
# Parent  361f0d420ad4ff6d77a352af4bfeeb58e1d74c1c
TL-32:  Refactor ivy include for non-ivy based projects.

diff -r 361f0d420ad4 -r 26a4d8410fdf bootstrap.xml
--- a/bootstrap.xml	Sat Dec 18 11:54:16 2010 -0500
+++ b/bootstrap.xml	Sat Dec 18 14:20:32 2010 -0500
@@ -30,12 +30,6 @@
         </sequential>
     </macrodef>
 
-    <ssdt:fetch         dest="${user.home.ant.lib}/ivy.jar"
-                        src="${ssdt.ivy.jar.src}"/>
-    <ssdt:fetch         dest="${ssdt.devel.kit}/ssdt.default.ivy.settings.xml"
-                        src="${ssdt.ivy.settings.src}"/>
-
-    <ssdt:import-ant file="ivy-ant.xml"/>
     <ssdt:import-ant file="antcontrib-ant.xml"/>
     <ssdt:import-ant file="ssdt-common-build.xml"/>
 </project>
diff -r 361f0d420ad4 -r 26a4d8410fdf ivy-ant.xml
--- a/ivy-ant.xml	Sat Dec 18 11:54:16 2010 -0500
+++ b/ivy-ant.xml	Sat Dec 18 14:20:32 2010 -0500
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ivy-ant"  basedir="." xmlns:ivy="antlib:fr.jayasoft.ivy.ant" >
+<project name="ivy-ant"  basedir="." 
+    xmlns:ivy="antlib:fr.jayasoft.ivy.ant"
+    xmlns:ssdt="http://www.ssdt-ohio.org/ant/common">
+
+    <ssdt:fetch         dest="${user.home.ant.lib}/ivy.jar"
+                        src="${ssdt.ivy.jar.src}"/>
 
     <dirname property="ivy.home" file="${ant.file.ivy-ant}"/>
     <property name="ivy-ant.location" location="${ant.file.ivy-ant}"/>
@@ -12,6 +17,9 @@
     <property name="ivy.local.default.root"
               value="${user.home}/.ivy2/local"/>
 
+    <ssdt:fetch dest="${ssdt.devel.kit}/ssdt.default.ivy.settings.xml"
+                src="${ssdt.ivy.settings.src}"/>
+
     <target name="ivy-report" depends="init">
         <mkdir dir="${build.dir}/ivy"/>
         <ivy:resolve log="quiet" file="ivy.xml"/>