From a3e59ca8065738e3f0a8ae21a24c71e852b58f9d Mon Sep 17 00:00:00 2001
From: jmoore <jmoore@05709c45-44f0-0310-885b-81a1db45b4a6>
Date: Thu, 8 Apr 2010 20:41:35 +0000
Subject: [PATCH] see #2148 - More fixes for ivyeclipse task, includes
 performance improvements

git-svn-id: file:///home/svn/omero/trunk@6558 05709c45-44f0-0310-885b-81a1db45b4a6
---
 build.py                                  |  7 +--
 build.xml                                 | 68 +++++++++++++----------
 components/antlib/resources/global.xml    | 25 +++++++++
 components/antlib/resources/lifecycle.xml | 21 +++----
 components/romio/.classpath               | 64 ---------------------
 5 files changed, 74 insertions(+), 111 deletions(-)
 delete mode 100644 components/romio/.classpath

diff --git a/build.py b/build.py
index dc975f27628..593d804bfa8 100755
--- a/build.py
+++ b/build.py
@@ -127,13 +127,12 @@ def execute(args):
         if len(args) > 0 and args[0] == "-hudson":
             build_hudson()
         elif len(args) > 0 and args[0] == "-perf":
-            A = list(args)
-            A.pop(0)
-            A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + A
+            args.pop(0)
+            A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + args
             java_omero(A)
         else:
             java_omero(args)
-            notification(""" Finished: %s """ % " ".join(args), 0)
+        notification(""" Finished: %s """ % " ".join(args), 0)
     except KeyboardInterrupt:
         sys.stderr.write("\nCancelled by user\n")
         sys.exit(2)
diff --git a/build.xml b/build.xml
index d4c99414a32..b579ef30d97 100644
--- a/build.xml
+++ b/build.xml
@@ -43,7 +43,10 @@ java component.
         <!-- Prevent future invocations and PermGen errors-->
         <property name="ivy.done" value="done"/>
         <!-- Touch the local configuration file which is no longer mandatory -->
-        <touch file="${basedir}/etc/local.properties"/>
+        <if><not><available file="${basedir}/etc/local.properties"/></not>
+        <then>
+            <touch file="${basedir}/etc/local.properties"/>
+        </then></if>
         <installIvy/>
         <ivy:buildlist reference="all.buildpath" settingsRef="ivy.toplevel">
             <fileset dir="${omero.home}/components" includes="*/build.xml" excludes="**/policy/**,**/tools/**"/>
@@ -195,22 +198,14 @@ java component.
     </target>
 
     <target name="eclipse" depends="init">
-        <ivy:resolve file="ivy.xml" type="jar" conf="build" settingsRef="ivy.toplevel" log="quiet" haltonfailure="false"/>
-        <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
-        <ivyeclipse conf="build"/>
-    </target>
-
-    <target name="eclipse-tests" depends="init">
-        <ivy:resolve file="ivy.xml" type="jar" conf="test" settingsRef="ivy.toplevel" log="quiet" haltonfailure="false"/>
-        <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
-        <ivyeclipse conf="test"/>
+        <tryEclipse settingsRef="ivy.toplevel"/>
     </target>
 
     <target name="build-eclipse" description="Creates all source directories needed by eclipse in case default build is failing." depends="init">
-        <iterate buildpathref="all.buildpath" target="prepare"/>
-        <iterate buildpathref="OmeroJava.buildpath" target="prepare"/>
-        <iterate buildpathref="OmeroImporter.buildpath" target="prepare"/>
-        <iterate buildpathref="licenses.buildpath" target="prepare"/>
+        <iterate buildpathref="all.buildpath" target="eclipse"/>
+        <iterate buildpathref="OmeroJava.buildpath" target="eclipse"/>
+        <iterate buildpathref="OmeroImporter.buildpath" target="eclipse"/>
+        <iterate buildpathref="licenses.buildpath" target="eclipse"/>
         <antcall target="eclipse" inheritRefs="true" inheritAll="true"/>
     </target>
 
@@ -544,15 +539,12 @@ java component.
     <target name="_dist" depends="init"><prepareDist/></target>
     <macrodef name="prepareDist">
         <sequential>
-            <copy file="${omero.home}/LICENSE.txt" todir="${dist.dir}/" overwrite="true"/>
-            <copy todir="${dist.dir}/etc" overwrite="true">
+            <copy file="${omero.home}/LICENSE.txt" todir="${dist.dir}/"/>
+            <copy todir="${dist.dir}/etc">
                 <fileset dir="${omero.home}/etc">
                     <exclude name="local.properties"/>
                 </fileset>
             </copy>
-            <echo file="${dist.dir}/etc/omero.properties" append="true">
-omero.version=${omero.version}
-            </echo>
             <copy todir="${dist.dir}">
                 <fileset dir="${omero.home}">
                     <include name="sql/**"/>
@@ -567,16 +559,34 @@ omero.version=${omero.version}
             <ivy:resolve file="ivy.xml" type="jar,egg" conf="client" settingsRef="ivy.toplevel" log="quiet"/>
             <ivy:retrieve conf="client" pattern="${dist.dir}/lib/client/[module].[ext]" sync="false" log="quiet" settingsRef="ivy.toplevel"/>
 
