Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

365302: clean up old Logger mbeans

This commit is contained in:
Greg Wilkins 2012-01-13 13:59:49 +11:00
parent e77b7eace1
commit 04d703c062
6 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
View File

@ -53,7 +53,7 @@ public class LikeJettyXml
mbContainer.start(); mbContainer.start();
server.getContainer().addEventListener(mbContainer); server.getContainer().addEventListener(mbContainer);
server.addBean(mbContainer,true); server.addBean(mbContainer,true);
mbContainer.addBean(Log.getRootLogger()); mbContainer.addBean(new Log());
// Setup Threadpool // Setup Threadpool
QueuedThreadPool threadPool = new QueuedThreadPool(); QueuedThreadPool threadPool = new QueuedThreadPool();

1
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
View File

@ -34,6 +34,7 @@ import org.eclipse.jetty.util.component.Container.Relationship;
import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.Dumpable;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.log.StdErrLog;
import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.util.thread.ShutdownThread;
/** /**

1
jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/Slf4jLog-mbean.properties
View File

@ -1 +0,0 @@
Slf4jLog: SL4J log adapter

1
jetty-jmx/src/main/resources/org/eclipse/jetty/util/log/jmx/StdErrLog-mbean.properties
View File

@ -1 +0,0 @@
StdErrLog: Log adapter that logs to stderr

3
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
View File

@ -62,7 +62,7 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
* <p> * <p>
* This servlet needs the jetty-util and jetty-client classes to be available to the web application. * This servlet needs the jetty-util and jetty-client classes to be available to the web application.
* <p> * <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> * <p>
* The following init parameters may be used to configure the servlet: * The following init parameters may be used to configure the servlet:
* <ul> * <ul>
@ -127,7 +127,6 @@ public class ProxyServlet implements Servlet
if (_context != null) if (_context != null)
{ {
_context.setAttribute(config.getServletName() + ".Logger",_log);
_context.setAttribute(config.getServletName() + ".ThreadPool",_client.getThreadPool()); _context.setAttribute(config.getServletName() + ".ThreadPool",_client.getThreadPool());
_context.setAttribute(config.getServletName() + ".HttpClient",_client); _context.setAttribute(config.getServletName() + ".HttpClient",_client);
} }

2
test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
View File

@ -9,7 +9,7 @@
<context-param> <context-param>
<param-name>org.eclipse.jetty.server.context.ManagedAttributes</param-name> <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> </context-param>
<!-- Declare TestListener, which declares TestFilter --> <!-- Declare TestListener, which declares TestFilter -->