inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1-MC1 (5.1.0) to HEAD (5.1)

Browse Source 
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
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 09:48:19 +00:00
parent 7a7b8514b5
commit 25ef5ddfa7
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/resources/bitrock/project.xml
View File

@@ -283,9 +283,25 @@
</substitution> </substitution>
</substitutionList> </substitutionList>
<ruleList> <ruleList>
<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(alfrescosolr4).selected}"/>
<isFalse value="${component(alfrescosolr).selected}"/> <isFalse value="${component(alfrescosolr).selected}"/>
</ruleList> </ruleList>
</ruleGroup>
</ruleList>
</ruleGroup>
</ruleList>
</substitute> </substitute>
<substitute> <substitute>
<files>${installdir}/tomcat/shared/classes/alfresco-global.properties</files> <files>${installdir}/tomcat/shared/classes/alfresco-global.properties</files>
@@ -298,12 +314,21 @@
</substitutionList> </substitutionList>
<ruleList> <ruleList>
<ruleGroup ruleEvaluationLogic="or"> <ruleGroup ruleEvaluationLogic="or">
<ruleList>
<ruleGroup>
<ruleList> <ruleList>
<isTrue value="${component(alfrescosolr4).selected}"/> <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}"/> <isTrue value="${component(alfrescosolr).selected}"/>
</ruleList> </ruleList>
</ruleGroup> </ruleGroup>
</ruleList> </ruleList>
</ruleGroup>
</ruleList>
</substitute> </substitute>
<!-- Sharded Solr configuration --> <!-- Sharded Solr configuration -->