-            <!-- Must update the jars with the modified omero.properties file in order for the version to be updated -->
-            <jar update="true" destfile="${dist.dir}/lib/server/blitz.jar">
-                <fileset dir="etc" includes="omero.properties"/>
-            </jar>
-            <jar update="true" destfile="${dist.dir}/lib/client/omero_client.jar">
-                <fileset dir="etc" includes="omero.properties"/>
-            </jar>
-            <jar update="true" destfile="${dist.dir}/lib/client/OmeroImporter.jar">
-                <fileset dir="etc" includes="omero.properties"/>
-            </jar>
+            <loadproperties srcFile="${dist.dir}/etc/omero.properties">
+                <filterchain>
+                    <headfilter skip="20" lines="-1"/>
+                    <prefixlines prefix="dist.check."/>
+                </filterchain>
+            </loadproperties>
+            <if><not><equals arg1="${dist.check.omero.version}" arg2="${omero.version}"/></not>
+            <then>
+                <!-- Setting version -->
+                <copy todir="${dist.dir}/etc" overwrite="true">
+                    <fileset dir="${omero.home}/etc" includes="omero.properties"/>
+                </copy>
+                <echo file="${dist.dir}/etc/omero.properties" append="true">
+omero.version=${omero.version}
+                </echo>
+
+                <!-- Must update the jars with the modified omero.properties file in order for the version to be updated -->
+                <jar update="true" destfile="${dist.dir}/lib/server/blitz.jar">
+                    <fileset dir="${dist.dir}/etc" includes="omero.properties"/>
+                </jar>
+                <jar update="true" destfile="${dist.dir}/lib/client/omero_client.jar">
+                    <fileset dir="${dist.dir}/etc" includes="omero.properties"/>
+                </jar>
+                <jar update="true" destfile="${dist.dir}/lib/client/OmeroImporter.jar">
+                    <fileset dir="${dist.dir}/etc" includes="omero.properties"/>
+                </jar>
+            </then>
+            </if>
        </sequential>
     </macrodef>
 
diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
index 19229240b6d..ded2f26048e 100644
--- a/components/antlib/resources/global.xml
+++ b/components/antlib/resources/global.xml
@@ -143,6 +143,31 @@
 		</sequential>
 	</macrodef>
 
+        <macrodef name="tryEclipse">
+            <attribute name="settingsRef"/>
+            <sequential>
+                <trycatch>
+                    <try>
+                        <ivy:resolve file="test.xml" type="jar" conf="test" settingsRef="@{settingsRef}" log="quiet"/>
+                        <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
+                        <ivyeclipse conf="test"/>
+                    </try>
+                    <catch>
+                        <echo>
+
+                        ***************************************************************************
+                        Tests are not compiled. Run "test-compile". Falling back to regular eclipse
+                        ***************************************************************************
+
+                        </echo>
+                        <ivy:resolve file="ivy.xml" type="jar" conf="build" settingsRef="@{settingsRef}" log="quiet"/>
+                        <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
+                        <ivyeclipse conf="build"/>
+                    </catch>
+                </trycatch>
+            </sequential>
+        </macrodef>
+
         <!--
            These classpaths are used by all components, and amount to only the deps.lib.dir
            directory within each component. That directory is configured using deps-retrieve,
diff --git a/components/antlib/resources/lifecycle.xml b/components/antlib/resources/lifecycle.xml
index 4792458f1d0..19c730c9526 100644
--- a/components/antlib/resources/lifecycle.xml
+++ b/components/antlib/resources/lifecycle.xml
@@ -52,25 +52,18 @@
 		<property name="test.with.fail" value="true"/>
 	</target>
 
-	<target name="eclipse" depends="retrieve">
-		<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 name="eclipse" depends="prepare">
+                <tryEclipse settingsRef="ivy.${ant.project.name}"/>
 	</target>
 
-	<target name="eclipse-tests" depends="retrieve">
-		<ivy:resolve file="test.xml" type="jar" conf="test" settingsRef="ivy.${ant.project.name}" log="quiet"/>
-		<taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
-		<ivyeclipse conf="test"/>
-	</target>
-
-	<target name="retrieve" unless="retrieve.done">
+        <target name="retrieve" unless="retrieve.done">
+                <property name="retrieve.done" value="true"/>
+                <installIvy/>
 		<installIvy/>
-		<property name="retrieve.done" value="true"/>
 		<ivy:retrieve settingsRef="ivy.${ant.project.name}" pattern="${deps.lib.dir}/[artifact].[ext]" log="quiet" sync="false" symlink="true"/>
 	</target>
 
-	<target name="prepare" depends="retrieve,eclipse">
+	<target name="prepare" depends="retrieve">
 		<mkdir dir="${deps.lib.dir}"/>
 		<defineClasspath/>
                 <defineVariables/>
@@ -257,7 +250,7 @@ omero.version=${omero.version}
 			<flattenmapper/>
 		</pathconvert>
                 <property name="mf.classpath.and.jars" value="../../etc ${mf.classpath} services.jar extensions.jar"/>
