From 04d703c062a23c953ef3e20931854cd0d5be778c Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Fri, 13 Jan 2012 13:59:49 +1100
Subject: [PATCH] 365302: clean up old Logger mbeans

---
 .../src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java | 2 +-
 .../src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java    | 1 +
 .../org/eclipse/jetty/util/log/jmx/Slf4jLog-mbean.properties   | 1 -
 .../org/eclipse/jetty/util/log/jmx/StdErrLog-mbean.properties  | 1 -
 .../src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java | 3 +--
 test-jetty-webapp/src/main/webapp/WEB-INF/web.xml              | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/Slf4jLog-mbean.properties
 delete mode 100644 jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/StdErrLog-mbean.properties

diff --git a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
index 914aea63a74..16bf6fcd8fa 100644
--- a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
+++ b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
@@ -53,7 +53,7 @@ public class LikeJettyXml
         mbContainer.start();
         server.getContainer().addEventListener(mbContainer);
         server.addBean(mbContainer,true);
-        mbContainer.addBean(Log.getRootLogger());
+        mbContainer.addBean(new Log());
         
         // Setup Threadpool
         QueuedThreadPool threadPool = new QueuedThreadPool();
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
index 395791ea6dd..475a2da3a73 100644
--- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
+++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
@@ -34,6 +34,7 @@ import org.eclipse.jetty.util.component.Container.Relationship;
 import org.eclipse.jetty.util.component.Dumpable;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.util.log.StdErrLog;
 import org.eclipse.jetty.util.thread.ShutdownThread;
 
 /**
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/Slf4jLog-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/Slf4jLog-mbean.properties
deleted file mode 100644
index 58b10abec32..00000000000
--- a/jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/Slf4jLog-mbean.properties
+++ /dev/null
@@ -1 +0,0 @@
-Slf4jLog: SL4J log adapter
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/StdErrLog-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/StdErrLog-mbean.properties
deleted file mode 100644
index 16e56bb70be..00000000000
--- a/jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/StdErrLog-mbean.properties
+++ /dev/null
@@ -1 +0,0 @@
-StdErrLog: Log adapter that logs to stderr
\ No newline at end of file
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
index 48bfcf391c0..2b7ee1252ff 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
@@ -62,7 +62,7 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
  * <p>
  * This servlet needs the jetty-util and jetty-client classes to be available to the web application.
  * <p>
- * To facilitate JMX monitoring, the "HttpClient", it's "ThreadPool" and the "Logger" are set as context attributes prefixed with the servlet name.
+ * To facilitate JMX monitoring, the "HttpClient" and "ThreadPool" are set as context attributes prefixed with the servlet name.
  * <p>
  * The following init parameters may be used to configure the servlet:
  * <ul>
@@ -127,7 +127,6 @@ public class ProxyServlet implements Servlet
 
             if (_context != null)
             {
-                _context.setAttribute(config.getServletName() + ".Logger",_log);
                 _context.setAttribute(config.getServletName() + ".ThreadPool",_client.getThreadPool());
                 _context.setAttribute(config.getServletName() + ".HttpClient",_client);
             }
diff --git a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
index c08ca7fdbd9..0c633bd7655 100644
--- a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
@@ -9,7 +9,7 @@
   
   <context-param>
     <param-name>org.eclipse.jetty.server.context.ManagedAttributes</param-name>
-    <param-value>QoSFilter,TransparentProxy.Logger,TransparentProxy.ThreadPool,TransparentProxy.HttpClient</param-value>
+    <param-value>QoSFilter,TransparentProxy.ThreadPool,TransparentProxy.HttpClient</param-value>
   </context-param>
   
   <!-- Declare TestListener, which declares TestFilter -->