Author: kkolinko Date: Mon Feb 11 12:37:39 2019 New Revision: 1853357 URL: http://svn.apache.org/viewvc?rev=1853357&view=rev Log: Fix messages used by Host Manager web application. Disambiguate message keys used for different messages. (kkolinko)
Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1853357&r1=1853356&r2=1853357&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Mon Feb 11 12:37:39 2019 @@ -433,7 +433,7 @@ public class HostManagerServlet host = (StandardHost) engine.findChild(name); if (host != null) { - writer.println(smClient.getString("hostManagerServlet.add", name)); + writer.println(smClient.getString("hostManagerServlet.addSuccess", name)); } else { // Something failed writer.println(smClient.getString( @@ -493,7 +493,7 @@ public class HostManagerServlet Host host = (StandardHost) engine.findChild(name); if (host == null) { writer.println(smClient.getString( - "hostManagerServlet.remove", name)); + "hostManagerServlet.removeSuccess", name)); } else { // Something failed writer.println(smClient.getString( Modified: tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=1853357&r1=1853356&r2=1853357&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties [UTF-8] (original) +++ tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties [UTF-8] Mon Feb 11 12:37:39 2019 @@ -15,6 +15,7 @@ hostManagerServlet.add=add: Adding host [{0}] hostManagerServlet.addFailed=FAIL - Failed to add host [{0}] +hostManagerServlet.addSuccess=OK - Host [{0}] added hostManagerServlet.alreadyHost=FAIL - Host already exists with host name [{0}] hostManagerServlet.alreadyStarted=FAIL - Host [{0}] is already started hostManagerServlet.alreadyStopped=FAIL - Host [{0}] is already stopped @@ -38,6 +39,7 @@ hostManagerServlet.persisted=OK - Config hostManagerServlet.postCommand=FAIL - Tried to use command [{0}] via a GET request but POST is required hostManagerServlet.remove=remove: Removing host [{0}] hostManagerServlet.removeFailed=FAIL - Failed to remove host [{0}] +hostManagerServlet.removeSuccess=OK - Removed host [{0}] hostManagerServlet.start=start: Starting host with name [{0}] hostManagerServlet.startFailed=FAIL - Failed to start host [{0}] hostManagerServlet.started=OK - Host [{0}] started Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1853357&r1=1853356&r2=1853357&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 11 12:37:39 2019 @@ -81,6 +81,14 @@ </scode> </changelog> </subsection> + <subsection name="Web applications"> + <changelog> + <fix> + Fix messages used by Host Manager web application. Disambiguate + message keys used for different messages. (kkolinko) + </fix> + </changelog> + </subsection> <subsection name="Tribes"> <changelog> <add> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org