-		<jar destfile="${target.dir}/${ivy.module}.jar">
+		<jar destfile="${target.dir}/${ivy.module}.jar" update="true">
 			<manifest>
 				<attribute name="Class-Path" value="${mf.classpath.and.jars}"/>
 				<attribute name="Main-Class" value="${main.class}"/>
diff --git a/components/romio/.classpath b/components/romio/.classpath
deleted file mode 100644
index 5df1587dac6..00000000000
--- a/components/romio/.classpath
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn" kind="src" path="src" />
-	<classpathentry excluding="**/.svn" kind="src" path="resources" />
-	<classpathentry excluding="**/.svn" kind="src" path="target/generated/src" />
-	<classpathentry excluding="**/.svn" kind="src" path="target/generated/resources" />
-	<classpathentry excluding="**/.svn" kind="src" output="target/test-classes" path="test" />
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4" />
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="output" path="target/classes" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org/apache/lucene/lucene-core/jars/lucene-core-2.4.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/omero/dsl/jars/dsl-Beta-4.2.0-DEV.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/commons-beanutils/commons-beanutils/jars/commons-beanutils-1.8.0.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/omero/dsl-test/jars/dsl-test-Beta-4.2.0-DEV.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/velocity-tools/velocity-tools-generic/jars/velocity-tools-generic-1.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/testng/testng/jars/testng-5.11-jdk15.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/asm/asm-attrs/jars/asm-attrs-1.5.3.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org/hibernate/hibernate-tools/jars/hibernate-tools-3.2.0.beta11.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/checkstyle/checkstyle/jars/checkstyle-4.3.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/org.springframework.test/jars/org.springframework.test-3.0.1.RELEASE-A.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/javassist/javassist/jars/javassist-3.9.0.GA.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org/apache/lucene/lucene-spellchecker/jars/lucene-spellchecker-2.4.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/antlr/antlr/jars/antlr-2.7.6.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/org.springframework.orm/jars/org.springframework.orm-3.0.1.RELEASE-A.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/velocity/velocity/jars/velocity-1.4.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/cglib/cglib/jars/cglib-2.2.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/commons-io/commons-io/jars/commons-io-1.4.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org/hibernate/hibernate/jars/hibernate-3.5.0-Final.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/jakarta-oro/jakarta-oro/jars/jakarta-oro-2.0.8.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/jmock/jmock/jars/jmock-1.0.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/asm/asm/jars/asm-1.5.3.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/omero/romio/jars/romio-Beta-4.2.0-DEV.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/omero/postgresql/jars/postgresql-8.3-604.jdbc3.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/commons-collections/commons-collections/jars/commons-collections-3.2.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/apache/ant/jars/ant-1.8.0.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/org.springframework.jdbc/jars/org.springframework.jdbc-3.0.1.RELEASE-A.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/org.springframework.beans/jars/org.springframework.beans-3.0.1.RELEASE-A.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/slf4j/slf4j-api/jars/slf4j-api-1.5.8.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org/apache/lucene/lucene-highlighter/jars/lucene-highlighter-2.4.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/commons-logging/commons-logging/jars/commons-logging-1.1.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/omero/common-test/jars/common-test-Beta-4.2.0-DEV.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/com.springsource.org.aopalliance/jars/com.springsource.org.aopalliance-1.0.0.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/hibernate/hibernate-validator/jars/hibernate-validator-3.1.0.GA.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/hibernate/hibernate-jpa-2.0-api/jars/hibernate-jpa-2.0-api-1.0.0.Final.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/log4j/log4j/jars/log4j-1.2.14.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/junit/junit/jars/junit-3.8.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/perf4j/perf4j/jars/perf4j-0.9.10.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/slf4j/jul-to-slf4j/jars/jul-to-slf4j-1.5.8.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/jamon/jamon/jars/jamon-2.7.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/dom4j/dom4j/jars/dom4j-1.6.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/emma/emma/jars/emma-2.0.5312.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/emma/emma_ant/jars/emma_ant-2.0.5312.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/hibernate/hibernate-search/jars/hibernate-search-3.1.1.GA.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/findbugs/findbugs-ant/jars/findbugs-ant-1.2.1.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/org.springframework.core/jars/org.springframework.core-3.0.1.RELEASE-A.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org/hibernate/jtidy/jars/jtidy-3.2.0.beta11.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/org.springframework.context/jars/org.springframework.context-3.0.1.RELEASE-A.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/omero/common/jars/common-Beta-4.2.0-DEV.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/org.springframework.aop/jars/org.springframework.aop-3.0.1.RELEASE-A.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/omero/model-psql/jars/model-psql-Beta-4.2.0-DEV.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org.springframework/org.springframework.transaction/jars/org.springframework.transaction-3.0.1.RELEASE-A.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/org/hibernate/freemarker/jars/freemarker-3.2.0.beta11.jar" />
-	<classpathentry ivygen="true" kind="lib" path="/Users/josh/GlencoeSoftware.git/git/omero.git/etc/../lib/cache/slf4j/slf4j-log4j12/jars/slf4j-log4j12-1.5.8.jar" />
-</classpath>