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 HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
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
This commit is contained in:
Ramona Neamtu
2015-12-15 12:53:49 +00:00
parent d276080acc
commit 930e1e7fa7
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
View File

@@ -201,14 +201,31 @@
<setInstallerVariable name="component(alfresco).parameter(remote_solr_configuration).ask" value="1" /> <setInstallerVariable name="component(alfresco).parameter(remote_solr_configuration).ask" value="1" />
</actionList> </actionList>
<ruleList> <ruleList>
<isFalse value="${component(alfrescosolr4).selected}"/> <ruleGroup ruleEvaluationLogic="or">
<isFalse value="${component(alfrescosolr).selected}"/> <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> </ruleList>
</actionGroup> </actionGroup>
<!-- Sharded Solr configuration panel --> <!-- Sharded Solr configuration panel -->
<setInstallerVariable name="component(alfresco).parameter(sharded_solr).ask" value="1"> <setInstallerVariable name="component(alfresco).parameter(sharded_solr).ask" value="1">
<ruleList> <ruleList>
<compareText logic="equals" text="${alfresco_edition}" value="enterprise"/>
<isTrue value="${component(alfrescosolr4).selected}"/> <isTrue value="${component(alfrescosolr4).selected}"/>
</ruleList> </ruleList>
</setInstallerVariable> </setInstallerVariable>