From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 14 Feb 2011 23:36:25 +0000 (+0000)
Subject: CSPACE-3325: Nuxeo.conf updating now depends on availability of PropertyFile Ant... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9b803719a4f940cdb044b58ff1748b39f2165519;p=tmp%2Fjakarta-migration.git

CSPACE-3325: Nuxeo.conf updating now depends on availability of PropertyFile Ant task, rather than on version of Ant. Reset task now removes existing values from nuxeo.templates property, returning that property to its default state.
---

diff --git a/3rdparty/nuxeo/nuxeo-database-templates/build.xml b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
index a4f2311fe..144205950 100644
--- a/3rdparty/nuxeo/nuxeo-database-templates/build.xml
+++ b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
@@ -31,7 +31,7 @@
     
     <target name="deploy-templates-dir"
     	description="deploys a CollectionSpace-specific Nuxeo database template folder for the ${db} database to ${nuxeo.templates.dir}"
-        depends="templates-dir-exists">
+        depends="check-templates-dir-exists">
         <mkdir dir="${nuxeo.templates.dir}/${collectionspace.template.dir}"/>
         <copy todir="${nuxeo.templates.dir}/${collectionspace.template.dir}">
             <fileset dir="${collectionspace.template.dir.path}"/>
@@ -40,7 +40,7 @@
 
     <target name="update-nuxeo-config"
     	description="updates the main Nuxeo configuration file to specify the database template folder to use for CollectionSpace"
-        depends="templates-dir-exists, has-minimum-ant-version, backup-nuxeo-config" if="ant.minimum.version.verified">
+        depends="check-templates-dir-exists, check-propertyfile-task-exists, backup-nuxeo-config" if="has.propertyfile.task">
         <!-- Set the value of the property pointing to the active templates directory (or directories) -->
         <propertyfile file="${nuxeo.main.config.file}">
             <entry key="nuxeo.templates" operation="=" value="${collectionspace.template.dir}"/>
@@ -67,9 +67,9 @@
     
    <target name="reset-nuxeo-config"
     	description="updates the main Nuxeo configuration file to reset the database template folder to an empty value"
-        depends="templates-dir-exists, has-minimum-ant-version, backup-nuxeo-config" if="ant.minimum.version.verified">
+        depends="check-templates-dir-exists, check-propertyfile-task-exists, backup-nuxeo-config" if="has.propertyfile.task">
         <propertyfile file="${nuxeo.main.config.file}">
-            <entry key="nuxeo.templates" operation="=" value="${collectionspace.template.dir}"/>
+            <entry key="nuxeo.templates" operation="=" value=""/>
         </propertyfile>
     </target>
     
@@ -80,18 +80,18 @@
         <copy file="${nuxeo.main.config.file}" tofile="${nuxeo.main.config.file}${backup.suffix}" overwrite="true"/>
     </target>
     
-    <target name="templates-dir-exists"
-    	description="verifies the existence of a Nuxeo database template folder for the ${db} database">
-        <available file="${collectionspace.template.dir.path}" type="dir" property="has.templates.dir"/>
+    <target name="check-templates-dir-exists"
+    	description="checks for the existence of a Nuxeo database template folder for the ${db} database">
+        <available file="${collectionspace.template.dir.path}" type="dir"
+            property="has.templates.dir"/>
         <fail unless="has.templates.dir"
             message="Nuxeo database templates directory ${collectionspace.template.dir.path} could not be found."/>
     </target>
 
-    <target name="has-minimum-ant-version"
-    description="verifies that the minimum required ant version exists for one or more tasks in this build file">
-        <condition property="ant.minimum.version.verified">
-          <antversion atleast="1.8.2"/>
-        </condition> 
+    <target name="check-propertyfile-task-exists"
+    description="checks that the PropertyFile task exists; that task is required by one or more targets in this build file">
+        <available classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"
+            property="has.propertyfile.task"/>
     </target>
 
 </project>