From 403f806f97f85616580cc7203353502c7f68496d Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 15 Feb 2011 00:02:10 +0000
Subject: [PATCH] CSPACE-3325: Ant buildfile now checks for the active main
 Nuxeo config file's location in NUXEO_CONF environment variable, if present,
 before defaulting to /usr/local/share/jboss/bin/nuxeo.conf.

---
 .../nuxeo/nuxeo-database-templates/build.xml  | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/3rdparty/nuxeo/nuxeo-database-templates/build.xml b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
index 144205950..6648fe1ae 100644
--- a/3rdparty/nuxeo/nuxeo-database-templates/build.xml
+++ b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
@@ -30,7 +30,7 @@
     </target>
     
     <target name="deploy-templates-dir"
-    	description="deploys a CollectionSpace-specific Nuxeo database template folder for the ${db} database to ${nuxeo.templates.dir}"
+    	description="deploys a CollectionSpace-specific Nuxeo database template folder"
         depends="check-templates-dir-exists">
         <mkdir dir="${nuxeo.templates.dir}/${collectionspace.template.dir}"/>
         <copy todir="${nuxeo.templates.dir}/${collectionspace.template.dir}">
@@ -39,23 +39,25 @@
     </target>
 
     <target name="update-nuxeo-config"
-    	description="updates the main Nuxeo configuration file to specify the database template folder to use for CollectionSpace"
-        depends="check-templates-dir-exists, check-propertyfile-task-exists, backup-nuxeo-config" if="has.propertyfile.task">
+    	description="updates the active Nuxeo configuration file to specify the database template folder to use for CollectionSpace"
+        depends="check-templates-dir-exists, check-propertyfile-task-exists, set-nuxeo-active-config, 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}"/>
+        <echo message="Setting the Nuxeo database templates directory ..."/>
+        <propertyfile file="${nuxeo.active.config.file}">
+             <entry key="nuxeo.templates" operation="=" value="${collectionspace.template.dir}"/>
         </propertyfile>
     </target>
     
     <!-- Undeploy-related targets -->
 
     <target name="undeploy"
-        description="undeploys CollectionSpace-specific Nuxeo database template folders from ${nuxeo.templates.dir}"
+        description="undeploys CollectionSpace-specific Nuxeo database template folders"
         depends="undeploy-template-dirs, reset-nuxeo-config">
     </target>
     
     <target name="undeploy-template-dirs"
-    	description="deletes CollectionSpace-specific database template folders from the deploy directory">
+    	description="deletes CollectionSpace-specific database template folders from the deploy directory"
+        depends="check-templates-dir-exists">
         <delete quiet="false" includeemptydirs="true">
             <fileset id="collectionspace.template.files" dir="${nuxeo.templates.dir}">
                 <patternset>
@@ -66,18 +68,34 @@
     </target>
     
    <target name="reset-nuxeo-config"
-    	description="updates the main Nuxeo configuration file to reset the database template folder to an empty value"
-        depends="check-templates-dir-exists, check-propertyfile-task-exists, backup-nuxeo-config" if="has.propertyfile.task">
-        <propertyfile file="${nuxeo.main.config.file}">
+    	description="resets the value of the database template folder in the active Nuxeo configuration file to an empty value"
+        depends="check-propertyfile-task-exists, set-nuxeo-active-config, backup-nuxeo-config"
+        if="has.propertyfile.task">
+        <propertyfile file="${nuxeo.active.config.file}">
             <entry key="nuxeo.templates" operation="=" value=""/>
         </propertyfile>
     </target>
     
     <!-- Utility targets -->
+    
+    <target name="set-nuxeo-active-config"
+        description="Sets the path to the active Nuxeo configuration file"
+        depends="set-nuxeo-active-config-with-env, set-nuxeo-active-config-without-env">
+    </target>
+
+    <target name="set-nuxeo-active-config-with-env" if="env.NUXEO_CONF"
+        description="Sets the path to the active Nuxeo configuration file, if set in the NUXEO_CONF environment variable">
+        <property name="nuxeo.active.config.file" value="${env.NUXEO_CONF}"/>
+    </target>
+
+    <target name="set-nuxeo-active-config-without-env" unless="env.NUXEO_CONF"
+        description="Sets the path to the active Nuxeo configuration file, in the absence of a NUXEO_CONF environment variable">
+        <property name="nuxeo.active.config.file" value="${nuxeo.main.config.file}"/>
+    </target>
 
     <target name="backup-nuxeo-config"
-    	description="makes a single backup copy of the existing main Nuxeo configuration file, overwriting the previous backup">
-        <copy file="${nuxeo.main.config.file}" tofile="${nuxeo.main.config.file}${backup.suffix}" overwrite="true"/>
+    	description="makes a single backup copy of the active, main Nuxeo configuration file, overwriting the previous backup">
+        <copy file="${nuxeo.active.config.file}" tofile="${nuxeo.active.config.file}${backup.suffix}" overwrite="true"/>
     </target>
     
     <target name="check-templates-dir-exists"
-- 
2.47.3