Hi

Uuups, I was a little bit too quick.
Using the build.xml =>  clean-cache and resolve four new libs are missing:
gt-cql-2.7.5.jar
gt-data-2.7.5.jar
gt-main-2.7.5.jar
gt-shapefile-2.7.5.jar


OK new patch attached. I remember adding gt-cql before - but is gt-shapefile really needed?

..Steve
Index: ivysettings.xml
===================================================================
--- ivysettings.xml	(revision 2309)
+++ ivysettings.xml	(working copy)
@@ -10,6 +10,7 @@
 
 	<resolvers>
 		<chain name="custom" returnFirst="true">
+
 			<resolver ref="default" />
 
 			<url name="mkgmap">
@@ -17,10 +18,21 @@
 				<artifact pattern="${mkgmap.ivy.repo}/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" />
 			</url>
 
-			<url name="com.springsource.repository.bundles.external">
-				<ivy pattern="http://repository.springsource.com/ivy/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"; />
-				<artifact pattern="http://repository.springsource.com/ivy/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"; />
-			</url>
 		</chain>
+
+		<ibiblio name="geotools-resolver" m2compatible="true" root="http://repo.opengeo.org/"; />
+
+		<url name="spring-resolver" >
+			<ivy pattern="http://repository.springsource.com/ivy/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"; />
+			<artifact pattern="http://repository.springsource.com/ivy/bundles/external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"; />
+		</url>
+
 	</resolvers>
+
+	<modules>
+		<module organisation="org.geotools" resolver="geotools-resolver"/>
+		<module organisation="java3d" resolver="geotools-resolver"/>
+		<module organisation="javax.media.jai" resolver="spring-resolver"/>
+	</modules>
+
 </ivysettings>
Index: ivy.xml
===================================================================
--- ivy.xml	(revision 2309)
+++ ivy.xml	(working copy)
@@ -56,5 +56,20 @@
 
 		<dependency org="javax.media.jai" name="com.springsource.javax.media.jai.codec" rev="1.1.3"
 								conf="optional->compile"/>
+		<dependency org="javax.media.jai" name="com.springsource.javax.media.jai.core" rev="1.1.3"
+					conf="optional->default(*),compile(*),master(*)"/>
+
+		<dependency org="org.geotools" name="gt-api" rev="2.7.5" conf="optional->default,compile">
+			<!-- A broken version of this is in the main repo which causes problems. Since we already depend on it, just ignore it here -->
+			<exclude module="jai_core"/>
+		</dependency>
+		<dependency org="org.geotools" name="gt-cql" rev="2.7.5" conf="optional->default,compile">
+			<exclude module="jai_core"/>
+		</dependency>
+		<dependency org="org.geotools" name="gt-shapefile" rev="2.7.5" conf="optional->default,compile">
+			<exclude module="jai_core"/>
+		</dependency>
+		<dependency org="org.geotools" name="geotools" rev="2.7.5" conf="optional->default,compile"/>
+
 	</dependencies>
 </ivy-module>
Index: build.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- build.xml	(revision 2308)
+++ build.xml	(revision )
@@ -126,7 +126,11 @@
 	<target name="resolve-macker" depends="init-ivy" description="Downloads macker program dependencies using ivy.">
 		<ivy:retrieve conf="macker" log="download-only"/>
 	</target>
-	<target name="resolve" depends="resolve-compile, resolve-test, resolve-macker" description="Downloads all program dependencies using ivy." />
+	<target name="resolve-optional" depends="init-ivy" description="Downloads optional program dependencies using ivy.">
+		<ivy:retrieve conf="optional" log="download-only"/>
+	</target>
+	<target name="resolve" depends="resolve-compile, resolve-test, resolve-macker, resolve-optional"
+					description="Downloads all program dependencies using ivy." />
 
 	<!-- targets for publishing the project (locally) via ivy -->
 	<target name="publish" depends="dist">
_______________________________________________
mkgmap-dev mailing list
[email protected]
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev

Reply via email to