From 4d514863c3fa545e1d0839dc8545c4c1aec87ca0 Mon Sep 17 00:00:00 2001
From: Natalia Smintanca <natalia.penciuc@ness.com>
Date: Thu, 19 Nov 2015 09:25:09 +0000
Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1)    117595 jphuynh:
 ACE-4593: Reordered port binding error messages to check syntax before trying
 to bind.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../resources/bitrock/alfresco-sharepoint.xml | 12 ++---
 src/main/resources/bitrock/alfrescodm.xml     | 24 +++++-----
 src/main/resources/bitrock/tomcat.xml         | 48 +++++++++----------
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/main/resources/bitrock/alfresco-sharepoint.xml b/src/main/resources/bitrock/alfresco-sharepoint.xml
index f559611ab0..8e821028ce 100644
--- a/src/main/resources/bitrock/alfresco-sharepoint.xml
+++ b/src/main/resources/bitrock/alfresco-sharepoint.xml
@@ -24,18 +24,18 @@
                 <portTest condition="cannot_bind" port="${alfresco_sharepoint_port}"/>
             </ruleList>
             <validationActionList>
-                <throwError>
-                    <text>Couldn’t bind to the given port number. Select another port for the SharePoint Protocol.</text>
-                    <ruleList>
-                        <portTest port="${alfresco_sharepoint_port}" condition="cannot_bind"/>
-                    </ruleList>
-                </throwError>
                 <throwError>
                     <text>Use numbers only the port configuration fields. Other characters are not permitted.</text>
                     <ruleList>
                         <stringTest text="${alfresco_sharepoint_port}" type="not_digit" />
                     </ruleList>
                 </throwError>
+                <throwError>
+                    <text>Couldn’t bind to the given port number. Select another port for the SharePoint Protocol.</text>
+                    <ruleList>
+                        <portTest port="${alfresco_sharepoint_port}" condition="cannot_bind"/>
+                    </ruleList>
+                </throwError>
             </validationActionList>
         </stringParameter>
     </parameterList>
diff --git a/src/main/resources/bitrock/alfrescodm.xml b/src/main/resources/bitrock/alfrescodm.xml
index 4b64f1d21e..58d5556833 100644
--- a/src/main/resources/bitrock/alfrescodm.xml
+++ b/src/main/resources/bitrock/alfrescodm.xml
@@ -54,18 +54,18 @@
                 <portTest condition="cannot_bind" port="${alfresco_ftp_port}"/>
             </ruleList>
             <validationActionList>
-                <throwError>
-                    <text>Couldn’t bind to the given port number. Select another FTP Port.</text>
-                    <ruleList>
-                        <portTest port="${alfresco_ftp_port}" condition="cannot_bind"/>
-                    </ruleList>
-                </throwError>
                 <throwError>
                     <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
                     <ruleList>
                         <stringTest text="${alfresco_ftp_port}" type="not_digit" />
                     </ruleList>
                 </throwError>
+                <throwError>
+                    <text>Couldn’t bind to the given port number. Select another FTP Port.</text>
+                    <ruleList>
+                        <portTest port="${alfresco_ftp_port}" condition="cannot_bind"/>
+                    </ruleList>
+                </throwError>
             </validationActionList>
         </stringParameter>
         <stringParameter>
@@ -82,18 +82,18 @@
                 <portTest condition="cannot_bind" port="${alfresco_rmi_port}"/>
             </ruleList>
             <validationActionList>
-                <throwError>
-                    <text>Couldn’t bind to the given port number. Select another RMI Port.</text>
-                    <ruleList>
-                        <portTest port="${alfresco_rmi_port}" condition="cannot_bind"/>
-                    </ruleList>
-                </throwError>
                 <throwError>
                     <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
                     <ruleList>
                         <stringTest text="${alfresco_rmi_port}" type="not_digit" />
                     </ruleList>
                 </throwError>
+                <throwError>
+                    <text>Couldn’t bind to the given port number. Select another RMI Port.</text>
+                    <ruleList>
+                        <portTest port="${alfresco_rmi_port}" condition="cannot_bind"/>
+                    </ruleList>
+                </throwError>
             </validationActionList>
         </stringParameter>
         <directoryParameter>
