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

Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)

Browse Source 
133148 adavis: REPO-1458
      - Installer changes (from Andy H)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-28 20:21:58 +00:00
parent 6ef09b2f66
commit 2d3e6b2bf8
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@
<setInstallerVariable name="component(alfresco).parameter(alfresco_ftp_port).ask" value="0"/> <setInstallerVariable name="component(alfresco).parameter(alfresco_ftp_port).ask" value="0"/>
</actionList> </actionList>
<ruleList> <ruleList>
<compareText text="${product_fullname}" logic="equals" value="Alfresco One Share"/> <compareText text="${product_fullname}" logic="equals" value="Alfresco Content Services Share"/>
</ruleList> </ruleList>
</actionGroup> </actionGroup>
</preBuildActionList> </preBuildActionList>
@@ -205,14 +205,14 @@
<ruleList> <ruleList>
<ruleGroup> <ruleGroup>
<ruleList> <ruleList>
<compareText logic="equals" text="${project.fullName}" value="Alfresco One Platform"/> <compareText logic="equals" text="${project.fullName}" value="Alfresco Content Services Platform"/>
<isFalse value="${component(alfrescosolr4).selected}"/> <isFalse value="${component(alfrescosolr4).selected}"/>
</ruleList> </ruleList>
</ruleGroup> </ruleGroup>
<ruleGroup> <ruleGroup>
<ruleList> <ruleList>
<compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Platform"/> <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Platform"/>
<compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Share"/> <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Share"/>
<compareText logic="equals" text="${alfresco_edition}" value="enterprise"/> <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}"/>
@@ -226,7 +226,7 @@
<!-- 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="does_not_equal" text="${project.fullName}" value="Alfresco One Share"/> <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Share"/>
<compareText logic="equals" text="${alfresco_edition}" value="enterprise"/> <compareText logic="equals" text="${alfresco_edition}" value="enterprise"/>
<isTrue value="${component(alfrescosolr4).selected}"/> <isTrue value="${component(alfrescosolr4).selected}"/>
</ruleList> </ruleList>

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

@@ -263,7 +263,7 @@
</substitution> </substitution>
</substitutionList> </substitutionList>
<ruleList> <ruleList>
<compareText text="${product_fullname}" logic="equals" value="Alfresco One Share"/> <compareText text="${product_fullname}" logic="equals" value="Alfresco Content Services Share"/>
</ruleList> </ruleList>
</substitute> </substitute>
@@ -286,14 +286,14 @@
<ruleList> <ruleList>
<ruleGroup> <ruleGroup>
<ruleList> <ruleList>
<compareText logic="equals" text="${project.fullName}" value="Alfresco One Platform"/> <compareText logic="equals" text="${project.fullName}" value="Alfresco Content Services Platform"/>
<isFalse value="${component(alfrescosolr4).selected}"/> <isFalse value="${component(alfrescosolr4).selected}"/>
</ruleList> </ruleList>
</ruleGroup> </ruleGroup>
<ruleGroup> <ruleGroup>
<ruleList> <ruleList>
<compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Platform"/> <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Platform"/>
<compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Share"/> <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Share"/>
<compareText logic="equals" text="${alfresco_edition}" value="enterprise"/> <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}"/>
@@ -317,14 +317,14 @@
<ruleList> <ruleList>
<ruleGroup> <ruleGroup>
<ruleList> <ruleList>
<compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Share"/> <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Share"/>
<isTrue value="${component(alfrescosolr4).selected}"/> <isTrue value="${component(alfrescosolr4).selected}"/>
</ruleList> </ruleList>
</ruleGroup> </ruleGroup>
<ruleGroup> <ruleGroup>
<ruleList> <ruleList>
<compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Platform"/> <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Platform"/>
<compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One Share"/> <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Share"/>
<isTrue value="${component(alfrescosolr).selected}"/> <isTrue value="${component(alfrescosolr).selected}"/>
</ruleList> </ruleList>
</ruleGroup> </ruleGroup>