Changeset 1710 for trunk/components/antlib/resources/omero.xml

Timestamp:

07/06/07 14:41:24 (17 months ago)

Author:

jmoore

Message:

More Ivy cleanups: * Fixing omero.xml -> dist/build.xml * Setting import.dir * Better deploy (depends on update (tests for local.properties)) * Remove check-system from setup * Moved product.properties to omero.properties

Files:

• trunk/components/antlib/resources/omero.xml (modified) (4 diffs)

trunk/components/antlib/resources/omero.xml

@@ -23 +23 @@
 
         <!-- This overrides the classpath.file properties of all the components. -->
-        <property name="ant.resources"       value="${basedir}/components/antlib/resources/"/>
-        <property name="classpath.file"      value="${ant.resources}/dist-classpath.xml"/>
+        <property name="import.dir"       value="${basedir}/components/antlib/resources/"/>
+        <property name="classpath.file"   value="${import.dir}/dist-classpath.xml"/>
         <import file="${classpath.file}"/> <!-- imports global.xml -->
-        <import file="${ant.resources}/multiproject.xml"/>
+        <import file="${import.dir}/dependencies.xml"/>
+        <import file="${import.dir}/multiproject.xml"/>
+        <import file="${import.dir}/setup.xml"/>
+        <property file="${basedir}/etc/omero.properties"/>
 
         <target name="classpath-define">
@@ -42 +45 @@
 
         <target name="update">
+                <fail>etc/local.properties does not exist. Try calling "setup"<condition>
+                <not><available file="${basedir}/etc/local.properties"/></not></condition></fail>
 
                 <!-- copied from app/build.xml refactor -->
@@ -55 +60 @@
 
                 <jar update="true"
-                  destfile="${artifact.final.name}">
+                  destfile="${product.final.name}">
                         <fileset dir="${basedir}/etc">
                                 <include name="local.properties"/>
@@ -89 +94 @@
                 <fileset dir="${omero.home}" includes="*.ear" id="ear.files"/>
         </target>
-        <target name="deploy" depends="deploy-ear-jboss"/>
+
+        <target name="deploy" depends="update">
+                <property name="jboss.deploy.dir" value="${env.JBOSS_HOME}/server/default/deploy"/>
+                <property name="jboss.deploy.dir" value="${env.JBOSS_HOME}/server/default/deploy"/>
+                <copy todir="${jboss.deploy.dir}">
+                        <fileset dir="${basedir}" includes="*.ear,*.war"/>
+                </copy>
+        </target>
 
         <target name="check" depends="classpath-define,load-groovy">