fix ome#2149 - Upgrading ant, ivy and adding ivyeclipse task (see ome…

…#2148)

git-svn-id: file:///home/svn/omero/trunk@6551 05709c45-44f0-0310-885b-81a1db45b4a6

.classpath-template

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="etc"/>
+	<classpathentry kind="src" path="components/tools/OmeroJava/src"/>
+	<classpathentry kind="src" path="components/tools/OmeroJava/test"/>
+	<classpathentry kind="src" path="components/tools/OmeroImporter/test"/>
+	<classpathentry kind="src" path="components/tools/OmeroImporter/src"/>
+	<classpathentry kind="src" path="components/dsl/test"/>
+	<classpathentry kind="src" path="components/dsl/resources"/>
+	<classpathentry kind="src" path="components/dsl/src"/>
+	<classpathentry kind="src" path="components/model/target/generated/src"/>
+	<classpathentry kind="src" path="components/model/target/generated/resources"/>
+	<classpathentry kind="src" path="components/model/src"/>
+	<classpathentry kind="src" path="components/model/test"/>
+	<classpathentry kind="src" path="components/model/resources"/>
+	<classpathentry kind="src" path="components/rendering/target/generated/src"/>
+	<classpathentry kind="src" path="components/rendering/src"/>
+	<classpathentry kind="src" path="components/rendering/resources"/>
+	<classpathentry kind="src" path="components/rendering/target/generated/resources"/>
+	<classpathentry kind="src" path="components/romio/resources"/>
+	<classpathentry kind="src" path="components/romio/src"/>
+	<classpathentry kind="src" path="components/romio/test"/>
+	<classpathentry kind="src" output="target/eclipse-server" path="components/server/src"/>
+	<classpathentry kind="src" output="target/eclipse-server" path="components/server/test"/>
+	<classpathentry kind="src" output="target/eclipse-server" path="components/server/resources"/>
+	<classpathentry kind="src" output="target/eclipse-blitz" path="components/blitz/target/generated/resources"/>
+	<classpathentry kind="src" output="target/eclipse-blitz" path="components/blitz/test"/>
+	<classpathentry kind="src" output="target/eclipse-blitz" path="components/blitz/resources"/>
+	<classpathentry kind="src" output="target/eclipse-blitz" path="components/blitz/src"/>
+	<classpathentry kind="src" output="target/eclipse-blitz" path="components/blitz/target/generated/src"/>
+	<classpathentry kind="src" output="target/eclipse-blitz" path="components/blitz/generated"/>
+	<classpathentry kind="src" output="target/eclipse-common" path="components/common/src"/>
+	<classpathentry kind="src" output="target/eclipse-common" path="components/common/test"/>
+	<classpathentry kind="src" output="target/eclipse-common" path="components/common/resources"/>
+	<classpathentry kind="src" output="target/eclipse-common" path="components/common/target/generated/resources"/>
+	<classpathentry kind="src" output="target/eclipse-common" path="components/common/target/generated/src"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/eclipse-bin"/>
+</classpath>

build.xml

@@ -49,6 +49,10 @@ java component.
             <fileset dir="${omero.home}/components" includes="*/build.xml" excludes="**/policy/**,**/tools/**"/>
         </ivy:buildlist>
         <!-- Single file paths defined in antlib/resources/directories.xml -->
+
+        <ivy:resolve file="ivy.xml" type="jar" conf="build" settingsRef="ivy.toplevel" log="quiet"/>
+        <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
+        <ivyeclipse conf="build"/>
     </target>
 
     <target name="quick" description="Deprecated">

components/antlib/resources/global.xml

@@ -34,9 +34,9 @@
         <import file="${import.dir}/directories.xml"/>
 
         <taskdef resource="net/sf/antcontrib/antcontrib.properties"
-                 classpath="${lib.dir}/repository/ant-contrib-1.0b1.jar"/>
+                 classpath="${lib.dir}/repository/ant-contrib-1.0b3.jar"/>
         <taskdef resource="net/sf/antcontrib/antlib.xml"
-                 classpath="${lib.dir}/repository/ant-contrib-1.0b1.jar"/>
+                 classpath="${lib.dir}/repository/ant-contrib-1.0b3.jar"/>
 
         <!-- Define properties :
                 The user's environment (env) overrides all other
@@ -124,11 +124,13 @@
 
         <macrodef name="installIvy">
             <sequential>
-            <path id="ivy.classpath">
-                <fileset dir="${omero.home}/lib/repository" includes="ivy*.jar"/>
-                <fileset dir="${omero.home}/lib/repository" includes="jakarta-oro*.jar"/>
-            </path>
-            <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.classpath"/>
+            <classloader name="ivy.loader">
+                <classpath id="ivy.classpath">
+                    <fileset dir="${omero.home}/lib/repository" includes="ivy*.jar"/>
+                    <fileset dir="${omero.home}/lib/repository" includes="jakarta-oro*.jar"/>
+                </classpath>
+            </classloader>
+            <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" loaderref="ivy.loader"/>
             <ivy:settings id="ivy.${ant.project.name}" file="${etc.dir}/ivysettings.xml"/>
             </sequential>
         </macrodef>

components/antlib/resources/lifecycle.xml

@@ -84,6 +84,9 @@ omero.version=${omero.version}
 				classpathref="omero.classpath">
 			</sql>
 		</presetdef>
+		<ivy:resolve file="ivy.xml" type="jar" conf="build" settingsRef="ivy.${ant.project.name}" log="quiet"/>
+		<taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
+		<ivyeclipse conf="build"/>
 	</target>
 
 	<target name="generate" depends="prepare">