View | Details | Raw Unified | Return to bug 43538
Collapse All | Expand All

(-)webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties (+2 lines)
Lines 42-47 Link Here
42
htmlManagerServlet.list=List Applications
42
htmlManagerServlet.list=List Applications
43
htmlManagerServlet.manager=Manager
43
htmlManagerServlet.manager=Manager
44
htmlManagerServlet.messageLabel=Message:
44
htmlManagerServlet.messageLabel=Message:
45
htmlManagerServlet.serverHostname=Hostname
46
htmlManagerServlet.serverIPAddress=IP Address
45
htmlManagerServlet.serverJVMVendor=JVM Vendor
47
htmlManagerServlet.serverJVMVendor=JVM Vendor
46
htmlManagerServlet.serverJVMVersion=JVM Version
48
htmlManagerServlet.serverJVMVersion=JVM Version
47
htmlManagerServlet.serverOSArch=OS Architecture
49
htmlManagerServlet.serverOSArch=OS Architecture
(-)webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java (-2 / +14 lines)
Lines 21-26 Link Here
21
21
22
import java.io.IOException;
22
import java.io.IOException;
23
import java.io.PrintWriter;
23
import java.io.PrintWriter;
24
import java.net.InetAddress;
25
import java.net.UnknownHostException;
24
import java.util.Enumeration;
26
import java.util.Enumeration;
25
import java.util.Iterator;
27
import java.util.Iterator;
26
import java.util.Set;
28
import java.util.Set;
Lines 253-259 Link Here
253
        StatusTransformer.writeManager(writer,args,mode);
255
        StatusTransformer.writeManager(writer,args,mode);
254
256
255
        // Server Header Section
257
        // Server Header Section
256
        args = new Object[7];
258
        args = new Object[9];
257
        args[0] = sm.getString("htmlManagerServlet.serverTitle");
259
        args[0] = sm.getString("htmlManagerServlet.serverTitle");
258
        args[1] = sm.getString("htmlManagerServlet.serverVersion");
260
        args[1] = sm.getString("htmlManagerServlet.serverVersion");
259
        args[2] = sm.getString("htmlManagerServlet.serverJVMVersion");
261
        args[2] = sm.getString("htmlManagerServlet.serverJVMVersion");
Lines 261-277 Link Here
261
        args[4] = sm.getString("htmlManagerServlet.serverOSName");
263
        args[4] = sm.getString("htmlManagerServlet.serverOSName");
262
        args[5] = sm.getString("htmlManagerServlet.serverOSVersion");
264
        args[5] = sm.getString("htmlManagerServlet.serverOSVersion");
263
        args[6] = sm.getString("htmlManagerServlet.serverOSArch");
265
        args[6] = sm.getString("htmlManagerServlet.serverOSArch");
266
        args[7] = sm.getString("htmlManagerServlet.serverHostname");
267
        args[8] = sm.getString("htmlManagerServlet.serverIPAddress");
264
        // use StatusTransformer to output status
268
        // use StatusTransformer to output status
265
        StatusTransformer.writePageHeading(writer,args,mode);
269
        StatusTransformer.writePageHeading(writer,args,mode);
266
270
267
        // Server Row Section
271
        // Server Row Section
268
        args = new Object[6];
272
        args = new Object[8];
269
        args[0] = ServerInfo.getServerInfo();
273
        args[0] = ServerInfo.getServerInfo();
270
        args[1] = System.getProperty("java.runtime.version");
274
        args[1] = System.getProperty("java.runtime.version");
271
        args[2] = System.getProperty("java.vm.vendor");
275
        args[2] = System.getProperty("java.vm.vendor");
272
        args[3] = System.getProperty("os.name");
276
        args[3] = System.getProperty("os.name");
273
        args[4] = System.getProperty("os.version");
277
        args[4] = System.getProperty("os.version");
274
        args[5] = System.getProperty("os.arch");
278
        args[5] = System.getProperty("os.arch");
279
        try {
280
            InetAddress address = InetAddress.getLocalHost();
281
            args[6] = address.getHostName();
282
            args[7] = address.getHostAddress();
283
         } catch (UnknownHostException e) {
284
            args[6] = "-";
285
            args[7] = "-";
286
        }
275
        // use StatusTransformer to output status
287
        // use StatusTransformer to output status
276
        StatusTransformer.writeServerInfo(writer, args, mode);
288
        StatusTransformer.writeServerInfo(writer, args, mode);
277
289
(-)webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java (-2 / +14 lines)
Lines 22-27 Link Here
22
import java.io.IOException;
22
import java.io.IOException;
23
import java.io.PrintWriter;
23
import java.io.PrintWriter;
24
import java.io.StringWriter;
24
import java.io.StringWriter;
25
import java.net.InetAddress;
26
import java.net.UnknownHostException;
25
import java.text.MessageFormat;
27
import java.text.MessageFormat;
26
import java.util.Iterator;
28
import java.util.Iterator;
27
import java.util.List;
29
import java.util.List;
Lines 446-452 Link Here
446
        writer.print(MessageFormat.format(UPLOAD_SECTION, args));
448
        writer.print(MessageFormat.format(UPLOAD_SECTION, args));
447
449
448
        // Server Header Section
450
        // Server Header Section
449
        args = new Object[7];
451
        args = new Object[9];
450
        args[0] = sm.getString("htmlManagerServlet.serverTitle");
452
        args[0] = sm.getString("htmlManagerServlet.serverTitle");
451
        args[1] = sm.getString("htmlManagerServlet.serverVersion");
