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

116607 jphuynh: ACE-4593: Updated port binding error message.
   - Will need to go through localisation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

src/main/resources/bitrock/alfresco-sharepoint.xml

@@ -30,6 +30,12 @@
                         <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>
             </validationActionList>
         </stringParameter>
     </parameterList>

src/main/resources/bitrock/alfrescodm.xml

@@ -60,6 +60,12 @@
                         <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>
             </validationActionList>
         </stringParameter>
         <stringParameter>
@@ -82,6 +88,12 @@
                         <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>
             </validationActionList>
         </stringParameter>
         <directoryParameter>

src/main/resources/bitrock/base-functions.xml

@@ -1665,7 +1665,7 @@ rem RUBY_APPLICATION_STOP</value>
         </parameterList>
         <actionList>
             <throwError>
-                <text>Please choose a correct value number for the ports (only digits are allowed)</text>
+                <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
                 <ruleList>
                     <stringTest text="${serverPort}" type="not_digit" />
                 </ruleList>

src/main/resources/bitrock/lang/alf-en.po

@@ -562,6 +562,9 @@ msgstr "Couldn’t bind to the given port number. Select another Tomcat Server P
 msgid "Couldn’t bind to the given port number. Select another Tomcat Shutdown Port."
 msgstr "Couldn’t bind to the given port number. Select another Tomcat Shutdown Port."
 
+msgid "Use numbers only in the port configuration fields. Other characters are not permitted."
+msgstr "Use numbers only in the port configuration fields. Other characters are not permitted."
+
 msgid "Couldn’t bind to the given port number. Select another port for the SharePoint Protocol."
 msgstr "Couldn’t bind to the given port number. Select another port for the SharePoint Protocol."
 

src/main/resources/bitrock/tomcat.xml

@@ -277,7 +277,7 @@ System variables provided by this component:
                     <value/>
                     <ask>1</ask>
                     <description>Tomcat Server Port:</description>
-            <validationActionList>
+                    <validationActionList>
                         <baseCheckPort serverName="Tomcat" serverType="${tomcat_installation_type}" serverPort="${tomcat_server_port}" serverRequiredRunning="${tomcat_existing_required_running}"/>
                     </validationActionList>
                 </stringParameter>
@@ -287,7 +287,7 @@ System variables provided by this component:
                     <value/>
                     <ask>1</ask>
                     <description>Tomcat Shutdown Port:</description>
-            <validationActionList>
+                    <validationActionList>
                         <throwError>
                             <text>Couldn’t bind to the given port number. Select another Tomcat Shutdown Port.</text>
                             <ruleList>
@@ -300,6 +300,12 @@ 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,6 +324,12 @@ System variables provided by this component:
                                 <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>
                     </validationActionList>
                     <ruleList>
                         <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>
@@ -329,13 +341,19 @@ System variables provided by this component:
                     <value/>
                     <ask>1</ask>
                     <description>Tomcat AJP Port:</description>
-            <validationActionList>
+                    <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>
                     </validationActionList>
                     <ruleList>
                         <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>
@@ -354,6 +372,12 @@ System variables provided by this component:
                                 <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>
                     </validationActionList>
                     <ruleList>
                         <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>