CSPACE-4247 - Fixed missing parameterization of credentials in nuxeo.conf. Removed...

diff --git a/3rdparty/nuxeo/nuxeo-database-templates/build.xml b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
index f2a1e73b4a042493eb0e75ff6d5989213e8ba488..91e1d9c4bed90c533f9f26f526ce515670f7474b 100644 (file)
--- 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 27b8caa39f6758863e3346e299deb75b5eb5add4..aba8309d0a0f1dbd7441082ddac0592ad91972e5 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -269,6 +269,8 @@
                        <copy file="${src.nuxeo.conf}" todir="${jboss.bin}">\r
                                <filterset>\r
                                        <filter token="DB" value="${db}" />\r
+                                       <filter token="NUXEO_USER" value="${db.nuxeo.user}" />\r
+                                       <filter token="NUXEO_PW" value="${env.DB_PASSWORD_NUXEO}" />\r
                                </filterset>\r
                        </copy>\r
     </target>\r

diff --git a/src/main/resources/config/nuxeo.conf b/src/main/resources/config/nuxeo.conf
index 877729bd3de31ae9f6f464fc810603f180876488..315fd5971e6e881a9feccf4769cd67c33feb6bc4 100644 (file)
--- 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=