Added the log viewer, othe rminor updates

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@260 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/index.jsp

@@ -34,7 +34,6 @@
 <%  // Title of this page and breadcrumbs
     String title = "Jive Messenger Admin";
     pageinfo.setTitle(title);
-    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
     pageinfo.setPageID("server-main");
 %>
 

src/web/log.jsp

+<%--
+  -	$RCSfile$
+  -	$Revision$
+  -	$Date$
+  -
+  - Copyright (C) 2004 Jive Software. All rights reserved.
+  -
+  - This software is published under the terms of the GNU Public License (GPL),
+  - a copy of which is included in this distribution.
+--%>
+
+<%@ page import="java.io.*,
+                 java.text.SimpleDateFormat,
+                 org.jivesoftware.messenger.user.User,
+                 java.util.Date,
+                 java.text.ParseException,
+                 org.jivesoftware.messenger.auth.UnauthorizedException,
+                 org.jivesoftware.util.ParamUtils,
+                 org.jivesoftware.util.Log,
+                 org.jivesoftware.util.StringUtils"
+    errorPage="error.jsp"
+%>
+
+<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
+
+<%!
+    static final SimpleDateFormat formatter = new SimpleDateFormat("yyyy.MM.dd kk:mm:ss");
+
+    private static final String parseDate(String input) {
+        if (input == null || "".equals(input)) {
+            return input;
+        }
+        if (input.length() < 19) {
+            return input;
+        }
+        String d = input.substring(0,19);
+        // try to parse it
+        try {
+            Date date = formatter.parse(d);
+            StringBuffer buf = new StringBuffer(input.length());
+            buf.append("<span class=\"date\" title=\"").append(formatter.format(date)).append("\">");
+            buf.append(d).append("</span>");
+            buf.append(input.substring(19,input.length()));
+            return buf.toString();
+        }
+        catch (ParseException pe) {
+            return input;
+        }
+    }
+
+    private static final String hilite(String input) {
+        if (input == null || "".equals(input)) {
+            return input;
+        }
+        if (input.indexOf("org.jivesoftware.") > -1) {
+            StringBuffer buf = new StringBuffer();
+            buf.append("<span class=\"hilite\">").append(input).append("</span>");
+            return buf.toString();
+        }
+        else if (input.startsWith(" --- ") && input.endsWith(" --- ")) {
+            StringBuffer buf = new StringBuffer();
+            buf.append("<span class=\"hilite-marker\">").append(input).append("</span>");
+            return buf.toString();
+        }
+        return input;
+    }
+%>
+
+<%
+    // Get parameters
+    String log = ParamUtils.getParameter(request,"log");
+    String numLinesParam = ParamUtils.getParameter(request,"lines");
+    int numLines = ParamUtils.getIntParameter(request,"lines",50);
+    String mode = ParamUtils.getParameter(request,"mode");
+
+    // Set defaults
+    if (log == null) {
+        log = "error";
+    }
+    if (mode == null) {
+        mode = "asc";
+    }
+    if (numLinesParam == null) {
+        numLinesParam = "50";
+    }
+
+    // Other vars
+    File logDir = new File(Log.getLogDirectory());
+    String filename = log + ".log";
+    File logFile = new File(logDir, filename);
+
+    BufferedReader in = new BufferedReader(new FileReader(logFile));
+    String line = null;
+    int totalNumLines = 0;
+    while ((line=in.readLine()) != null) {
+        totalNumLines++;
+    }
+    in.close();
+    // adjust the 'numLines' var to match totalNumLines if 'all' was passed in:
+    if ("All".equals(numLinesParam)) {
+        numLines = totalNumLines;
+    }
+    String[] lines = new String[numLines];
+    in = new BufferedReader(new FileReader(logFile));
+    // skip lines
+    int start = totalNumLines - numLines;
+    if (start < 0) { start = 0; }
+    for (int i=0; i<start; i++) {
+        in.readLine();
+    }
+    int i = 0;
+    if ("asc".equals(mode)) {
+        while ((line=in.readLine()) != null && i<numLines) {
+            line = StringUtils.escapeHTMLTags(line);
+            line = parseDate(line);
+            line = hilite(line);
+            lines[i] = line;
+            i++;
+        }
+    }
+    else {
+        int end = lines.length-1;
+        while ((line=in.readLine()) != null && i<numLines) {
+            line = StringUtils.escapeHTMLTags(line);
+            line = parseDate(line);
+            line = hilite(line);
+            lines[end-i] = line;
+            i++;
+        }
+    }
+    numLines = start + i;
+%>
+
+<html>
+<head>
+    <title><%= log %></title>
+    <style type="text/css">
+    .log TABLE {
+        border : 1px #ccc solid;
+    }
+    .log TH {
+        font-family : verdana, arial;
+        font-weight : bold;
+        font-size : 8pt;
+    }
+    .log TR TH {
+        background-color : #ddd;
+        border-bottom : 1px #ccc solid;
+        padding-left : 2px;
+        padding-right : 2px;
+        text-align : left;
+    }
+    .log .head-num {
+        border-right : 1px #ccc solid;
+    }
+    .log TD {
+        font-family : courier new,monospaced;
+        font-size : 9pt;
+        background-color : #ffe;
+    }
+    .log .num {
+        width : 1%;
+        background-color : #eee !important;
+        border-right : 1px #ccc solid;
+        padding-left : 2px;
+        padding-right : 2px;
+    }
+    .log .line {
+        padding-left : 10px;
+    }
+    .hilite {
+        color : #900;
+    }
+    .hilite-marker {
+        background-color : #ff0;
+        color : #000;
+        font-weight : bold;
+    }
+    </style>
+</head>
+<body>
+
+<div class="log">
+<table cellpadding="1" cellspacing="0" border="0" width="100%">
+<tr>
+    <th class="head-num">line</th>
+    <th>&nbsp;</th>
+</tr>
+<tr>
+    <td width="1%" nowrap class="num">
+        <%  if ("asc".equals(mode)) { %>
+            <%  for (int j=start+1; j<=numLines; j++) { %>
+                <%= j %><br>
+            <%  } %>
+        <%  } else { %>
+            <%  for(int j=numLines; j>=start+1; j--) { %>
+                <%= j %><br>
+            <%  } %>
+        <%  } %>
+    </td>
+    <td width="99%" class="line">
+        <%  for (int j=0; j<lines.length; j++) {
+                if (lines[j] != null) {
+        %>
+            <nobr><%= lines[j] %></nobr><br>
+
+        <%      }
+            }
+        %>
+    </td>
+</tr>
+</table>
+</div>
+
+</body>
+</html>
\ No newline at end of file

