From 072478e077ef8f4da6ca13801cf5e628164cdd28 Mon Sep 17 00:00:00 2001
From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 20 Jul 2011 21:40:15 +0000
Subject: [PATCH] CSPACE-4247 - Fixed missing parameterization of credentials
 in nuxeo.conf. Removed build script elsewhere that did equivalent work, but
 only if ant 1.8 or later was installed.

---
 3rdparty/nuxeo/nuxeo-database-templates/build.xml | 6 ++++--
 build.xml                                         | 2 ++
 src/main/resources/config/nuxeo.conf              | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/3rdparty/nuxeo/nuxeo-database-templates/build.xml b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
index f2a1e73b4..91e1d9c4b 100644
--- a/3rdparty/nuxeo/nuxeo-database-templates/build.xml
+++ b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
@@ -26,7 +26,7 @@
 
     <target name="deploy"
     	description="deploys a database template directory to Nuxeo"
-        depends="deploy-templates-dir, update-nuxeo-config">
+			depends="deploy-templates-dir">
     </target>
     
     <target name="deploy-templates-dir"
@@ -38,10 +38,11 @@
         </copy>
     </target>
 
+		<!-- Set the value of the property pointing to the active templates directory
+		OBSOLETE - this is now handled by a deploy task at the root.
     <target name="update-nuxeo-config"
     	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) -->
         <echo message="Setting the Nuxeo database templates directory ..."/>
         <propertyfile file="${nuxeo.active.config.file}">
              <entry key="nuxeo.templates" operation="=" value="${collectionspace.template.dir}"/>
@@ -49,6 +50,7 @@
              <entry key="nuxeo.db.password" operation="=" value="${db.nuxeo.user.password}"/>
         </propertyfile>
     </target>
+		-->
     
     <!-- Undeploy-related targets -->
 
diff --git a/build.xml b/build.xml
index 27b8caa39..aba8309d0 100644
--- a/build.xml
+++ b/build.xml
@@ -269,6 +269,8 @@
 			<copy file="${src.nuxeo.conf}" todir="${jboss.bin}">
 				<filterset>
 					<filter token="DB" value="${db}" />
+					<filter token="NUXEO_USER" value="${db.nuxeo.user}" />
+					<filter token="NUXEO_PW" value="${env.DB_PASSWORD_NUXEO}" />
 				</filterset>
 			</copy>
     </target>
diff --git a/src/main/resources/config/nuxeo.conf b/src/main/resources/config/nuxeo.conf
index 877729bd3..315fd5971 100644
--- a/src/main/resources/config/nuxeo.conf
+++ b/src/main/resources/config/nuxeo.conf
@@ -37,8 +37,8 @@ nuxeo.templates=collectionspace_@DB@
 
 # Database configuration
 #nuxeo.db.name= 
-nuxeo.db.user=nuxeo
-nuxeo.db.password=nuxpw
+nuxeo.db.user=@NUXEO_USER@
+nuxeo.db.password=@NUXEO_PW@
 #nuxeo.db.host=
 #nuxeo.db.port=
 #nuxeo.db.min-pool-size=
-- 
2.47.3