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

125993 jphuynh: MNT-15862: Removed too restrictive rule on error message displayed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@126021 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandra Leahu
2016-04-29 11:53:53 +00:00
parent 73aeb2d2fd
commit 38d234686d

View File

@@ -1729,8 +1729,6 @@ rem RUBY_APPLICATION_STOP</value>
<compareText text="${serverIp}" logic="equals" value=""/>
<portTest port="${serverPort}" condition="cannot_bind"/>
<compareText text="${serverType}" logic="equals" value="bundled"/>
<compareText text="${serverName}" logic="does_not_equal" value="Tomcat"/>
<compareText text="${serverName}" logic="does_not_equal" value="LibreOffice"/>
</ruleList>
</ruleGroup>
<ruleGroup>
@@ -1738,8 +1736,6 @@ rem RUBY_APPLICATION_STOP</value>
<compareText text="${serverIp}" logic="does_not_equal" value=""/>
<portTest condition="cannot_bind" port="${serverPort}" ip="${serverIp}" />
<compareText text="${serverType}" logic="equals" value="bundled"/>
<compareText text="${serverName}" logic="does_not_equal" value="Tomcat"/>
<compareText text="${serverName}" logic="does_not_equal" value="LibreOffice"/>
</ruleList>
</ruleGroup>
<compareText text="${reservedPorts}" logic="contains" value=" ${serverPort} "/>