NOJIRA: Add merge:action directive on elasticSearchIndexConfig in tenant bindings.

diff --git a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
index 4a816804a4d76fbceffd877c84ab4b7618f06645..5511e5114537dfd332a6bfd24b77a115c8e3835d 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
@@ -12,7 +12,7 @@
                        org.collectionspace.services.nuxeo.elasticsearch.anthro.AnthroESDocumentWriter
                </tenant:elasticSearchDocumentWriter>
 
-               <tenant:elasticSearchIndexConfig>
+               <tenant:elasticSearchIndexConfig merge:action="replace">
                        <tenant:mapping merge:action="replace">
                                {
                                        // For now, don't index a field unless there's a mapping explicitly defined. This keeps the

diff --git a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
index 90bdc32d74287e78afc61f5964863669e7b08445..8af5e5dd269486d2c03a22296122638b3e7b7ee5 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
@@ -8,7 +8,7 @@
        <!-- value in cspace/config/services/tenants/fcart-tenant-bindings-proto.xml -->
 
        <tenant:tenantBinding id="1000">
-               <tenant:elasticSearchIndexConfig>
+               <tenant:elasticSearchIndexConfig merge:action="replace">
                        <tenant:mapping merge:action="replace">
                                {
                                        // For now, don't index a field unless there's a mapping explicitly defined. This keeps the

diff --git a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
index b5b29b1d6b7469f4859de93ffd9edbb34f67ef1e..796ccea4dd461145748a573c3cecacb305c89611 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
@@ -12,7 +12,7 @@
           org.collectionspace.services.nuxeo.elasticsearch.materials.MaterialsESDocumentWriter
         </tenant:elasticSearchDocumentWriter>
 
-        <tenant:elasticSearchIndexConfig>
+        <tenant:elasticSearchIndexConfig merge:action="replace">
             <tenant:mapping merge:action="replace">
               {
                 // For now, don't index a field unless there's a mapping explicitly defined. This keeps the