From c4d23bd27d144861ba5c97d67baddaf2daaa0690 Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Wed, 22 Oct 2014 10:14:56 +0000
Subject: [PATCH] ACE-3233 Integrated Bitnami's fix (Case 16263) to set
 index.subsystem.name to solr or solr4 depending on installed components

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 src/main/resources/bitrock/alfresco-solr.xml  | 1 +
 src/main/resources/bitrock/alfresco-solr4.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/resources/bitrock/alfresco-solr.xml b/src/main/resources/bitrock/alfresco-solr.xml
index 9d629ef08a..09bb65d13f 100644
--- a/src/main/resources/bitrock/alfresco-solr.xml
+++ b/src/main/resources/bitrock/alfresco-solr.xml
@@ -41,6 +41,7 @@
         </folder>
     </folderList>
     <postInstallationActionList>
+        <alfrescoSetProperty property="index.subsystem.name" value="solr" />
         <alfrescoConfigure alfrescoFiles="${alfresco_data_directory}/solr/archive-SpacesStore/conf/solrcore.properties;${alfresco_data_directory}/solr/workspace-SpacesStore/conf/solrcore.properties;${tomcat_server_directory}/conf/Catalina/localhost/solr.xml" />
 	<substitute>
 	    <files>${alfresco_data_directory}/solr/archive-SpacesStore/conf/solrcore.properties;${alfresco_data_directory}/solr/workspace-SpacesStore/conf/solrcore.properties</files>
diff --git a/src/main/resources/bitrock/alfresco-solr4.xml b/src/main/resources/bitrock/alfresco-solr4.xml
index 9bf94023bf..ae77b72c08 100644
--- a/src/main/resources/bitrock/alfresco-solr4.xml
+++ b/src/main/resources/bitrock/alfresco-solr4.xml
@@ -41,6 +41,7 @@
         </folder>
     </folderList>
     <postInstallationActionList>
+       <alfrescoSetProperty property="index.subsystem.name" value="solr4" />
        <alfrescoConfigure alfrescoFiles="${installdir}/solr4/archive-SpacesStore/conf/solrcore.properties;${installdir}/solr4/workspace-SpacesStore/conf/solrcore.properties;${tomcat_server_directory}/conf/Catalina/localhost/solr4.xml" />
       <substitute>
           <files>${installdir}/solr4/archive-SpacesStore/conf/solrcore.properties;${installdir}/solr4/workspace-SpacesStore/conf/solrcore.properties</files>