Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

85012: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84133: Fix for     ACE-2768    SOLR 4/1.4 configuration is shared for composite properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/core-services-context.xml

@@ -1110,7 +1110,7 @@
         </property>
         <property name="compositePropertyTypes">
             <map>
-                <entry key="solr.store.mappings">
+                <entry key="solr4.store.mappings">
                     <value>org.alfresco.repo.search.impl.solr.SolrStoreMapping</value>
                 </entry>
             </map>

config/alfresco/repository.properties

@@ -914,6 +914,17 @@ solr.store.mappings.value.solrMappingArchive.baseUrl=/solr/archive
 solr.store.mappings.value.solrMappingArchive.protocol=archive
 solr.store.mappings.value.solrMappingArchive.identifier=SpacesStore
 
+#Default SOLR 4 store mappings mappings
+solr4.store.mappings=solrMappingAlfresco,solrMappingArchive
+solr4.store.mappings.value.solrMappingAlfresco.httpClientFactory=solrHttpClientFactory
+solr4.store.mappings.value.solrMappingAlfresco.baseUrl=/solr4/alfresco
+solr4.store.mappings.value.solrMappingAlfresco.protocol=workspace
+solr4.store.mappings.value.solrMappingAlfresco.identifier=SpacesStore
+solr4.store.mappings.value.solrMappingArchive.httpClientFactory=solrHttpClientFactory
+solr4.store.mappings.value.solrMappingArchive.baseUrl=/solr4/archive
+solr4.store.mappings.value.solrMappingArchive.protocol=archive
+solr4.store.mappings.value.solrMappingArchive.identifier=SpacesStore
+
 #
 # Web Publishing Properties
 #

config/alfresco/subsystems/Search/solr4/solr-search-context.xml

@@ -58,7 +58,7 @@
             </map>
         </property>
         <property name="storeMappings">
-            <ref bean="solr.store.mappings" />
+            <ref bean="solr4.store.mappings" />
         </property>
         <property name="includeGroupsForRoleAdmin">
         	<value>${solr.query.includeGroupsForRoleAdmin}</value>
@@ -70,7 +70,7 @@
     
     
     <!--The configurable RPC user mappings - actually a post-processed composite property! -->
-    <bean id="solr.store.mappings" class="org.springframework.beans.factory.config.ListFactoryBean">
+    <bean id="solr4.store.mappings" class="org.springframework.beans.factory.config.ListFactoryBean">
         <property name="sourceList">
             <list>
                 <bean class="org.alfresco.repo.search.impl.solr.SolrStoreMapping">