From c8c748614bba3d8eb9dab5333b102ed97dfdb8f3 Mon Sep 17 00:00:00 2001
From: samskivert <samskivert@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 27 Aug 2010 23:36:44 +0000
Subject: [PATCH] I think I understand Ivy well enough now to define sane
 dependencies. Of course these differ from the "standard definitions", but I'm
 going to stick with my usual approach of assuming that everyone else is
 crazy.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2834 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 build-ivy.xml | 12 +++++++-----
 ivy.xml       | 22 +++++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/build-ivy.xml b/build-ivy.xml
index b552f1cf..dfca3a9c 100644
--- a/build-ivy.xml
+++ b/build-ivy.xml
@@ -32,7 +32,7 @@
     <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"/>
-    <ivy:cachepath pathid="compile.classpath" conf="runtime" log="download-only"/>
+    <ivy:cachepath pathid="compile.classpath" conf="compile" log="download-only"/>
     <ivy:cachepath pathid="test.classpath" conf="test" log="download-only"/>
   </target>
 
@@ -52,10 +52,12 @@
   </target>
 
   <target name="check-ivy" depends="-init-ivy" description="Computes and prints Ivy classpath.">
-    <property refid="compile.classpath" name="compile.str"/>
-    <echo>Compile: ${compile.str}</echo>
-    <property refid="test.classpath" name="test.str"/>
-    <echo>Test: ${test.str}</echo>
+    <pathconvert pathsep="${line.separator}  " property="compile.str" refid="compile.classpath"/>
+    <echo>Compile classpath:</echo>
+    <echo>  ${compile.str}</echo>
+    <echo>Test classpath:</echo>
+    <pathconvert pathsep="${line.separator}  " property="test.str" refid="test.classpath"/>
+    <echo>  ${test.str}</echo>
   </target>
 
   <target name="clean" description="Cleans out most build results.">
diff --git a/ivy.xml b/ivy.xml
index 0c40ff50..9e3530fb 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -2,17 +2,21 @@
   <info organisation="com.samskivert" module="samskivert" revision="1.0">
     <description homepage="http://code.google.com/p/samskivert"/>
   </info>
-  <configurations defaultconfmapping="test->master(*);compile->master(*);runtime->master(*)">
-    <conf name="master" visibility="public"/>
-    <conf name="compile" visibility="public"/>
-    <conf name="runtime" visibility="public" extends="compile"/>
-    <conf name="test" visibility="private" extends="runtime"/>
+  <configurations>
     <conf name="default" visibility="public" extends="runtime,master"/>
+    <conf name="master" visibility="public"/>
+    <conf name="provided" visibility="public"/>
+    <conf name="runtime" visibility="public"/>
+    <conf name="sources" visibility="public"/>
+    <conf name="javadoc" visibility="public"/>
+    <conf name="optional" visibility="public"/>
+    <conf name="compile" visibility="private" extends="runtime,provided,optional"/>
+    <conf name="test" visibility="private" extends="compile"/>
   </configurations>
   <dependencies>
-    <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="compile"/>
-    <dependency org="log4j" name="log4j" rev="1.2.15" conf="runtime"/>
-    <dependency org="javax.mail" name="mail" rev="1.4.1" transitive="false" conf="runtime"/>
-    <dependency org="junit" name="junit" rev="4.8.1" conf="test"/>
+    <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->master(*)"/>
+    <dependency org="log4j" name="log4j" rev="1.2.15" conf="optional->master(*)"/>
+    <dependency org="javax.mail" name="mail" rev="1.4.1" conf="optional->master(*)"/>
+    <dependency org="junit" name="junit" rev="4.8.1" conf="test->master(*)"/>
   </dependencies>
 </ivy-module>