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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1136216 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/manager/Constants.java b/java/org/apache/catalina/manager/Constants.java
index 1f644d9..ba7b555 100644 (file)
--- a/java/org/apache/catalina/manager/Constants.java
+++ b/java/org/apache/catalina/manager/Constants.java
@@ -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" +

diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index 2d3a779..d15dbf1 100644 (file)
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -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 extends ManagerServlet {
         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 extends ManagerServlet {
         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

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index ae0a83f..eafb465 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -58,6 +58,8 @@ htmlManagerServlet.list=List Applications
 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

diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java b/java/org/apache/catalina/manager/StatusManagerServlet.java
index 092db09..c0ee2dc 100644 (file)
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -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);
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 85d59e4..c33e8b4 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>