453
        args[1] = sm.getString("htmlManagerServlet.serverVersion");
452
        args[2] = sm.getString("htmlManagerServlet.serverJVMVersion");
454
        args[2] = sm.getString("htmlManagerServlet.serverJVMVersion");
Lines 454-470 Link Here
454
        args[4] = sm.getString("htmlManagerServlet.serverOSName");
456
        args[4] = sm.getString("htmlManagerServlet.serverOSName");
455
        args[5] = sm.getString("htmlManagerServlet.serverOSVersion");
457
        args[5] = sm.getString("htmlManagerServlet.serverOSVersion");
456
        args[6] = sm.getString("htmlManagerServlet.serverOSArch");
458
        args[6] = sm.getString("htmlManagerServlet.serverOSArch");
459
        args[7] = sm.getString("htmlManagerServlet.serverHostname");
460
        args[8] = sm.getString("htmlManagerServlet.serverIPAddress");
457
        writer.print(MessageFormat.format
461
        writer.print(MessageFormat.format
458
                     (Constants.SERVER_HEADER_SECTION, args));
462
                     (Constants.SERVER_HEADER_SECTION, args));
459
463
460
        // Server Row Section
464
        // Server Row Section
461
        args = new Object[6];
465
        args = new Object[8];
462
        args[0] = ServerInfo.getServerInfo();
466
        args[0] = ServerInfo.getServerInfo();
463
        args[1] = System.getProperty("java.runtime.version");
467
        args[1] = System.getProperty("java.runtime.version");
464
        args[2] = System.getProperty("java.vm.vendor");
468
        args[2] = System.getProperty("java.vm.vendor");
465
        args[3] = System.getProperty("os.name");
469
        args[3] = System.getProperty("os.name");
466
        args[4] = System.getProperty("os.version");
470
        args[4] = System.getProperty("os.version");
467
        args[5] = System.getProperty("os.arch");
471
        args[5] = System.getProperty("os.arch");
472
        try {
473
            InetAddress address = InetAddress.getLocalHost();
474
            args[6] = address.getHostName();
475
            args[7] = address.getHostAddress();
476
        } catch ( UnknownHostException e) {
477
            args[6] = "-";
478
            args[7] = "-";
479
        }
468
        writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args));
480
        writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args));
469
481
470
        // HTML Tail Section
482
        // HTML Tail Section
(-)webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java (-2 / +6 lines)
Lines 155-161 Link Here
155
    public static final String SERVER_HEADER_SECTION =
155
    public static final String SERVER_HEADER_SECTION =
156
        "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
156
        "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
157
        "<tr>\n" +
157
        "<tr>\n" +
158
        " <td colspan=\"6\" class=\"title\">{0}</td>\n" +
158
        " <td colspan=\"8\" class=\"title\">{0}</td>\n" +
159
        "</tr>\n" +
159
        "</tr>\n" +
160
        "<tr>\n" +
160
        "<tr>\n" +
161
        " <td class=\"header-center\"><small>{1}</small></td>\n" +
161
        " <td class=\"header-center\"><small>{1}</small></td>\n" +
Lines 164-169 Link Here
164
        " <td class=\"header-center\"><small>{4}</small></td>\n" +
164
        " <td class=\"header-center\"><small>{4}</small></td>\n" +
165
        " <td class=\"header-center\"><small>{5}</small></td>\n" +
165
        " <td class=\"header-center\"><small>{5}</small></td>\n" +
166
        " <td class=\"header-center\"><small>{6}</small></td>\n" +
166
        " <td class=\"header-center\"><small>{6}</small></td>\n" +
167
        " <td class=\"header-center\"><small>{7}</small></td>\n" +
168
        " <td class=\"header-center\"><small>{8}</small></td>\n" +
167
        "</tr>\n";
169
        "</tr>\n";
168
170
169
    public static final String SERVER_ROW_SECTION =
171
    public static final String SERVER_ROW_SECTION =
Lines 174-179 Link Here
174
        " <td class=\"row-center\"><small>{3}</small></td>\n" +
176
        " <td class=\"row-center\"><small>{3}</small></td>\n" +
175
        " <td class=\"row-center\"><small>{4}</small></td>\n" +
177
        " <td class=\"row-center\"><small>{4}</small></td>\n" +
176
        " <td class=\"row-center\"><small>{5}</small></td>\n" +
178
        " <td class=\"row-center\"><small>{5}</small></td>\n" +
179
        " <td class=\"row-center\"><small>{6}</small></td>\n" +
180
        " <td class=\"row-center\"><small>{7}</small></td>\n" +
177
        "</tr>\n" +
181
        "</tr>\n" +
178
        "</table>\n" +
182
        "</table>\n" +
179
        "<br>\n" +
183
        "<br>\n" +
Lines 182-188 Link Here
182
    public static final String HTML_TAIL_SECTION =
186
    public static final String HTML_TAIL_SECTION =
183
        "<hr size=\"1\" noshade=\"noshade\">\n" +
187
        "<hr size=\"1\" noshade=\"noshade\">\n" +
184
        "<center><font size=\"-1\" color=\"#525D76\">\n" +
188
        "<center><font size=\"-1\" color=\"#525D76\">\n" +
185
        " <em>Copyright &copy; 1999-2005, Apache Software Foundation</em>" +
189
        " <em>Copyright &copy; 1999-2007, Apache Software Foundation</em>" +
186
        "</font></center>\n" +
190
        "</font></center>\n" +
187
        "\n" +
191
        "\n" +
188
        "</body>\n" +
192
        "</body>\n" +

Return to bug 43538