Merge remote-tracking branch 'origin/master' into jetty-8

README.txt

@@ -15,3 +15,5 @@ dependencies.
 The tests do a lot of stress testing, and on some machines it is 
 necessary to set the file descriptor limit to greater than 2048
 for the tests to all pass successfully. 
+
+Bypass tests by building with -Dmaven.test.skip=true but note that this will not produce some test jars that are leveraged in other places in the build.

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();

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;
 
 /**

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

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

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

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

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);
             }

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

@@ -10,7 +10,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 -->