From 25ef5ddfa7fd2473f46c67cbb3d34cd2239c88db Mon Sep 17 00:00:00 2001
From: Jean-Pierre Huynh <jean-pierre.huynh@alfresco.com>
Date: Thu, 10 Dec 2015 09:48:19 +0000
Subject: [PATCH] Merged 5.1-MC1 (5.1.0) to HEAD (5.1)    118870 jphuynh:
 BDE-409: Fixed substitution logic that was broken on the Platform installer.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 src/main/resources/bitrock/project.xml | 33 ++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml
index fe5aea2bf8..7c2a320c34 100644
--- a/src/main/resources/bitrock/project.xml
+++ b/src/main/resources/bitrock/project.xml
@@ -283,8 +283,24 @@
                 </substitution>
             </substitutionList>
             <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>
         </substitute>
         <substitute>
@@ -299,8 +315,17 @@
             <ruleList>
                 <ruleGroup ruleEvaluationLogic="or">
                     <ruleList>
-                        <isTrue value="${component(alfrescosolr4).selected}"/>
-                        <isTrue value="${component(alfrescosolr).selected}"/>
+                        <ruleGroup>
+                            <ruleList>
+                                <isTrue value="${component(alfrescosolr4).selected}"/>
+                            </ruleList>
+                        </ruleGroup>
+                        <ruleGroup>
+                            <ruleList>
+                                <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Platform"/>
+                                <isTrue value="${component(alfrescosolr).selected}"/>
+                            </ruleList>
+                        </ruleGroup>
                     </ruleList>
                 </ruleGroup>
             </ruleList>