src/web/server-props.jsp

-<%@ taglib uri="core" prefix="c"%>
-<%@ taglib uri="fmt" prefix="fmt" %>
 <%--
   -	$RCSfile$
   -	$Revision$
   -	$Date$
+  -
+  - Copyright (C) 2004 Jive Software. All rights reserved.
+  -
+  - This software is published under the terms of the GNU Public License (GPL),
+  - a copy of which is included in this distribution.
 --%>
 
 <%@ page import="org.jivesoftware.util.*,
                  org.jivesoftware.messenger.XMPPServerInfo,
                  java.util.Iterator,
-                 org.jivesoftware.messenger.ServerPort"
+                 org.jivesoftware.messenger.ServerPort,
+                 org.jivesoftware.admin.AdminPageBean"
 %>
+
+<%@ taglib uri="core" prefix="c" %>
+<%@ taglib uri="fmt" prefix="fmt" %>
+
+<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
+
 <%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 <c:set var="admin" value="${admin.manager}" />
 
-<!-- Define Title and BreadCrumbs -->
-<c:set var="title" value="Server Properties"  />
-<c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
-<c:set target="${breadcrumbs}" property="${title}" value="server-props.jsp" />
+<%  // Title of this page and breadcrumbs
+    String title = "Server Properties";
+    pageinfo.setTitle(title);
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-props.jsp"));
+    pageinfo.setPageID("server-props");
+%>
 <jsp:include page="top.jsp" flush="true" />
-
-
+<jsp:include page="title.jsp" flush="true" />
 
 <p>
 Below is a list of information for this <fmt:message key="short.title" bundle="${lang}" /> server.

src/web/server-status.jsp

@@ -2,6 +2,11 @@
   -	$RCSfile$
   -	$Revision$
   -	$Date$
+  -
+  - Copyright (C) 2004 Jive Software. All rights reserved.
+  -
+  - This software is published under the terms of the GNU Public License (GPL),
+  - a copy of which is included in this distribution.
 --%>
 
 <%@ page import="org.jivesoftware.util.*,
@@ -10,23 +15,28 @@
                  org.jivesoftware.messenger.XMPPServer,
                  org.jivesoftware.messenger.container.*,
                  org.jivesoftware.messenger.spi.BasicServer,
-                 org.jivesoftware.messenger.auth.UnauthorizedException"
+                 org.jivesoftware.messenger.auth.UnauthorizedException,
+                 org.jivesoftware.admin.AdminPageBean"
 %>
 
 <%@ taglib uri="core" prefix="c" %>
-<%@ taglib uri="fmt" prefix="ftm" %>
+<%@ taglib uri="fmt" prefix="fmt" %>
+
+<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 
 <%-- Define Administration Bean --%>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
-<!-- Define Title and BreadCrumbs -->
-<c:set var="title" value="Server Status"  />
-<c:set var="breadcrumbs" value="${admin.breadCrumbs}"  />
-<c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
-<c:set target="${breadcrumbs}" property="${title}" value="server-status.jsp" />
+<%  // Title of this page and breadcrumbs
+    String title = "Server Status";
+    pageinfo.setTitle(title);
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
+    pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-status.jsp"));
+    pageinfo.setPageID("server-status");
+%>
 <jsp:include page="top.jsp" flush="true" />
-
+<jsp:include page="title.jsp" flush="true" />
 
 <%  // Get parameters //
     boolean stop = request.getParameter("stop") != null;