From bf00fbcf3b33cf14e9b92d5143dda1380e6576f6 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 12 Jan 2012 15:05:38 -0600 Subject: [PATCH 1/3] nop change --- README.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/README.txt b/README.txt index 28a387764c3..0bb3c75dfe5 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,3 @@ - This is a source checkout of the Jetty webserver. To build, use: From d79b023d4bca942aefbadca384080c4663059c6b Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 12 Jan 2012 15:21:46 -0600 Subject: [PATCH 2/3] add some text --- README.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.txt b/README.txt index 0bb3c75dfe5..3412f8ff169 100644 --- a/README.txt +++ b/README.txt @@ -1,3 +1,4 @@ + This is a source checkout of the Jetty webserver. To build, use: @@ -14,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. From 04d703c062a23c953ef3e20931854cd0d5be778c Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 13 Jan 2012 13:59:49 +1100 Subject: [PATCH 3/3] 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; *

* This servlet needs the jetty-util and jetty-client classes to be available to the web application. *

- * 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. *

* The following init parameters may be used to configure the servlet: *

    @@ -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 @@ org.eclipse.jetty.server.context.ManagedAttributes - QoSFilter,TransparentProxy.Logger,TransparentProxy.ThreadPool,TransparentProxy.HttpClient + QoSFilter,TransparentProxy.ThreadPool,TransparentProxy.HttpClient