From 930e1e7fa76f8c40ec871e12fc054f2a786a5963 Mon Sep 17 00:00:00 2001
From: Ramona Neamtu <ramona.popa@ness.com>
Date: Tue, 15 Dec 2015 12:53:49 +0000
Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1)    119860 jphuynh: Merged
 5.1-MC1 (5.1.0) to HEAD (5.1)       118829 jphuynh: Merged JPHUYNH/BDE-409
 (5.1.0) to 5.1-MC1 (5.1.0)          115380 jphuynh: Merged 
 ^/alfresco/BRANCHES/DEV/JPHUYNH/BDE-409@114065             114065: BDE-409:
 Solr Sharded is an Enterprise Only feature.                + Fixed the
 Alfresco Platform Installer scenario. (No Solr1 in that case)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ...alfresco-customstack-postgres-settings.xml | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml b/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
index cd67d831d0..c21f5ad338 100644
--- a/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
@@ -201,14 +201,31 @@
                 <setInstallerVariable name="component(alfresco).parameter(remote_solr_configuration).ask" value="1" />
             </actionList>
             <ruleList>
-                <isFalse value="${component(alfrescosolr4).selected}"/>
-                <isFalse value="${component(alfrescosolr).selected}"/>
+                <ruleGroup ruleEvaluationLogic="or">
+                    <ruleList>
+                        <ruleGroup>
+                            <ruleList>
+                                <compareText logic="equals" text="${project.fullName}" value="Alfresco One Platform"/>
+                                <isFalse value="${component(alfrescosolr4).selected}"/>
+                            </ruleList>
+                        </ruleGroup>
+                        <ruleGroup>
+                            <ruleList>
+                                <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Platform"/>
+                                <compareText logic="equals" text="${alfresco_edition}" value="enterprise"/>
+                                <isFalse value="${component(alfrescosolr4).selected}"/>
+                                <isFalse value="${component(alfrescosolr).selected}"/>
+                            </ruleList>
+                        </ruleGroup>
+                    </ruleList>
+                </ruleGroup>
             </ruleList>
         </actionGroup>
 
         <!-- Sharded Solr configuration panel -->
         <setInstallerVariable name="component(alfresco).parameter(sharded_solr).ask" value="1">
             <ruleList>
+                <compareText logic="equals" text="${alfresco_edition}" value="enterprise"/>
                 <isTrue value="${component(alfrescosolr4).selected}"/>
             </ruleList>
         </setInstallerVariable>
@@ -248,7 +265,7 @@
                 <!-- Advanced mode -->
                 <actionGroup>
                     <actionList>
-                        <setInstallerVariable name="component(tomcat).parameter(tomcat_show_ports).value" value="1"/> 
+                        <setInstallerVariable name="component(tomcat).parameter(tomcat_show_ports).value" value="1"/>
                         <setInstallerVariable name="component(libreofficecomponent).parameter(libreoffice_show_ports).value" value="1">
                             <ruleList>
                                 <componentTest logic="exists" name="libreofficecomponent"/>
@@ -280,7 +297,7 @@
                             <ruleList>
                                 <componentTest logic="exists" name="postgres"/>
                             </ruleList>
-                        </setInstallerVariable> 
+                        </setInstallerVariable>
                         <setInstallerVariable name="alfresco_show_ports" value="no"/>
                         <setInstallerVariable name="project.allowComponentSelection" value="0"/>
                     </actionList>
@@ -321,7 +338,7 @@
                     <ruleList>
                         <componentTest logic="exists" name="postgresservice"/>
                     </ruleList>
-                </setInstallerVariable> 
+                </setInstallerVariable>
                 <setInstallerVariable name="component(libreofficecomponent).parameter(libreofficeservice_startup).value" value="${alfrescocustomstack_services_startup}">
                     <ruleList>
                         <componentTest logic="exists" name="libreofficecomponent"/>