inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2026-09-16 18:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
114401 jphuynh: ACE-4446: Fixed duplicated error messages around port binding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2015-10-15 15:19:31 +00:00
parent 8a50fd3d15
commit deb28cb0af
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/bitrock/base-functions.xml
+2 -2
View File
@@ -1676,7 +1676,7 @@ rem RUBY_APPLICATION_STOP</value>
<variable>process_binding_port</variable>
</getProcessUsingPort>
<setInstallerVariable name="process_binding_message" value=""/>
<setInstallerVariable name="process_binding_message" value="${tr('This port is already in use by &quot;${process_binding_port}&quot; 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. Please select another ${serverName} Server Port.')}">
<ruleList>
<compareText text="${serverIp}" logic="equals" value=""/>
<compareText text="${process_binding_port}" logic="does_not_equal" value=""/>
@@ -1685,7 +1685,7 @@ rem RUBY_APPLICATION_STOP</value>
</setInstallerVariable>
<throwError>
<text>Unable to bind to the given port number. ${process_binding_message}Please select another ${serverName} Server Port.</text>
<text>Unable to bind to the given port number. ${process_binding_message}</text>
<ruleEvaluationLogic>or</ruleEvaluationLogic>
<ruleList>
<ruleGroup>
src/main/resources/bitrock/lang/alf-en.po
+6
View File
@@ -657,3 +657,9 @@ msgstr "Repository location: "
msgid "Solr is an open source enterprise search platform that uses Apache Lucene as an indexing and search engine. Solr 4 provides improvements in scalability, performance, and flexibility over Solr 1."
msgstr "Solr is an open source enterprise search platform that uses Apache Lucene as an indexing and search engine. Solr 4 provides improvements in scalability, performance, and flexibility over Solr 1."
msgid "Unable to bind to the given port number. ${process_binding_message}"
msgstr "Unable to bind to the given port number. ${process_binding_message}"
msgid "This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port."
msgstr "This port is already in use by the ${process_binding_port} process. Please select another ${serverName} Server Port."