yoavs 2003/06/06 18:57:13
Modified: src/java/org/apache/log4j/servlet ConfigurationServlet.java
Log:
- Changed PRIORITY to LEVEL for consistency with log4j 1.2.x
- Factored out printing of page header and level selector
Revision Changes Path
1.6 +53 -32
jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet/ConfigurationServlet.java
Index: ConfigurationServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet/ConfigurationServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConfigurationServlet.java 29 Apr 2003 16:21:30 -0000 1.5
+++ ConfigurationServlet.java 7 Jun 2003 01:57:13 -0000 1.6
@@ -77,6 +77,7 @@
* that have logged at least one message since application startup.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Luther E. Birdzell</a>
+ * @author Yoav Shapira <[EMAIL PROTECTED]>
* @since 1.3
*/
public class ConfigurationServlet extends HttpServlet
@@ -84,22 +85,22 @@
/**
* The response content type: text/html
*/
- public static final String CONTENT_TYPE = "text/html";
+ private static final String CONTENT_TYPE = "text/html";
/**
* The root appender.
*/
- public static final String ROOT = "Root";
+ private static final String ROOT = "Root";
/**
* The name of the class / package.
*/
- public static final String CLASS = "CLASS";
+ private static final String CLASS = "CLASS";
/**
* The logging level.
*/
- public static final String PRIORITY = "PRIORITY";
+ private static final String LEVEL = "LEVEL";
/**
* Print the status of all current <code>Logger</code>s and
@@ -121,16 +122,14 @@
int loggerNum = 0;
// print title and header
- out.println(
- "<html><head><title>Log4J Control Console</title></head>"
- + "<body><H3>Log4J Control Console</H3>");
- out.println("<A href=\"" + request.getRequestURI() + "\">Refresh</A><HR>");
+ printHeader(out);
+
out.println("<table width=\"50%\" border=\"1\">");
out.println("<tr BGCOLOR=\"#5991A6\">");
out.println(
"<td><FONT COLOR=\"BLACK\" FACE=\"Helvetica\"><B>Class</B></FONT></td>");
out.print(
- "<td><FONT COLOR=\"BLACK\" FACE=\"Helvetica\"><B>Priority</B></FONT>");
+ "<td><FONT COLOR=\"BLACK\" FACE=\"Helvetica\"><B>Level</B></FONT>");
out.println("</td>");
out.println("</tr>");
@@ -147,7 +146,7 @@
out.println("</table>");
out.println(
"<FONT SIZE=\"-3\" COLOR=\"BLACK\" FACE=\"Helvetica\">* "
- + "Inherits Priority From Parent.</FONT><BR>");
+ + "Inherits LEVEL From Parent.</FONT><BR>");
out.println("<A href=\"" + request.getRequestURI() + "\">Refresh</A><HR>");
// print set options
@@ -177,25 +176,8 @@
out.println("</SELECT><BR></td></tr>");
// print logging levels
- out.println(
- "<tr BGCOLOR=\"#5991A6\"><td><FONT COLOR=\"BLACK\" "
- + "FACE=\"Helvetica\"><B>Priority:</B></FONT></td>");
- out.println("<td><SELECT name=\"PRIORITY\">");
- out.println(
- "<OPTION VALUE=\"" + Level.OFF + "\">" + Level.OFF + "</OPTION>");
- out.println(
- "<OPTION VALUE=\"" + Level.FATAL + "\">" + Level.FATAL + "</OPTION>");
- out.println(
- "<OPTION VALUE=\"" + Level.ERROR + "\">" + Level.ERROR + "</OPTION>");
- out.println(
- "<OPTION VALUE=\"" + Level.WARN + "\">" + Level.WARN + "</OPTION>");
- out.println(
- "<OPTION VALUE=\"" + Level.INFO + "\">" + Level.INFO + "</OPTION>");
- out.println(
- "<OPTION VALUE=\"" + Level.DEBUG + "\">" + Level.DEBUG + "</OPTION>");
- out.println(
- "<OPTION VALUE=\"" + Level.ALL + "\">" + Level.ALL + "</OPTION>");
- out.println("</SELECT><BR></td></tr>");
+ printLevelSelector(out);
+
out.println("</table></FONT>");
out.println(
"<input type=\"submit\" name=\"Submit\" value=\"Set Option\"></FONT>");
@@ -218,10 +200,10 @@
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
String className = (String) request.getParameter(CLASS);
- String priority = (String) request.getParameter(PRIORITY);
+ String level = (String) request.getParameter(LEVEL);
if (className != null) {
- setClass(className, priority);
+ setClass(className, level);
}
doGet(request, response);
@@ -286,7 +268,7 @@
Logger logger = null;
Enumeration enum = LogManager.getCurrentLoggers();
Comparator comp = new LoggerComparator();
- ArrayList list = new ArrayList();
+ List list = new ArrayList();
// Add all current loggers to the list
while (enum.hasMoreElements()) {
@@ -297,6 +279,45 @@
Collections.sort(list, comp);
return list;
+ }
+
+ /**
+ * Prints the page header.
+ *
+ * @param out The output writer
+ */
+ private void printHeader(PrintWriter out) {
+ out.println(
+ "<html><head><title>Log4J Control Console</title></head>"
+ + "<body><H3>Log4J Control Console</H3>");
+ out.println("<A href=\"" + request.getRequestURI() + "\">Refresh</A><HR>");
+ }
+
+ /**
+ * Prints the Level select HTML.
+ *
+ * @param out The output writer
+ */
+ private void printLevelSelector(PrintWriter out) {
+ out.println(
+ "<tr BGCOLOR=\"#5991A6\"><td><FONT COLOR=\"BLACK\" "
+ + "FACE=\"Helvetica\"><B>Level:</B></FONT></td>");
+ out.println("<td><SELECT name=\"" + LEVEL + "\">");
+ out.println(
+ "<OPTION VALUE=\"" + Level.OFF + "\">" + Level.OFF + "</OPTION>");
+ out.println(
+ "<OPTION VALUE=\"" + Level.FATAL + "\">" + Level.FATAL + "</OPTION>");
+ out.println(
+ "<OPTION VALUE=\"" + Level.ERROR + "\">" + Level.ERROR + "</OPTION>");
+ out.println(
+ "<OPTION VALUE=\"" + Level.WARN + "\">" + Level.WARN + "</OPTION>");
+ out.println(
+ "<OPTION VALUE=\"" + Level.INFO + "\">" + Level.INFO + "</OPTION>");
+ out.println(
+ "<OPTION VALUE=\"" + Level.DEBUG + "\">" + Level.DEBUG + "</OPTION>");
+ out.println(
+ "<OPTION VALUE=\"" + Level.ALL + "\">" + Level.ALL + "</OPTION>");
+ out.println("</SELECT><BR></td></tr>");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
