From 73e597e0586919db822635733d4181066c8d147c Mon Sep 17 00:00:00 2001
From: remillet <remillet@yahoo.com>
Date: Thu, 23 Feb 2017 20:45:05 -0800
Subject: [PATCH] CSPACE-7080: Updated Nuxeo repository config for
 blobs/binaries.

---
 .../7.10-HF17/config/proto-repo-config.xml         |  1 -
 .../services/common/ServiceMain.java               | 14 +++++++++-----
 .../services/common/config/ConfigUtils.java        |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-repo-config.xml b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-repo-config.xml
index 3d8ea3ad4..6dd85c1c0 100644
--- a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-repo-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-repo-config.xml
@@ -30,7 +30,6 @@
         <repository name="default" factory="org.nuxeo.ecm.core.storage.sql.ra.PoolingRepositoryFactory">
 			<pool minPoolSize="0" maxPoolSize="20" blockingTimeoutMillis="100" idleTimeoutMinutes="10"/>
 			<clustering enabled="false" delay="1000"/>                
-			<binaryStore path=""/> <!-- Default value will be repository/database name.  Can be partial or full system path.  Partial path is relative to Nuxeo's data dir -->
 			<xa-datasource>@XA_DATASOURCE@</xa-datasource> <!-- The transactional datasource for Nuxeo -->
 			<noDDL>false</noDDL>
 			<sqlInitFile>vcsconfig.sql.txt</sqlInitFile> <!-- see https://doc.nuxeo.com/display/ADMINDOC/VCS+Configuration#VCSConfiguration-DatabaseCreationOption -->		
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 4ae59463f..9821be5f7 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
@@ -1091,18 +1091,22 @@ public class ServiceMain {
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc, "/component", "name",
                 String.format("config:%s-repository", repositoryName));
         
-        // Text substitutions within first extension point, "repository"
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
-        		ConfigUtils.REPOSITORY_EXTENSION_POINT_XPATH + "/repository", "name",
+        		ConfigUtils.CONFIGURATION_EXTENSION_POINT_XPATH + "/blobprovider", "name",
                 repositoryName);
         
+        repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
+        		ConfigUtils.CONFIGURATION_EXTENSION_POINT_XPATH + "/blobprovider/property[@name='path']",
+        			Tools.isBlank(binaryStorePath) ? repositoryName : binaryStorePath);
+        
+        // Text substitutions within first extension point, "repository"
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
         		ConfigUtils.REPOSITORY_EXTENSION_POINT_XPATH + "/repository", "name",
                 repositoryName);
         
-        repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
-        		ConfigUtils.REPOSITORY_EXTENSION_POINT_XPATH + "/repository/binaryStore", "path",
-                Tools.isBlank(binaryStorePath) ? repositoryName : binaryStorePath);  // Can be either partial or full path.  Partial path will be relative to Nuxeo's data directory
+//        repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
+//        		ConfigUtils.REPOSITORY_EXTENSION_POINT_XPATH + "/repository/binaryStore", "path",
+//                Tools.isBlank(binaryStorePath) ? repositoryName : binaryStorePath);  // Can be either partial or full path.  Partial path will be relative to Nuxeo's data directory
 
         /* Create the JDBC url options if any exist */
         String jdbcOptions = XmlTools.getElementValue(repoConfigDoc,
diff --git a/services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java b/services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java
index 4d11001e8..e218d69f3 100644
--- a/services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java
+++ b/services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java
@@ -15,6 +15,7 @@ public class ConfigUtils {
     public static final String COMPONENT_EXTENSION_XPATH = "/component" + EXTENSION_XPATH;
     public static final String DATASOURCE_EXTENSION_POINT_XPATH = String.format(COMPONENT_EXTENSION_XPATH, "datasources");
     public static final String REPOSITORY_EXTENSION_POINT_XPATH = String.format(COMPONENT_EXTENSION_XPATH, "repository");
+    public static final String CONFIGURATION_EXTENSION_POINT_XPATH = String.format(COMPONENT_EXTENSION_XPATH, "configuration");
     public static final String ELASTICSEARCH_INDEX_EXTENSION_XPATH = String.format(EXTENSION_XPATH, "elasticSearchIndex");
     public static final String ELASTICSEARCH_EXTENSIONS_EXPANDER_STR = "%elasticSearchIndex_extensions%";
     
-- 
2.47.3