From bc4e8e43f08049b2d869162da177cd836663bfa2 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Huynh <jean-pierre.huynh@alfresco.com>
Date: Mon, 17 Aug 2015 16:51:38 +0000
Subject: [PATCH] RA-558: Fixed Platform URL substitution in Advanced mode.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 src/main/resources/bitrock/alfrescodm.xml | 14 --------------
 src/main/resources/bitrock/project.xml    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/bitrock/alfrescodm.xml b/src/main/resources/bitrock/alfrescodm.xml
index 0d7d22f75f..e09601db73 100644
--- a/src/main/resources/bitrock/alfrescodm.xml
+++ b/src/main/resources/bitrock/alfrescodm.xml
@@ -415,20 +415,6 @@
                 </substitution>
             </substitutionList>
         </substitute>
-        <!-- Substitute repository url  -->
-        <substitute>
-            <files>${installdir}/tomcat/shared/classes/alfresco/web-extension/share-config-custom.xml</files>
-            <type>exact</type>
-            <substitutionList>
-                <substitution>
-                    <pattern>http://localhost:8080/alfresco</pattern>
-                        <value>${repository_url_port}</value>
-                </substitution>
-            </substitutionList>
-            <ruleList>
-                <compareText text="${product_fullname}" logic="equals" value="Alfresco Share"/>
-            </ruleList>
-        </substitute>
         <propertiesFileSet>
             <file>${application_server_conf_directory}/logging.properties</file>
             <key>org.apache.catalina.loader.WebappClassLoader.level</key>
diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml
index aec6ee9dea..06aa4c70fc 100644
--- a/src/main/resources/bitrock/project.xml
+++ b/src/main/resources/bitrock/project.xml
@@ -252,6 +252,20 @@
 	                <isTrue value="${component(postgres).selected}" />
 		    </ruleList>
 		</actionGroup>
+		<!-- Substitute repository url  -->
+        <substitute>
+            <files>${installdir}/tomcat/shared/classes/alfresco/web-extension/share-config-custom.xml</files>
+            <type>exact</type>
+            <substitutionList>
+                <substitution>
+                    <pattern>http://localhost:${application_server_port}/alfresco</pattern>
+                    <value>${project.component(alfresco).parameter(repository_url_port).value}</value>
+                </substitution>
+            </substitutionList>
+            <ruleList>
+                <compareText text="${product_fullname}" logic="equals" value="Alfresco Share"/>
+            </ruleList>
+        </substitute>
     </postInstallationActionList>
     
     <finalPageActionList>