From 2d3e6b2bf8ca1bbcf2b9b73e99ceaf73caf9adb6 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Mon, 28 Nov 2016 20:21:58 +0000
Subject: [PATCH] Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)    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
---
 .../alfresco-customstack-postgres-settings.xml     | 10 +++++-----
 src/main/resources/bitrock/project.xml             | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml b/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
index e8405d3280..57534b6ef6 100644
--- a/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
@@ -51,7 +51,7 @@
                 <setInstallerVariable name="component(alfresco).parameter(alfresco_ftp_port).ask" value="0"/>
             </actionList>
             <ruleList>
-                <compareText text="${product_fullname}" logic="equals" value="Alfresco One Share"/>
+                <compareText text="${product_fullname}" logic="equals" value="Alfresco Content Services Share"/>
             </ruleList>
         </actionGroup>
     </preBuildActionList>
@@ -205,14 +205,14 @@
                     <ruleList>
                         <ruleGroup>
                             <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}"/>
                             </ruleList>
                         </ruleGroup>
                         <ruleGroup>
                             <ruleList>
-                                <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One 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 Platform"/>
+                                <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Share"/>
                                 <compareText logic="equals" text="${alfresco_edition}" value="enterprise"/>
                                 <isFalse value="${component(alfrescosolr4).selected}"/>
                                 <isFalse value="${component(alfrescosolr).selected}"/>
@@ -226,7 +226,7 @@
         <!-- Sharded Solr configuration panel -->
         <setInstallerVariable name="component(alfresco).parameter(sharded_solr).ask" value="1">
             <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"/>
                 <isTrue value="${component(alfrescosolr4).selected}"/>
             </ruleList>
diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml
index 4bb0a33376..996ff821da 100644
--- a/src/main/resources/bitrock/project.xml
+++ b/src/main/resources/bitrock/project.xml
@@ -263,7 +263,7 @@
                 </substitution>
             </substitutionList>
             <ruleList>
-                <compareText text="${product_fullname}" logic="equals" value="Alfresco One Share"/>
+                <compareText text="${product_fullname}" logic="equals" value="Alfresco Content Services Share"/>
             </ruleList>
         </substitute>
 
@@ -286,14 +286,14 @@
                     <ruleList>
                         <ruleGroup>
                             <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}"/>
                             </ruleList>
                         </ruleGroup>
                         <ruleGroup>
                             <ruleList>
-                                <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One 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 Platform"/>
+                                <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Share"/>
                                 <compareText logic="equals" text="${alfresco_edition}" value="enterprise"/>
                                 <isFalse value="${component(alfrescosolr4).selected}"/>
                                 <isFalse value="${component(alfrescosolr).selected}"/>
@@ -317,14 +317,14 @@
                     <ruleList>
                         <ruleGroup>
                             <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}"/>
                             </ruleList>
                         </ruleGroup>
                         <ruleGroup>
                             <ruleList>
-                                <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco One 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 Platform"/>
+                                <compareText logic="does_not_equal" text="${project.fullName}" value="Alfresco Content Services Share"/>
                                 <isTrue value="${component(alfrescosolr).selected}"/>
                             </ruleList>
                         </ruleGroup>