inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Natalia Smintanca
2015-11-19 09:25:09 +00:00
parent acb40de71f
commit 4d514863c3
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/bitrock/alfresco-sharepoint.xml
View File

@@ -24,18 +24,18 @@
<portTest condition="cannot_bind" port="${alfresco_sharepoint_port}"/> <portTest condition="cannot_bind" port="${alfresco_sharepoint_port}"/>
</ruleList> </ruleList>
<validationActionList> <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> <throwError>
<text>Use numbers only the port configuration fields. Other characters are not permitted.</text> <text>Use numbers only the port configuration fields. Other characters are not permitted.</text>
<ruleList> <ruleList>
<stringTest text="${alfresco_sharepoint_port}" type="not_digit" /> <stringTest text="${alfresco_sharepoint_port}" type="not_digit" />
</ruleList> </ruleList>
</throwError> </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> </validationActionList>
</stringParameter> </stringParameter>
</parameterList> </parameterList>

24
src/main/resources/bitrock/alfrescodm.xml
View File

@@ -54,18 +54,18 @@
<portTest condition="cannot_bind" port="${alfresco_ftp_port}"/> <portTest condition="cannot_bind" port="${alfresco_ftp_port}"/>
</ruleList> </ruleList>
<validationActionList> <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> <throwError>
<text>Use numbers only in the port configuration fields. Other characters are not permitted.</text> <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
<ruleList> <ruleList>
<stringTest text="${alfresco_ftp_port}" type="not_digit" /> <stringTest text="${alfresco_ftp_port}" type="not_digit" />
</ruleList> </ruleList>
</throwError> </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> </validationActionList>
</stringParameter> </stringParameter>
<stringParameter> <stringParameter>
@@ -82,18 +82,18 @@
<portTest condition="cannot_bind" port="${alfresco_rmi_port}"/> <portTest condition="cannot_bind" port="${alfresco_rmi_port}"/>
</ruleList> </ruleList>
<validationActionList> <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> <throwError>
<text>Use numbers only in the port configuration fields. Other characters are not permitted.</text> <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
<ruleList> <ruleList>
<stringTest text="${alfresco_rmi_port}" type="not_digit" /> <stringTest text="${alfresco_rmi_port}" type="not_digit" />
</ruleList> </ruleList>
</throwError> </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> </validationActionList>
</stringParameter> </stringParameter>
<directoryParameter> <directoryParameter>

48
src/main/resources/bitrock/tomcat.xml
View File

@@ -288,6 +288,12 @@ System variables provided by this component:
<ask>1</ask> <ask>1</ask>
<description>Tomcat Shutdown Port:</description> <description>Tomcat Shutdown Port:</description>
<validationActionList> <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> <throwError>
<text>Couldn’t bind to the given port number. Select another Tomcat Shutdown Port.</text> <text>Couldn’t bind to the given port number. Select another Tomcat Shutdown Port.</text>
<ruleList> <ruleList>
@@ -300,12 +306,6 @@ System variables provided by this component:
<compareText text="${tomcat_server_shutdown_port}" logic="equals" value="${tomcat_server_port}"/> <compareText text="${tomcat_server_shutdown_port}" logic="equals" value="${tomcat_server_port}"/>
</ruleList> </ruleList>
</throwError> </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> </validationActionList>
<ruleList> <ruleList>
<compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/> <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>
@@ -318,18 +318,18 @@ System variables provided by this component:
<ask>1</ask> <ask>1</ask>
<description>Tomcat SSL Port:</description> <description>Tomcat SSL Port:</description>
<validationActionList> <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> <throwError>
<text>Use numbers only in the port configuration fields. Other characters are not permitted.</text> <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
<ruleList> <ruleList>
<stringTest text="${tomcat_server_ssl_port}" type="not_digit" /> <stringTest text="${tomcat_server_ssl_port}" type="not_digit" />
</ruleList> </ruleList>
</throwError> </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> </validationActionList>
<ruleList> <ruleList>
<compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/> <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>
@@ -342,18 +342,18 @@ System variables provided by this component:
<ask>1</ask> <ask>1</ask>
<description>Tomcat AJP Port:</description> <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> <throwError>
<text>Use numbers only in the port configuration fields. Other characters are not permitted.</text> <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
<ruleList> <ruleList>
<stringTest text="${tomcat_server_ajp_port}" type="not_digit" /> <stringTest text="${tomcat_server_ajp_port}" type="not_digit" />
</ruleList> </ruleList>
</throwError> </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> </validationActionList>
<ruleList> <ruleList>
<compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/> <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>
@@ -366,18 +366,18 @@ System variables provided by this component:
<ask>0</ask> <ask>0</ask>
<description>Tomcat JMX Port:</description> <description>Tomcat JMX Port:</description>
<validationActionList> <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> <throwError>
<text>Use numbers only in the port configuration fields. Other characters are not permitted.</text> <text>Use numbers only in the port configuration fields. Other characters are not permitted.</text>
<ruleList> <ruleList>
<stringTest text="${tomcat_server_jmx_port}" type="not_digit" /> <stringTest text="${tomcat_server_jmx_port}" type="not_digit" />
</ruleList> </ruleList>
</throwError> </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> </validationActionList>
<ruleList> <ruleList>
<compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/> <compareText text="${tomcat_installation_type}" logic="equals" value="bundled"/>