Author: markt
Date: Wed Jun 15 21:58:00 2011
New Revision: 1136216
URL: http://svn.apache.org/viewvc?rev=1136216&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43538
Add host name and IP address to the HTML Manager application.
Patch by Dennis Lundberg.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=1136216&r1=1136215&r2=1136216&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Wed Jun 15
21:58:00 2011
@@ -170,7 +170,7 @@ public class Constants {
SERVER_HEADER_SECTION =
"<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
"<tr>\n" +
- " <td colspan=\"6\" class=\"title\">{0}</td>\n" +
+ " <td colspan=\"8\" class=\"title\">{0}</td>\n" +
"</tr>\n" +
"<tr>\n" +
" <td class=\"header-center\"><small>{1}</small></td>\n" +
@@ -179,6 +179,8 @@ public class Constants {
" <td class=\"header-center\"><small>{4}</small></td>\n" +
" <td class=\"header-center\"><small>{5}</small></td>\n" +
" <td class=\"header-center\"><small>{6}</small></td>\n" +
+ " <td class=\"header-center\"><small>{7}</small></td>\n" +
+ " <td class=\"header-center\"><small>{8}</small></td>\n" +
"</tr>\n";
SERVER_ROW_SECTION =
@@ -189,6 +191,8 @@ public class Constants {
" <td class=\"row-center\"><small>{3}</small></td>\n" +
" <td class=\"row-center\"><small>{4}</small></td>\n" +
" <td class=\"row-center\"><small>{5}</small></td>\n" +
+ " <td class=\"row-center\"><small>{6}</small></td>\n" +
+ " <td class=\"row-center\"><small>{7}</small></td>\n" +
"</tr>\n" +
"</table>\n" +
"<br>\n" +
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1136216&r1=1136215&r2=1136216&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Wed
Jun 15 21:58:00 2011
@@ -22,6 +22,8 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -630,7 +632,7 @@ public final class HTMLManagerServlet ex
writer.print(MessageFormat.format(DIAGNOSTICS_SECTION, args));
// Server Header Section
- args = new Object[7];
+ args = new Object[9];
args[0] = smClient.getString("htmlManagerServlet.serverTitle");
args[1] = smClient.getString("htmlManagerServlet.serverVersion");
args[2] = smClient.getString("htmlManagerServlet.serverJVMVersion");
@@ -638,17 +640,27 @@ public final class HTMLManagerServlet ex
args[4] = smClient.getString("htmlManagerServlet.serverOSName");
args[5] = smClient.getString("htmlManagerServlet.serverOSVersion");
args[6] = smClient.getString("htmlManagerServlet.serverOSArch");
+ args[7] = sm.getString("htmlManagerServlet.serverHostname");
+ args[8] = sm.getString("htmlManagerServlet.serverIPAddress");
writer.print(MessageFormat.format
(Constants.SERVER_HEADER_SECTION, args));
// Server Row Section
- args = new Object[6];
+ args = new Object[8];
args[0] = ServerInfo.getServerInfo();
args[1] = System.getProperty("java.runtime.version");
args[2] = System.getProperty("java.vm.vendor");
args[3] = System.getProperty("os.name");
args[4] = System.getProperty("os.version");
args[5] = System.getProperty("os.arch");
+ try {
+ InetAddress address = InetAddress.getLocalHost();
+ args[6] = address.getHostName();
+ args[7] = address.getHostAddress();
+ } catch (UnknownHostException e) {
+ args[6] = "-";
+ args[7] = "-";
+ }
writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args));
// HTML Tail Section
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=1136216&r1=1136215&r2=1136216&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Wed
Jun 15 21:58:00 2011
@@ -58,6 +58,8 @@ htmlManagerServlet.list=List Application
htmlManagerServlet.manager=Manager
htmlManagerServlet.messageLabel=Message:
htmlManagerServlet.noManager=-
+htmlManagerServlet.serverHostname=Hostname
+htmlManagerServlet.serverIPAddress=IP Address
htmlManagerServlet.serverJVMVendor=JVM Vendor
htmlManagerServlet.serverJVMVersion=JVM Version
htmlManagerServlet.serverOSArch=OS Architecture
Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1136216&r1=1136215&r2=1136216&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Wed
Jun 15 21:58:00 2011
@@ -21,6 +21,8 @@ package org.apache.catalina.manager;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Set;
@@ -240,7 +242,7 @@ public class StatusManagerServlet
StatusTransformer.writeManager(writer,args,mode);
// Server Header Section
- args = new Object[7];
+ args = new Object[9];
args[0] = sm.getString("htmlManagerServlet.serverTitle");
args[1] = sm.getString("htmlManagerServlet.serverVersion");
args[2] = sm.getString("htmlManagerServlet.serverJVMVersion");
@@ -248,17 +250,27 @@ public class StatusManagerServlet
args[4] = sm.getString("htmlManagerServlet.serverOSName");
args[5] = sm.getString("htmlManagerServlet.serverOSVersion");
args[6] = sm.getString("htmlManagerServlet.serverOSArch");
+ args[7] = sm.getString("htmlManagerServlet.serverHostname");
+ args[8] = sm.getString("htmlManagerServlet.serverIPAddress");
// use StatusTransformer to output status
StatusTransformer.writePageHeading(writer,args,mode);
// Server Row Section
- args = new Object[6];
+ args = new Object[8];
args[0] = ServerInfo.getServerInfo();
args[1] = System.getProperty("java.runtime.version");
args[2] = System.getProperty("java.vm.vendor");
args[3] = System.getProperty("os.name");
args[4] = System.getProperty("os.version");
args[5] = System.getProperty("os.arch");
+ try {
+ InetAddress address = InetAddress.getLocalHost();
+ args[6] = address.getHostName();
+ args[7] = address.getHostAddress();
+ } catch (UnknownHostException e) {
+ args[6] = "-";
+ args[7] = "-";
+ }
// use StatusTransformer to output status
StatusTransformer.writeServerInfo(writer, args, mode);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1136216&r1=1136215&r2=1136216&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 15 21:58:00 2011
@@ -97,6 +97,10 @@
Update Maven repository information in the documentation to reflect
current usage. (markt)
</fix>
+ <add>
+ <bug>43538</bug>: Add host name and IP address to the HTML Manager
+ application. Patch by Dennis Lundberg. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
