[patch] Patch tha implements this functionality

43538.patch (text/plain), 7.19 KB, created by Dennis Lundberg on 2007-10-02 14:50:14 UTC

(hide)

Description: Patch tha implements this functionality

Filename:

MIME Type:

Creator: Dennis Lundberg

Created: 2007-10-02 14:50:14 UTC

Size: 7.19 KB

patch

obsolete

>Index: webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties >=================================================================== >--- webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties (revision 580777) >+++ webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties (working copy) >@@ -42,6 +42,8 @@ > htmlManagerServlet.list=List Applications > htmlManagerServlet.manager=Manager > htmlManagerServlet.messageLabel=Message: >+htmlManagerServlet.serverHostname=Hostname >+htmlManagerServlet.serverIPAddress=IP Address > htmlManagerServlet.serverJVMVendor=JVM Vendor > htmlManagerServlet.serverJVMVersion=JVM Version > htmlManagerServlet.serverOSArch=OS Architecture >Index: webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java >=================================================================== >--- webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java (revision 580777) >+++ webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java (working copy) >@@ -21,6 +21,8 @@ > > 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; >@@ -253,7 +255,7 @@ > 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"); >@@ -261,17 +263,27 @@ > 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); > >Index: webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java >=================================================================== >--- webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java (revision 580777) >+++ webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java (working copy) >@@ -22,6 +22,8 @@ > 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.Iterator; > import java.util.List; >@@ -446,7 +448,7 @@ > writer.print(MessageFormat.format(UPLOAD_SECTION, args)); > > // 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"); >@@ -454,17 +456,27 @@ > 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"); > 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 >Index: webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java >=================================================================== >--- webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java (revision 580777) >+++ webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java (working copy) >@@ -155,7 +155,7 @@ > public static final String 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" + >@@ -164,6 +164,8 @@ > " <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"; > > public static final String SERVER_ROW_SECTION = >@@ -174,6 +176,8 @@ > " <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" + >@@ -182,7 +186,7 @@ > public static final String HTML_TAIL_SECTION = > "<hr size=\"1\" noshade=\"noshade\">\n" + > "<center><font size=\"-1\" color=\"#525D76\">\n" + >- " <em>Copyright &copy; 1999-2005, Apache Software Foundation</em>" + >+ " <em>Copyright &copy; 1999-2007, Apache Software Foundation</em>" + > "</font></center>\n" + > "\n" + > "</body>\n" + View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]