[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 3e196064642e55d5cb4545f06f3a40a0754f3ea6
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Jun 15 12:31:32 2012 +0200

    Some documentation about ivysettings.xml.

diff --git a/debian/ivysettings.xml b/debian/ivysettings.xml
index 5494702..8961d3b 100644
--- a/debian/ivysettings.xml
+++ b/debian/ivysettings.xml
@@ -3,24 +3,40 @@
 	<settings defaultResolver="debian-m2"/>
 
 	<resolvers>
+
+		<!-- This resolver is for artifacts that have a POM in Maven repository;
+                     everything should come from here, unless the exceptions below. -->
 		<ibiblio
 			name="debian-m2"
 			m2compatible="true"
 			root="file:///usr/share/maven-repo"/>
+
+		<!-- Some artifacts used within osmosis are dependencies for others; this
+                     resolver make them available. -->
 		<filesystem name="local">
 			<artifact pattern="${debian.dir}/../build/[artifact].[ext]" />
 		</filesystem>
+
+		<!-- This resolver is for artifacts without POMs; they're selected using
+                     only their filename. -->
 		<filesystem name="share-java">
 			<artifact pattern="/usr/share/java/[artifact](-[revision]).[ext]" />
 		</filesystem>
+
 	</resolvers>
 
+	<!-- Do not use the user cache, but use a directory in debian/ -->
 	<caches defaultCacheDir="${debian.dir}/ivy-cache">
 	</caches>
 
+	<!-- Here we map artifacts to resolvers (everything not declared here uses
+             the default resolver, defined above). -->
 	<modules>
+
+		<!-- Artifacts from osmosis itself. -->
 		<module organisation="org.openstreetmap.osmosis" resolver="local"/>
 
+		<!-- Artifacts without POMs. -->
 		<module organisation="postgresql" name="postgresql" resolver="share-java"/>
 		<module organisation="crosby" name="osmpbf" resolver="share-java"/>
 		<module organisation="org.postgis" name="postgis" resolver="share-java"/>

-- 
Osmosis, an OSM data processor