Merged HEAD (5.1) to 5.1.N (5.1.1)

115795 jphuynh: ACE-4547, ACE-4446: Fixed process binding message


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-11-03 08:04:14 +00:00
parent b25bbef54d
commit cb1c9daa7a

View File

@@ -1676,7 +1676,7 @@ rem RUBY_APPLICATION_STOP</value>
<variable>process_binding_port</variable> <variable>process_binding_port</variable>
</getProcessUsingPort> </getProcessUsingPort>
<setInstallerVariable name="process_binding_message" value=""/> <setInstallerVariable name="process_binding_message" value=""/>
<setInstallerVariable name="process_binding_message" value="${tr('This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port.')}"> <setInstallerVariable name="process_binding_message" value="${tr('This port is already in use by the ${process_binding_port} process. Select another ${serverName} Server Port.')}">
<ruleList> <ruleList>
<compareText text="${serverIp}" logic="equals" value=""/> <compareText text="${serverIp}" logic="equals" value=""/>
<compareText text="${process_binding_port}" logic="does_not_equal" value=""/> <compareText text="${process_binding_port}" logic="does_not_equal" value=""/>