From 96cebacd35fde7bb42908b99167ea29459fb2638 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 5 Mar 2014 20:16:03 -0800
Subject: [PATCH] CSPACE-6329: Copy prototype Nuxeo repo config file to a
 directory outside the Nuxeo server config directory, so its settings don't
 get inadvertently picked up by Nuxeo.

---
 3rdparty/nuxeo/build.xml                      | 19 +++++++------------
 .../common/api/JEEServerDeployment.java       |  8 ++++++--
 .../services/common/ServiceMain.java          |  6 +++++-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index 9cbec3722..45d8a54a4 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -116,19 +116,13 @@
     <target name="deploy" depends="package"
     	description="deploy nuxeo server libs to ${jee.server.cspace}">
         <copy todir="${jee.server.cspace}/nuxeo-server">
-           <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}"/>
-        </copy>
-        <copy todir="${jee.server.cspace}/nuxeo-server/config" overwrite="true">
-            <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}/config"/>
-            <filterset>
-                <filter token="DB" value="${db}" />
-				<filter token="DB_URL" value="jdbc:${db}://${db.host}:${db.port}/nuxeo"/>
-            	<filter token="DB_SERVER_HOSTNAME" value="${db.host}"/>
-				<filter token="XA_DATASOURCE" value="${db.xaDataSource}" />
-                <filter token="NUXEO_USER" value="${db.nuxeo.user}" />
-                <filter token="NUXEO_PW" value="${db.nuxeo.user.password}" />
-            </filterset>
+           <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}">
+                <exclude name="**/config/*-repo-config.xml"/>
+           </fileset>
         </copy>
+        <echo message="Copying Nuxeo prototype repo config file ..."/>
+        <copy file="${basedir}/nuxeo-server/${nuxeo.release}/config/proto-repo-config.xml"
+            todir="${jee.server.cspace}/cspace/services" overwrite="true"/>
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="nuxeo-platform-listener/build.xml" target="deploy" inheritall="false"/>
 				<!-- Disabled due to integration issues between ImageMagick and Ghostscript on Linux systems        
@@ -141,6 +135,7 @@
         <delete dir="${jee.server.cspace}/nuxeo-server/bundles"/>
         <delete dir="${jee.server.cspace}/nuxeo-server/config"/>
         <delete dir="${jee.server.cspace}/nuxeo-server/lib"/>
+        <delete file="${jee.server.cspace}/cspace/config/services/proto-repo-config.xml" failonerror="false"/>
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="nuxeo-platform-listener/build.xml" target="undeploy" inheritall="false"/>
 		<ant antfile="nuxeo-platform-quote/build.xml" target="undeploy" inheritall="false"/>
diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
index 3f4210bb2..e42755a33 100644
--- a/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
+++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
@@ -3,8 +3,12 @@ package org.collectionspace.services.common.api;
 import java.io.File;
 
 public interface JEEServerDeployment {
+    final public static String CONFIG_DIR_NAME = "config";
     final public static String CSPACE_DIR_NAME = "cspace";
-    final public static String CONFIG_DIR_PATH = "config" + File.separator + "services";
+    final public static String SERVICES_DIR_NAME = "services";
+    final public static String CONFIG_DIR_PATH = CONFIG_DIR_NAME + File.separator + SERVICES_DIR_NAME;
+    
+    final public static String CSPACE_SERVICES_DIR_PATH = CSPACE_DIR_NAME + File.separator + SERVICES_DIR_NAME;
 
     final public static String TENANT_BINDINGS_FILENAME_PREFIX = "tenant-bindings";
     final public static String TENANT_BINDINGS_PROTOTYPE_FILENAME = TENANT_BINDINGS_FILENAME_PREFIX + "-proto.xml";
@@ -12,7 +16,7 @@ public interface JEEServerDeployment {
 	
 	public final static String NUXEO_CLIENT_DIR = "nuxeo-client";
 	public final static String NUXEO_SERVER_DIR = "nuxeo-server";
-	public final static String NUXEO_CONFIG_DIR = "config";
+	public final static String NUXEO_CONFIG_DIR = CONFIG_DIR_NAME;
 	public final static String NUXEO_SERVER_CONFIG_DIR = NUXEO_SERVER_DIR + File.separator + NUXEO_CONFIG_DIR;
         public final static String NUXEO_REPO_CONFIG_FILENAME_SUFFIX = "-repo-config.xml";
         public final static String NUXEO_PROTOTYPE_CONFIG_FILENAME = "proto" + NUXEO_REPO_CONFIG_FILENAME_SUFFIX;
diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index 6542e2da5..90b643f7e 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -375,6 +375,10 @@ public class ServiceMain {
     public String getServerRootDir() {
         return serverRootDir;
     }
+
+    public String getCspaceServicesConfigDir() {
+        return getServerRootDir() + File.separator + JEEServerDeployment.CSPACE_SERVICES_DIR_PATH;
+    }
     
     public String getNuxeoConfigDir() {
         return getServerRootDir() + File.separator + JEEServerDeployment.NUXEO_SERVER_CONFIG_DIR;
@@ -764,7 +768,7 @@ public class ServiceMain {
         
         // Get the prototype copy of the Nuxeo repository config file.
         File prototypeNuxeoConfigFile =
-                new File(getNuxeoConfigDir() + File.separator + getNuxeoProtoConfigFilename());
+                new File(getCspaceServicesConfigDir() + File.separator + getNuxeoProtoConfigFilename());
         // FIXME: Consider checking for the presence of existing configuration files,
         // rather than always failing outright if the prototype file for creating
         // new or updated files can't be located.
-- 
2.47.3