Author: markt
Date: Sat May 4 22:23:22 2013
New Revision: 1479205
URL: http://svn.apache.org/r1479205
Log:
i18n
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1479205&r1=1479204&r2=1479205&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Sat
May 4 22:23:22 2013
@@ -105,6 +105,7 @@ managerServlet.sessiontimeout={0} minute
managerServlet.sessiontimeout.unlimited=unlimited time: {0} sessions
managerServlet.sessiontimeout.expired={0} minutes: {1} sessions were expired
managerServlet.sessions=OK - Session information for application at context
path {0}
+managerServlet.sslConnectorCiphers=OK - Connector / SSL Cipher information
managerServlet.started=OK - Started application at context path {0}
managerServlet.startFailed=FAIL - Application at context path {0} could not be
started
managerServlet.stopped=OK - Stopped application at context path {0}
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1479205&r1=1479204&r2=1479205&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sat May
4 22:23:22 2013
@@ -372,7 +372,7 @@ public class ManagerServlet extends Http
} else if (command.equals("/threaddump")) {
threadDump(writer, smClient);
} else if (command.equals("/sslConnectorCiphers")) {
- sslConnectorCiphers(writer);
+ sslConnectorCiphers(writer, smClient);
} else {
writer.println(smClient.getString("managerServlet.unknownCommand",
command));
@@ -557,8 +557,10 @@ public class ManagerServlet extends Http
writer.print(Diagnostics.getThreadDump());
}
- protected void sslConnectorCiphers(PrintWriter writer) {
- writer.println("OK - Connector / SSL Cipher information");
+ protected void sslConnectorCiphers(PrintWriter writer,
+ StringManager smClient) {
+ writer.println(smClient.getString(
+ "managerServlet.sslConnectorCiphers"));
Map<String,Set<String>> connectorCiphers = getConnectorCiphers();
for (Map.Entry<String,Set<String>> entry :
connectorCiphers.entrySet()) {
writer.println(entry.getKey());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