diff --git a/src/main/resources/bitrock/tomcat.xml b/src/main/resources/bitrock/tomcat.xml
index 1f53f1accb..37776d1ca5 100644
--- a/src/main/resources/bitrock/tomcat.xml
+++ b/src/main/resources/bitrock/tomcat.xml
@@ -288,6 +288,12 @@ System variables provided by this component:
                     <ask>1</ask>
                     <description>Tomcat Shutdown Port:</description>
                     <validationActionList>
+                        <throwError>
+                            <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
+                            <ruleList>
+                                <stringTest text="${tomcat_server_shutdown_port}" type="not_digit" />
+                            </ruleList>
+                        </throwError>
                         <throwError>
                             <text>Couldn’t bind to the given port number. Select another Tomcat Shutdown Port.</text>
                             <ruleList>
@@ -300,12 +306,6 @@ System variables provided by this component:
                                 <compareText text="${tomcat_server_shutdown_port}" logic="equals" value="${tomcat_server_port}"/>
                             </ruleList>
                         </throwError>
-                        <throwError>
-                            <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
-                            <ruleList>
-                                <stringTest text="${tomcat_server_shutdown_port}" type="not_digit" />
-                            </ruleList>
-                        </throwError>
                     </validationActionList>
                     <ruleList>
                         <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>
@@ -318,18 +318,18 @@ System variables provided by this component:
                     <ask>1</ask>
                     <description>Tomcat SSL Port:</description>
                     <validationActionList>
-                        <throwError>
-                            <text>Couldn’t bind to the given port number. Select another Tomcat SSL Port.</text>
-                            <ruleList>
-                                <portTest port="${tomcat_server_ssl_port}" condition="cannot_bind"/>
-                            </ruleList>
-                        </throwError>
                         <throwError>
                             <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
                             <ruleList>
                                 <stringTest text="${tomcat_server_ssl_port}" type="not_digit" />
                             </ruleList>
                         </throwError>
+                        <throwError>
+                            <text>Couldn’t bind to the given port number. Select another Tomcat SSL Port.</text>
+                            <ruleList>
+                                <portTest port="${tomcat_server_ssl_port}" condition="cannot_bind"/>
+                            </ruleList>
+                        </throwError>
                     </validationActionList>
                     <ruleList>
                         <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>
@@ -342,18 +342,18 @@ System variables provided by this component:
                     <ask>1</ask>
                     <description>Tomcat AJP Port:</description>
                     <validationActionList>
-                        <throwError>
-                            <text>Couldn’t bind to the given port number. Select another Tomcat AJP Port.</text>
-                            <ruleList>
-                                <portTest port="${tomcat_server_ajp_port}" condition="cannot_bind"/>
-                            </ruleList>
-                        </throwError>
                         <throwError>
                             <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
                             <ruleList>
                                 <stringTest text="${tomcat_server_ajp_port}" type="not_digit" />
                             </ruleList>
                         </throwError>
+                        <throwError>
+                            <text>Couldn’t bind to the given port number. Select another Tomcat AJP Port.</text>
+                            <ruleList>
+                                <portTest port="${tomcat_server_ajp_port}" condition="cannot_bind"/>
+                            </ruleList>
+                        </throwError>
                     </validationActionList>
                     <ruleList>
                         <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>
@@ -366,18 +366,18 @@ System variables provided by this component:
                     <ask>0</ask>
                     <description>Tomcat JMX Port:</description>
                     <validationActionList>
-                        <throwError>
-                            <text>Couldn’t bind to the given port number. Select another Tomcat JMX Port.</text>
-                            <ruleList>
-                                <portTest port="${tomcat_server_jmx_port}" condition="cannot_bind"/>
-                            </ruleList>
-                        </throwError>
                         <throwError>
                             <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
                             <ruleList>
                                 <stringTest text="${tomcat_server_jmx_port}" type="not_digit" />
                             </ruleList>
                         </throwError>
+                        <throwError>
+                            <text>Couldn’t bind to the given port number. Select another Tomcat JMX Port.</text>
+                            <ruleList>
+                                <portTest port="${tomcat_server_jmx_port}" condition="cannot_bind"/>
+                            </ruleList>
+                        </throwError>
                     </validationActionList>
                     <ruleList>
                         <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>