changeset 18:e4c45fd105ea

TL-32: Modify iivy-ant to retrieve 'runtime' conf for web libraries.
author smith@nwoca.org
date Tue, 11 Jan 2011 19:02:58 -0500
parents fc114dab4c50
children 2632897c8a2b
files bootstrap.xml ivy-ant.xml
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap.xml	Thu Dec 30 14:53:49 2010 -0500
+++ b/bootstrap.xml	Tue Jan 11 19:02:58 2011 -0500
@@ -5,8 +5,7 @@
     <property   file="${ssdt.devel.kit}/private.properties"/>
     <property   name="user.home.ant.lib"        value="${user.home}/.ant/lib"/>
     <property   name="ssdt.devel.kit.src"       value="http://hg.ssdt-ohio.org/browse/public/develkit"/>
-    <property   name="ssdt.ivy.jar.src"         value="http://ivy.ssdt.nwoca.org/repository/ivy/ivy.jar"/>
-    <property   name="ssdt.ivy.settings.src"    value="${ssdt.devel.kit.src}/ssdt.default.ivy.settings.xml"/>
+    
     <mkdir      dir="${ssdt.devel.kit}"/>
     <mkdir      dir="${user.home.ant.lib}"/>
 
--- a/ivy-ant.xml	Thu Dec 30 14:53:49 2010 -0500
+++ b/ivy-ant.xml	Tue Jan 11 19:02:58 2011 -0500
@@ -2,6 +2,9 @@
 <project name="ivy-ant"  basedir="." 
     xmlns:ivy="antlib:fr.jayasoft.ivy.ant"
     xmlns:ssdt="http://www.ssdt-ohio.org/ant/common">
+    
+    <property   name="ssdt.ivy.jar.src"         value="http://ivy.ssdt.nwoca.org/repository/ivy/ivy.jar"/>
+    <property   name="ssdt.ivy.settings.src"    value="${ssdt.devel.kit.src}/ssdt.default.ivy.settings.xml"/>
 
     <ssdt:fetch         dest="${user.home.ant.lib}/ivy.jar"
                         src="${ssdt.ivy.jar.src}"/>
@@ -48,11 +51,11 @@
 
     <target name="-ivy-copy-webjars" if="build.web.dir">
         <ivy:resolve  log="quiet" file="ivy.xml"/>
-        <ivy:retrieve pattern="${basedir}/${build.web.dir}/WEB-INF/lib/[artifact]-[revision].[ext]" type="jar"/>
+        <ivy:retrieve pattern="${basedir}/${build.web.dir}/WEB-INF/lib/[artifact]-[revision].[ext]" type="jar" conf="runtime"/>
     </target>
 
     <target name="-ivy-retrieve-web-jars" if="build.web.dir">
-        <ivy:retrieve pattern="${basedir}/${build.web.dir}/WEB-INF/lib/[artifact]-[revision].[ext]" type="jar"/>
+        <ivy:retrieve pattern="${basedir}/${build.web.dir}/WEB-INF/lib/[artifact]-[revision].[ext]" type="jar" conf="runtime"/>
     </target>
 
     <target name="-ivy-define-classpaths">