From 97a2275faca28eeb2fdee1a1b5af10a4cc8319ec Mon Sep 17 00:00:00 2001
From: Jean-Pierre Huynh <jean-pierre.huynh@alfresco.com>
Date: Tue, 18 Aug 2015 11:26:31 +0000
Subject: [PATCH] RA-562: Removed the FTP panel from the Share installer + some
 refactoring.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ...alfresco-customstack-postgres-settings.xml | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml b/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
index bda268d83f..eb9f418b1b 100644
--- a/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-postgres-settings.xml
@@ -37,32 +37,23 @@
             </ruleList>
         </actionGroup>
 
-        <!-- Disable password prompt when PostgreSQL is not packaged -->
-        <setInstallerVariable name="component(alfresco).parameter(alfresco_admin_password).allowEmptyValue" value="1">
-            <ruleList>
-                <compareText text="${product_fullname}" logic="equals" value="Alfresco Share"/>
-            </ruleList>
-        </setInstallerVariable>
-        <setInstallerVariable name="component(alfresco).parameter(alfresco_admin_password).ask" value="0">
-            <ruleList>
-                <compareText text="${product_fullname}" logic="equals" value="Alfresco Share"/>
-            </ruleList>
-        </setInstallerVariable>
-
         <!-- Alfresco Share specifics -->
-        <setInstallerVariable name="component(alfresco).parameter(repository_url_port).ask" value="1">
+        <actionGroup>
+            <actionList>
+                <!-- Disable password prompt when PostgreSQL is not packaged -->
+                <setInstallerVariable name="component(alfresco).parameter(alfresco_admin_password).allowEmptyValue" value="1"/>
+                <setInstallerVariable name="component(alfresco).parameter(alfresco_admin_password).ask" value="0"/>
+                <!-- Ask for Platform URL -->
+                <setInstallerVariable name="component(alfresco).parameter(repository_url_port).ask" value="1"/>
+                <!-- Disable RMI panel -->
+                <setInstallerVariable name="component(alfresco).parameter(alfresco_rmi_port).ask" value="0"/>
+                <!-- Disable FTP panel -->
+                <setInstallerVariable name="component(alfresco).parameter(alfresco_ftp_port).ask" value="0"/>
+            </actionList>
             <ruleList>
                 <compareText text="${product_fullname}" logic="equals" value="Alfresco Share"/>
             </ruleList>
-        </setInstallerVariable>
-
-        <!-- Disable RMI panel for Share Installer -->
-        <setInstallerVariable name="component(alfresco).parameter(alfresco_rmi_port).ask" value="0">
-            <ruleList>
-                <compareText text="${product_fullname}" logic="equals" value="Alfresco Share"/>
-            </ruleList>
-        </setInstallerVariable>
-
+        </actionGroup>
     </preBuildActionList>
     <initializationActionList>
         <setInstallerVariable name="alfresco_installer_bitness" value="64"/>