diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 4b0a2b9ddd1d..5b38c489a619 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -85,6 +85,10 @@ jetty-annotations ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty @@ -105,6 +109,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/apache-jsp/src/main/java/module-info.java b/apache-jsp/src/main/java/module-info.java index 018320716a0a..20f6efc0d1ec 100644 --- a/apache-jsp/src/main/java/module-info.java +++ b/apache-jsp/src/main/java/module-info.java @@ -29,9 +29,9 @@ requires java.xml; requires jetty.servlet.api; - requires org.slf4j; requires org.eclipse.jetty.util; requires org.mortbay.apache.jasper; + requires org.slf4j; provides Log with JuliLog; provides ServletContainerInitializer with JettyJasperInitializer; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyDistribution.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyDistribution.java index 91f362d4fd60..a94825be6f0d 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyDistribution.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyDistribution.java @@ -23,8 +23,8 @@ import java.nio.file.Paths; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A utility test class to locate a Jetty Distribution for testing purposes by searching: @@ -36,7 +36,7 @@ */ public class JettyDistribution { - private static final Logger LOG = Log.getLogger(JettyDistribution.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyDistribution.class); public static final Path DISTRIBUTION; static @@ -64,7 +64,7 @@ public class JettyDistribution } catch (Throwable th) { - LOG.warn(th); + LOG.warn("Unable to resolve Jetty Distribution location", th); } } @@ -119,7 +119,7 @@ private static Path asJettyDistribution(String jettyHome) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return null; } diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketServerTest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketServerTest.java index 099ced7edfc5..4e80855d51df 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketServerTest.java +++ b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketServerTest.java @@ -25,8 +25,6 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError; @@ -37,6 +35,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.MatcherAssert.assertThat; @@ -87,7 +87,7 @@ public void testGetEcho() throws Exception @WebSocket public static class TrackingClientEndpoint { - private static final Logger LOG = Log.getLogger(TrackingClientEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(TrackingClientEndpoint.class); public LinkedBlockingQueue messages = new LinkedBlockingQueue<>(); @OnWebSocketMessage @@ -99,7 +99,7 @@ public void onMessage(String message) @OnWebSocketError public void onError(Throwable cause) { - LOG.warn(cause); + LOG.warn("TrackingClientEndpoint Error", cause); } @OnWebSocketClose diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index db889380de8b..e72012565394 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -51,6 +51,16 @@ jetty-io ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java b/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java index 7ddf404f62ef..fea5ed349236 100644 --- a/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java +++ b/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java @@ -32,12 +32,12 @@ import org.eclipse.jetty.io.NegotiatingClientConnectionFactory; import org.eclipse.jetty.io.ssl.ALPNProcessor.Client; import org.eclipse.jetty.io.ssl.SslClientConnectionFactory; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ALPNClientConnectionFactory extends NegotiatingClientConnectionFactory { - private static final Logger LOG = Log.getLogger(ALPNClientConnectionFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(ALPNClientConnectionFactory.class); private final List processors = new ArrayList<>(); private final Executor executor; @@ -64,7 +64,7 @@ public ALPNClientConnectionFactory(Executor executor, ClientConnectionFactory co catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to load client processor", x); failure.addSuppressed(x); continue; } diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index e2863c7231f1..8251b50b33af 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -26,12 +26,23 @@ jetty-alpn-client ${project.version} + + org.slf4j + slf4j-api + + org.eclipse.jetty.http2 http2-client ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/org/eclipse/jetty/alpn/conscrypt/client/ConscryptClientALPNProcessor.java b/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/org/eclipse/jetty/alpn/conscrypt/client/ConscryptClientALPNProcessor.java index d32edd7f4c68..681d708a3a55 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/org/eclipse/jetty/alpn/conscrypt/client/ConscryptClientALPNProcessor.java +++ b/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/org/eclipse/jetty/alpn/conscrypt/client/ConscryptClientALPNProcessor.java @@ -28,12 +28,12 @@ import org.eclipse.jetty.io.ssl.ALPNProcessor; import org.eclipse.jetty.io.ssl.SslConnection; import org.eclipse.jetty.io.ssl.SslHandshakeListener; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ConscryptClientALPNProcessor implements ALPNProcessor.Client { - private static final Logger LOG = Log.getLogger(ConscryptClientALPNProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(ConscryptClientALPNProcessor.class); @Override public void init() @@ -95,8 +95,8 @@ public void handshakeSucceeded(Event event) } catch (Throwable e) { + LOG.warn("Unable to process Conscrypt ApplicationProtocol for {}", alpnConnection, e); alpnConnection.selected(null); - LOG.warn(e); } } } diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptServerALPNProcessor.java b/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptServerALPNProcessor.java index 1d54ed8fc2df..974029cd8bf0 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptServerALPNProcessor.java +++ b/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptServerALPNProcessor.java @@ -31,12 +31,12 @@ import org.eclipse.jetty.io.ssl.ALPNProcessor; import org.eclipse.jetty.io.ssl.SslConnection.DecryptedEndPoint; import org.eclipse.jetty.io.ssl.SslHandshakeListener; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ConscryptServerALPNProcessor implements ALPNProcessor.Server { - private static final Logger LOG = Log.getLogger(ConscryptServerALPNProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(ConscryptServerALPNProcessor.class); @Override public void init() diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index fb8b4a1bb2a5..95928e956081 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -40,6 +40,10 @@ jetty-alpn-client ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty.http2 @@ -47,6 +51,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + diff --git a/jetty-alpn/jetty-alpn-java-client/src/main/java/org/eclipse/jetty/alpn/java/client/JDK9ClientALPNProcessor.java b/jetty-alpn/jetty-alpn-java-client/src/main/java/org/eclipse/jetty/alpn/java/client/JDK9ClientALPNProcessor.java index a8660e3fe105..3a455ffb0242 100644 --- a/jetty-alpn/jetty-alpn-java-client/src/main/java/org/eclipse/jetty/alpn/java/client/JDK9ClientALPNProcessor.java +++ b/jetty-alpn/jetty-alpn-java-client/src/main/java/org/eclipse/jetty/alpn/java/client/JDK9ClientALPNProcessor.java @@ -28,12 +28,12 @@ import org.eclipse.jetty.io.ssl.SslConnection.DecryptedEndPoint; import org.eclipse.jetty.io.ssl.SslHandshakeListener; import org.eclipse.jetty.util.JavaVersion; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JDK9ClientALPNProcessor implements ALPNProcessor.Client { - private static final Logger LOG = Log.getLogger(JDK9ClientALPNProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(JDK9ClientALPNProcessor.class); @Override public void init() diff --git a/jetty-alpn/jetty-alpn-java-server/src/main/java/org/eclipse/jetty/alpn/java/server/JDK9ServerALPNProcessor.java b/jetty-alpn/jetty-alpn-java-server/src/main/java/org/eclipse/jetty/alpn/java/server/JDK9ServerALPNProcessor.java index cd3e99333a76..f5ae6579eba4 100644 --- a/jetty-alpn/jetty-alpn-java-server/src/main/java/org/eclipse/jetty/alpn/java/server/JDK9ServerALPNProcessor.java +++ b/jetty-alpn/jetty-alpn-java-server/src/main/java/org/eclipse/jetty/alpn/java/server/JDK9ServerALPNProcessor.java @@ -28,12 +28,12 @@ import org.eclipse.jetty.io.ssl.SslConnection; import org.eclipse.jetty.io.ssl.SslHandshakeListener; import org.eclipse.jetty.util.JavaVersion; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JDK9ServerALPNProcessor implements ALPNProcessor.Server, SslHandshakeListener { - private static final Logger LOG = Log.getLogger(JDK9ServerALPNProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(JDK9ServerALPNProcessor.class); @Override public void init() diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java index cf798a142e8f..8d6e931793d0 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java +++ b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java @@ -27,12 +27,12 @@ import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.NegotiatingServerConnection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ALPNServerConnection extends NegotiatingServerConnection { - private static final Logger LOG = Log.getLogger(ALPNServerConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(ALPNServerConnection.class); public ALPNServerConnection(Connector connector, EndPoint endPoint, SSLEngine engine, List protocols, String defaultProtocol) { diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java index 5615f004fe01..f0f2628fba08 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java +++ b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java @@ -31,12 +31,12 @@ import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.NegotiatingServerConnectionFactory; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ALPNServerConnectionFactory extends NegotiatingServerConnectionFactory { - private static final Logger LOG = Log.getLogger(ALPNServerConnectionFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(ALPNServerConnectionFactory.class); private final List processors = new ArrayList<>(); @@ -61,7 +61,7 @@ public ALPNServerConnectionFactory(@Name("protocols") String... protocols) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug(x.getMessage(), x); if (x != failure) failure.addSuppressed(x); continue; @@ -75,7 +75,7 @@ public ALPNServerConnectionFactory(@Name("protocols") String... protocols) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug("Could not initialize " + processor, x); + LOG.debug("Could not initialize {}", processor, x); if (x != failure) failure.addSuppressed(x); } diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java index 3f36bf1d3e9d..e07eaf2323a1 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java @@ -39,7 +39,6 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; - import javax.servlet.ServletContainerInitializer; import javax.servlet.annotation.HandlesTypes; @@ -51,8 +50,6 @@ import org.eclipse.jetty.util.ProcessorUtils; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.statistic.CounterStatistic; import org.eclipse.jetty.webapp.AbstractConfiguration; @@ -63,13 +60,15 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebDescriptor; import org.eclipse.jetty.webapp.WebXmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Configuration for Annotations */ public class AnnotationConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(AnnotationConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(AnnotationConfiguration.class); public static final String SERVLET_CONTAINER_INITIALIZER_EXCLUSION_PATTERN = "org.eclipse.jetty.containerInitializerExclusionPattern"; public static final String SERVLET_CONTAINER_INITIALIZER_ORDER = "org.eclipse.jetty.containerInitializerOrder"; @@ -337,7 +336,7 @@ public void configure(WebAppContext context) throws Exception { //handle introspectable annotations (postconstruct,predestroy, multipart etc etc) context.getObjectFactory().addDecorator(new AnnotationDecorator(context)); - + if (!context.getMetaData().isMetaDataComplete()) { //If web.xml not metadata-complete, if this is a servlet 3 webapp or above @@ -411,7 +410,7 @@ public void postConfigure(WebAppContext context) throws Exception /** * Perform scanning of classes for discoverable - * annotations such as WebServlet/WebFilter/WebListener + * annotations such as WebServlet/WebFilter/WebListener * * @param context the context for the scan * @throws Exception if unable to scan @@ -836,8 +835,10 @@ public List getNonExcludedInitializers(WebAppContex catch (Error e) { // Probably a SCI discovered on the system classpath that is hidden by the context classloader - LOG.info("Error: {} for {}", e.getMessage(), context); - LOG.debug(e); + if (LOG.isDebugEnabled()) + LOG.debug("Error: {} for {}", e.getMessage(), context, e); + else + LOG.info("Error: {} for {}", e.getMessage(), context); continue; } @@ -1026,7 +1027,7 @@ public void parseContainerPath(final WebAppContext context, final AnnotationPars /** * Scan jars in WEB-INF/lib. - * + * * Only jars selected by MetaInfConfiguration, and that are not excluded * by an ordering will be considered. * diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java index 9837009efd2a..4ffe33c9cc2d 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java @@ -27,11 +27,11 @@ import org.eclipse.jetty.servlet.BaseHolder; import org.eclipse.jetty.servlet.Source.Origin; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebDescriptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AnnotationIntrospector @@ -40,7 +40,7 @@ */ public class AnnotationIntrospector { - private static final Logger LOG = Log.getLogger(AnnotationIntrospector.class); + private static final Logger LOG = LoggerFactory.getLogger(AnnotationIntrospector.class); private final Set> _introspectedClasses = new HashSet<>(); private final List _handlers = new ArrayList(); private final WebAppContext _context; @@ -89,13 +89,13 @@ public void handle(Class clazz) c = c.getSuperclass(); } } - + public WebAppContext getContext() { return _context; } } - + public AnnotationIntrospector(WebAppContext context) { _context = Objects.requireNonNull(context); @@ -105,11 +105,11 @@ public void registerHandler(IntrospectableAnnotationHandler handler) { _handlers.add(handler); } - + /** - * Test if an object should be introspected for some specific types of annotations + * Test if an object should be introspected for some specific types of annotations * like PostConstruct/PreDestroy/MultiPart etc etc. - * + * * According to servlet 4.0, these types of annotations should only be evaluated iff any * of the following are true: *
    @@ -118,10 +118,10 @@ public void registerHandler(IntrospectableAnnotationHandler handler) * in a descriptor AND web.xml is NOT metadata-complete AND any web-fragment.xml associated with the location of * the class is NOT metadata-complete *
- * + * * We also support evaluations of these types of annotations for objects that were created directly * by the jetty api. - * + * * @param o the object to check for its ability to be introspected for annotations * @param metaInfo meta information about the object to be introspected * @return true if it can be introspected according to servlet 4.0 rules @@ -130,27 +130,27 @@ public boolean isIntrospectable(Object o, Object metaInfo) { if (o == null) return false; //nothing to introspect - + if (metaInfo == null) return true; //no information about the object to introspect, assume introspectable - + @SuppressWarnings("rawtypes") BaseHolder holder = null; - + try { holder = (BaseHolder)metaInfo; } catch (ClassCastException e) { - LOG.warn(e); + LOG.warn("Not introspectable {}", metaInfo.getClass().getName(), e); return true; //not the type of information we were expecting, assume introspectable } - + Origin origin = (holder.getSource() == null ? null : holder.getSource().getOrigin()); if (origin == null) return true; //assume introspectable - + switch (origin) { case EMBEDDED: @@ -168,7 +168,7 @@ public boolean isIntrospectable(Object o, Object metaInfo) //is not metadata-complete if (_context.getMetaData().isMetaDataComplete()) return false; - + String descriptorLocation = holder.getSource().getResource(); if (descriptorLocation == null) return true; //no descriptor, can't be metadata-complete @@ -186,16 +186,15 @@ public boolean isIntrospectable(Object o, Object metaInfo) } /** - * @param o - * @param metaInfo + * */ public void introspect(Object o, Object metaInfo) { if (!isIntrospectable(o, metaInfo)) return; - + Class clazz = o.getClass(); - + synchronized (_introspectedClasses) { //Synchronize on the set of already introspected classes. diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java index 23d82584508d..1e6621ce8ecb 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java @@ -39,8 +39,6 @@ import org.eclipse.jetty.util.MultiReleaseJarFile; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassReader; @@ -48,6 +46,8 @@ import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AnnotationParser @@ -69,7 +69,7 @@ */ public class AnnotationParser { - private static final Logger LOG = Log.getLogger(AnnotationParser.class); + private static final Logger LOG = LoggerFactory.getLogger(AnnotationParser.class); protected static int ASM_OPCODE_VERSION = Opcodes.ASM7; //compatibility of api protected static String ASM_OPCODE_VERSION_STR = "ASM7"; diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java index 3d57f75996c4..c2532731ae5a 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java @@ -24,8 +24,8 @@ import org.eclipse.jetty.annotations.AnnotationParser.AbstractHandler; import org.eclipse.jetty.annotations.AnnotationParser.ClassInfo; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ClassInheritanceHandler @@ -34,7 +34,7 @@ */ public class ClassInheritanceHandler extends AbstractHandler { - private static final Logger LOG = Log.getLogger(ClassInheritanceHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ClassInheritanceHandler.class); Map> _inheritanceMap; @@ -64,7 +64,7 @@ public void handle(ClassInfo classInfo) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to handle {}", classInfo, e); } } diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java index c9e3cc81a091..72604d851ce1 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java @@ -24,16 +24,16 @@ import org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler; import org.eclipse.jetty.security.ConstraintAware; import org.eclipse.jetty.security.ConstraintSecurityHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DeclaresRolesAnnotationHandler */ public class DeclareRolesAnnotationHandler extends AbstractIntrospectableAnnotationHandler { - private static final Logger LOG = Log.getLogger(DeclareRolesAnnotationHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(DeclareRolesAnnotationHandler.class); public DeclareRolesAnnotationHandler(WebAppContext context) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java index 8b2e87df27e5..0a0896fa527c 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java @@ -32,21 +32,21 @@ import org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler; import org.eclipse.jetty.plus.annotation.Injection; import org.eclipse.jetty.plus.annotation.InjectionCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.MetaData; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ResourceAnnotationHandler extends AbstractIntrospectableAnnotationHandler { - private static final Logger LOG = Log.getLogger(ResourceAnnotationHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ResourceAnnotationHandler.class); protected static final List> ENV_ENTRY_TYPES = Arrays.asList(new Class[] - { - String.class, Character.class, Integer.class, Boolean.class, Double.class, Byte.class, Short.class, Long.class, - Float.class - }); + { + String.class, Character.class, Integer.class, Boolean.class, Double.class, Byte.class, Short.class, Long.class, + Float.class + }); public ResourceAnnotationHandler(WebAppContext wac) { @@ -98,7 +98,7 @@ public void handleClass(Class clazz) } catch (NamingException e) { - LOG.warn(e); + LOG.warn("Unable to bind name {} to {} from class {}", name, mappedName, clazz, e); } } } diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourcesAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourcesAnnotationHandler.java index 01d8d771724f..e5bb183e5e98 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourcesAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourcesAnnotationHandler.java @@ -23,13 +23,13 @@ import javax.naming.NamingException; import org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ResourcesAnnotationHandler extends AbstractIntrospectableAnnotationHandler { - private static final Logger LOG = Log.getLogger(ResourcesAnnotationHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ResourcesAnnotationHandler.class); public ResourcesAnnotationHandler(WebAppContext wac) { @@ -67,7 +67,7 @@ public void doHandle(Class clazz) } catch (NamingException e) { - LOG.warn(e); + LOG.warn("Unable to bind {} to {}", name, mappedName, e); } } } diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java index d432903eff7f..0f8be1166a99 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java @@ -23,15 +23,15 @@ import org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler; import org.eclipse.jetty.plus.annotation.RunAsCollection; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.Descriptor; import org.eclipse.jetty.webapp.MetaData; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RunAsAnnotationHandler extends AbstractIntrospectableAnnotationHandler { - private static final Logger LOG = Log.getLogger(RunAsAnnotationHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(RunAsAnnotationHandler.class); public RunAsAnnotationHandler(WebAppContext wac) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializersStarter.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializersStarter.java index e92828673b4a..9a96f0f003fc 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializersStarter.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializersStarter.java @@ -23,9 +23,9 @@ import org.eclipse.jetty.plus.annotation.ContainerInitializer; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ServletContainerInitializersStarter @@ -35,7 +35,7 @@ */ public class ServletContainerInitializersStarter extends AbstractLifeCycle implements ServletContextHandler.ServletContainerInitializerCaller { - private static final Logger LOG = Log.getLogger(ServletContainerInitializersStarter.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletContainerInitializersStarter.class); WebAppContext _context; public ServletContainerInitializersStarter(WebAppContext context) @@ -60,7 +60,7 @@ public void doStart() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to call startup on {}", i, e); throw new RuntimeException(e); } } diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java index c580bd22daf5..328d51d505a7 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java @@ -31,10 +31,10 @@ import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletMapping; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ServletSecurityAnnotationHandler @@ -55,7 +55,7 @@ */ public class ServletSecurityAnnotationHandler extends AbstractIntrospectableAnnotationHandler { - private static final Logger LOG = Log.getLogger(ServletSecurityAnnotationHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletSecurityAnnotationHandler.class); public ServletSecurityAnnotationHandler(WebAppContext wac) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java index 07f3919c4f8a..fbe62081d65b 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java @@ -29,20 +29,20 @@ import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.FilterMapping; import org.eclipse.jetty.servlet.Source; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.DiscoveredAnnotation; import org.eclipse.jetty.webapp.MetaData; import org.eclipse.jetty.webapp.Origin; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * WebFilterAnnotation */ public class WebFilterAnnotation extends DiscoveredAnnotation { - private static final Logger LOG = Log.getLogger(WebFilterAnnotation.class); + private static final Logger LOG = LoggerFactory.getLogger(WebFilterAnnotation.class); public WebFilterAnnotation(WebAppContext context, String className) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotationHandler.java index 3055259478d3..3cae920d061d 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotationHandler.java @@ -21,16 +21,16 @@ import org.eclipse.jetty.annotations.AnnotationParser.ClassInfo; import org.eclipse.jetty.annotations.AnnotationParser.FieldInfo; import org.eclipse.jetty.annotations.AnnotationParser.MethodInfo; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * WebFilterAnnotationHandler */ public class WebFilterAnnotationHandler extends AbstractDiscoverableAnnotationHandler { - private static final Logger LOG = Log.getLogger(WebFilterAnnotationHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(WebFilterAnnotationHandler.class); public WebFilterAnnotationHandler(WebAppContext context) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java index 50613c388708..a3bb6e7a6921 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java @@ -29,20 +29,20 @@ import org.eclipse.jetty.servlet.ListenerHolder; import org.eclipse.jetty.servlet.Source; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.DiscoveredAnnotation; import org.eclipse.jetty.webapp.MetaData; import org.eclipse.jetty.webapp.Origin; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * WebListenerAnnotation */ public class WebListenerAnnotation extends DiscoveredAnnotation { - private static final Logger LOG = Log.getLogger(WebListenerAnnotation.class); + private static final Logger LOG = LoggerFactory.getLogger(WebListenerAnnotation.class); public WebListenerAnnotation(WebAppContext context, String className) { @@ -88,7 +88,7 @@ public void apply() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to add listener {}", clazz, e); } } } diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java index 4b0cc31f747e..919f3a834b00 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java @@ -21,13 +21,13 @@ import org.eclipse.jetty.annotations.AnnotationParser.ClassInfo; import org.eclipse.jetty.annotations.AnnotationParser.FieldInfo; import org.eclipse.jetty.annotations.AnnotationParser.MethodInfo; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class WebListenerAnnotationHandler extends AbstractDiscoverableAnnotationHandler { - private static final Logger LOG = Log.getLogger(WebListenerAnnotationHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(WebListenerAnnotationHandler.class); public WebListenerAnnotationHandler(WebAppContext context) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java index 84986bf6e9fe..c310dfc00368 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java @@ -32,20 +32,20 @@ import org.eclipse.jetty.servlet.Source; import org.eclipse.jetty.util.ArrayUtil; import org.eclipse.jetty.util.LazyList; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.DiscoveredAnnotation; import org.eclipse.jetty.webapp.MetaData; import org.eclipse.jetty.webapp.Origin; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * WebServletAnnotation */ public class WebServletAnnotation extends DiscoveredAnnotation { - private static final Logger LOG = Log.getLogger(WebServletAnnotation.class); + private static final Logger LOG = LoggerFactory.getLogger(WebServletAnnotation.class); public WebServletAnnotation(WebAppContext context, String className) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java index 47106cb4c13f..f3c02f38d87f 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java @@ -21,9 +21,9 @@ import org.eclipse.jetty.annotations.AnnotationParser.ClassInfo; import org.eclipse.jetty.annotations.AnnotationParser.FieldInfo; import org.eclipse.jetty.annotations.AnnotationParser.MethodInfo; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * WebServletAnnotationHandler @@ -32,7 +32,7 @@ */ public class WebServletAnnotationHandler extends AbstractDiscoverableAnnotationHandler { - private static final Logger LOG = Log.getLogger(WebServletAnnotationHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(WebServletAnnotationHandler.class); public WebServletAnnotationHandler(WebAppContext context) { diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java index fb086620c40a..13753551f7c3 100644 --- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java +++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java @@ -21,7 +21,6 @@ import java.io.File; import java.net.URL; import java.net.URLClassLoader; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.servlet.ServletContainerInitializer; @@ -30,7 +29,6 @@ import org.eclipse.jetty.toolchain.test.JAR; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.resource.Resource; -import org.eclipse.jetty.webapp.FragmentDescriptor; import org.eclipse.jetty.webapp.RelativeOrdering; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebDescriptor; diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationDecorator.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationDecorator.java index eaeac24d5836..ba6fd673b2e4 100644 --- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationDecorator.java +++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationDecorator.java @@ -85,7 +85,7 @@ public void testAnnotationDecorator() throws Exception { new AnnotationDecorator(null); }); - + WebAppContext context = new WebAppContext(); AnnotationDecorator decorator = new AnnotationDecorator(context); ServletE servlet = new ServletE(); @@ -94,10 +94,10 @@ public void testAnnotationDecorator() throws Exception LifeCycleCallbackCollection callbacks = (LifeCycleCallbackCollection)context.getAttribute(LifeCycleCallbackCollection.LIFECYCLE_CALLBACK_COLLECTION); assertNotNull(callbacks); assertFalse(callbacks.getPreDestroyCallbacks().isEmpty()); - + //reset context.removeAttribute(LifeCycleCallbackCollection.LIFECYCLE_CALLBACK_COLLECTION); - + //test with BaseHolder metadata, should not introspect with metdata-complete==true context.getMetaData().setWebDescriptor(new TestWebDescriptor(MetaData.Complete.True)); assertTrue(context.getMetaData().isMetaDataComplete()); @@ -110,10 +110,10 @@ public void testAnnotationDecorator() throws Exception DecoratedObjectFactory.disassociateInfo(); callbacks = (LifeCycleCallbackCollection)context.getAttribute(LifeCycleCallbackCollection.LIFECYCLE_CALLBACK_COLLECTION); assertNull(callbacks); - + //reset context.removeAttribute(LifeCycleCallbackCollection.LIFECYCLE_CALLBACK_COLLECTION); - + //test with BaseHolder metadata, should introspect with metadata-complete==false context.getMetaData().setWebDescriptor(new TestWebDescriptor(MetaData.Complete.False)); DecoratedObjectFactory.associateInfo(holder); diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/resources/TestResourceAnnotations.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/resources/TestResourceAnnotations.java index 9ccef3072d3d..ef98e8ff419d 100644 --- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/resources/TestResourceAnnotations.java +++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/resources/TestResourceAnnotations.java @@ -76,7 +76,7 @@ public void testResourceAnnotations() AnnotationIntrospector parser = new AnnotationIntrospector(wac); ResourceAnnotationHandler handler = new ResourceAnnotationHandler(wac); parser.registerHandler(handler); - + ResourceA resourceA = new ResourceA(); ResourceB resourceB = new ResourceB(); parser.introspect(resourceA, null); diff --git a/jetty-annotations/src/test/resources/web-fragment4false.xml b/jetty-annotations/src/test/resources/web-fragment4false.xml index 391672008da0..7d44223765b3 100644 --- a/jetty-annotations/src/test/resources/web-fragment4false.xml +++ b/jetty-annotations/src/test/resources/web-fragment4false.xml @@ -1,10 +1,6 @@ - + ardvaark diff --git a/jetty-annotations/src/test/resources/web-fragment4true.xml b/jetty-annotations/src/test/resources/web-fragment4true.xml index d9a3558589df..cf84dc66bde3 100644 --- a/jetty-annotations/src/test/resources/web-fragment4true.xml +++ b/jetty-annotations/src/test/resources/web-fragment4true.xml @@ -1,11 +1,6 @@ - + badger diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java index 56b200b599cc..bf6b391cda38 100644 --- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java +++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java @@ -49,21 +49,21 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletMapping; import org.eclipse.jetty.servlet.Source; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppClassLoader; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Extension of WebAppContext to allow configuration via Ant environment. */ public class AntWebAppContext extends WebAppContext { - private static final Logger LOG = Log.getLogger(WebAppContext.class); + private static final Logger LOG = LoggerFactory.getLogger(WebAppContext.class); public static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/.*jsp-api-[^/]*\\.jar$|.*/.*jsp-[^/]*\\.jar$|.*/.*taglibs[^/]*\\.jar$|.*/.*jstl[^/]*\\.jar$|.*/.*jsf-impl-[^/]*\\.jar$|.*/.*javax.faces-[^/]*\\.jar$|.*/.*myfaces-impl-[^/]*\\.jar$"; @@ -176,7 +176,7 @@ public URL[] getURLs() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebXmlConfiguration.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebXmlConfiguration.java index a097c78282d0..56d5460b25f9 100644 --- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebXmlConfiguration.java +++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebXmlConfiguration.java @@ -21,10 +21,10 @@ import java.io.File; import java.util.List; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebXmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This configuration object provides additional way to inject application @@ -34,7 +34,7 @@ */ public class AntWebXmlConfiguration extends WebXmlConfiguration { - private static final Logger LOG = Log.getLogger(WebXmlConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(WebXmlConfiguration.class); /** * List of classpath files. diff --git a/jetty-cdi/src/main/java/org/eclipse/jetty/cdi/CdiServletContainerInitializer.java b/jetty-cdi/src/main/java/org/eclipse/jetty/cdi/CdiServletContainerInitializer.java index 30139bc41d11..70f017f17a33 100644 --- a/jetty-cdi/src/main/java/org/eclipse/jetty/cdi/CdiServletContainerInitializer.java +++ b/jetty-cdi/src/main/java/org/eclipse/jetty/cdi/CdiServletContainerInitializer.java @@ -26,8 +26,8 @@ import org.eclipse.jetty.annotations.AnnotationConfiguration; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A {@link ServletContainerInitializer} that introspects for a CDI API @@ -48,7 +48,7 @@ public class CdiServletContainerInitializer implements ServletContainerInitializer { public static final String CDI_INTEGRATION_ATTRIBUTE = "org.eclipse.jetty.cdi"; - private static final Logger LOG = Log.getLogger(CdiServletContainerInitializer.class); + private static final Logger LOG = LoggerFactory.getLogger(CdiServletContainerInitializer.class); @Override public void onStartup(Set> c, ServletContext ctx) diff --git a/jetty-cdi/src/main/java/org/eclipse/jetty/cdi/CdiSpiDecorator.java b/jetty-cdi/src/main/java/org/eclipse/jetty/cdi/CdiSpiDecorator.java index ecc27e0a2e88..cd77cf513c63 100644 --- a/jetty-cdi/src/main/java/org/eclipse/jetty/cdi/CdiSpiDecorator.java +++ b/jetty-cdi/src/main/java/org/eclipse/jetty/cdi/CdiSpiDecorator.java @@ -26,8 +26,8 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.Decorator; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A Decorator that invokes the CDI provider within a webapp to decorate objects created by @@ -47,7 +47,7 @@ */ public class CdiSpiDecorator implements Decorator { - private static final Logger LOG = Log.getLogger(CdiServletContainerInitializer.class); + private static final Logger LOG = LoggerFactory.getLogger(CdiServletContainerInitializer.class); public static final String MODE = "CdiSpiDecorator"; private final ServletContextHandler _context; diff --git a/jetty-client/src/main/java/module-info.java b/jetty-client/src/main/java/module-info.java index 633e74db4348..40005b81a799 100644 --- a/jetty-client/src/main/java/module-info.java +++ b/jetty-client/src/main/java/module-info.java @@ -33,5 +33,6 @@ // Only required if using SPNEGO. requires static java.security.jgss; // Only required if using JMX. + requires static java.management; requires static org.eclipse.jetty.jmx; } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java index 7d901328f83c..9271318a6028 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java @@ -29,13 +29,13 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject public abstract class AbstractConnectionPool implements ConnectionPool, Dumpable { - private static final Logger LOG = Log.getLogger(AbstractConnectionPool.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractConnectionPool.class); private final AtomicBoolean closed = new AtomicBoolean(); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpClientTransport.java b/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpClientTransport.java index 957fa20bc03f..7e9722160ef3 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpClientTransport.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpClientTransport.java @@ -24,13 +24,13 @@ import org.eclipse.jetty.util.Promise; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject public abstract class AbstractHttpClientTransport extends ContainerLifeCycle implements HttpClientTransport { - protected static final Logger LOG = Log.getLogger(HttpClientTransport.class); + protected static final Logger LOG = LoggerFactory.getLogger(HttpClientTransport.class); private HttpClient client; private ConnectionPool.Factory factory; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java b/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java index 878a639c2a1b..4053bb89c541 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java @@ -40,13 +40,13 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.QuotedCSV; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AuthenticationProtocolHandler implements ProtocolHandler { public static final int DEFAULT_MAX_CONTENT_LENGTH = 16 * 1024; - public static final Logger LOG = Log.getLogger(AuthenticationProtocolHandler.class); + public static final Logger LOG = LoggerFactory.getLogger(AuthenticationProtocolHandler.class); private final HttpClient client; private final int maxContentLength; private final ResponseNotifier notifier; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java index 90a8c21ca56f..73f4b1b734d7 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java @@ -37,14 +37,14 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Sweeper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject public class DuplexConnectionPool extends AbstractConnectionPool implements Sweeper.Sweepable { - private static final Logger LOG = Log.getLogger(DuplexConnectionPool.class); + private static final Logger LOG = LoggerFactory.getLogger(DuplexConnectionPool.class); private final ReentrantLock lock = new ReentrantLock(); private final Deque idleConnections; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java index 1845babbd521..1867615b3ef0 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java @@ -19,12 +19,12 @@ package org.eclipse.jetty.client; import org.eclipse.jetty.client.api.Result; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class HttpChannel { - protected static final Logger LOG = Log.getLogger(HttpChannel.class); + protected static final Logger LOG = LoggerFactory.getLogger(HttpChannel.class); private final HttpDestination _destination; private final TimeoutCompleteListener _totalTimeout; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java index bbd56bb12b8a..ea6459057eb1 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java @@ -74,13 +74,13 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.ThreadPool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

HttpClient provides an efficient, asynchronous, non-blocking implementation @@ -122,7 +122,7 @@ public class HttpClient extends ContainerLifeCycle { public static final String USER_AGENT = "Jetty/" + Jetty.VERSION; - private static final Logger LOG = Log.getLogger(HttpClient.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpClient.class); private final ConcurrentMap destinations = new ConcurrentHashMap<>(); private final ProtocolHandlers handlers = new ProtocolHandlers(); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java index 1cf2ef0b6a98..cb6cc8f844cf 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java @@ -34,12 +34,12 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.util.HttpCookieStore; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class HttpConnection implements IConnection { - private static final Logger LOG = Log.getLogger(HttpConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpConnection.class); private final HttpDestination destination; private int idleTimeoutGuard; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java index 9559b43eece5..dc9bf42b7e99 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java @@ -27,8 +27,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link HttpContent} is a stateful, linear representation of the request content provided @@ -66,7 +66,7 @@ */ public class HttpContent implements Callback, Closeable { - private static final Logger LOG = Log.getLogger(HttpContent.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpContent.class); private static final ByteBuffer AFTER = ByteBuffer.allocate(0); private static final ByteBuffer CLOSE = ByteBuffer.allocate(0); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConversation.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConversation.java index 14c9d3312051..1eddf4613261 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConversation.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConversation.java @@ -25,12 +25,12 @@ import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.util.AttributesMap; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpConversation extends AttributesMap { - private static final Logger LOG = Log.getLogger(HttpConversation.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpConversation.class); private final Deque exchanges = new ConcurrentLinkedDeque<>(); private volatile List listeners; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java index 9e99a0a10d10..bc00ab3cf43f 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java @@ -46,16 +46,16 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.Sweeper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject public abstract class HttpDestination extends ContainerLifeCycle implements Destination, Closeable, Callback, Dumpable { - protected static final Logger LOG = Log.getLogger(HttpDestination.class); + protected static final Logger LOG = LoggerFactory.getLogger(HttpDestination.class); private final HttpClient client; private final Origin origin; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java index 8b6673371ca1..d52393d28b0e 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java @@ -22,12 +22,12 @@ import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Result; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpExchange { - private static final Logger LOG = Log.getLogger(HttpExchange.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpExchange.class); private final HttpDestination destination; private final HttpRequest request; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java index 238ab839e1a6..64a2812a0243 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java @@ -38,13 +38,13 @@ import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpProxy extends ProxyConfiguration.Proxy { - private static final Logger LOG = Log.getLogger(HttpProxy.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpProxy.class); public HttpProxy(String host, int port) { diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java index c2fd19178f68..15a4047c4e70 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java @@ -42,8 +42,8 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.MathUtils; import org.eclipse.jetty.util.component.Destroyable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link HttpReceiver} provides the abstract code to implement the various steps of the receive of HTTP responses. @@ -72,7 +72,7 @@ */ public abstract class HttpReceiver { - protected static final Logger LOG = Log.getLogger(HttpReceiver.class); + protected static final Logger LOG = LoggerFactory.getLogger(HttpReceiver.class); private final AtomicReference responseState = new AtomicReference<>(ResponseState.IDLE); private final HttpChannel channel; @@ -286,7 +286,7 @@ protected void storeCookie(URI uri, HttpField field) catch (IOException x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to store cookies {} from {}", field, uri, x); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java index 72ba8c25c75b..8efcc2820659 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java @@ -33,8 +33,8 @@ import org.eclipse.jetty.client.api.Result; import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.http.HttpMethod; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utility class that handles HTTP redirects. @@ -60,7 +60,7 @@ */ public class HttpRedirector { - private static final Logger LOG = Log.getLogger(HttpRedirector.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpRedirector.class); private static final String SCHEME_REGEXP = "(^https?)"; private static final String AUTHORITY_REGEXP = "([^/?#]+)"; // The location may be relative so the scheme://authority part may be missing diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java index 0e2cc1280d6b..2b8f3099a82b 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java @@ -31,8 +31,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IteratingCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link HttpSender} abstracts the algorithm to send HTTP requests, so that subclasses only implement @@ -59,7 +59,7 @@ */ public abstract class HttpSender implements AsyncContentProvider.Listener { - protected static final Logger LOG = Log.getLogger(HttpSender.class); + protected static final Logger LOG = LoggerFactory.getLogger(HttpSender.class); private final AtomicReference requestState = new AtomicReference<>(RequestState.QUEUED); private final AtomicReference senderState = new AtomicReference<>(SenderState.IDLE); @@ -363,7 +363,11 @@ private void executeAbort(HttpExchange exchange, Throwable failure) catch (RejectedExecutionException x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + { + if (x != failure) + x.addSuppressed(failure); + LOG.debug("Exchange aborted {}", exchange, x); + } abort(exchange, failure); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java index 457f4e0cf862..943e1b615bc0 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java @@ -22,12 +22,12 @@ import org.eclipse.jetty.client.api.Destination; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.LeakDetector; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class LeakTrackingConnectionPool extends DuplexConnectionPool { - private static final Logger LOG = Log.getLogger(LeakTrackingConnectionPool.class); + private static final Logger LOG = LoggerFactory.getLogger(LeakTrackingConnectionPool.class); private final LeakDetector leakDetector = new LeakDetector() { diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java index 8475ef7da621..b5ed9fe63cf7 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java @@ -32,13 +32,13 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Sweeper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MultiplexConnectionPool extends AbstractConnectionPool implements ConnectionPool.Multiplexable, Sweeper.Sweepable { - private static final Logger LOG = Log.getLogger(MultiplexConnectionPool.class); + private static final Logger LOG = LoggerFactory.getLogger(MultiplexConnectionPool.class); private final HttpDestination destination; private final Deque idleConnections; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java index a2f44510b2a0..6aac59709894 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java @@ -36,8 +36,8 @@ import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

ClientConnectionFactory for the @@ -446,7 +446,7 @@ public Connection newConnection(EndPoint endPoint, Map context) protected abstract static class ProxyProtocolConnection extends AbstractConnection implements Callback { - protected static final Logger LOG = Log.getLogger(ProxyProtocolConnection.class); + protected static final Logger LOG = LoggerFactory.getLogger(ProxyProtocolConnection.class); private final ClientConnectionFactory factory; private final Map context; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/RequestNotifier.java b/jetty-client/src/main/java/org/eclipse/jetty/client/RequestNotifier.java index 1a2819e0ccdd..a4886519114b 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/RequestNotifier.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/RequestNotifier.java @@ -22,12 +22,12 @@ import java.util.List; import org.eclipse.jetty.client.api.Request; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RequestNotifier { - private static final Logger LOG = Log.getLogger(ResponseNotifier.class); + private static final Logger LOG = LoggerFactory.getLogger(ResponseNotifier.class); private final HttpClient client; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ResponseNotifier.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ResponseNotifier.java index 31ec0bb2fc3d..1d3f959f10d1 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/ResponseNotifier.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ResponseNotifier.java @@ -32,12 +32,12 @@ import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.CountingCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ResponseNotifier { - private static final Logger LOG = Log.getLogger(ResponseNotifier.class); + private static final Logger LOG = LoggerFactory.getLogger(ResponseNotifier.class); public void notifyBegin(List listeners, Response response) { diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java b/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java index ef5746a2dfb0..b73513166493 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java @@ -35,8 +35,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Socks4Proxy extends ProxyConfiguration.Proxy { @@ -78,7 +78,7 @@ public org.eclipse.jetty.io.Connection newConnection(EndPoint endPoint, Map request = new AtomicReference<>(); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ValidatingConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ValidatingConnectionPool.java index 594383faa705..7aec6712b7da 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/ValidatingConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ValidatingConnectionPool.java @@ -30,9 +30,9 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A connection pool that validates connections before @@ -59,7 +59,7 @@ */ public class ValidatingConnectionPool extends DuplexConnectionPool { - private static final Logger LOG = Log.getLogger(ValidatingConnectionPool.class); + private static final Logger LOG = LoggerFactory.getLogger(ValidatingConnectionPool.class); private final Scheduler scheduler; private final long timeout; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java index e52f1d2ff9d6..f7ecd63dfa7f 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java @@ -43,13 +43,13 @@ import org.eclipse.jetty.io.AbstractConnection; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Sweeper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpConnectionOverHTTP extends AbstractConnection implements IConnection, org.eclipse.jetty.io.Connection.UpgradeFrom, Sweeper.Sweepable { - private static final Logger LOG = Log.getLogger(HttpConnectionOverHTTP.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpConnectionOverHTTP.class); private final AtomicBoolean closed = new AtomicBoolean(); private final AtomicInteger sweeps = new AtomicInteger(); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java index 70d6767cd741..49e5e2ef5fb5 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java @@ -142,10 +142,10 @@ protected ByteBuffer onUpgradeFrom() private void process() { + HttpConnectionOverHTTP connection = getHttpConnection(); + EndPoint endPoint = connection.getEndPoint(); try { - HttpConnectionOverHTTP connection = getHttpConnection(); - EndPoint endPoint = connection.getEndPoint(); while (true) { // Always parse even empty buffers to advance the parser. @@ -192,7 +192,7 @@ else if (read == 0) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to fill from endpoint {}", endPoint, x); networkBuffer.clear(); releaseNetworkBuffer(); failAndClose(x); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java index 411cc48713b3..7906b5a87b2e 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java @@ -62,7 +62,7 @@ protected void sendHeaders(HttpExchange exchange, HttpContent content, Callback catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to send headers on exchange {}", exchange, x); callback.failed(x); } } @@ -133,7 +133,7 @@ protected void sendContent(HttpExchange exchange, HttpContent content, Callback catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to send content on {}", exchange, x); callback.failed(x); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/proxy/ProxyProtocolClientConnectionFactory.java b/jetty-client/src/main/java/org/eclipse/jetty/client/proxy/ProxyProtocolClientConnectionFactory.java index c6483fa72fbb..4da66ec27f50 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/proxy/ProxyProtocolClientConnectionFactory.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/proxy/ProxyProtocolClientConnectionFactory.java @@ -36,8 +36,8 @@ import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ProxyProtocolClientConnectionFactory implements ClientConnectionFactory { @@ -61,7 +61,7 @@ public org.eclipse.jetty.io.Connection newConnection(EndPoint endPoint, Map context; public ProxyProtocolConnection(EndPoint endPoint, Executor executor, Map context) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java index 4fd7c1a9fc97..2f81b71f94b4 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.client.api.ContentProvider; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A {@link ContentProvider} for an {@link InputStream}. @@ -53,7 +53,7 @@ */ public class InputStreamContentProvider implements ContentProvider, Callback, Closeable { - private static final Logger LOG = Log.getLogger(InputStreamContentProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(InputStreamContentProvider.class); private final InputStreamContentProviderIterator iterator = new InputStreamContentProviderIterator(); private final InputStream stream; @@ -131,7 +131,7 @@ public void close() } catch (IOException x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } } @@ -199,7 +199,7 @@ else if (read < 0) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Failed to read", x); if (failure == null) { failure = x; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java index a48115460e5d..94d7dac43b81 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java @@ -41,8 +41,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implementation of {@link Listener} that produces an {@link InputStream} @@ -75,7 +75,7 @@ */ public class InputStreamResponseListener extends Listener.Adapter { - private static final Logger LOG = Log.getLogger(InputStreamResponseListener.class); + private static final Logger LOG = LoggerFactory.getLogger(InputStreamResponseListener.class); private static final DeferredContentProvider.Chunk EOF = new DeferredContentProvider.Chunk(BufferUtil.EMPTY_BUFFER, Callback.NOOP); private final Object lock = this; private final CountDownLatch responseLatch = new CountDownLatch(1); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/MultiPartContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/MultiPartContentProvider.java index 27ce2ca51360..8252e3e7413a 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/MultiPartContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/MultiPartContentProvider.java @@ -39,8 +39,8 @@ import org.eclipse.jetty.io.RuntimeIOException; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A {@link ContentProvider} for form uploads with the {@code "multipart/form-data"} @@ -66,7 +66,7 @@ */ public class MultiPartContentProvider extends AbstractTypedContentProvider implements AsyncContentProvider, Closeable { - private static final Logger LOG = Log.getLogger(MultiPartContentProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(MultiPartContentProvider.class); private static final byte[] COLON_SPACE_BYTES = new byte[]{':', ' '}; private static final byte[] CR_LF_BYTES = new byte[]{'\r', '\n'}; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java index 67509c9b8c57..ffa41c752bbd 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java @@ -33,8 +33,8 @@ import org.eclipse.jetty.client.api.ContentProvider; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A {@link ContentProvider} for files using JDK 7's {@code java.nio.file} APIs.

@@ -46,7 +46,7 @@ */ public class PathContentProvider extends AbstractTypedContentProvider { - private static final Logger LOG = Log.getLogger(PathContentProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(PathContentProvider.class); private final Path filePath; private final long fileSize; @@ -183,7 +183,7 @@ public void close() } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/SPNEGOAuthentication.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/SPNEGOAuthentication.java index 0c7689ad514d..5f3d77426040 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/SPNEGOAuthentication.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/SPNEGOAuthentication.java @@ -41,13 +41,13 @@ import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.util.Attributes; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; import org.ietf.jgss.GSSName; import org.ietf.jgss.Oid; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Implementation of the SPNEGO (or "Negotiate") authentication defined in RFC 4559.

@@ -61,7 +61,7 @@ */ public class SPNEGOAuthentication extends AbstractAuthentication { - private static final Logger LOG = Log.getLogger(SPNEGOAuthentication.class); + private static final Logger LOG = LoggerFactory.getLogger(SPNEGOAuthentication.class); private static final String NEGOTIATE = HttpHeader.NEGOTIATE.asString(); private final GSSManager gssManager = GSSManager.getInstance(); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java index 733cb78f8732..26b58540a99b 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java @@ -37,11 +37,12 @@ import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.server.handler.AbstractHandler; -import org.eclipse.jetty.util.log.Log; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -49,6 +50,8 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest { + private static final Logger LOG = LoggerFactory.getLogger(HttpConnectionLifecycleTest.class); + @Override public HttpClient newHttpClient(HttpClientTransport transport) { @@ -403,7 +406,7 @@ public void handle(String target, org.eclipse.jetty.server.Request baseRequest, Collection activeConnections = connectionPool.getActiveConnections(); assertEquals(0, activeConnections.size()); - Log.getLogger(HttpConnection.class).info("Expecting java.lang.IllegalStateException: HttpParser{s=CLOSED,..."); + LOG.info("Expecting java.lang.IllegalStateException: HttpParser{s=CLOSED,..."); CountDownLatch latch = new CountDownLatch(1); ByteBuffer buffer = ByteBuffer.allocate(16 * 1024 * 1024); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/LivelockTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/LivelockTest.java index 1643806f60d2..af9996827545 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/LivelockTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/LivelockTest.java @@ -31,14 +31,14 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.util.SocketAddressResolver; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -120,7 +120,7 @@ public void testLivelock(boolean serverLiveLock, boolean clientLiveLock) throws int requestRate = 5; long pause = 1000 / requestRate; - Logger clientLog = Log.getLogger("TESTClient"); + Logger clientLog = LoggerFactory.getLogger("TESTClient"); CountDownLatch latch = new CountDownLatch(count); for (int i = 0; i < count; ++i) { @@ -133,9 +133,9 @@ public void testLivelock(boolean serverLiveLock, boolean clientLiveLock) throws else { if (result.getRequestFailure() != null) - clientLog.warn(result.getRequestFailure()); + clientLog.warn("Request Failure on {}", result, result.getRequestFailure()); if (result.getResponseFailure() != null) - clientLog.warn(result.getResponseFailure()); + clientLog.warn("Response Failure on {}", result, result.getResponseFailure()); } }); sleep(pause); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java index 52a0648f64c4..72748ffded63 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java @@ -33,14 +33,14 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class SslBytesTest { - protected final Logger logger = Log.getLogger(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); public static class TLSRecord { @@ -146,10 +146,7 @@ public void run() } catch (IOException x) { - logger.info(x.getClass() + ": " + x.getMessage()); - - if (logger.isDebugEnabled()) - logger.debug(x); + logger.warn("Unable to accept from {}", serverSocket, x); } } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/util/SPNEGOAuthenticationTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/util/SPNEGOAuthenticationTest.java index fbb7e26f57a7..dfd157edf188 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/util/SPNEGOAuthenticationTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/util/SPNEGOAuthenticationTest.java @@ -51,8 +51,6 @@ import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -60,6 +58,8 @@ import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -71,7 +71,7 @@ @DisabledOnJre({JRE.JAVA_8, JRE.JAVA_9, JRE.JAVA_10}) public class SPNEGOAuthenticationTest extends AbstractHttpClientServerTest { - private static final Logger LOG = Log.getLogger(SPNEGOAuthenticationTest.class); + private static final Logger LOG = LoggerFactory.getLogger(SPNEGOAuthenticationTest.class); static { diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 68ace6744ea2..7a229ce4da3c 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -45,6 +45,10 @@ jetty-xml ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-jmx @@ -56,6 +60,12 @@ slf4j-api + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/AppLifeCycle.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/AppLifeCycle.java index cc08391a3e29..22e7840098ca 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/AppLifeCycle.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/AppLifeCycle.java @@ -27,8 +27,8 @@ import org.eclipse.jetty.deploy.graph.Graph; import org.eclipse.jetty.deploy.graph.Node; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The lifecycle of an App in the {@link DeploymentManager}. @@ -40,7 +40,7 @@ */ public class AppLifeCycle extends Graph { - private static final Logger LOG = Log.getLogger(AppLifeCycle.class); + private static final Logger LOG = LoggerFactory.getLogger(AppLifeCycle.class); private static final String ALL_NODES = "*"; diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java index 88c05bf99b9b..3793d99f7b66 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java @@ -46,10 +46,10 @@ import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The Deployment Manager. @@ -68,7 +68,7 @@ @ManagedObject("Deployment Manager") public class DeploymentManager extends ContainerLifeCycle { - private static final Logger LOG = Log.getLogger(DeploymentManager.class); + private static final Logger LOG = LoggerFactory.getLogger(DeploymentManager.class); private MultiException onStartupErrors; /** @@ -534,7 +534,7 @@ private void requestAppGoal(AppEntry appentry, String nodeName) catch (Throwable ignore) { // The runBindings failed for 'failed' node - LOG.ignore(ignore); + LOG.trace("IGNORED", ignore); } if (isStarting()) diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugBinding.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugBinding.java index c0c664e7a34b..4930596d94ae 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugBinding.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugBinding.java @@ -21,12 +21,12 @@ import org.eclipse.jetty.deploy.App; import org.eclipse.jetty.deploy.AppLifeCycle; import org.eclipse.jetty.deploy.graph.Node; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DebugBinding implements AppLifeCycle.Binding { - private static final Logger LOG = Log.getLogger(DebugBinding.class); + private static final Logger LOG = LoggerFactory.getLogger(DebugBinding.class); final String[] _targets; diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java index 6d9b728e1c30..1b69c90e40a5 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java @@ -24,12 +24,12 @@ import org.eclipse.jetty.deploy.graph.Node; import org.eclipse.jetty.deploy.providers.WebAppProvider; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.WebAppClassLoader; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Provides a way of globally setting various aspects of webapp contexts. @@ -46,7 +46,7 @@ */ public class GlobalWebappConfigBinding implements AppLifeCycle.Binding { - private static final Logger LOG = Log.getLogger(GlobalWebappConfigBinding.class); + private static final Logger LOG = LoggerFactory.getLogger(GlobalWebappConfigBinding.class); private String _jettyXml; diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java index e1140fe1aeed..32dd02b1393a 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java @@ -37,9 +37,9 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -47,7 +47,7 @@ @ManagedObject("Abstract Provider for loading webapps") public abstract class ScanningAppProvider extends ContainerLifeCycle implements AppProvider { - private static final Logger LOG = Log.getLogger(ScanningAppProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(ScanningAppProvider.class); private Map _appMap = new HashMap(); diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.svg b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.svg index 43841b1fb647..7e62945425c4 100644 --- a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.svg +++ b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.svg @@ -4,34 +4,12 @@ - - + + - + image/svg+xml - + diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.svg b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.svg index 969021da7fad..a74d356d80ab 100644 --- a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.svg +++ b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.svg @@ -4,46 +4,8 @@ - - + - - + + - + image/svg+xml - + diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager_Roles.svg b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager_Roles.svg index f208563ffa80..fe849872f5c0 100644 --- a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager_Roles.svg +++ b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager_Roles.svg @@ -4,34 +4,12 @@ - - + + - + image/svg+xml - + diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java index a8c33191f584..5a8c294fcc3b 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java @@ -27,14 +27,14 @@ import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; import org.eclipse.jetty.util.Scanner; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.extension.ExtendWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.condition.OS.WINDOWS; @@ -45,7 +45,7 @@ @ExtendWith(WorkDirExtension.class) public class ScanningAppProviderRuntimeUpdatesTest { - private static final Logger LOG = Log.getLogger(ScanningAppProviderRuntimeUpdatesTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ScanningAppProviderRuntimeUpdatesTest.class); public WorkDir testdir; private static XmlConfiguredJetty jetty; @@ -106,7 +106,7 @@ public void waitForDirectoryScan() } catch (InterruptedException e) { - LOG.warn(e); + LOG.warn("Sleep failed", e); } } while (_scans.get() < scan); diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index 9d4ec739d535..cb1adfc13ae0 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -35,6 +35,16 @@ jetty-client ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java index 68be4272fc5a..c4720e323187 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java @@ -53,12 +53,12 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpConnectionOverFCGI extends AbstractConnection implements IConnection { - private static final Logger LOG = Log.getLogger(HttpConnectionOverFCGI.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpConnectionOverFCGI.class); private final LinkedList requests = new LinkedList<>(); private final Map activeChannels = new ConcurrentHashMap<>(); @@ -152,9 +152,9 @@ private void releaseNetworkBuffer() void process() { + EndPoint endPoint = getEndPoint(); try { - EndPoint endPoint = getEndPoint(); while (true) { if (parse(networkBuffer.getBuffer())) @@ -185,7 +185,7 @@ else if (read < 0) catch (Exception x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to fill from endpoint {}", endPoint, x); networkBuffer.clear(); releaseNetworkBuffer(); close(x); diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java index db5025547048..0b31c501a4ae 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java @@ -24,12 +24,12 @@ import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.IteratingCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Flusher { - private static final Logger LOG = Log.getLogger(Flusher.class); + private static final Logger LOG = LoggerFactory.getLogger(Flusher.class); private final Queue queue = new ArrayDeque<>(); private final IteratingCallback flushCallback = new FlushCallback(); diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java index 445e5aac4fdc..15e90361dd4e 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java @@ -21,8 +21,8 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.fcgi.FCGI; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Parser for FastCGI frame headers.

@@ -41,7 +41,7 @@ */ public class HeaderParser { - private static final Logger LOG = Log.getLogger(Parser.class); + private static final Logger LOG = LoggerFactory.getLogger(Parser.class); private State state = State.VERSION; private int cursor; diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java index 041ef33bd7de..538d229db9f3 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java @@ -23,8 +23,8 @@ import java.nio.charset.StandardCharsets; import org.eclipse.jetty.http.HttpField; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Parser for the PARAMS frame body.

@@ -60,7 +60,7 @@ */ public class ParamsContentParser extends ContentParser { - private static final Logger LOG = Log.getLogger(ParamsContentParser.class); + private static final Logger LOG = LoggerFactory.getLogger(ParamsContentParser.class); private final ServerParser.Listener listener; private State state = State.LENGTH; diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java index 2d1ac024ae05..b4abccd8268f 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java @@ -22,8 +22,8 @@ import org.eclipse.jetty.fcgi.FCGI; import org.eclipse.jetty.http.HttpField; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

The FastCGI protocol exchanges frames.

@@ -47,7 +47,7 @@ */ public abstract class Parser { - private static final Logger LOG = Log.getLogger(Parser.class); + private static final Logger LOG = LoggerFactory.getLogger(Parser.class); protected final HeaderParser headerParser = new HeaderParser(); private State state = State.HEADER; diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java index 890e9751b7f2..ade1a39b03c7 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java @@ -32,8 +32,8 @@ import org.eclipse.jetty.http.HttpParser; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

The parser for STDOUT type frame bodies.

@@ -45,7 +45,7 @@ */ public class ResponseContentParser extends StreamContentParser { - private static final Logger LOG = Log.getLogger(ResponseContentParser.class); + private static final Logger LOG = LoggerFactory.getLogger(ResponseContentParser.class); private final Map parsers = new ConcurrentHashMap<>(); private final ClientParser.Listener listener; diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java index 785647d5fdbd..1d801ae0cbbe 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java @@ -21,8 +21,8 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.fcgi.FCGI; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A stream content parser parses frame bodies of type STDIN, STDOUT and STDERR.

@@ -30,7 +30,7 @@ */ public class StreamContentParser extends ContentParser { - private static final Logger LOG = Log.getLogger(StreamContentParser.class); + private static final Logger LOG = LoggerFactory.getLogger(StreamContentParser.class); private final FCGI.StreamType streamType; private final Parser.Listener listener; diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 6b8cd246e860..b01bfa9050ba 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -39,7 +39,17 @@ jetty-server ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty jetty-servlet diff --git a/jetty-fcgi/fcgi-server/src/main/java/module-info.java b/jetty-fcgi/fcgi-server/src/main/java/module-info.java index c4201e8cd37e..2722eaaec7a8 100644 --- a/jetty-fcgi/fcgi-server/src/main/java/module-info.java +++ b/jetty-fcgi/fcgi-server/src/main/java/module-info.java @@ -21,9 +21,9 @@ exports org.eclipse.jetty.fcgi.server; exports org.eclipse.jetty.fcgi.server.proxy; - requires org.slf4j; requires transitive org.eclipse.jetty.fcgi.client; requires transitive org.eclipse.jetty.proxy; + requires org.slf4j; // Only required if using the proxy features. requires static jetty.servlet.api; diff --git a/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java index 70e640945f71..ddba3fa5f70f 100644 --- a/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java +++ b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java @@ -36,12 +36,12 @@ import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpTransport; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpChannelOverFCGI extends HttpChannel { - private static final Logger LOG = Log.getLogger(HttpChannelOverFCGI.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpChannelOverFCGI.class); private final HttpFields fields = new HttpFields(); private final Dispatcher dispatcher; diff --git a/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpTransportOverFCGI.java b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpTransportOverFCGI.java index cbdb3f5504e5..866989a7cd13 100644 --- a/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpTransportOverFCGI.java +++ b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpTransportOverFCGI.java @@ -31,12 +31,12 @@ import org.eclipse.jetty.server.HttpTransport; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpTransportOverFCGI implements HttpTransport { - private static final Logger LOG = Log.getLogger(HttpTransportOverFCGI.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpTransportOverFCGI.class); private final ServerGenerator generator; private final Flusher flusher; private final int request; diff --git a/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnection.java b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnection.java index 987d4cb3a781..27b1b9ba4659 100644 --- a/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnection.java +++ b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/ServerFCGIConnection.java @@ -34,12 +34,12 @@ import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpInput; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ServerFCGIConnection extends AbstractConnection { - private static final Logger LOG = Log.getLogger(ServerFCGIConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(ServerFCGIConnection.class); private final ConcurrentMap channels = new ConcurrentHashMap<>(); private final Connector connector; @@ -121,7 +121,7 @@ else if (read == 0) catch (Exception x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to fill endpoint", x); bufferPool.release(buffer); // TODO: fail and close ? } diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java index 528607b7f6eb..9daa5f146e6a 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java @@ -45,8 +45,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * GCloudSessionDataStore @@ -54,7 +54,7 @@ @ManagedObject public class GCloudSessionDataStore extends AbstractSessionDataStore { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(GCloudSessionDataStore.class); public static final int DEFAULT_MAX_QUERY_RESULTS = 100; public static final int DEFAULT_MAX_RETRIES = 5; @@ -594,7 +594,7 @@ public Set doGetExpired(Set candidates) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to expire candidate sessions individually", e); } } } @@ -603,7 +603,7 @@ public Set doGetExpired(Set candidates) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get expired", e); return expired; //return what we got } } @@ -921,7 +921,7 @@ protected SessionData sessionFromEntity(Entity entity) throws Exception } catch (DatastoreException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } long expiry = entity.getLong(_model.getExpiry()); long maxInactive = entity.getLong(_model.getMaxInactive()); diff --git a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml index cf0b516e1e38..1bd391807ca3 100644 --- a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml +++ b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml @@ -10,13 +10,27 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java b/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java index c272f6c5d3d2..c61ecbc3b7a1 100644 --- a/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java +++ b/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java @@ -34,8 +34,8 @@ import org.eclipse.jetty.server.session.SessionDataStore; import org.eclipse.jetty.server.session.UnreadableSessionDataException; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Session data stored in Hazelcast @@ -46,7 +46,7 @@ public class HazelcastSessionDataStore implements SessionDataStore { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(HazelcastSessionDataStore.class); private IMap sessionDataMap; diff --git a/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java b/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java index 6c9bed49ed73..b021b9096d7d 100644 --- a/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java +++ b/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java @@ -30,7 +30,6 @@ import com.hazelcast.config.XmlConfigBuilder; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; - import org.eclipse.jetty.server.session.AbstractSessionDataStoreFactory; import org.eclipse.jetty.server.session.SessionData; import org.eclipse.jetty.server.session.SessionDataStore; @@ -60,7 +59,7 @@ public class HazelcastSessionDataStoreFactory private boolean scavengeZombies = false; private String addresses; - + public boolean isScavengeZombies() { return scavengeZombies; @@ -86,12 +85,12 @@ public SessionDataStore getSessionDataStore(SessionHandler handler) if (configurationLocation == null) { ClientConfig config = new ClientConfig(); - + if (addresses != null && !addresses.isEmpty()) { config.getNetworkConfig().setAddresses(Arrays.asList(addresses.split(","))); } - + SerializerConfig sc = new SerializerConfig() .setImplementation(new SessionDataSerializer()) .setTypeClass(SessionData.class); @@ -212,7 +211,7 @@ public void setHazelcastInstanceName(String hazelcastInstanceName) { this.hazelcastInstanceName = hazelcastInstanceName; } - + public String getAddresses() { return addresses; diff --git a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java index 52e3f3349f9e..0e1caf4b3ed2 100644 --- a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java +++ b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java @@ -35,15 +35,15 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Jetty handler that bridges requests to {@link HttpHandler}. */ public class HttpSpiContextHandler extends ContextHandler { - public static final Logger LOG = Log.getLogger(HttpSpiContextHandler.class); + public static final Logger LOG = LoggerFactory.getLogger(HttpSpiContextHandler.class); private HttpContext _httpContext; @@ -89,7 +89,7 @@ public void doScope(String target, Request baseRequest, HttpServletRequest req, } catch (Exception ex) { - LOG.debug(ex); + LOG.debug("Failed to handle", ex); PrintWriter writer = new PrintWriter(jettyHttpExchange.getResponseBody()); resp.setStatus(500); diff --git a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServer.java b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServer.java index c41fae0b0c65..5d5ab6d670a7 100644 --- a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServer.java +++ b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServer.java @@ -36,16 +36,16 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ThreadPool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Jetty implementation of {@link com.sun.net.httpserver.HttpServer}. */ public class JettyHttpServer extends com.sun.net.httpserver.HttpServer { - private static final Logger LOG = Log.getLogger(JettyHttpServer.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyHttpServer.class); private final HttpConfiguration _httpConfiguration; @@ -223,7 +223,7 @@ private void cleanUpConnectors() } catch (Exception ex) { - LOG.warn(ex); + LOG.warn("Unable to stop connector {}", connector, ex); } _server.removeConnector(connector); } diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 9b32a761e5bd..34620564bc73 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -26,6 +26,12 @@ ${project.version} + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java b/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java index 7ec4ccd86708..570daca5159d 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Locale; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.http.CookieCompliance.Violation.COMMA_NOT_VALID_OCTET; import static org.eclipse.jetty.http.CookieCompliance.Violation.RESERVED_NAMES_NOT_DOLLAR_PREFIXED; @@ -32,7 +32,7 @@ */ public abstract class CookieCutter { - protected static final Logger LOG = Log.getLogger(CookieCutter.class); + protected static final Logger LOG = LoggerFactory.getLogger(CookieCutter.class); protected final CookieCompliance _complianceMode; private final ComplianceViolation.Listener _complianceListener; @@ -207,7 +207,7 @@ else if (tokenstart >= 0) } catch (Exception e) { - LOG.debug(e); + LOG.debug("Unable to process Cookie", e); } name = null; diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java index dc9a6824b706..a0017569bf81 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java @@ -25,8 +25,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableSet; @@ -84,7 +84,7 @@ public String getDescription() } } - private static final Logger LOG = Log.getLogger(HttpParser.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpParser.class); public static final String VIOLATIONS_ATTR = "org.eclipse.jetty.http.compliance.violations"; public static final HttpCompliance RFC7230 = new HttpCompliance("RFC7230", noneOf(Violation.class)); diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java index d1a4811e9058..219e9c135844 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java @@ -25,13 +25,13 @@ import org.eclipse.jetty.util.Attributes; import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // TODO consider replacing this with java.net.HttpCookie (once it supports RFC6265) public class HttpCookie { - private static final Logger LOG = Log.getLogger(HttpCookie.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpCookie.class); private static final String __COOKIE_DELIM = "\",;\\ \t"; private static final String __01Jan1970_COOKIE = DateGenerator.formatCookieDate(0).trim(); diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java index 3a584f679020..7def4fdcfc46 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java @@ -34,8 +34,8 @@ import java.util.stream.Stream; import org.eclipse.jetty.util.QuotedStringTokenizer; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * HTTP Fields. A collection of HTTP header and or Trailer fields. @@ -47,7 +47,7 @@ */ public class HttpFields implements Iterable { - private static final Logger LOG = Log.getLogger(HttpFields.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpFields.class); private HttpField[] _fields; private int _size; @@ -896,7 +896,7 @@ public String toString() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get fields as String", e); return e.toString(); } } diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java index 4302da7afa88..c488b990403f 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java @@ -29,8 +29,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.Trie; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.http.HttpStatus.INTERNAL_SERVER_ERROR_500; @@ -44,7 +44,7 @@ */ public class HttpGenerator { - private static final Logger LOG = Log.getLogger(HttpGenerator.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpGenerator.class); public static final boolean __STRICT = Boolean.getBoolean("org.eclipse.jetty.http.HttpGenerator.STRICT"); @@ -251,7 +251,7 @@ public Result generateRequest(MetaData.Request info, ByteBuffer header, ByteBuff } catch (BufferOverflowException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return Result.HEADER_OVERFLOW; } catch (Exception e) @@ -429,7 +429,7 @@ else if (status == HttpStatus.NO_CONTENT_204 || status == HttpStatus.NOT_MODIFIE } catch (BufferOverflowException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return Result.HEADER_OVERFLOW; } catch (Exception e) diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java index 2acfb494bd77..1d6db1f0cf9b 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java @@ -31,8 +31,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.Trie; import org.eclipse.jetty.util.Utf8StringBuilder; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.http.HttpCompliance.RFC7230; import static org.eclipse.jetty.http.HttpCompliance.Violation; @@ -89,7 +89,7 @@ */ public class HttpParser { - public static final Logger LOG = Log.getLogger(HttpParser.class); + public static final Logger LOG = LoggerFactory.getLogger(HttpParser.class); public static final int INITIAL_URI_LENGTH = 256; private static final int MAX_CHUNK_LENGTH = Integer.MAX_VALUE / 16 - 16; @@ -1069,7 +1069,7 @@ private long convertContentLength(String valueString) } catch (NumberFormatException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); throw new BadMessageException(HttpStatus.BAD_REQUEST_400, "Invalid Content-Length Value", e); } } diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java b/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java index 89243847fd89..f377b566cfb9 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java @@ -36,8 +36,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.Trie; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * MIME Type enum and utilities @@ -45,7 +45,7 @@ public class MimeTypes { - private static final Logger LOG = Log.getLogger(MimeTypes.class); + private static final Logger LOG = LoggerFactory.getLogger(MimeTypes.class); private static final Trie TYPES = new ArrayTrie(512); private static final Map __dftMimeMap = new HashMap(); private static final Map __inferredEncodings = new HashMap(); @@ -218,15 +218,19 @@ else if (__dftMimeMap.size() < props.keySet().size()) } catch (IOException e) { - LOG.warn(e.toString()); - LOG.debug(e); + if (LOG.isDebugEnabled()) + LOG.warn("Unable to read mime-type resource: {}", resourceName, e); + else + LOG.warn("Unable to read mime-type resource: {} - {}", resourceName, e.toString()); } } } catch (IOException e) { - LOG.warn(e.toString()); - LOG.debug(e); + if (LOG.isDebugEnabled()) + LOG.warn("Unable to load mime-type resource: {}", resourceName, e); + else + LOG.warn("Unable to load mime-type resource: {} - {}", resourceName, e.toString()); } resourceName = "encoding.properties"; @@ -262,15 +266,19 @@ else if ((__inferredEncodings.size() + __assumedEncodings.size()) < props.keySet } catch (IOException e) { - LOG.warn(e.toString()); - LOG.debug(e); + if (LOG.isDebugEnabled()) + LOG.warn("Unable to read encoding resource: {}", resourceName, e); + else + LOG.warn("Unable to read encoding resource: {} - {}", resourceName, e.toString()); } } } catch (IOException e) { - LOG.warn(e.toString()); - LOG.debug(e); + if (LOG.isDebugEnabled()) + LOG.warn("Unable to load encoding resource: {}", resourceName, e); + else + LOG.warn("Unable to load encoding resource: {} - {}", resourceName, e.toString()); } } diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/PreEncodedHttpField.java b/jetty-http/src/main/java/org/eclipse/jetty/http/PreEncodedHttpField.java index e1f39a606891..4c26bfba9416 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/PreEncodedHttpField.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/PreEncodedHttpField.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.ServiceLoader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Pre encoded HttpField. @@ -38,7 +38,7 @@ */ public class PreEncodedHttpField extends HttpField { - private static final Logger LOG = Log.getLogger(PreEncodedHttpField.class); + private static final Logger LOG = LoggerFactory.getLogger(PreEncodedHttpField.class); private static final HttpFieldPreEncoder[] __encoders; static @@ -55,7 +55,7 @@ public class PreEncodedHttpField extends HttpField } catch (Error | RuntimeException e) { - LOG.debug(e); + LOG.debug("Unable to add HttpFieldPreEncoder", e); } } LOG.debug("HttpField encoders loaded: {}", encoders); diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java b/jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java index be8905ae02fd..d2bf32835fcf 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java @@ -23,7 +23,8 @@ import java.util.List; import java.util.function.ToIntFunction; -import org.eclipse.jetty.util.log.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.lang.Integer.MIN_VALUE; @@ -39,6 +40,8 @@ */ public class QuotedQualityCSV extends QuotedCSV implements Iterable { + private static final Logger LOG = LoggerFactory.getLogger(QuotedQualityCSV.class); + /** * Lambda to apply a most specific MIME encoding secondary ordering. * @@ -129,7 +132,7 @@ else if (paramValue >= 0 && } catch (Exception e) { - Log.getLogger(QuotedQualityCSV.class).ignore(e); + LOG.trace("IGNORED", e); q = 0.0D; } buffer.setLength(Math.max(0, paramName - 1)); diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java index 2417d719744a..b0ef6bf817bc 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java @@ -32,8 +32,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Path Mappings of PathSpec to Resource. @@ -45,7 +45,7 @@ @ManagedObject("Path Mappings") public class PathMappings implements Iterable>, Dumpable { - private static final Logger LOG = Log.getLogger(PathMappings.class); + private static final Logger LOG = LoggerFactory.getLogger(PathMappings.class); private final Set> _mappings = new TreeSet<>(); private Trie> _exactMap = new ArrayTernaryTrie<>(false); diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java index 5381a892d28d..fefc652d854e 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java @@ -20,13 +20,13 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ServletPathSpec extends PathSpec { - private static final Logger LOG = Log.getLogger(ServletPathSpec.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletPathSpec.class); /** * If a servlet or filter path mapping isn't a suffix mapping, ensure diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java index 130c5aa3899b..63a5463044f8 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java @@ -31,8 +31,8 @@ import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.UrlEncoded; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * PathSpec for URI Template based declarations @@ -41,7 +41,7 @@ */ public class UriTemplatePathSpec extends RegexPathSpec { - private static final Logger LOG = Log.getLogger(UriTemplatePathSpec.class); + private static final Logger LOG = LoggerFactory.getLogger(UriTemplatePathSpec.class); private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{(.*)\\}"); /** diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpCookieTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpCookieTest.java index 41a53f5e43f6..194139e9c6ca 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpCookieTest.java +++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpCookieTest.java @@ -18,15 +18,6 @@ package org.eclipse.jetty.http; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collections; -import java.util.Enumeration; -import java.util.EventListener; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; import java.util.stream.Stream; import org.eclipse.jetty.http.HttpCookie.SameSite; diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 06b47b0943a8..541f701eee58 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -39,7 +39,17 @@ jetty-alpn-client ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientSession.java b/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientSession.java index 0d52b4c581cc..6aa7ae9eb4bd 100644 --- a/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientSession.java +++ b/jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientSession.java @@ -33,13 +33,13 @@ import org.eclipse.jetty.http2.generator.Generator; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HTTP2ClientSession extends HTTP2Session { - private static final Logger LOG = Log.getLogger(HTTP2ClientSession.class); + private static final Logger LOG = LoggerFactory.getLogger(HTTP2ClientSession.class); private final AtomicLong streamsOpened = new AtomicLong(); private final AtomicLong streamsClosed = new AtomicLong(); diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java index 8baaefcb3229..de1f2306e72c 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java @@ -52,10 +52,10 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -565,7 +565,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response) while (true) { int read = input.read(buffer); - Log.getLogger(IdleTimeoutTest.class).info("Read {} bytes", read); + LoggerFactory.getLogger(IdleTimeoutTest.class).info("Read {} bytes", read); if (read < 0) break; sleep(delay); diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/InterleavingTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/InterleavingTest.java index 99a6a7e1b095..e6c5b1fefb18 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/InterleavingTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/InterleavingTest.java @@ -45,9 +45,9 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FuturePromise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.lessThanOrEqualTo; @@ -188,7 +188,7 @@ public void succeeded() } groups.get(currentStream).add(currentLength); - Logger logger = Log.getLogger(getClass()); + Logger logger = LoggerFactory.getLogger(getClass()); logger.debug("frame lengths = {}", streamLengths); groups.forEach((stream, lengths) -> diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/RawHTTP2ProxyTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/RawHTTP2ProxyTest.java index a16eefe3fe3c..c8ee642159f1 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/RawHTTP2ProxyTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/RawHTTP2ProxyTest.java @@ -53,18 +53,18 @@ import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; public class RawHTTP2ProxyTest { - private static final Logger LOGGER = Log.getLogger(RawHTTP2ProxyTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RawHTTP2ProxyTest.class); private final List servers = new ArrayList<>(); private final List clients = new ArrayList<>(); diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/SmallThreadPoolLoadTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/SmallThreadPoolLoadTest.java index 7b833b86c410..386d6b07311e 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/SmallThreadPoolLoadTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/SmallThreadPoolLoadTest.java @@ -46,13 +46,13 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.Scheduler; import org.hamcrest.Matchers; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -60,7 +60,7 @@ @Disabled public class SmallThreadPoolLoadTest extends AbstractTest { - private final Logger logger = Log.getLogger(SmallThreadPoolLoadTest.class); + private final Logger logger = LoggerFactory.getLogger(SmallThreadPoolLoadTest.class); private final AtomicLong requestIds = new AtomicLong(); @Override diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 995a3b8d5926..30d716433d25 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -16,12 +16,23 @@ http2-hpack ${project.version} + + org.slf4j + slf4j-api + + org.eclipse.jetty jetty-jmx ${project.version} true + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java index 191c025ef42f..f4b2823b7fab 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/AbstractFlowControlStrategy.java @@ -30,13 +30,13 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject public abstract class AbstractFlowControlStrategy implements FlowControlStrategy, Dumpable { - protected static final Logger LOG = Log.getLogger(FlowControlStrategy.class); + protected static final Logger LOG = LoggerFactory.getLogger(FlowControlStrategy.class); private final AtomicLong sessionStall = new AtomicLong(); private final AtomicLong sessionStallTime = new AtomicLong(); diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java index 8c8874d7abf4..ff3ff5542747 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java @@ -35,15 +35,15 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ExecutionStrategy; import org.eclipse.jetty.util.thread.TryExecutor; import org.eclipse.jetty.util.thread.strategy.EatWhatYouKill; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HTTP2Connection extends AbstractConnection implements WriteFlusher.Listener { - protected static final Logger LOG = Log.getLogger(HTTP2Connection.class); + protected static final Logger LOG = LoggerFactory.getLogger(HTTP2Connection.class); // TODO remove this once we are sure EWYK is OK for http2 private static final boolean PEC_MODE = Boolean.getBoolean("org.eclipse.jetty.http2.PEC_MODE"); diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java index 74b2533c482d..bc249bd0b2ca 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Flusher.java @@ -36,12 +36,12 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HTTP2Flusher extends IteratingCallback implements Dumpable { - private static final Logger LOG = Log.getLogger(HTTP2Flusher.class); + private static final Logger LOG = LoggerFactory.getLogger(HTTP2Flusher.class); private static final ByteBuffer[] EMPTY_BYTE_BUFFERS = new ByteBuffer[0]; private final Queue windows = new ArrayDeque<>(); diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java index 576e352caac1..27bab4b27758 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java @@ -68,14 +68,14 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject public abstract class HTTP2Session extends ContainerLifeCycle implements ISession, Parser.Listener { - private static final Logger LOG = Log.getLogger(HTTP2Session.class); + private static final Logger LOG = LoggerFactory.getLogger(HTTP2Session.class); private final ConcurrentMap streams = new ConcurrentHashMap<>(); private final AtomicBiInteger streamCount = new AtomicBiInteger(); // Hi = closed, Lo = stream count @@ -1580,7 +1580,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Reset failed", x); complete(); } @@ -1602,7 +1602,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("OnReset failed", x); complete(); } @@ -1640,7 +1640,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("CloseCallback failed", x); complete(); } @@ -1662,7 +1662,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("DisconnectCallback failed", x); complete(); } diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java index 98c37e40858a..3fefbdab6da0 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java @@ -47,14 +47,14 @@ import org.eclipse.jetty.util.MathUtils; import org.eclipse.jetty.util.Promise; 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.thread.AutoLock; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HTTP2Stream extends IdleTimeout implements IStream, Callback, Dumpable { - private static final Logger LOG = Log.getLogger(HTTP2Stream.class); + private static final Logger LOG = LoggerFactory.getLogger(HTTP2Stream.class); private final AutoLock lock = new AutoLock(); private final Queue dataQueue = new ArrayDeque<>(); diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java index 8220f09960b3..5c3e5bbc19ea 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2StreamEndPoint.java @@ -35,13 +35,13 @@ import org.eclipse.jetty.io.EofException; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Invocable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class HTTP2StreamEndPoint implements EndPoint { - private static final Logger LOG = Log.getLogger(HTTP2StreamEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(HTTP2StreamEndPoint.class); private final Deque dataQueue = new ArrayDeque<>(); private final AtomicReference writeState = new AtomicReference<>(WriteState.IDLE); diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/BodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/BodyParser.java index 7e26a455fdef..2c06fd20e90e 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/BodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/BodyParser.java @@ -32,8 +32,8 @@ import org.eclipse.jetty.http2.frames.SettingsFrame; import org.eclipse.jetty.http2.frames.WindowUpdateFrame; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

The base parser for the frame body of HTTP/2 frames.

@@ -44,7 +44,7 @@ */ public abstract class BodyParser { - protected static final Logger LOG = Log.getLogger(BodyParser.class); + protected static final Logger LOG = LoggerFactory.getLogger(BodyParser.class); private final HeaderParser headerParser; private final Parser.Listener listener; diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockParser.java index fde1d0972fc3..11a922a81cec 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderBlockParser.java @@ -27,14 +27,14 @@ import org.eclipse.jetty.http2.hpack.HpackException; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HeaderBlockParser { public static final MetaData STREAM_FAILURE = new MetaData(HttpVersion.HTTP_2, null); public static final MetaData SESSION_FAILURE = new MetaData(HttpVersion.HTTP_2, null); - private static final Logger LOG = Log.getLogger(HeaderBlockParser.class); + private static final Logger LOG = LoggerFactory.getLogger(HeaderBlockParser.class); private final HeaderParser headerParser; private final ByteBufferPool byteBufferPool; @@ -102,21 +102,21 @@ public MetaData parse(ByteBuffer buffer, int blockLength) catch (HpackException.StreamException x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Stream error, stream={}", headerParser.getStreamId(), x); notifier.streamFailure(headerParser.getStreamId(), ErrorCode.PROTOCOL_ERROR.code, "invalid_hpack_block"); return STREAM_FAILURE; } catch (HpackException.CompressionException x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Compression error, buffer={}", BufferUtil.toDetailString(buffer), x); notifier.connectionFailure(buffer, ErrorCode.COMPRESSION_ERROR.code, "invalid_hpack_block"); return SESSION_FAILURE; } catch (HpackException.SessionException x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Session error, buffer={}", BufferUtil.toDetailString(buffer), x); notifier.connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR.code, "invalid_hpack_block"); return SESSION_FAILURE; } diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java index 799c29fc3ccf..5997c00d199a 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java @@ -36,8 +36,8 @@ import org.eclipse.jetty.http2.frames.WindowUpdateFrame; import org.eclipse.jetty.http2.hpack.HpackDecoder; import org.eclipse.jetty.io.ByteBufferPool; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

The HTTP/2 protocol parser.

@@ -46,7 +46,7 @@ */ public class Parser { - private static final Logger LOG = Log.getLogger(Parser.class); + private static final Logger LOG = LoggerFactory.getLogger(Parser.class); private final ByteBufferPool byteBufferPool; private final Listener listener; @@ -138,7 +138,7 @@ public void parse(ByteBuffer buffer) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Parse failed", x); connectionFailure(buffer, ErrorCode.PROTOCOL_ERROR, "parser_error"); } } diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/PrefaceParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/PrefaceParser.java index 6f4c85a3ed69..0dc6a052d3d0 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/PrefaceParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/PrefaceParser.java @@ -23,12 +23,12 @@ import org.eclipse.jetty.http2.ErrorCode; import org.eclipse.jetty.http2.frames.PrefaceFrame; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PrefaceParser { - private static final Logger LOG = Log.getLogger(PrefaceParser.class); + private static final Logger LOG = LoggerFactory.getLogger(PrefaceParser.class); private final Parser.Listener listener; private int cursor; diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java index bf4aeea28f84..21aaf5aa6cde 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java @@ -25,12 +25,12 @@ import org.eclipse.jetty.http2.frames.FrameType; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ServerParser extends Parser { - private static final Logger LOG = Log.getLogger(ServerParser.class); + private static final Logger LOG = LoggerFactory.getLogger(ServerParser.class); private final Listener listener; private final PrefaceParser prefaceParser; @@ -124,7 +124,7 @@ public void parse(ByteBuffer buffer) } catch (Throwable x) { - LOG.debug(x); + LOG.debug("Parse error", x); BufferUtil.clear(buffer); notifyConnectionFailure(ErrorCode.PROTOCOL_ERROR.code, "parser_error"); } diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java index 26fae4edd1ff..1854ab3371d3 100644 --- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java +++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/SettingsBodyParser.java @@ -28,12 +28,12 @@ import org.eclipse.jetty.http2.Flags; import org.eclipse.jetty.http2.frames.Frame; import org.eclipse.jetty.http2.frames.SettingsFrame; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SettingsBodyParser extends BodyParser { - private static final Logger LOG = Log.getLogger(SettingsBodyParser.class); + private static final Logger LOG = LoggerFactory.getLogger(SettingsBodyParser.class); private final int maxKeys; private State state = State.PREPARE; diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 6f154432a16e..c3c2f088d345 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -48,6 +48,10 @@ jetty-io ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty.tests @@ -55,6 +59,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java index d42de950516e..546066dd610f 100644 --- a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java +++ b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java @@ -32,8 +32,8 @@ import org.eclipse.jetty.util.ArrayTernaryTrie; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.Trie; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * HPACK - Header Compression for HTTP/2 @@ -45,7 +45,7 @@ */ public class HpackContext { - public static final Logger LOG = Log.getLogger(HpackContext.class); + public static final Logger LOG = LoggerFactory.getLogger(HpackContext.class); private static final String EMPTY = ""; public static final String[][] STATIC_TABLE = { diff --git a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java index 4b6aa53d76fb..ab07b75b27c2 100644 --- a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java +++ b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java @@ -26,8 +26,8 @@ import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.http2.hpack.HpackContext.Entry; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Hpack Decoder @@ -35,7 +35,7 @@ */ public class HpackDecoder { - public static final Logger LOG = Log.getLogger(HpackDecoder.class); + public static final Logger LOG = LoggerFactory.getLogger(HpackDecoder.class); public static final HttpField.LongValueHttpField CONTENT_LENGTH_0 = new HttpField.LongValueHttpField(HttpHeader.CONTENT_LENGTH, 0L); diff --git a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java index ef89b05515a3..d3b6a70e96b8 100644 --- a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java +++ b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackEncoder.java @@ -38,12 +38,12 @@ import org.eclipse.jetty.http2.hpack.HpackContext.StaticEntry; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HpackEncoder { - private static final Logger LOG = Log.getLogger(HpackEncoder.class); + private static final Logger LOG = LoggerFactory.getLogger(HpackEncoder.class); private static final HttpField[] STATUSES = new HttpField[599]; static final EnumSet DO_NOT_HUFFMAN = EnumSet.of( diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 49a7e917d53a..d4c7a55ad7b7 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -30,12 +30,23 @@ jetty-alpn-java-client ${project.version} + + org.slf4j + slf4j-api + + org.eclipse.jetty jetty-alpn-java-server ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/ClientHTTP2StreamEndPoint.java b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/ClientHTTP2StreamEndPoint.java index f672bb74f387..f189f1c3ee86 100644 --- a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/ClientHTTP2StreamEndPoint.java +++ b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/ClientHTTP2StreamEndPoint.java @@ -24,12 +24,12 @@ import org.eclipse.jetty.http2.frames.DataFrame; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ClientHTTP2StreamEndPoint extends HTTP2StreamEndPoint implements HTTP2Channel.Client { - private static final Logger LOG = Log.getLogger(ClientHTTP2StreamEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(ClientHTTP2StreamEndPoint.class); public ClientHTTP2StreamEndPoint(IStream stream) { diff --git a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java index ed680456e31e..2bec70b3e42a 100644 --- a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java +++ b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java @@ -155,7 +155,7 @@ public void succeeded() public void failed(Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("ReleaseCallback failed", x); release(); } diff --git a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpConnectionOverHTTP2.java b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpConnectionOverHTTP2.java index cc13c4bdeeb2..95e4cb084799 100644 --- a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpConnectionOverHTTP2.java +++ b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpConnectionOverHTTP2.java @@ -40,13 +40,13 @@ import org.eclipse.jetty.http2.IStream; import org.eclipse.jetty.http2.api.Session; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Sweeper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpConnectionOverHTTP2 extends HttpConnection implements Sweeper.Sweepable { - private static final Logger LOG = Log.getLogger(HttpConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpConnection.class); private final Set activeChannels = ConcurrentHashMap.newKeySet(); private final Queue idleChannels = new ConcurrentLinkedQueue<>(); diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 702a6204ab0f..ccbaeed6add4 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -55,6 +55,10 @@ jetty-server ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-servlet @@ -73,6 +77,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java index 5921710592eb..9b4133c9bdd9 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2CServerConnectionFactory.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * HTTP2 Clear Text Connection factory. @@ -46,7 +46,7 @@ */ public class HTTP2CServerConnectionFactory extends HTTP2ServerConnectionFactory implements ConnectionFactory.Upgrading { - private static final Logger LOG = Log.getLogger(HTTP2CServerConnectionFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(HTTP2CServerConnectionFactory.class); public HTTP2CServerConnectionFactory(@Name("config") HttpConfiguration httpConfiguration) { diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java index 49e44ef0b4ee..cd116fecc430 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java @@ -40,12 +40,12 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnectionFactory implements CipherDiscriminator { - private static final Logger LOG = Log.getLogger(HTTP2ServerConnectionFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(HTTP2ServerConnectionFactory.class); public HTTP2ServerConnectionFactory(@Name("config") HttpConfiguration httpConfiguration) { diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java index d7b0cb3a9592..1660a244a85e 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java @@ -39,13 +39,13 @@ import org.eclipse.jetty.http2.parser.ServerParser; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HTTP2ServerSession extends HTTP2Session implements ServerParser.Listener { - private static final Logger LOG = Log.getLogger(HTTP2ServerSession.class); + private static final Logger LOG = LoggerFactory.getLogger(HTTP2ServerSession.class); private final ServerSessionListener listener; diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java index bd251ef64778..f83e43f985f4 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java @@ -45,12 +45,12 @@ import org.eclipse.jetty.server.HttpInput; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpChannelOverHTTP2 extends HttpChannel implements Closeable, WriteFlusher.Listener, HTTP2Channel.Server { - private static final Logger LOG = Log.getLogger(HttpChannelOverHTTP2.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpChannelOverHTTP2.class); private static final HttpField SERVER_VERSION = new PreEncodedHttpField(HttpHeader.SERVER, HttpConfiguration.SERVER_VERSION); private static final HttpField POWERED_BY = new PreEncodedHttpField(HttpHeader.X_POWERED_BY, HttpConfiguration.SERVER_VERSION); diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java index 416c8acc090b..d9bc67dc04c6 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java @@ -42,12 +42,12 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpTransportOverHTTP2 implements HttpTransport { - private static final Logger LOG = Log.getLogger(HttpTransportOverHTTP2.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpTransportOverHTTP2.class); private final AtomicBoolean commit = new AtomicBoolean(); private final TransportCallback transportCallback = new TransportCallback(); diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/ServerHTTP2StreamEndPoint.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/ServerHTTP2StreamEndPoint.java index 49cdf584001e..9b922d327c36 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/ServerHTTP2StreamEndPoint.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/ServerHTTP2StreamEndPoint.java @@ -27,12 +27,12 @@ import org.eclipse.jetty.http2.frames.HeadersFrame; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ServerHTTP2StreamEndPoint extends HTTP2StreamEndPoint implements HTTP2Channel.Server { - private static final Logger LOG = Log.getLogger(ServerHTTP2StreamEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(ServerHTTP2StreamEndPoint.class); public ServerHTTP2StreamEndPoint(IStream stream) { diff --git a/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java b/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java index 0598f614bf53..a94e08c902d6 100644 --- a/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java +++ b/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java @@ -29,9 +29,9 @@ import org.eclipse.jetty.server.session.UnreadableSessionDataException; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.infinispan.commons.api.BasicCache; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * InfinispanSessionDataStore @@ -39,7 +39,7 @@ @ManagedObject public class InfinispanSessionDataStore extends AbstractSessionDataStore { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(InfinispanSessionDataStore.class); /** * Clustered cache of sessions diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index ef53deabed61..77e73ece8aab 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -18,6 +18,16 @@ jetty-util ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java index 3d3043f6ee52..eac63d67f89c 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java @@ -26,9 +26,9 @@ import java.util.concurrent.TimeoutException; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Invocable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A convenience base implementation of {@link Connection}.

@@ -39,7 +39,7 @@ */ public abstract class AbstractConnection implements Connection { - private static final Logger LOG = Log.getLogger(AbstractConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractConnection.class); private final List _listeners = new CopyOnWriteArrayList<>(); private final long _created = System.currentTimeMillis(); @@ -95,7 +95,7 @@ protected void failedCallback(final Callback callback, final Throwable x) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed callback", x); } }; @@ -108,7 +108,7 @@ protected void failedCallback(final Callback callback, final Throwable x) } catch (RejectedExecutionException e) { - LOG.debug(e); + LOG.debug("Rejected", e); callback.failed(x); } break; diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java index b00ac5dcb7e1..7cd08ad45426 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java @@ -25,13 +25,13 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint { - private static final Logger LOG = Log.getLogger(AbstractEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractEndPoint.class); private final AtomicReference _state = new AtomicReference<>(State.OPEN); private final long _created = System.currentTimeMillis(); diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java index 50cdf335de51..bddd34d0bfcd 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java @@ -34,17 +34,17 @@ import java.util.concurrent.locks.Condition; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ByteArrayEndPoint. */ public class ByteArrayEndPoint extends AbstractEndPoint { - static final Logger LOG = Log.getLogger(ByteArrayEndPoint.class); + static final Logger LOG = LoggerFactory.getLogger(ByteArrayEndPoint.class); static final InetAddress NOIP; static final InetSocketAddress NOIPPORT; @@ -57,7 +57,7 @@ public class ByteArrayEndPoint extends AbstractEndPoint } catch (UnknownHostException e) { - LOG.warn(e); + LOG.warn("Unable to get IPv4 no-ip reference for 0.0.0.0", e); } finally { diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java index 323fc4496d26..2c89a1737536 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java @@ -28,10 +28,10 @@ import java.nio.channels.Selector; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Invocable; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Channel End Point. @@ -39,7 +39,7 @@ */ public abstract class ChannelEndPoint extends AbstractEndPoint implements ManagedSelector.Selectable { - private static final Logger LOG = Log.getLogger(ChannelEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(ChannelEndPoint.class); private final ByteChannel _channel; private final GatheringByteChannel _gather; @@ -89,7 +89,7 @@ public void close() } catch (Throwable x) { - LOG.warn(x); + LOG.warn("Unable to close ChannelEndPoint", x); } } } @@ -192,7 +192,7 @@ public void doClose() } catch (IOException e) { - LOG.debug(e); + LOG.debug("Unable to close channel", e); } finally { @@ -232,7 +232,7 @@ else if (filled == -1) } catch (IOException e) { - LOG.debug(e); + LOG.debug("Unable to shutdown output", e); shutdownInput(); filled = -1; } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java index a13617f8a860..abe77a5673ee 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java @@ -32,12 +32,12 @@ import org.eclipse.jetty.util.Promise; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ClientConnector extends ContainerLifeCycle { @@ -45,7 +45,7 @@ public class ClientConnector extends ContainerLifeCycle public static final String REMOTE_SOCKET_ADDRESS_CONTEXT_KEY = CLIENT_CONNECTOR_CONTEXT_KEY + ".remoteSocketAddress"; public static final String CLIENT_CONNECTION_FACTORY_CONTEXT_KEY = CLIENT_CONNECTOR_CONTEXT_KEY + ".clientConnectionFactory"; public static final String CONNECTION_PROMISE_CONTEXT_KEY = CLIENT_CONNECTOR_CONTEXT_KEY + ".connectionPromise"; - private static final Logger LOG = Log.getLogger(ClientConnector.class); + private static final Logger LOG = LoggerFactory.getLogger(ClientConnector.class); private Executor executor; private Scheduler scheduler; @@ -288,7 +288,7 @@ protected void safeClose(Closeable closeable) } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java b/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java index 0e4b60e05983..f064941af8e9 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java @@ -22,9 +22,9 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.util.component.Destroyable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.lang.Long.MAX_VALUE; @@ -50,7 +50,7 @@ */ public abstract class CyclicTimeout implements Destroyable { - private static final Logger LOG = Log.getLogger(CyclicTimeout.class); + private static final Logger LOG = LoggerFactory.getLogger(CyclicTimeout.class); private static final Timeout NOT_SET = new Timeout(MAX_VALUE, null); private static final Scheduler.Task DESTROYED = () -> false; diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java b/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java index 25705ea3eda1..b904638d6659 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java @@ -24,10 +24,10 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Invocable; import org.eclipse.jetty.util.thread.Invocable.InvocationType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A Utility class to help implement {@link EndPoint#fillInterested(Callback)} @@ -35,7 +35,7 @@ */ public abstract class FillInterest { - private static final Logger LOG = Log.getLogger(FillInterest.class); + private static final Logger LOG = LoggerFactory.getLogger(FillInterest.class); private final AtomicReference _interested = new AtomicReference<>(null); protected FillInterest() diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java b/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java index 012c0485a0e0..99d4969f1c9e 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java @@ -22,9 +22,9 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An Abstract implementation of an Idle Timeout. @@ -36,7 +36,7 @@ */ public abstract class IdleTimeout { - private static final Logger LOG = Log.getLogger(IdleTimeout.class); + private static final Logger LOG = LoggerFactory.getLogger(IdleTimeout.class); private final Scheduler _scheduler; private final AtomicReference _timeout = new AtomicReference<>(); private volatile long _idleTimeout; diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/LeakTrackingByteBufferPool.java b/jetty-io/src/main/java/org/eclipse/jetty/io/LeakTrackingByteBufferPool.java index 61683237e3a1..d61dce79115b 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/LeakTrackingByteBufferPool.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/LeakTrackingByteBufferPool.java @@ -24,12 +24,12 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.LeakDetector; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class LeakTrackingByteBufferPool extends ContainerLifeCycle implements ByteBufferPool { - private static final Logger LOG = Log.getLogger(LeakTrackingByteBufferPool.class); + private static final Logger LOG = LoggerFactory.getLogger(LeakTrackingByteBufferPool.class); private final LeakDetector leakDetector = new LeakDetector() { diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java index e8b1122c7baa..afa3410f8822 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java @@ -36,6 +36,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.Objects; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; @@ -47,11 +48,11 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ExecutionStrategy; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.strategy.EatWhatYouKill; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

{@link ManagedSelector} wraps a {@link Selector} simplifying non-blocking operations on channels.

@@ -61,7 +62,7 @@ */ public class ManagedSelector extends ContainerLifeCycle implements Dumpable { - private static final Logger LOG = Log.getLogger(ManagedSelector.class); + private static final Logger LOG = LoggerFactory.getLogger(ManagedSelector.class); private static final boolean FORCE_SELECT_NOW; static @@ -302,7 +303,7 @@ static int safeReadyOps(SelectionKey selectionKey) } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); return -1; } } @@ -315,7 +316,7 @@ static int safeInterestOps(SelectionKey selectionKey) } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); return -1; } } @@ -434,7 +435,7 @@ private void processUpdates() } catch (Throwable th) { - LOG.warn(th); + LOG.warn("Cannot update selector {}", _selector, th); } } _updateable.clear(); @@ -512,7 +513,7 @@ private boolean select() else { LOG.warn(x.toString()); - LOG.debug(x); + LOG.debug("select() failure", x); } } return false; @@ -639,7 +640,7 @@ public List get(long timeout, TimeUnit unit) } catch (InterruptedException x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } return keys; } @@ -671,7 +672,7 @@ public void update(Selector selector) catch (Throwable x) { IO.close(_channel); - LOG.warn(x); + LOG.warn("Unable to register OP_ACCEPT on selector", x); } } @@ -746,7 +747,7 @@ public void update(Selector selector) { IO.close(channel); _selectorManager.onAcceptFailed(channel, x); - LOG.debug(x); + LOG.debug("Unable to register update for accept", x); } } @@ -760,7 +761,7 @@ public void run() } catch (Throwable x) { - LOG.debug(x); + LOG.debug("Unable to accept", x); failed(x); } } @@ -768,8 +769,8 @@ public void run() protected void failed(Throwable failure) { IO.close(channel); - LOG.warn(String.valueOf(failure)); - LOG.debug(failure); + LOG.warn("ManagedSelector#Accept failure : {}", Objects.toString(failure)); + LOG.debug("ManagedSelector#Accept failure", failure); _selectorManager.onAcceptFailed(channel, failure); } } @@ -934,8 +935,8 @@ public void run() catch (Throwable failure) { IO.close(_connect.channel); - LOG.warn(String.valueOf(failure)); - LOG.debug(failure); + LOG.warn("ManagedSelector#CreateEndpoint failure : {}", Objects.toString(failure)); + LOG.debug("ManagedSelector#CreateEndpoint failure", failure); _connect.failed(failure); } } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java index 7060f86a6bcd..79b22580dace 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java @@ -24,12 +24,12 @@ import javax.net.ssl.SSLEngine; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class NegotiatingClientConnection extends AbstractConnection { - private static final Logger LOG = Log.getLogger(NegotiatingClientConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(NegotiatingClientConnection.class); private final SSLEngine engine; private final ClientConnectionFactory connectionFactory; @@ -108,7 +108,7 @@ private int fill() } catch (IOException x) { - LOG.debug(x); + LOG.debug("Unable to fill from endpoint", x); close(); return -1; } @@ -123,7 +123,7 @@ private void replaceConnection() } catch (Throwable x) { - LOG.debug(x); + LOG.debug("Unable to replace connection", x); close(); } } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficSelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficSelectChannelEndPoint.java index 6985babda5cf..5ff5c11a33c0 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficSelectChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficSelectChannelEndPoint.java @@ -25,13 +25,13 @@ import java.nio.channels.SocketChannel; import java.util.List; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NetworkTrafficSelectChannelEndPoint extends SocketChannelEndPoint { - private static final Logger LOG = Log.getLogger(NetworkTrafficSelectChannelEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(NetworkTrafficSelectChannelEndPoint.class); private final List listeners; @@ -85,7 +85,7 @@ public void onOpen() } catch (Exception x) { - LOG.warn(x); + LOG.warn("listener.opened failure", x); } } } @@ -105,7 +105,7 @@ public void onClose(Throwable cause) } catch (Exception x) { - LOG.warn(x); + LOG.warn("listener.closed failure", x); } } } @@ -124,7 +124,7 @@ public void notifyIncoming(ByteBuffer buffer, int read) } catch (Exception x) { - LOG.warn(x); + LOG.warn("listener.incoming() failure", x); } } } @@ -143,7 +143,7 @@ public void notifyOutgoing(ByteBuffer view) } catch (Exception x) { - LOG.warn(x); + LOG.warn("listener.outgoing() failure", x); } } } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java index 1e6bf65f9fc4..fb427e682917 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java @@ -41,11 +41,11 @@ import org.eclipse.jetty.util.component.Container; import org.eclipse.jetty.util.component.ContainerLifeCycle; 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.thread.Scheduler; import org.eclipse.jetty.util.thread.ThreadPool; import org.eclipse.jetty.util.thread.ThreadPoolBudget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

{@link SelectorManager} manages a number of {@link ManagedSelector}s that @@ -58,7 +58,7 @@ public abstract class SelectorManager extends ContainerLifeCycle implements Dumpable { public static final int DEFAULT_CONNECT_TIMEOUT = 15000; - protected static final Logger LOG = Log.getLogger(SelectorManager.class); + protected static final Logger LOG = LoggerFactory.getLogger(SelectorManager.class); private final Executor executor; private final Scheduler scheduler; @@ -433,7 +433,7 @@ protected void onAccepting(SelectableChannel channel) } catch (Throwable x) { - LOG.warn(x); + LOG.warn("Failed to notify onAccepting on listener {}", l, x); } } } @@ -448,7 +448,7 @@ protected void onAcceptFailed(SelectableChannel channel, Throwable cause) } catch (Throwable x) { - LOG.warn(x); + LOG.warn("Failed to notify onAcceptFailed on listener {}", l, x); } } } @@ -463,7 +463,7 @@ protected void onAccepted(SelectableChannel channel) } catch (Throwable x) { - LOG.warn(x); + LOG.warn("Failed to notify onAccepted on listener {}", l, x); } } } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java index 313523cf0b43..23809302b8ca 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java @@ -25,13 +25,13 @@ import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SocketChannelEndPoint extends ChannelEndPoint { - private static final Logger LOG = Log.getLogger(SocketChannelEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(SocketChannelEndPoint.class); private final Socket _socket; private final InetSocketAddress _local; private final InetSocketAddress _remote; @@ -77,7 +77,7 @@ protected void doShutdownOutput() } catch (IOException e) { - LOG.debug(e); + LOG.debug("Unable to shutdown output", e); } } } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java b/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java index b24c7f25d667..d75415dffee4 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java @@ -31,10 +31,10 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Invocable; import org.eclipse.jetty.util.thread.Invocable.InvocationType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A Utility class to help implement {@link EndPoint#write(Callback, ByteBuffer...)} by calling @@ -45,7 +45,7 @@ */ public abstract class WriteFlusher { - private static final Logger LOG = Log.getLogger(WriteFlusher.class); + private static final Logger LOG = LoggerFactory.getLogger(WriteFlusher.class); private static final boolean DEBUG = LOG.isDebugEnabled(); // Easy for the compiler to remove the code if DEBUG==false private static final ByteBuffer[] EMPTY_BUFFERS = new ByteBuffer[]{BufferUtil.EMPTY_BUFFER}; private static final EnumMap> __stateTransitions = new EnumMap<>(StateType.class); @@ -325,7 +325,7 @@ private void fail(Callback callback, Throwable... suppressed) case IDLE: for (Throwable t : suppressed) { - LOG.warn(t); + LOG.warn("Failed Write Cause", t); } return; @@ -489,7 +489,7 @@ public boolean onFail(Throwable cause) if (DEBUG) { LOG.debug("ignored: {} {}", cause, this); - LOG.ignore(cause); + LOG.trace("IGNORED", cause); } return false; diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java index 4b6d5b064244..a23e92e9e9fd 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java @@ -43,9 +43,9 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Invocable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A Connection that acts as an interceptor between an EndPoint providing SSL encrypted data @@ -79,7 +79,7 @@ */ public class SslConnection extends AbstractConnection implements Connection.UpgradeTo { - private static final Logger LOG = Log.getLogger(SslConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(SslConnection.class); private static final String TLS_1_3 = "TLSv1.3"; private enum HandshakeState @@ -930,7 +930,7 @@ private void terminateInput() } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } @@ -946,12 +946,12 @@ private Throwable closeInbound() throws SSLException { if (handshakeStatus == HandshakeStatus.NOT_HANDSHAKING && isRequireCloseMessage()) throw x; - LOG.ignore(x); + LOG.trace("IGNORED", x); return x; } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); return x; } } @@ -1200,7 +1200,7 @@ protected void onIncompleteFlush() } catch (IOException e) { - LOG.debug(e); + LOG.debug("Incomplete flush?", e); close(e); write = BufferUtil.EMPTY_BUFFER; _flushState = FlushState.WRITING; @@ -1300,7 +1300,7 @@ public void doShutdownOutput() } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); endPoint.close(); } } @@ -1314,7 +1314,7 @@ private void closeOutbound() catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to close outbound", x); } } @@ -1339,7 +1339,7 @@ private boolean isOutboundDone() } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); return true; } } @@ -1373,7 +1373,7 @@ private boolean isInboundDone() } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); return true; } } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java index fc479ba28139..537174b8625e 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java @@ -48,8 +48,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.Scheduler; @@ -62,6 +60,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -75,7 +75,7 @@ @SuppressWarnings("Duplicates") public class SocketChannelEndPointTest { - private static final Logger LOG = Log.getLogger(SocketChannelEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(SocketChannelEndPoint.class); public interface Scenario { @@ -673,7 +673,7 @@ public String toString() @SuppressWarnings("Duplicates") public static class TestConnection extends AbstractConnection { - private static final Logger LOG = Log.getLogger(TestConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(TestConnection.class); volatile FutureCallback _blockingRead; final AtomicInteger _blockAt; @@ -814,13 +814,13 @@ public void onFillable() catch (InterruptedException | EofException e) { if (LOG.isDebugEnabled()) - LOG.debug(e); + LOG.debug("Fill interrupted", e); else LOG.info(e.getClass().getName()); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to fill from endpoint", e); } } } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java index 43678aca45a3..3ad5bdd737ee 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java @@ -42,7 +42,6 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.Scheduler; @@ -50,6 +49,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -60,6 +61,8 @@ public class SslConnectionTest { + private static final Logger LOG = LoggerFactory.getLogger(SslConnectionTest.class); + private static final int TIMEOUT = 1000000; private static ByteBufferPool __byteBufferPool = new LeakTrackingByteBufferPool(new MappedByteBufferPool.Tagged()); @@ -250,11 +253,11 @@ public synchronized void onFillable() } catch (InterruptedException | EofException e) { - Log.getRootLogger().ignore(e); + LOG.trace("IGNORED", e); } catch (Exception e) { - Log.getRootLogger().warn(e); + LOG.warn("During onFillable", e); } finally { diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java index 84dcd36dae44..23ec9436cde9 100644 --- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java +++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java @@ -48,8 +48,8 @@ import org.eclipse.jetty.util.ArrayUtil; import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JAASLoginService @@ -60,7 +60,7 @@ */ public class JAASLoginService extends AbstractLifeCycle implements LoginService { - private static final Logger LOG = Log.getLogger(JAASLoginService.class); + private static final Logger LOG = LoggerFactory.getLogger(JAASLoginService.class); public static final String DEFAULT_ROLE_CLASS_NAME = "org.eclipse.jetty.jaas.JAASRole"; public static final String[] DEFAULT_ROLE_CLASS_NAMES = {DEFAULT_ROLE_CLASS_NAME}; @@ -263,7 +263,7 @@ else if (callback instanceof ServletRequestCallback) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return null; } @@ -293,7 +293,7 @@ public void logout(UserIdentity user) } catch (LoginException e) { - LOG.warn(e); + LOG.warn("Failed to logout {}", user, e); } } diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractDatabaseLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractDatabaseLoginModule.java index 8a2db300dd58..d28af395ef8c 100644 --- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractDatabaseLoginModule.java +++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractDatabaseLoginModule.java @@ -27,9 +27,9 @@ import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Credential; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractDatabaseLoginModule @@ -40,7 +40,7 @@ */ public abstract class AbstractDatabaseLoginModule extends AbstractLoginModule { - private static final Logger LOG = Log.getLogger(AbstractDatabaseLoginModule.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractDatabaseLoginModule.class); private String userQuery; private String rolesQuery; diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/JDBCLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/JDBCLoginModule.java index 48da75fe0027..df1b4627acca 100644 --- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/JDBCLoginModule.java +++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/JDBCLoginModule.java @@ -25,8 +25,8 @@ import javax.security.auth.callback.CallbackHandler; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JDBCLoginModule @@ -39,7 +39,7 @@ */ public class JDBCLoginModule extends AbstractDatabaseLoginModule { - private static final Logger LOG = Log.getLogger(JDBCLoginModule.class); + private static final Logger LOG = LoggerFactory.getLogger(JDBCLoginModule.class); private String dbDriver; private String dbUrl; diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java index fc5eef8d3302..9aa236f822c1 100644 --- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java +++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java @@ -46,9 +46,9 @@ import org.eclipse.jetty.jaas.callback.ObjectCallback; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Credential; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A LdapLoginModule for use with JAAS setups @@ -84,7 +84,7 @@ */ public class LdapLoginModule extends AbstractLoginModule { - private static final Logger LOG = Log.getLogger(LdapLoginModule.class); + private static final Logger LOG = LoggerFactory.getLogger(LdapLoginModule.class); /** * hostname of the ldap server @@ -450,17 +450,13 @@ public boolean login() throws LoginException catch (IOException e) { if (_debug) - { - LOG.info(e); - } + LOG.info("Login failure", e); throw new LoginException("IO Error performing login."); } catch (AuthenticationException e) { if (_debug) - { - LOG.info(e); - } + LOG.info("Login failure", e); return false; } catch (LoginException e) @@ -470,7 +466,7 @@ public boolean login() throws LoginException catch (Exception e) { if (_debug) - LOG.info(e); + LOG.info("Login failure", e); throw new LoginException("Error obtaining user info"); } } diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java index f929e66ee97d..73b733e50618 100644 --- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java +++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java @@ -29,9 +29,9 @@ import org.eclipse.jetty.security.AbstractLoginService; import org.eclipse.jetty.security.PropertyUserStore; import org.eclipse.jetty.server.UserIdentity; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Credential; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * PropertyFileLoginModule @@ -40,7 +40,7 @@ public class PropertyFileLoginModule extends AbstractLoginModule { public static final String DEFAULT_FILENAME = "realm.properties"; - private static final Logger LOG = Log.getLogger(PropertyFileLoginModule.class); + private static final Logger LOG = LoggerFactory.getLogger(PropertyFileLoginModule.class); private static ConcurrentHashMap _propertyUserStores = new ConcurrentHashMap(); diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticator.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticator.java index 9a110eda17f1..a005f5f6528e 100644 --- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticator.java +++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticator.java @@ -44,15 +44,15 @@ import org.eclipse.jetty.server.Authentication; import org.eclipse.jetty.server.Authentication.User; import org.eclipse.jetty.server.UserIdentity; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Rev: 4793 $ $Date: 2009-03-19 00:00:01 +0100 (Thu, 19 Mar 2009) $ */ public class JaspiAuthenticator extends LoginAuthenticator { - private static final Logger LOG = Log.getLogger(JaspiAuthenticator.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(JaspiAuthenticator.class.getName()); private final ServerAuthConfig _authConfig; diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticatorFactory.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticatorFactory.java index 710ff6f91c57..cfbf05c9e234 100644 --- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticatorFactory.java +++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticatorFactory.java @@ -37,12 +37,12 @@ import org.eclipse.jetty.security.IdentityService; import org.eclipse.jetty.security.LoginService; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JaspiAuthenticatorFactory extends DefaultAuthenticatorFactory { - private static final Logger LOG = Log.getLogger(JaspiAuthenticatorFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(JaspiAuthenticatorFactory.class); private static String MESSAGE_LAYER = "HTTP"; @@ -120,7 +120,7 @@ public Authenticator getAuthenticator(Server server, ServletContext context, Aut } catch (AuthException e) { - LOG.warn(e); + LOG.warn("Failed to get ServerAuthConfig", e); } return authenticator; } diff --git a/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/BasicAuthModule.java b/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/BasicAuthModule.java index a15393b0f911..7b7f412af1ec 100644 --- a/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/BasicAuthModule.java +++ b/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/BasicAuthModule.java @@ -32,13 +32,13 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.security.jaspi.modules.BaseAuthModule; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class BasicAuthModule extends BaseAuthModule { - private static final Logger LOG = Log.getLogger(BasicAuthModule.class); + private static final Logger LOG = LoggerFactory.getLogger(BasicAuthModule.class); private String realmName; diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 639ef6aaa5f9..9115002325a4 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -18,7 +18,7 @@ maven-surefire-plugin - @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.jmx=ALL-UNNAMED --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.util.log.jmx=ALL-UNNAMED + @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.jmx=ALL-UNNAMED --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.logging.jmx=ALL-UNNAMED @@ -42,6 +42,13 @@ jetty-util ${project.version} + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + provided + true + com.openpojo diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml index 24c0e2031d4c..052fa7cc5067 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx.xml @@ -21,12 +21,5 @@ - - - - - - - diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java index 255e2750403b..6a287c07226f 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java @@ -43,10 +43,10 @@ import org.eclipse.jetty.util.HostPort; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.ShutdownThread; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

LifeCycle wrapper for JMXConnectorServer.

@@ -61,7 +61,7 @@ public class ConnectorServer extends AbstractLifeCycle { public static final String RMI_REGISTRY_CLIENT_SOCKET_FACTORY_ATTRIBUTE = "com.sun.jndi.rmi.factory.socket"; - private static final Logger LOG = Log.getLogger(ConnectorServer.class); + private static final Logger LOG = LoggerFactory.getLogger(ConnectorServer.class); private JMXServiceURL _jmxURL; private final Map _environment; @@ -183,7 +183,7 @@ private String startRegistry(HostPort hostPort) throws Exception } catch (Throwable ex) { - LOG.ignore(ex); + LOG.trace("IGNORED", ex); } RMIClientSocketFactory csf = _sslContextFactory == null ? null : new SslRMIClientSocketFactory(); @@ -208,7 +208,7 @@ private void stopRegistry() } catch (Exception ex) { - LOG.ignore(ex); + LOG.trace("IGNORED", ex); } finally { 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 d1f9bfb93501..f8db4c44bd22 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 @@ -45,8 +45,8 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.Destroyable; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Container class for the MBean instances @@ -54,7 +54,7 @@ @ManagedObject("The component that registers beans as MBeans") public class MBeanContainer implements Container.InheritedListener, Dumpable, Destroyable { - private static final Logger LOG = Log.getLogger(MBeanContainer.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(MBeanContainer.class.getName()); private static final ConcurrentMap __unique = new ConcurrentHashMap<>(); private static final Container ROOT = new ContainerLifeCycle(); @@ -436,11 +436,11 @@ private void unregister(ObjectName objectName) } catch (MBeanRegistrationException | InstanceNotFoundException x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } catch (Throwable x) { - LOG.warn(x); + LOG.warn("Unable to unregister {}", objectName, x); } } } diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java index 2d960d64dc9c..7af48fb4f6cb 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MetaData.java @@ -47,12 +47,12 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class MetaData { - private static final Logger LOG = Log.getLogger(MetaData.class); + private static final Logger LOG = LoggerFactory.getLogger(MetaData.class); private static final MBeanAttributeInfo[] NO_ATTRIBUTES = new MBeanAttributeInfo[0]; private static final MBeanConstructorInfo[] NO_CONSTRUCTORS = new MBeanConstructorInfo[0]; private static final MBeanOperationInfo[] NO_OPERATIONS = new MBeanOperationInfo[0]; diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java index 6d848c9d0a3c..72478e58b73a 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java @@ -27,8 +27,8 @@ import javax.management.ObjectName; import javax.management.ReflectionException; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A dynamic MBean that can wrap an arbitrary Object instance.

@@ -44,7 +44,7 @@ */ public class ObjectMBean implements DynamicMBean { - private static final Logger LOG = Log.getLogger(ObjectMBean.class); + private static final Logger LOG = LoggerFactory.getLogger(ObjectMBean.class); protected final Object _managed; private MetaData _metaData; @@ -154,7 +154,7 @@ public AttributeList getAttributes(String[] names) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to get attribute {}", name, x); } } return results; @@ -188,7 +188,7 @@ public AttributeList setAttributes(AttributeList attributes) catch (Throwable x) { if (LOG.isDebugEnabled()) - LOG.debug(x); + LOG.debug("Unable to get Attribute {}", attribute, x); } } return results; diff --git a/jetty-jmx/src/test/java/com/acme/jmx/DerivedMBean.java b/jetty-jmx/src/test/java/com/acme/jmx/DerivedMBean.java index 32cb90e664f2..f3d8782b1194 100644 --- a/jetty-jmx/src/test/java/com/acme/jmx/DerivedMBean.java +++ b/jetty-jmx/src/test/java/com/acme/jmx/DerivedMBean.java @@ -23,13 +23,13 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject("Derived MBean Wrapper") public class DerivedMBean extends ObjectMBean { - private static final Logger LOG = Log.getLogger(DerivedMBean.class); + private static final Logger LOG = LoggerFactory.getLogger(DerivedMBean.class); public DerivedMBean(Object managedObject) { diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java index 498e1f5853ab..96a9a1f2ba06 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java @@ -32,8 +32,8 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ContextFactory @@ -58,7 +58,7 @@ */ public class ContextFactory implements ObjectFactory { - private static final Logger LOG = Log.getLogger(ContextFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(ContextFactory.class); /** * Map of classloaders to contexts. diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/DataSourceCloser.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/DataSourceCloser.java index bdb37b924695..c76a7cb0cde7 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/DataSourceCloser.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/DataSourceCloser.java @@ -25,8 +25,8 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.Destroyable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Close a DataSource. @@ -36,7 +36,7 @@ */ public class DataSourceCloser implements Destroyable { - private static final Logger LOG = Log.getLogger(DataSourceCloser.class); + private static final Logger LOG = LoggerFactory.getLogger(DataSourceCloser.class); final DataSource _datasource; final String _shutdown; @@ -74,7 +74,7 @@ public void destroy() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to shutdown datasource {}", _datasource, e); } try @@ -85,7 +85,7 @@ public void destroy() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to close datasource {}", _datasource, e); } } } diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/InitialContextFactory.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/InitialContextFactory.java index 7f7ac6498c82..d25796e71879 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/InitialContextFactory.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/InitialContextFactory.java @@ -27,8 +27,8 @@ import javax.naming.NamingException; import org.eclipse.jetty.jndi.local.localContextRoot; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * InitialContextFactory.java @@ -40,7 +40,7 @@ */ public class InitialContextFactory implements javax.naming.spi.InitialContextFactory { - private static final Logger LOG = Log.getLogger(InitialContextFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(InitialContextFactory.class); public static class DefaultParser implements NameParser { diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java index 87b9e71c7628..43f803a28e04 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java @@ -46,8 +46,8 @@ import javax.naming.spi.NamingManager; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * NamingContext @@ -60,7 +60,7 @@ @SuppressWarnings("unchecked") public class NamingContext implements Context, Dumpable { - private static final Logger LOG = Log.getLogger(NamingContext.class); + private static final Logger LOG = LoggerFactory.getLogger(NamingContext.class); private static final List __empty = Collections.emptyList(); public static final String DEEP_BINDING = "org.eclipse.jetty.jndi.deepBinding"; public static final String LOCK_PROPERTY = "org.eclipse.jetty.jndi.lock"; diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingUtil.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingUtil.java index 5c822ae60149..b24824a973d9 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingUtil.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingUtil.java @@ -28,15 +28,15 @@ import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Naming Utility Methods */ public class NamingUtil { - private static final Logger LOG = Log.getLogger(NamingUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(NamingUtil.class); /** * Bind an object to a context ensuring all sub-contexts diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaRootURLContext.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaRootURLContext.java index 786ae6874b0d..a36353c80233 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaRootURLContext.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaRootURLContext.java @@ -29,8 +29,8 @@ import org.eclipse.jetty.jndi.ContextFactory; import org.eclipse.jetty.jndi.NamingContext; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // This is a required name for JNDI // @checkstyle-disable-check : TypeNameCheck @@ -44,7 +44,7 @@ */ public class javaRootURLContext implements Context { - private static final Logger LOG = Log.getLogger(javaRootURLContext.class); + private static final Logger LOG = LoggerFactory.getLogger(javaRootURLContext.class); public static final String URL_PREFIX = "java:"; @@ -73,7 +73,7 @@ public class javaRootURLContext implements Context } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to bind default NamingContext to: comp", e); } } diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaURLContextFactory.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaURLContextFactory.java index 0b329d6cf3d7..3df8d71013db 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaURLContextFactory.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaURLContextFactory.java @@ -24,8 +24,8 @@ import javax.naming.NamingException; import javax.naming.spi.ObjectFactory; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // This is a required name for JNDI // @checkstyle-disable-check : TypeNameCheck @@ -37,7 +37,7 @@ */ public class javaURLContextFactory implements ObjectFactory { - private static final Logger LOG = Log.getLogger(javaURLContextFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(javaURLContextFactory.class); /** * Either return a new context or the resolution of a url. diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/local/localContextRoot.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/local/localContextRoot.java index 364f3dafc67b..56ca5bf9dbd6 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/local/localContextRoot.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/local/localContextRoot.java @@ -38,8 +38,8 @@ import javax.naming.spi.NamingManager; import org.eclipse.jetty.jndi.NamingContext; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // This is a required name for JNDI // @checkstyle-disable-check : TypeNameCheck @@ -51,7 +51,7 @@ */ public class localContextRoot implements Context { - private static final Logger LOG = Log.getLogger(localContextRoot.class); + private static final Logger LOG = LoggerFactory.getLogger(localContextRoot.class); protected static final NamingContext __root = new NamingRoot(); private final Hashtable _env; @@ -142,7 +142,7 @@ private Object dereference(Object ctx, String firstComponent) throws NamingExcep } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to dereference {}, {}", ctx, firstComponent, e); throw new NamingException(e.getMessage()); } } diff --git a/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java b/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java index 61371acb3cfa..f173ce5a20e3 100644 --- a/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java +++ b/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java @@ -41,10 +41,10 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.HandlerList; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -58,7 +58,7 @@ */ public class TestJNDI { - private static final Logger LOG = Log.getLogger(TestJNDI.class); + private static final Logger LOG = LoggerFactory.getLogger(TestJNDI.class); static { diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java index 537efca59582..b72d7fbca7f5 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java @@ -43,8 +43,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * MongoSessionDataStore @@ -97,7 +97,7 @@ public class MongoSessionDataStore extends NoSqlSessionDataStore { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(MongoSessionDataStore.class); /** * Special attribute for a session that is context-specific diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/JwtDecoder.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/JwtDecoder.java index 8d4ff89c8361..2ce4ababc8c7 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/JwtDecoder.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/JwtDecoder.java @@ -24,15 +24,15 @@ import java.util.Map; import org.eclipse.jetty.util.ajax.JSON; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Used to decode the ID Token from the base64 encrypted JSON Web Token (JWT). */ public class JwtDecoder { - private static final Logger LOG = Log.getLogger(JwtDecoder.class); + private static final Logger LOG = LoggerFactory.getLogger(JwtDecoder.class); /** * Decodes a JSON Web Token (JWT) into a Map of claims. diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdAuthenticator.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdAuthenticator.java index 1054f58f4dbf..94703d1d1e1f 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdAuthenticator.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdAuthenticator.java @@ -45,9 +45,9 @@ import org.eclipse.jetty.util.MultiMap; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.UrlEncoded; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Implements authentication using OpenId Connect on top of OAuth 2.0. @@ -64,7 +64,7 @@ */ public class OpenIdAuthenticator extends LoginAuthenticator { - private static final Logger LOG = Log.getLogger(OpenIdAuthenticator.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenIdAuthenticator.class); public static final String CLAIMS = "org.eclipse.jetty.security.openid.claims"; public static final String RESPONSE = "org.eclipse.jetty.security.openid.response"; diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java index e7591f524c9b..73f2269ac0af 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java @@ -30,9 +30,9 @@ import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.ajax.JSON; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Holds the configuration for an OpenID Connect service. @@ -42,7 +42,7 @@ */ public class OpenIdConfiguration extends ContainerLifeCycle { - private static final Logger LOG = Log.getLogger(OpenIdConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenIdConfiguration.class); private static final String CONFIG_PATH = "/.well-known/openid-configuration"; private final HttpClient httpClient; diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdCredentials.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdCredentials.java index 20ba2ec61196..07c6f6fc22d6 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdCredentials.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdCredentials.java @@ -29,8 +29,8 @@ import org.eclipse.jetty.client.util.FormContentProvider; import org.eclipse.jetty.util.Fields; import org.eclipse.jetty.util.ajax.JSON; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

The credentials of an user to be authenticated with OpenID Connect. This will contain @@ -44,7 +44,7 @@ */ public class OpenIdCredentials implements Serializable { - private static final Logger LOG = Log.getLogger(OpenIdCredentials.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenIdCredentials.class); private static final long serialVersionUID = 4766053233370044796L; private final String redirectUri; diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdLoginService.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdLoginService.java index c7b6b4ac6c6d..bfded7209345 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdLoginService.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdLoginService.java @@ -27,8 +27,8 @@ import org.eclipse.jetty.security.LoginService; import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The implementation of {@link LoginService} required to use OpenID Connect. @@ -39,7 +39,7 @@ */ public class OpenIdLoginService extends ContainerLifeCycle implements LoginService { - private static final Logger LOG = Log.getLogger(OpenIdLoginService.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenIdLoginService.class); private final OpenIdConfiguration configuration; private final LoginService loginService; @@ -94,7 +94,7 @@ public UserIdentity login(String identifier, Object credentials, ServletRequest } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Unable to redeem auth code", e); return null; } diff --git a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java index bc0ee2300916..c5a50ee839b4 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java +++ b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java @@ -33,10 +33,10 @@ import org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration; import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelper; import org.eclipse.jetty.osgi.boot.utils.TldBundleDiscoverer; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ContainerTldBundleDiscoverer @@ -66,7 +66,7 @@ public class ContainerTldBundleDiscoverer implements TldBundleDiscoverer { - private static final Logger LOG = Log.getLogger(ContainerTldBundleDiscoverer.class); + private static final Logger LOG = LoggerFactory.getLogger(ContainerTldBundleDiscoverer.class); private static String DEFAULT_JSP_FACTORY_IMPL_CLASS = "org.apache.jasper.runtime.JspFactoryImpl"; /** diff --git a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java index accad4162c9a..c85aaa42d6a8 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java +++ b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java @@ -29,10 +29,10 @@ import org.eclipse.jetty.osgi.boot.JettyBootstrapActivator; import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelper; import org.eclipse.jetty.osgi.boot.utils.TldBundleDiscoverer; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JSTLBundleDiscoverer @@ -47,7 +47,7 @@ */ public class JSTLBundleDiscoverer implements TldBundleDiscoverer { - private static final Logger LOG = Log.getLogger(JSTLBundleDiscoverer.class); + private static final Logger LOG = LoggerFactory.getLogger(JSTLBundleDiscoverer.class); /** * Default name of a class that belongs to the jstl bundle. From that class diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java index a3148e9b7cdb..8db88e052e85 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java @@ -28,13 +28,13 @@ import org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration; import org.eclipse.jetty.osgi.boot.OSGiWebappConstants; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.statistic.CounterStatistic; import org.eclipse.jetty.webapp.WebAppContext; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Extend the AnnotationConfiguration to support OSGi: @@ -43,7 +43,7 @@ */ public class AnnotationConfiguration extends org.eclipse.jetty.annotations.AnnotationConfiguration { - private static final Logger LOG = Log.getLogger(org.eclipse.jetty.annotations.AnnotationConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(org.eclipse.jetty.annotations.AnnotationConfiguration.class); public class BundleParserTask extends ParserTask { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java index 9372f9b58fc1..4c7d6b3e8b83 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java @@ -30,12 +30,12 @@ import org.eclipse.jetty.osgi.boot.utils.OSGiClassLoader; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.JarResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; import org.osgi.framework.Bundle; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractContextProvider @@ -45,7 +45,7 @@ */ public abstract class AbstractContextProvider extends AbstractLifeCycle implements AppProvider { - private static final Logger LOG = Log.getLogger(AbstractContextProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractContextProvider.class); private DeploymentManager _deploymentManager; diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java index 10fa4e81c674..ee52bf382a20 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java @@ -27,12 +27,12 @@ import org.eclipse.jetty.deploy.AppProvider; import org.eclipse.jetty.deploy.DeploymentManager; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceRegistration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractOSGiApp @@ -41,7 +41,7 @@ */ public abstract class AbstractOSGiApp extends App { - private static final Logger LOG = Log.getLogger(AbstractOSGiApp.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractOSGiApp.class); protected Bundle _bundle; protected Dictionary _properties; @@ -175,7 +175,7 @@ protected Resource findFile(String fileName, String jettyHome, String bundleOver } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to find relative override location: {}", bundleOverrideLocation, e); } } if (res != null) diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java index 6f1b71fdbdd2..cd34e0d677ec 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java @@ -33,8 +33,6 @@ import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelperFactory; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.JarResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.WebAppClassLoader; @@ -44,6 +42,8 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.packageadmin.PackageAdmin; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractWebAppProvider @@ -53,7 +53,7 @@ */ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implements AppProvider { - private static final Logger LOG = Log.getLogger(AbstractWebAppProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractWebAppProvider.class); private boolean _parentLoaderPriority; diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java index 8e5a0ff62683..a7a0e60d622f 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java @@ -28,14 +28,14 @@ import org.eclipse.jetty.deploy.App; import org.eclipse.jetty.osgi.boot.internal.serverfactory.ServerInstanceWrapper; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.BundleTracker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * BundleContextProvider @@ -44,7 +44,7 @@ */ public class BundleContextProvider extends AbstractContextProvider implements BundleProvider { - private static final Logger LOG = Log.getLogger(AbstractContextProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractContextProvider.class); private Map _appMap = new HashMap(); @@ -79,7 +79,7 @@ public Object addingBundle(Bundle bundle, BundleEvent event) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to add bundle {}", bundle, e); } return null; } @@ -93,7 +93,7 @@ public void removedBundle(Bundle bundle, BundleEvent event, Object object) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to remove bundle {}", bundle, e); } } } @@ -131,7 +131,7 @@ protected void doStop() throws Exception } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to unregister {}", _serviceRegForBundles, e); } } } diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java index 466b9f9c6a2b..ba6d78fd28e9 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java @@ -27,14 +27,14 @@ import org.eclipse.jetty.osgi.boot.internal.serverfactory.ServerInstanceWrapper; import org.eclipse.jetty.osgi.boot.utils.Util; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.BundleTracker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * BundleWebAppProvider @@ -43,7 +43,7 @@ */ public class BundleWebAppProvider extends AbstractWebAppProvider implements BundleProvider { - private static final Logger LOG = Log.getLogger(AbstractWebAppProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractWebAppProvider.class); /** * Map of Bundle to App. Used when a Bundle contains a webapp. @@ -79,7 +79,7 @@ public Object addingBundle(Bundle bundle, BundleEvent event) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to add bundle {}", bundle, e); } return null; } @@ -93,7 +93,7 @@ public void removedBundle(Bundle bundle, BundleEvent event, Object object) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to remove bundle {}", bundle, e); } } } @@ -129,7 +129,7 @@ protected void doStop() throws Exception } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to unregister {}", _serviceRegForBundles, e); } } diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java index 9b40fabaf79c..cb9942158158 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java @@ -22,13 +22,13 @@ import org.eclipse.jetty.osgi.boot.internal.serverfactory.JettyServerServiceTracker; import org.eclipse.jetty.osgi.boot.utils.internal.PackageAdminServiceTracker; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JettyBootstrapActivator @@ -41,7 +41,7 @@ */ public class JettyBootstrapActivator implements BundleActivator { - private static final Logger LOG = Log.getLogger(JettyBootstrapActivator.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyBootstrapActivator.class); private static JettyBootstrapActivator INSTANCE = null; diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiMetaInfConfiguration.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiMetaInfConfiguration.java index b3a7e198fdb4..6386b3a3a87c 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiMetaInfConfiguration.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiMetaInfConfiguration.java @@ -35,8 +35,6 @@ import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelperFactory; import org.eclipse.jetty.osgi.boot.utils.Util; import org.eclipse.jetty.osgi.boot.utils.internal.PackageAdminServiceTracker; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceCollection; import org.eclipse.jetty.webapp.Configuration; @@ -45,6 +43,8 @@ import org.eclipse.jetty.webapp.WebInfConfiguration; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * OSGiWebInfConfiguration @@ -53,7 +53,7 @@ */ public class OSGiMetaInfConfiguration extends MetaInfConfiguration { - private static final Logger LOG = Log.getLogger(WebInfConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(WebInfConfiguration.class); /** * Comma separated list of symbolic names of bundles that contain tlds that should be considered diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java index 45b2fe645423..a3787f7c7e3d 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java @@ -29,8 +29,6 @@ import org.eclipse.jetty.osgi.boot.internal.serverfactory.ServerInstanceWrapper; import org.eclipse.jetty.osgi.boot.utils.Util; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -39,6 +37,8 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ServiceContextProvider @@ -47,7 +47,7 @@ */ public class ServiceContextProvider extends AbstractContextProvider implements ServiceProvider { - private static final Logger LOG = Log.getLogger(AbstractContextProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractContextProvider.class); private Map _serviceMap = new HashMap<>(); @@ -221,7 +221,7 @@ protected void doStop() throws Exception } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to unregister {}", _serviceRegForServices, e); } } super.doStop(); diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java index 3437facef483..7f0ce92d89ee 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java @@ -29,8 +29,6 @@ import org.eclipse.jetty.osgi.boot.internal.serverfactory.ServerInstanceWrapper; import org.eclipse.jetty.osgi.boot.utils.Util; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -39,6 +37,8 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ServiceWebAppProvider @@ -47,7 +47,7 @@ */ public class ServiceWebAppProvider extends AbstractWebAppProvider implements ServiceProvider { - private static final Logger LOG = Log.getLogger(AbstractWebAppProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractWebAppProvider.class); /** * Map of ServiceRef to App. Used when it is an osgi service that is a WebAppContext. @@ -253,7 +253,7 @@ protected void doStop() throws Exception } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to unregister {}", _serviceRegForServices, e); } } super.doStop(); diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java index b89b887b2d85..59bcd04a2518 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java @@ -35,12 +35,12 @@ import org.eclipse.jetty.osgi.boot.utils.OSGiClassLoader; import org.eclipse.jetty.osgi.boot.utils.Util; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.JarResource; import org.eclipse.jetty.util.resource.Resource; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DefaultJettyAtJettyHomeHelper @@ -54,7 +54,7 @@ */ public class DefaultJettyAtJettyHomeHelper { - private static final Logger LOG = Log.getLogger(DefaultJettyAtJettyHomeHelper.class); + private static final Logger LOG = LoggerFactory.getLogger(DefaultJettyAtJettyHomeHelper.class); /** * contains a comma separated list of paths to the etc/jetty-*.xml files @@ -214,7 +214,7 @@ else if (jettyHomeBundleSysProp != null) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to start Jetty at Jetty Home", e); throw e; } finally diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/JettyServerServiceTracker.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/JettyServerServiceTracker.java index de5a0438596f..3e082f89eade 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/JettyServerServiceTracker.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/JettyServerServiceTracker.java @@ -23,11 +23,11 @@ import org.eclipse.jetty.osgi.boot.OSGiServerConstants; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTrackerCustomizer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JettyServerServiceTracker @@ -37,7 +37,7 @@ */ public class JettyServerServiceTracker implements ServiceTrackerCustomizer { - private static Logger LOG = Log.getLogger(JettyServerServiceTracker.class.getName()); + private static Logger LOG = LoggerFactory.getLogger(JettyServerServiceTracker.class.getName()); @Override public Object addingService(ServiceReference sr) @@ -65,7 +65,7 @@ public Object addingService(ServiceReference sr) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to start server {}", name, e); return sr.getBundle().getBundleContext().getService(sr); } } @@ -82,15 +82,15 @@ public void removedService(ServiceReference reference, Object service) { if (service instanceof ServerInstanceWrapper) { + ServerInstanceWrapper wrapper = (ServerInstanceWrapper)service; try { - ServerInstanceWrapper wrapper = (ServerInstanceWrapper)service; wrapper.stop(); LOG.info("Stopped Server {}", wrapper.getManagedServerName()); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to stop server {}", wrapper.getManagedServerName(), e); } } } diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java index f7b82911f16e..e8b2bcb3db25 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java @@ -51,10 +51,10 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ServerInstanceWrapper @@ -73,7 +73,7 @@ public class ServerInstanceWrapper private static Collection __containerTldBundleDiscoverers = new ArrayList<>(); - private static Logger LOG = Log.getLogger(ServerInstanceWrapper.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(ServerInstanceWrapper.class.getName()); private final String _managedServerName; @@ -278,7 +278,7 @@ public void start(Server server, Dictionary props) throws Except } catch (Exception x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } throw e; @@ -300,7 +300,7 @@ public void stop() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to stop server", e); } } @@ -356,7 +356,7 @@ private void init() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to add BundleAppProvider to DeploymentManager", e); } } @@ -370,7 +370,7 @@ private void init() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to add ServiceWebAppProvider to DeploymentManager", e); } } @@ -383,7 +383,7 @@ private void init() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to add BundleContextProvider to DeploymentManager", e); } } @@ -396,7 +396,7 @@ private void init() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to add ServiceContextProvider to DeploymentManager", e); } } } @@ -438,7 +438,7 @@ private List getManagedJettySharedLibFolderUrls(Dictionary } catch (Throwable mfe) { - LOG.warn(mfe); + LOG.warn("Unable to process legacy lib folder {}", tok, mfe); } } return libURLs; diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java index e75a236ca357..6d68c9a4de6a 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java @@ -34,13 +34,13 @@ import org.eclipse.jetty.osgi.boot.utils.BundleClassLoaderHelperFactory; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.WebAppClassLoader; import org.eclipse.jetty.webapp.WebAppContext; import org.osgi.framework.Bundle; import org.osgi.framework.BundleReference; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * OSGiWebappClassLoader @@ -51,7 +51,7 @@ public class OSGiWebappClassLoader extends WebAppClassLoader implements BundleReference { - private static final Logger __logger = Log.getLogger(OSGiWebappClassLoader.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(OSGiWebappClassLoader.class.getName()); /** * when a logging framework is setup in the osgi classloaders, it can access @@ -214,7 +214,7 @@ public void addClassPath(String classPath) throws IOException } else { - __logger.info("Did not add " + path + " to the classloader of the webapp " + getContext()); + LOG.info("Did not add " + path + " to the classloader of the webapp " + getContext()); } } } @@ -266,7 +266,7 @@ private boolean isAcceptableLibrary(File file, Set pathToClassFiles) catch (IOException e) { // nevermind. just trying our best - __logger.ignore(e); + LOG.trace("IGNORED", e); } return true; } @@ -300,7 +300,7 @@ public void setWebappContext(WebAppContext webappContext) catch (Throwable t) { // humf that will hurt if it does not work. - __logger.warn("Unable to set webappcontext", t); + LOG.warn("Unable to set webappcontext", t); } } } diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleClassLoaderHelperFactory.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleClassLoaderHelperFactory.java index e0c14d0d945a..8a9e2c41da92 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleClassLoaderHelperFactory.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleClassLoaderHelperFactory.java @@ -18,8 +18,8 @@ package org.eclipse.jetty.osgi.boot.utils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * BundleClassLoaderHelperFactory @@ -28,7 +28,7 @@ */ public class BundleClassLoaderHelperFactory { - private static final Logger LOG = Log.getLogger(BundleClassLoaderHelperFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(BundleClassLoaderHelperFactory.class); private static BundleClassLoaderHelperFactory _instance = new BundleClassLoaderHelperFactory(); @@ -53,7 +53,7 @@ public BundleClassLoaderHelper getHelper() } catch (Throwable t) { - LOG.ignore(t); + LOG.trace("IGNORED", t); } return helper; diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleFileLocatorHelperFactory.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleFileLocatorHelperFactory.java index 9d3330cf5e15..479a200a78a3 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleFileLocatorHelperFactory.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleFileLocatorHelperFactory.java @@ -18,8 +18,8 @@ package org.eclipse.jetty.osgi.boot.utils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * BundleFileLocatorHelperFactory @@ -28,7 +28,7 @@ */ public class BundleFileLocatorHelperFactory { - private static final Logger LOG = Log.getLogger(BundleFileLocatorHelperFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(BundleFileLocatorHelperFactory.class); private static BundleFileLocatorHelperFactory _instance = new BundleFileLocatorHelperFactory(); @@ -52,7 +52,7 @@ public BundleFileLocatorHelper getHelper() } catch (Throwable t) { - LOG.ignore(t); + LOG.trace("IGNORED", t); } return helper; } diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java index bb90555a9432..256e4e5aa4fc 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java @@ -26,9 +26,9 @@ import java.util.Enumeration; import java.util.List; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.Bundle; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * OSGiClassLoader @@ -38,7 +38,7 @@ */ public class OSGiClassLoader extends URLClassLoader { - private static final Logger LOG = Log.getLogger(OSGiClassLoader.class); + private static final Logger LOG = LoggerFactory.getLogger(OSGiClassLoader.class); private Bundle _bundle; private ClassLoader _osgiBundleClassLoader; diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultBundleClassLoaderHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultBundleClassLoaderHelper.java index 1547adf02ab9..ced85389b5e0 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultBundleClassLoaderHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultBundleClassLoaderHelper.java @@ -23,9 +23,9 @@ import java.util.List; import org.eclipse.jetty.osgi.boot.utils.BundleClassLoaderHelper; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.osgi.framework.Bundle; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DefaultBundleClassLoaderHelper @@ -35,7 +35,7 @@ */ public class DefaultBundleClassLoaderHelper implements BundleClassLoaderHelper { - private static final Logger LOG = Log.getLogger(BundleClassLoaderHelper.class); + private static final Logger LOG = LoggerFactory.getLogger(BundleClassLoaderHelper.class); private static enum OSGiContainerType { @@ -80,7 +80,7 @@ private static void checkContainerType(Bundle bundle) } catch (ClassNotFoundException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } try @@ -91,7 +91,7 @@ private static void checkContainerType(Bundle bundle) } catch (ClassNotFoundException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } try @@ -112,7 +112,7 @@ private static void checkContainerType(Bundle bundle) } catch (ClassNotFoundException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } try @@ -123,7 +123,7 @@ private static void checkContainerType(Bundle bundle) } catch (ClassNotFoundException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } LOG.warn("Unknown OSGi container type"); @@ -153,7 +153,7 @@ public ClassLoader getBundleClassLoader(Bundle bundle) } catch (ClassNotFoundException e) { - LOG.warn(e); + LOG.warn("Unable to load bundle activator {}", bundleActivator, e); } } @@ -207,6 +207,7 @@ private static ClassLoader internalGetEquinoxBundleClassLoader(Bundle bundle) { if (osgiContainer == OSGiContainerType.EquinoxOld) { + String bundleLoaderName = "org.eclipse.osgi.internal.loader.BundleLoader"; try { if (Equinox_BundleHost_getBundleLoader_method == null) @@ -219,19 +220,14 @@ private static ClassLoader internalGetEquinoxBundleClassLoader(Bundle bundle) if (Equinox_BundleLoader_createClassLoader_method == null && bundleLoader != null) { Equinox_BundleLoader_createClassLoader_method = - bundleLoader.getClass().getClassLoader().loadClass("org.eclipse.osgi.internal.loader.BundleLoader").getDeclaredMethod("createClassLoader", new Class[]{}); + bundleLoader.getClass().getClassLoader().loadClass(bundleLoaderName).getDeclaredMethod("createClassLoader", new Class[]{}); Equinox_BundleLoader_createClassLoader_method.setAccessible(true); } return (ClassLoader)Equinox_BundleLoader_createClassLoader_method.invoke(bundleLoader, new Object[]{}); } - catch (ClassNotFoundException t) - { - LOG.warn(t); - return null; - } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Unable to get equinox bundle classloader", t); return null; } } @@ -252,7 +248,7 @@ private static ClassLoader internalGetEquinoxBundleClassLoader(Bundle bundle) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get equinox luna bundle classloader", e); return null; } } @@ -288,7 +284,7 @@ private static ClassLoader internalGetFelixBundleClassLoader(Bundle bundle) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get felix bundle classloader", e); return null; } } @@ -320,21 +316,23 @@ private static ClassLoader internalGetFelixBundleClassLoader(Bundle bundle) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get field {}", Felix_BundleImpl_m_Modules_Field, e); return null; } } if (Felix_ModuleImpl_m_ClassLoader_Field == null && currentModuleImpl != null) { + String felixFrameworkModuleImplClassName = "org.apache.felix.framework.ModuleImpl"; + String felixFrameworkModuleImplClassLoaderField = "m_classLoader"; try { - Felix_ModuleImpl_m_ClassLoader_Field = bundle.getClass().getClassLoader().loadClass("org.apache.felix.framework.ModuleImpl").getDeclaredField("m_classLoader"); + Felix_ModuleImpl_m_ClassLoader_Field = bundle.getClass().getClassLoader().loadClass(felixFrameworkModuleImplClassName).getDeclaredField(felixFrameworkModuleImplClassLoaderField); Felix_ModuleImpl_m_ClassLoader_Field.setAccessible(true); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to find field {}.{}", felixFrameworkModuleImplClassName, felixFrameworkModuleImplClassLoaderField, e); return null; } } @@ -351,7 +349,7 @@ private static ClassLoader internalGetFelixBundleClassLoader(Bundle bundle) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get field {}", Felix_ModuleImpl_m_ClassLoader_Field, e); return null; } @@ -367,13 +365,13 @@ private static ClassLoader internalGetFelixBundleClassLoader(Bundle bundle) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get field {}", Felix_ModuleImpl_m_ClassLoader_Field, e); return null; } } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to load old felix container", e); return null; } } @@ -424,7 +422,7 @@ private static ClassLoader internalGetConciergeBundleClassLoader(Bundle bundle) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to load Concierge platform", e); return null; } } diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index c83cbf2cc750..0c13244b308f 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -409,6 +409,12 @@ jetty-test-helper test + + org.slf4j + slf4j-api + ${slf4j.version} + test + org.slf4j slf4j-log4j12 diff --git a/jetty-osgi/test-jetty-osgi/src/main/resources/jetty-logging.properties b/jetty-osgi/test-jetty-osgi/src/main/resources/jetty-logging.properties index 147cf004df88..c2be11c689ac 100644 --- a/jetty-osgi/test-jetty-osgi/src/main/resources/jetty-logging.properties +++ b/jetty-osgi/test-jetty-osgi/src/main/resources/jetty-logging.properties @@ -1 +1 @@ -org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog +org.eclipse.jetty.LEVEL=INFO \ No newline at end of file diff --git a/jetty-osgi/test-jetty-osgi/src/test/resources/log4j.properties b/jetty-osgi/test-jetty-osgi/src/test/resources/log4j.properties deleted file mode 100644 index 8bcbd0700c6d..000000000000 --- a/jetty-osgi/test-jetty-osgi/src/test/resources/log4j.properties +++ /dev/null @@ -1,16 +0,0 @@ -# LOG4J levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL -# -log4j.rootLogger=ALL,CONSOLE - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -#log4j.appender.CONSOLE.threshold=INFO -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -#log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n -log4j.appender.CONSOLE.layout.ConversionPattern=%d [%5p][%c] %m%n - -# Level tuning -# log4j.logger.org.eclipse.jetty=DEBUG -# log4j.logger.org.eclipse.jetty.security=DEBUG -log4j.logger.shaded.org.eclipse.aether=WARN -log4j.logger.shaded.org.apache.http=WARN -log4j.logger.org.ops4j=WARN diff --git a/jetty-osgi/test-jetty-osgi/src/test/resources/log4j.xml b/jetty-osgi/test-jetty-osgi/src/test/resources/log4j.xml new file mode 100644 index 000000000000..fd9c89961b15 --- /dev/null +++ b/jetty-osgi/test-jetty-osgi/src/test/resources/log4j.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java index 7392d0b77f36..b4ff90919a79 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java @@ -32,13 +32,13 @@ import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ContainerInitializer { - private static final Logger LOG = Log.getLogger(ContainerInitializer.class); + private static final Logger LOG = LoggerFactory.getLogger(ContainerInitializer.class); protected final ServletContainerInitializer _target; protected final Class[] _interestedTypes; diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java index a8d4061fa52a..ff71908e735d 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java @@ -27,8 +27,8 @@ import javax.naming.NamingException; import org.eclipse.jetty.util.IntrospectionUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Injection @@ -39,7 +39,7 @@ */ public class Injection { - private static final Logger LOG = Log.getLogger(Injection.class); + private static final Logger LOG = LoggerFactory.getLogger(Injection.class); private final Class _targetClass; private final String _jndiName; @@ -205,7 +205,7 @@ protected void injectField(Field field, Object injectable) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to inject field {} with {}", field, injectable, e); throw new IllegalStateException("Inject failed for field " + field.getName()); } } @@ -227,7 +227,7 @@ protected void injectMethod(Method method, Object injectable) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to inject method {} with {}", method, injectable, e); throw new IllegalStateException("Inject failed for method " + method.getName()); } } diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/InjectionCollection.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/InjectionCollection.java index 757ddb19961d..7d7133b3f7d1 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/InjectionCollection.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/InjectionCollection.java @@ -26,8 +26,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * InjectionCollection @@ -39,7 +39,7 @@ */ public class InjectionCollection { - private static final Logger LOG = Log.getLogger(InjectionCollection.class); + private static final Logger LOG = LoggerFactory.getLogger(InjectionCollection.class); public static final String INJECTION_COLLECTION = "org.eclipse.jetty.injectionCollection"; diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallbackCollection.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallbackCollection.java index a75d1d1efed4..a5de0b0467de 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallbackCollection.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallbackCollection.java @@ -27,8 +27,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * LifeCycleCallbackCollection @@ -43,7 +43,7 @@ */ public class LifeCycleCallbackCollection { - private static final Logger LOG = Log.getLogger(LifeCycleCallbackCollection.class); + private static final Logger LOG = LoggerFactory.getLogger(LifeCycleCallbackCollection.class); public static final String LIFECYCLE_CALLBACK_COLLECTION = "org.eclipse.jetty.lifecyleCallbackCollection"; diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PreDestroyCallback.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PreDestroyCallback.java index 15c8b531c47e..3e0132bfa486 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PreDestroyCallback.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PreDestroyCallback.java @@ -21,15 +21,15 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * PreDestroyCallback */ public class PreDestroyCallback extends LifeCycleCallback { - private static final Logger LOG = Log.getLogger(PreDestroyCallback.class); + private static final Logger LOG = LoggerFactory.getLogger(PreDestroyCallback.class); /** * @param clazz the class object to be injected diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/RunAsCollection.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/RunAsCollection.java index a563c2dd3507..45305b17ec22 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/RunAsCollection.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/RunAsCollection.java @@ -22,15 +22,15 @@ import java.util.concurrent.ConcurrentMap; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * RunAsCollection */ public class RunAsCollection { - private static final Logger LOG = Log.getLogger(RunAsCollection.class); + private static final Logger LOG = LoggerFactory.getLogger(RunAsCollection.class); public static final String RUNAS_COLLECTION = "org.eclipse.jetty.runAsCollection"; private ConcurrentMap _runAsMap = new ConcurrentHashMap();//map of classname to run-as diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntry.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntry.java index 7d63349b3640..95e1961bd3fb 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntry.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntry.java @@ -26,8 +26,8 @@ import javax.naming.NamingException; import org.eclipse.jetty.jndi.NamingUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * NamingEntry @@ -42,7 +42,7 @@ */ public abstract class NamingEntry { - private static final Logger LOG = Log.getLogger(NamingEntry.class); + private static final Logger LOG = LoggerFactory.getLogger(NamingEntry.class); public static final String __contextName = "__"; //all NamingEntries stored in context called "__" protected final Object _scope; protected final String _jndiName; //the name representing the object associated with the NamingEntry @@ -115,7 +115,7 @@ public void unbindENC() } catch (NamingException e) { - LOG.warn(e); + LOG.warn("Unable to unbind ENC", e); } } @@ -134,7 +134,7 @@ public void release() } catch (NamingException e) { - LOG.warn(e); + LOG.warn("Unable to release: {} and {}", _objectNameString, _namingEntryNameString, e); } } diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntryUtil.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntryUtil.java index 70d5b3f6b4c7..89dabeed4998 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntryUtil.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntryUtil.java @@ -31,12 +31,12 @@ import javax.naming.NamingException; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NamingEntryUtil { - private static final Logger LOG = Log.getLogger(NamingEntryUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(NamingEntryUtil.class); /** * Link a name in a webapp's java:/comp/evn namespace to a pre-existing @@ -196,7 +196,7 @@ public static Name getNameForScope(Object scope) } catch (NamingException e) { - LOG.warn(e); + LOG.warn("Unable to get name for scope {}", scope, e); return null; } } diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Transaction.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Transaction.java index f57ec23ad37a..384d69455fdd 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Transaction.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Transaction.java @@ -26,8 +26,8 @@ import javax.transaction.UserTransaction; import org.eclipse.jetty.jndi.NamingUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Transaction @@ -36,7 +36,7 @@ */ public class Transaction extends NamingEntry { - private static final Logger LOG = Log.getLogger(Transaction.class); + private static final Logger LOG = LoggerFactory.getLogger(Transaction.class); public static final String USER_TRANSACTION = "UserTransaction"; public static void bindToENC() @@ -109,7 +109,7 @@ public void unbindENC() } catch (NamingException e) { - LOG.warn(e); + LOG.warn("Unable to unbind java:comp/{}", getJndiName(), e); } } } diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java index 524c065c210d..6d486fc45f15 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java @@ -36,9 +36,9 @@ import org.eclipse.jetty.security.AbstractLoginService; import org.eclipse.jetty.security.IdentityService; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Credential; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DataSourceUserRealm @@ -48,7 +48,7 @@ */ public class DataSourceLoginService extends AbstractLoginService { - private static final Logger LOG = Log.getLogger(DataSourceLoginService.class); + private static final Logger LOG = LoggerFactory.getLogger(DataSourceLoginService.class); private String _jndiName = "javax.sql.DataSource/default"; private DataSource _datasource; diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java index ef5749faccf8..20f22c47d900 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java @@ -36,8 +36,6 @@ import org.eclipse.jetty.plus.jndi.EnvEntry; import org.eclipse.jetty.plus.jndi.NamingDump; import org.eclipse.jetty.plus.jndi.NamingEntryUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.FragmentConfiguration; @@ -47,13 +45,15 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebXmlConfiguration; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * EnvConfiguration */ public class EnvConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(EnvConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(EnvConfiguration.class); private static final String JETTY_ENV_BINDINGS = "org.eclipse.jetty.jndi.EnvConfiguration"; private Resource jettyEnvXmlResource; @@ -189,7 +189,7 @@ public void deconfigure(WebAppContext context) throws Exception } catch (NameNotFoundException e) { - LOG.warn(e); + LOG.warn("Unable to destroy InitialContext", e); } finally { @@ -214,7 +214,7 @@ public void destroy(WebAppContext context) throws Exception } catch (NameNotFoundException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); LOG.debug("No jndi entries scoped to webapp {}", context); } catch (NamingException e) diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusConfiguration.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusConfiguration.java index ce0fe7a2965e..93efd6349411 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusConfiguration.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusConfiguration.java @@ -27,21 +27,21 @@ import org.eclipse.jetty.plus.annotation.InjectionCollection; import org.eclipse.jetty.plus.annotation.LifeCycleCallbackCollection; import org.eclipse.jetty.plus.jndi.Transaction; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.FragmentConfiguration; import org.eclipse.jetty.webapp.JettyWebXmlConfiguration; import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebXmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Configuration */ public class PlusConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(PlusConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(PlusConfiguration.class); private Integer _key; diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDecorator.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDecorator.java index 589ec0ef72d3..6c5d6a74bf7b 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDecorator.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDecorator.java @@ -22,16 +22,16 @@ import org.eclipse.jetty.plus.annotation.LifeCycleCallbackCollection; import org.eclipse.jetty.plus.annotation.RunAsCollection; import org.eclipse.jetty.util.Decorator; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * PlusDecorator */ public class PlusDecorator implements Decorator { - private static final Logger LOG = Log.getLogger(PlusDecorator.class); + private static final Logger LOG = LoggerFactory.getLogger(PlusDecorator.class); protected WebAppContext _context; diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java index 3f1a7cae13fa..faa5e4fe6de1 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java @@ -36,21 +36,21 @@ import org.eclipse.jetty.plus.jndi.NamingEntry; import org.eclipse.jetty.plus.jndi.NamingEntryUtil; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.Descriptor; import org.eclipse.jetty.webapp.FragmentDescriptor; import org.eclipse.jetty.webapp.IterativeDescriptorProcessor; import org.eclipse.jetty.webapp.Origin; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.xml.XmlParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * PlusDescriptorProcessor */ public class PlusDescriptorProcessor extends IterativeDescriptorProcessor { - private static final Logger LOG = Log.getLogger(PlusDescriptorProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(PlusDescriptorProcessor.class); public PlusDescriptorProcessor() { diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 0066877b80f7..49da3737eb87 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -57,6 +57,10 @@ jetty-alpn-client ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty @@ -70,6 +74,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AfterContentTransformer.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AfterContentTransformer.java index 7950d08f201e..9169004064a0 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AfterContentTransformer.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AfterContentTransformer.java @@ -35,8 +35,8 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.component.Destroyable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A specialized transformer for {@link AsyncMiddleManServlet} that performs @@ -58,7 +58,7 @@ */ public abstract class AfterContentTransformer implements AsyncMiddleManServlet.ContentTransformer, Destroyable { - private static final Logger LOG = Log.getLogger(AfterContentTransformer.class); + private static final Logger LOG = LoggerFactory.getLogger(AfterContentTransformer.class); private final List sourceBuffers = new ArrayList<>(); private Path overflowDirectory = Paths.get(System.getProperty("java.io.tmpdir")); @@ -290,7 +290,7 @@ private void close(Closeable closeable) } catch (IOException x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java index 220384292e7e..e119cf44f152 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java @@ -55,8 +55,8 @@ import org.eclipse.jetty.util.CountingCallback; import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.component.Destroyable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Servlet 3.1 asynchronous proxy servlet with capability @@ -757,7 +757,7 @@ public void transform(ByteBuffer input, boolean finished, List outpu public static class GZIPContentTransformer implements ContentTransformer { - private static final Logger logger = Log.getLogger(GZIPContentTransformer.class); + private static final Logger logger = LoggerFactory.getLogger(GZIPContentTransformer.class); private final List buffers = new ArrayList<>(2); private final ContentTransformer transformer; diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java index e5a1246067fc..9cd10814def8 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java @@ -56,17 +56,17 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.HostPort; import org.eclipse.jetty.util.Promise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Implementation of a {@link Handler} that supports HTTP CONNECT.

*/ public class ConnectHandler extends HandlerWrapper { - protected static final Logger LOG = Log.getLogger(ConnectHandler.class); + protected static final Logger LOG = LoggerFactory.getLogger(ConnectHandler.class); private final Set whiteList = new HashSet<>(); private final Set blackList = new HashSet<>(); @@ -319,7 +319,7 @@ private void close(Closeable closeable) } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java index e13676915613..196ff272b66e 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java @@ -29,7 +29,7 @@ import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IteratingCallback; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; public abstract class ProxyConnection extends AbstractConnection { diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java index a77330e37654..bb0b2f5c20d9 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java @@ -74,13 +74,13 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.Utf8StringBuilder; import org.eclipse.jetty.util.ajax.JSON; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.OS; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -92,7 +92,7 @@ @Disabled("See issue #3974") public class AsyncMiddleManServletTest { - private static final Logger LOG = Log.getLogger(AsyncMiddleManServletTest.class); + private static final Logger LOG = LoggerFactory.getLogger(AsyncMiddleManServletTest.class); private static final String PROXIED_HEADER = "X-Proxied"; private HttpClient client; diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletLoadTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletLoadTest.java index ec13fbdc1c87..3a1ede5507bb 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletLoadTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletLoadTest.java @@ -43,13 +43,13 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.ProcessorUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -64,7 +64,7 @@ public static Stream data() .stream().map(Arguments::of); } - private static final Logger LOG = Log.getLogger(ProxyServletLoadTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ProxyServletLoadTest.class); private static final String PROXIED_HEADER = "X-Proxied"; private HttpClient client; diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java index e8b253000539..3f68329e5e94 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java @@ -38,9 +38,9 @@ import java.util.stream.Stream; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Normalize Attribute to String. @@ -62,7 +62,7 @@ */ public class AttributeNormalizer { - private static final Logger LOG = Log.getLogger(AttributeNormalizer.class); + private static final Logger LOG = LoggerFactory.getLogger(AttributeNormalizer.class); private static final Pattern __propertyPattern = Pattern.compile("(?<=[^$]|^)\\$\\{([^}]*)\\}"); private static class Attribute @@ -326,7 +326,7 @@ else if (path != null) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to normalize {}", o, e); } return String.valueOf(o); } @@ -376,7 +376,7 @@ protected String normalizePath(Path path) } catch (IOException ignore) { - LOG.ignore(ignore); + LOG.trace("IGNORED", ignore); } if (path.startsWith(a.path)) diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/ExtraXmlDescriptorProcessor.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/ExtraXmlDescriptorProcessor.java index fe14c738a49e..9e4f29d695fe 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/ExtraXmlDescriptorProcessor.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/ExtraXmlDescriptorProcessor.java @@ -18,12 +18,12 @@ package org.eclipse.jetty.quickstart; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.Descriptor; import org.eclipse.jetty.webapp.IterativeDescriptorProcessor; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.xml.XmlParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ExtraXmlDescriptorProcessor @@ -33,7 +33,7 @@ public class ExtraXmlDescriptorProcessor extends IterativeDescriptorProcessor { - private static final Logger LOG = Log.getLogger(ExtraXmlDescriptorProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(ExtraXmlDescriptorProcessor.class); private final StringBuilder _buffer = new StringBuilder(); private final boolean _showOrigin; diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/PreconfigureQuickStartWar.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/PreconfigureQuickStartWar.java index 362554360a1f..6534eed84cee 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/PreconfigureQuickStartWar.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/PreconfigureQuickStartWar.java @@ -24,16 +24,16 @@ import org.eclipse.jetty.plus.webapp.EnvConfiguration; import org.eclipse.jetty.plus.webapp.PlusConfiguration; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.JarResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PreconfigureQuickStartWar { - private static final Logger LOG = Log.getLogger(PreconfigureQuickStartWar.class); + private static final Logger LOG = LoggerFactory.getLogger(PreconfigureQuickStartWar.class); static final boolean ORIGIN = LOG.isDebugEnabled(); public static void main(String... args) throws Exception diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartConfiguration.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartConfiguration.java index b71c56b5a85d..35ba26a40555 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartConfiguration.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartConfiguration.java @@ -29,8 +29,6 @@ import org.eclipse.jetty.annotations.ServletContainerInitializersStarter; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.Configuration; @@ -39,6 +37,8 @@ import org.eclipse.jetty.webapp.WebDescriptor; import org.eclipse.jetty.webapp.WebInfConfiguration; import org.eclipse.jetty.webapp.WebXmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * QuickStartConfiguration @@ -47,7 +47,7 @@ */ public class QuickStartConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(QuickStartConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(QuickStartConfiguration.class); public static final Set> __replacedConfigurations = new HashSet<>(); public static final String ORIGIN_ATTRIBUTE = "org.eclipse.jetty.quickstart.origin"; diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartGeneratorConfiguration.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartGeneratorConfiguration.java index 59f864b93a52..0cf047c4c871 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartGeneratorConfiguration.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartGeneratorConfiguration.java @@ -53,8 +53,6 @@ import org.eclipse.jetty.servlet.ServletMapping; import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.webapp.AbstractConfiguration; @@ -64,6 +62,8 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebInfConfiguration; import org.eclipse.jetty.xml.XmlAppendable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * QuickStartGeneratorConfiguration @@ -77,7 +77,7 @@ */ public class QuickStartGeneratorConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(QuickStartGeneratorConfiguration.class); + static final Logger LOG = LoggerFactory.getLogger(QuickStartGeneratorConfiguration.class); public static final String ORIGIN = "org.eclipse.jetty.originAttribute"; public static final String DEFAULT_ORIGIN_ATTRIBUTE_NAME = "origin"; diff --git a/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod b/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod index 5caea6942c85..a1231ca8def6 100644 --- a/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod +++ b/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod @@ -1,4 +1,4 @@ -DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html [description] Enables a rewrite Rules container as a request customizer on diff --git a/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-rewrite/src/main/config/modules/rewrite.mod index 939acebdd127..3d9bb91b074f 100644 --- a/jetty-rewrite/src/main/config/modules/rewrite.mod +++ b/jetty-rewrite/src/main/config/modules/rewrite.mod @@ -1,11 +1,11 @@ -DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html [description] Enables the jetty-rewrite handler. Specific rewrite rules must be added to either to etc/jetty-rewrite.xml or a custom xml/module [provides] -rewrite +rewrite|default [depend] server diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java index db153cefdd4e..a1eff8f762dd 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base container to group rules. Can be extended so that the contained rules @@ -38,7 +38,7 @@ public class RuleContainer extends Rule implements Dumpable { public static final String ORIGINAL_QUERYSTRING_ATTRIBUTE_SUFFIX = ".QUERYSTRING"; - private static final Logger LOG = Log.getLogger(RuleContainer.class); + private static final Logger LOG = LoggerFactory.getLogger(RuleContainer.class); protected Rule[] _rules; diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java index 5d6406cf61b5..e159703cf02b 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java @@ -23,8 +23,8 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This rule can be used to protect against invalid unicode characters in a url making it into applications. @@ -38,7 +38,7 @@ */ public class ValidUrlRule extends Rule { - private static final Logger LOG = Log.getLogger(ValidUrlRule.class); + private static final Logger LOG = LoggerFactory.getLogger(ValidUrlRule.class); String _code = "400"; String _message = "Illegal Url"; diff --git a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java index 991fc3002574..0e67904d8f44 100644 --- a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java +++ b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java @@ -53,13 +53,13 @@ import org.eclipse.jetty.servlet.StatisticsServlet; import org.eclipse.jetty.util.RolloverFileOutputStream; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Runner @@ -71,7 +71,7 @@ @Deprecated public class Runner { - private static final Logger LOG = Log.getLogger(Runner.class); + private static final Logger LOG = LoggerFactory.getLogger(Runner.class); public static final String[] PLUS_CONFIGURATION_CLASSES = { diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index ed2047998031..a173d4ea82c4 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -50,7 +50,17 @@ jetty-server ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.tests jetty-http-tools diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java index a0471ea722f7..3584be44c36e 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java @@ -25,16 +25,16 @@ import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Credential; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractLoginService */ public abstract class AbstractLoginService extends ContainerLifeCycle implements LoginService { - private static final Logger LOG = Log.getLogger(AbstractLoginService.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractLoginService.class); protected IdentityService _identityService = new DefaultIdentityService(); protected String _name; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConfigurableSpnegoLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConfigurableSpnegoLoginService.java index f40829253122..9f521f9a2771 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConfigurableSpnegoLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConfigurableSpnegoLoginService.java @@ -36,14 +36,14 @@ import org.eclipse.jetty.security.authentication.AuthorizationService; import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; import org.ietf.jgss.GSSName; import org.ietf.jgss.Oid; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A configurable (as opposed to using system properties) SPNEGO LoginService.

@@ -58,7 +58,7 @@ */ public class ConfigurableSpnegoLoginService extends ContainerLifeCycle implements LoginService { - private static final Logger LOG = Log.getLogger(ConfigurableSpnegoLoginService.class); + private static final Logger LOG = LoggerFactory.getLogger(ConfigurableSpnegoLoginService.class); private final GSSManager _gssManager = GSSManager.getInstance(); private final String _realm; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java index 68851c767daf..fae59423c758 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java @@ -47,9 +47,9 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ConstraintSecurityHandler @@ -60,7 +60,7 @@ */ public class ConstraintSecurityHandler extends SecurityHandler implements ConstraintAware { - private static final Logger LOG = Log.getLogger(SecurityHandler.class); //use same as SecurityHandler + private static final Logger LOG = LoggerFactory.getLogger(SecurityHandler.class); //use same as SecurityHandler private static final String OMISSION_SUFFIX = ".omission"; private static final String ALL_METHODS = "*"; @@ -744,12 +744,14 @@ public boolean checkPathsWithUncoveredHttpMethods() Set paths = getPathsWithUncoveredHttpMethods(); if (paths != null && !paths.isEmpty()) { + ContextHandler.Context currentContext = ContextHandler.getCurrentContext(); + for (String p : paths) { - LOG.warn("{} has uncovered http methods for path: {}", ContextHandler.getCurrentContext(), p); + LOG.warn("{} has uncovered http methods for path: {}", currentContext, p); } if (LOG.isDebugEnabled()) - LOG.debug(new Throwable()); + LOG.debug("{} has uncovered http methods", currentContext, new Throwable()); return true; } return false; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java index 0730a9bc3242..12ab94ec680d 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java @@ -23,8 +23,8 @@ import java.util.stream.Collectors; import org.eclipse.jetty.server.UserIdentity; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Properties User Realm. @@ -44,7 +44,7 @@ */ public class HashLoginService extends AbstractLoginService { - private static final Logger LOG = Log.getLogger(HashLoginService.class); + private static final Logger LOG = LoggerFactory.getLogger(HashLoginService.class); private String _config; private boolean hotReload = false; // default is not to reload diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java index ec49dc2f716a..67c35d85eb6a 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java @@ -31,10 +31,10 @@ import javax.servlet.ServletRequest; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.security.Credential; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * HashMapped User Realm with JDBC as data source. @@ -51,7 +51,7 @@ */ public class JDBCLoginService extends AbstractLoginService { - private static final Logger LOG = Log.getLogger(JDBCLoginService.class); + private static final Logger LOG = LoggerFactory.getLogger(JDBCLoginService.class); protected String _config; protected String _jdbcDriver; @@ -284,7 +284,7 @@ private void closeConnection() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } _con = null; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java b/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java index 080691002f7f..aec9c720f95a 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java @@ -35,12 +35,12 @@ import org.eclipse.jetty.util.PathWatcher; import org.eclipse.jetty.util.PathWatcher.PathWatchEvent; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.JarFileResource; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.security.Credential; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

This class monitors a property file of the format mentioned below @@ -59,7 +59,7 @@ */ public class PropertyUserStore extends UserStore implements PathWatcher.Listener { - private static final Logger LOG = Log.getLogger(PropertyUserStore.class); + private static final Logger LOG = LoggerFactory.getLogger(PropertyUserStore.class); protected Path _configPath; protected PathWatcher _pathWatcher; @@ -305,7 +305,7 @@ public void onPathWatchEvent(PathWatchEvent event) } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to load users", e); } } diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java index e2a907b53efe..3629f069db5f 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java @@ -42,8 +42,8 @@ import org.eclipse.jetty.server.handler.ContextHandler.Context; import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract SecurityHandler. @@ -61,7 +61,7 @@ */ public abstract class SecurityHandler extends HandlerWrapper implements Authenticator.AuthConfiguration { - private static final Logger LOG = Log.getLogger(SecurityHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(SecurityHandler.class); private static final List __knownAuthenticatorFactories = new ArrayList<>(); private boolean _checkWelcomeFiles = false; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ConfigurableSpnegoAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ConfigurableSpnegoAuthenticator.java index 25902b67170b..4861a25cdbfc 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ConfigurableSpnegoAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ConfigurableSpnegoAuthenticator.java @@ -38,9 +38,9 @@ import org.eclipse.jetty.server.Authentication.User; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.UserIdentity; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A LoginAuthenticator that uses SPNEGO and the GSS API to authenticate requests.

@@ -52,7 +52,7 @@ */ public class ConfigurableSpnegoAuthenticator extends LoginAuthenticator { - private static final Logger LOG = Log.getLogger(ConfigurableSpnegoAuthenticator.class); + private static final Logger LOG = LoggerFactory.getLogger(ConfigurableSpnegoAuthenticator.class); private final String _authMethod; private Duration _authenticationDuration = Duration.ofNanos(-1); diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java index a83d086912db..71a25034bac5 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java @@ -39,12 +39,12 @@ import org.eclipse.jetty.server.Authentication; import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DeferredAuthentication implements Authentication.Deferred { - private static final Logger LOG = Log.getLogger(DeferredAuthentication.class); + private static final Logger LOG = LoggerFactory.getLogger(DeferredAuthentication.class); protected final LoginAuthenticator _authenticator; private Object _previousAssociation; @@ -74,7 +74,7 @@ public Authentication authenticate(ServletRequest request) } catch (ServerAuthException e) { - LOG.debug(e); + LOG.debug("Unable to authenticate {}", request, e); } return this; @@ -95,7 +95,7 @@ public Authentication authenticate(ServletRequest request, ServletResponse respo } catch (ServerAuthException e) { - LOG.debug(e); + LOG.debug("Unable to authenticate {}", request, e); } return this; } diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java index 74b07ffcb9fa..d97750c1f459 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java @@ -44,10 +44,10 @@ import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Credential; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The nonce max age in ms can be set with the {@link SecurityHandler#setInitParameter(String, String)} @@ -56,7 +56,7 @@ */ public class DigestAuthenticator extends LoginAuthenticator { - private static final Logger LOG = Log.getLogger(DigestAuthenticator.class); + private static final Logger LOG = LoggerFactory.getLogger(DigestAuthenticator.class); private final SecureRandom _random = new SecureRandom(); private long _maxNonceAgeMs = 60 * 1000; @@ -275,7 +275,7 @@ private int checkNonce(Digest digest, Request request) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return -1; } @@ -384,7 +384,7 @@ public boolean check(Object credentials) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to process digest", e); } return false; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java index 98694577ab2e..383dfd6f2743 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java @@ -47,9 +47,9 @@ import org.eclipse.jetty.util.MultiMap; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * FORM Authenticator. @@ -66,7 +66,7 @@ */ public class FormAuthenticator extends LoginAuthenticator { - private static final Logger LOG = Log.getLogger(FormAuthenticator.class); + private static final Logger LOG = LoggerFactory.getLogger(FormAuthenticator.class); public static final String __FORM_LOGIN_PAGE = "org.eclipse.jetty.security.form_login_page"; public static final String __FORM_ERROR_PAGE = "org.eclipse.jetty.security.form_error_page"; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java index 04db751c6d1c..1c9ac1a659a0 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java @@ -30,12 +30,12 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.server.session.Session; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class LoginAuthenticator implements Authenticator { - private static final Logger LOG = Log.getLogger(LoginAuthenticator.class); + private static final Logger LOG = LoggerFactory.getLogger(LoginAuthenticator.class); protected LoginService _loginService; protected IdentityService _identityService; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java index 8349bd21dae9..8092529925d0 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java @@ -30,8 +30,8 @@ import org.eclipse.jetty.security.LoginService; import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.server.UserIdentity; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * SessionAuthentication @@ -43,7 +43,7 @@ public class SessionAuthentication extends AbstractUserAuthentication implements Serializable, HttpSessionActivationListener, HttpSessionBindingListener { - private static final Logger LOG = Log.getLogger(SessionAuthentication.class); + private static final Logger LOG = LoggerFactory.getLogger(SessionAuthentication.class); private static final long serialVersionUID = -4643200685888258706L; diff --git a/jetty-security/src/test/resources/jetty-logging.properties b/jetty-security/src/test/resources/jetty-logging.properties index e6d3c167d1f4..bd86a8c53693 100755 --- a/jetty-security/src/test/resources/jetty-logging.properties +++ b/jetty-security/src/test/resources/jetty-logging.properties @@ -1,6 +1,5 @@ # Setup default logging implementation for during testing # Jetty Logging using jetty-slf4j-impl #org.eclipse.jetty.LEVEL=DEBUG - #org.eclipse.jetty.util.PathWatcher.LEVEL=DEBUG #org.eclipse.jetty.util.PathWatcher.Noisy.LEVEL=OFF diff --git a/jetty-server/src/main/config/modules/bytebufferpool.mod b/jetty-server/src/main/config/modules/bytebufferpool.mod index 7a813148b6ee..d4b28f9244dd 100644 --- a/jetty-server/src/main/config/modules/bytebufferpool.mod +++ b/jetty-server/src/main/config/modules/bytebufferpool.mod @@ -3,6 +3,9 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-m [description] Configures the ByteBufferPool used by ServerConnectors. +[depends] +logging + [xml] etc/jetty-bytebufferpool.xml diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod index 6118e9abeacb..8e76acec0d06 100644 --- a/jetty-server/src/main/config/modules/server.mod +++ b/jetty-server/src/main/config/modules/server.mod @@ -1,4 +1,4 @@ -DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html [description] Enables the core Jetty server on the classpath. diff --git a/jetty-server/src/main/config/modules/threadpool.mod b/jetty-server/src/main/config/modules/threadpool.mod index c0201b3c7e09..36541ef96645 100644 --- a/jetty-server/src/main/config/modules/threadpool.mod +++ b/jetty-server/src/main/config/modules/threadpool.mod @@ -3,6 +3,9 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-m [description] Enables the Server thread pool. +[depends] +logging + [xml] etc/jetty-threadpool.xml diff --git a/jetty-server/src/main/java/module-info.java b/jetty-server/src/main/java/module-info.java index 3bba30e7b79d..f71535497304 100644 --- a/jetty-server/src/main/java/module-info.java +++ b/jetty-server/src/main/java/module-info.java @@ -25,9 +25,9 @@ exports org.eclipse.jetty.server.jmx to org.eclipse.jetty.jmx; exports org.eclipse.jetty.server.session; - requires transitive org.slf4j; requires transitive jetty.servlet.api; requires transitive org.eclipse.jetty.http; + requires transitive org.slf4j; // Only required if using DatabaseAdaptor/JDBCSessionDataStore. requires static java.sql; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java index e9dfdcf08bad..357286a7c826 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java @@ -48,13 +48,13 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.Graceful; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.ThreadPoolBudget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

An abstract implementation of {@link Connector} that provides a {@link ConnectionFactory} mechanism @@ -141,7 +141,7 @@ @ManagedObject("Abstract implementation of the Connector Interface") public abstract class AbstractConnector extends ContainerLifeCycle implements Connector, Dumpable { - protected static final Logger LOG = Log.getLogger(AbstractConnector.class); + protected static final Logger LOG = LoggerFactory.getLogger(AbstractConnector.class); private final AutoLock _lock = new AutoLock(); private final Condition _setAccepting = _lock.newCondition(); @@ -643,17 +643,17 @@ protected boolean handleAcceptFailure(Throwable ex) { if (ex instanceof InterruptedException) { - LOG.debug(ex); + LOG.debug("Accept Interrupted", ex); return true; } if (ex instanceof ClosedByInterruptException) { - LOG.debug(ex); + LOG.debug("Accept Closed by Interrupt", ex); return false; } - LOG.warn(ex); + LOG.warn("Accept Failure", ex); try { // Arbitrary sleep to avoid spin looping. @@ -664,13 +664,13 @@ protected boolean handleAcceptFailure(Throwable ex) } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } return false; } else { - LOG.ignore(ex); + LOG.trace("IGNORED", ex); return false; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java index d7e7c5d5131b..69ff10b546a1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java @@ -110,7 +110,7 @@ protected boolean handleAcceptFailure(Throwable ex) { if (isOpen()) return super.handleAcceptFailure(ex); - LOG.ignore(ex); + LOG.trace("IGNORED", ex); return false; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AcceptRateLimit.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AcceptRateLimit.java index 075835712e44..28d9ca77db4b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AcceptRateLimit.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AcceptRateLimit.java @@ -30,10 +30,10 @@ import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.Container; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.statistic.RateStatistic; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A Listener that limits the rate at which new connections are accepted

@@ -62,7 +62,7 @@ @ManagedObject public class AcceptRateLimit extends AbstractLifeCycle implements SelectorManager.AcceptListener, Runnable { - private static final Logger LOG = Log.getLogger(AcceptRateLimit.class); + private static final Logger LOG = LoggerFactory.getLogger(AcceptRateLimit.class); private final Server _server; private final List _connectors = new ArrayList<>(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java index 6fe2a637de31..f1a9ba6cb880 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java @@ -23,15 +23,15 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.util.BlockingArrayQueue; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An asynchronously writing RequestLogWriter */ public class AsyncRequestLogWriter extends RequestLogWriter { - private static final Logger LOG = Log.getLogger(AsyncRequestLogWriter.class); + private static final Logger LOG = LoggerFactory.getLogger(AsyncRequestLogWriter.class); private final BlockingQueue _queue; private transient AsyncRequestLogWriter.WriterThread _thread; private boolean _warnedFull; @@ -81,11 +81,11 @@ public void run() } catch (InterruptedException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Failed to write log", t); } } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java index 9db3480edd96..3d4cc0f52de2 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java @@ -44,14 +44,14 @@ import org.eclipse.jetty.http.PrecompressedHttpContent; import org.eclipse.jetty.http.ResourceHttpContent; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CachedContentFactory implements HttpContent.ContentFactory { - private static final Logger LOG = Log.getLogger(CachedContentFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(CachedContentFactory.class); private static final Map NO_PRECOMPRESSED = Collections.unmodifiableMap(Collections.emptyMap()); private final ConcurrentMap _cache; @@ -334,7 +334,7 @@ protected ByteBuffer getIndirectBuffer(Resource resource) catch (IOException | IllegalArgumentException e) { if (LOG.isDebugEnabled()) - LOG.debug(e); + LOG.debug("Unable to get Indirect Buffer for {}", resource, e); } return null; } @@ -351,7 +351,7 @@ protected ByteBuffer getMappedBuffer(Resource resource) catch (IOException | IllegalArgumentException e) { if (LOG.isDebugEnabled()) - LOG.debug(e); + LOG.debug("Unable to get Mapped Buffer for {}", resource, e); } return null; } @@ -365,7 +365,7 @@ protected ByteBuffer getDirectBuffer(Resource resource) catch (IOException | IllegalArgumentException e) { if (LOG.isDebugEnabled()) - LOG.debug(e); + LOG.debug("Unable to get Direct Buffer for {}", resource, e); } return null; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionLimit.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionLimit.java index 2cbab41e39e5..054923a2862e 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionLimit.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionLimit.java @@ -33,8 +33,8 @@ import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.Container; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A Listener that limits the number of Connections.

@@ -60,7 +60,7 @@ @ManagedObject public class ConnectionLimit extends AbstractLifeCycle implements Listener, SelectorManager.AcceptListener { - private static final Logger LOG = Log.getLogger(ConnectionLimit.class); + private static final Logger LOG = LoggerFactory.getLogger(ConnectionLimit.class); private final Server _server; private final List _connectors = new ArrayList<>(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Cookies.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Cookies.java index e24bfc37cf54..f4bea7da7d55 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Cookies.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Cookies.java @@ -25,8 +25,8 @@ import org.eclipse.jetty.http.ComplianceViolation; import org.eclipse.jetty.http.CookieCompliance; import org.eclipse.jetty.http.CookieCutter; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Cookie parser @@ -38,7 +38,7 @@ */ public class Cookies extends CookieCutter { - protected static final Logger LOG = Log.getLogger(Cookies.class); + protected static final Logger LOG = LoggerFactory.getLogger(Cookies.class); protected final List _rawFields = new ArrayList<>(); protected final List _cookieList = new ArrayList<>(); private int _addedFields; @@ -137,7 +137,8 @@ protected void addCookie(String name, String value, String domain, String path, } catch (Exception e) { - LOG.debug(e); + LOG.debug("Unable to add Cookie name={}, value={}, domain={}, path={}, version={}, comment={}", + name, value, domain, path, version, comment, e); } } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java b/jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java index 2a55d850594c..dca18dc01cd8 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java @@ -42,8 +42,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.lang.invoke.MethodHandles.dropArguments; import static java.lang.invoke.MethodHandles.foldArguments; @@ -271,7 +271,7 @@ @ManagedObject("Custom format request log") public class CustomRequestLog extends ContainerLifeCycle implements RequestLog { - protected static final Logger LOG = Log.getLogger(CustomRequestLog.class); + protected static final Logger LOG = LoggerFactory.getLogger(CustomRequestLog.class); public static final String DEFAULT_DATE_FORMAT = "dd/MMM/yyyy:HH:mm:ss ZZZ"; @@ -347,7 +347,7 @@ public void log(Request request, Response response) } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Unable to log request", e); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/DebugListener.java b/jetty-server/src/main/java/org/eclipse/jetty/server/DebugListener.java index 275158ae1a21..0b62297ec6e6 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/DebugListener.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/DebugListener.java @@ -42,8 +42,8 @@ import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A Context Listener that produces additional debug. @@ -55,7 +55,7 @@ @ManagedObject("Debug Listener") public class DebugListener extends AbstractLifeCycle implements ServletContextListener { - private static final Logger LOG = Log.getLogger(DebugListener.class); + private static final Logger LOG = LoggerFactory.getLogger(DebugListener.class); private static final DateCache __date = new DateCache("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH); private final String _attr = String.format("__R%s@%x", this.getClass().getSimpleName(), System.identityHashCode(this)); @@ -140,7 +140,7 @@ public void contextInitialized(ServletContextEvent sce) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to dump {}", handler, e); } } } @@ -192,7 +192,7 @@ protected void log(String format, Object... arg) if (_out != null) _out.printf("%s.%03d:%s%n", __date.formatNow(now), ms, s); if (LOG.isDebugEnabled()) - LOG.info(s); + LOG.debug(s); } final AsyncListener _asyncListener = new AsyncListener() diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java index 74867150ffe7..2e93350a9dc2 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A {@link ConnectionFactory} combining multiple {@link Detecting} instances that will upgrade to @@ -37,7 +37,7 @@ */ public class DetectorConnectionFactory extends AbstractConnectionFactory implements ConnectionFactory.Detecting { - private static final Logger LOG = Log.getLogger(DetectorConnectionFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(DetectorConnectionFactory.class); private final List _detectingConnectionFactories; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java index dfb319693f6e..6801e9b669f3 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java @@ -36,12 +36,12 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.Attributes; import org.eclipse.jetty.util.MultiMap; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Dispatcher implements RequestDispatcher { - private static final Logger LOG = Log.getLogger(Dispatcher.class); + private static final Logger LOG = LoggerFactory.getLogger(Dispatcher.class); /** * Dispatch include attribute names diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java index 138c532512f1..0071afbda3e9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java @@ -24,8 +24,8 @@ import java.nio.file.Path; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Display an optional Warning Message if the {jetty.home} and {jetty.base} are the same directory. @@ -34,7 +34,7 @@ */ public class HomeBaseWarning { - private static final Logger LOG = Log.getLogger(HomeBaseWarning.class); + private static final Logger LOG = LoggerFactory.getLogger(HomeBaseWarning.class); public HomeBaseWarning() { @@ -59,7 +59,7 @@ public HomeBaseWarning() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); // Can't definitively determine this state return; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java index fdaf37a65103..15b917e5d4db 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java @@ -53,9 +53,9 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.SharedBlockingCallback.Blocker; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * HttpChannel represents a single endpoint for HTTP semantic processing. @@ -68,8 +68,8 @@ */ public class HttpChannel implements Runnable, HttpOutput.Interceptor { - public static Listener NOOP_LISTENER = new Listener(){}; - private static final Logger LOG = Log.getLogger(HttpChannel.class); + public static Listener NOOP_LISTENER = new Listener() {}; + private static final Logger LOG = LoggerFactory.getLogger(HttpChannel.class); private final AtomicLong _requests = new AtomicLong(); private final Connector _connector; @@ -512,7 +512,7 @@ public boolean handle() catch (Throwable failure) { if ("org.eclipse.jetty.continuation.ContinuationThrowable".equals(failure.getClass().getName())) - LOG.ignore(failure); + LOG.trace("IGNORED", failure); else handleException(failure); } @@ -542,7 +542,7 @@ public boolean sendErrorOrAbort(String message) } catch (Throwable x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); abort(x); } return false; @@ -803,7 +803,7 @@ public void onBadMessage(BadMessageException failure) } catch (IOException e) { - LOG.debug(e); + LOG.debug("Unable to send bad message response", e); } finally { @@ -813,7 +813,7 @@ public void onBadMessage(BadMessageException failure) } catch (Throwable e) { - LOG.debug(e); + LOG.debug("Unable to complete bad message", e); abort(e); } } @@ -872,7 +872,7 @@ public boolean sendResponse(MetaData.Response info, ByteBuffer content, boolean catch (Throwable failure) { if (LOG.isDebugEnabled()) - LOG.debug(failure); + LOG.debug("Unable to send response", failure); abort(failure); throw failure; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelListeners.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelListeners.java index 8b0899f479de..f380ab54e56f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelListeners.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelListeners.java @@ -21,8 +21,8 @@ import java.nio.ByteBuffer; import java.util.Collection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A {@link HttpChannel.Listener} that holds a collection of @@ -32,7 +32,7 @@ */ public class HttpChannelListeners implements HttpChannel.Listener { - static final Logger LOG = Log.getLogger(HttpChannel.class); + static final Logger LOG = LoggerFactory.getLogger(HttpChannel.class); public static HttpChannel.Listener NOOP = new HttpChannel.Listener() {}; private final NotifyRequest onRequestBegin; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java index ec38a169b14f..f02f299ab66c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java @@ -40,15 +40,15 @@ import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An HttpChannel customized to be transported over the HTTP/1 protocol */ public class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandler, ComplianceViolation.Listener { - private static final Logger LOG = Log.getLogger(HttpChannelOverHttp.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpChannelOverHttp.class); private static final HttpField PREAMBLE_UPGRADE_H2C = new HttpField(HttpHeader.UPGRADE, "h2c"); private final HttpFields _fields = new HttpFields(); private final MetaData.Request _metadata = new MetaData.Request(_fields); @@ -279,7 +279,7 @@ public void badMessage(BadMessageException failure) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } onBadMessage(failure); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java index 0cad3483aad4..0871e53b14b5 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java @@ -32,9 +32,9 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler.Context; import org.eclipse.jetty.server.handler.ErrorHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static javax.servlet.RequestDispatcher.ERROR_EXCEPTION; import static javax.servlet.RequestDispatcher.ERROR_EXCEPTION_TYPE; @@ -48,7 +48,7 @@ */ public class HttpChannelState { - private static final Logger LOG = Log.getLogger(HttpChannelState.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpChannelState.class); private static final long DEFAULT_TIMEOUT = Long.getLong("org.eclipse.jetty.server.HttpChannelState.DEFAULT_TIMEOUT", 30000L); @@ -471,7 +471,7 @@ private Action nextAction(boolean handling) case IDLE: case REGISTERED: break; - + default: throw new IllegalStateException(getStatusStringLocked()); } @@ -555,7 +555,7 @@ public void run() catch (Throwable e) { // TODO Async Dispatch Error - LOG.warn(e); + LOG.warn("Async dispatch error", e); } } } @@ -664,8 +664,10 @@ public void run() } catch (Throwable x) { - LOG.warn(x + " while invoking onTimeout listener " + listener); - LOG.debug(x); + if (LOG.isDebugEnabled()) + LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener, x); + else + LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener); } } } @@ -739,7 +741,7 @@ public void asyncError(Throwable failure) if (!(failure instanceof QuietException)) LOG.warn(failure.toString()); if (LOG.isDebugEnabled()) - LOG.debug(failure); + LOG.debug("Async error", failure); } } @@ -809,8 +811,10 @@ protected void onError(Throwable th) } catch (Throwable x) { - LOG.warn(x + " while invoking onError listener " + listener); - LOG.debug(x); + if (LOG.isDebugEnabled()) + LOG.warn("{} while invoking onError listener {}", x.toString(), listener, x); + else + LOG.warn("{} while invoking onError listener {}", x.toString(), listener); } } }); @@ -989,10 +993,12 @@ protected void completed() { listener.onComplete(event); } - catch (Throwable e) + catch (Throwable x) { - LOG.warn(e + " while invoking onComplete listener " + listener); - LOG.debug(e); + if (LOG.isDebugEnabled()) + LOG.warn("{} while invoking onComplete listener {}", x.toString(), listener, x); + else + LOG.warn("{} while invoking onComplete listener {}", x.toString(), listener); } } }); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index f7c1e92c0066..d54aeaf2d47f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -46,15 +46,15 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IteratingCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A {@link Connection} that handles the HTTP protocol.

*/ public class HttpConnection extends AbstractConnection implements Runnable, HttpTransport, WriteFlusher.Listener, Connection.UpgradeFrom, Connection.UpgradeTo { - private static final Logger LOG = Log.getLogger(HttpConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpConnection.class); public static final HttpField CONNECTION_CLOSE = new PreEncodedHttpField(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE.asString()); private static final ThreadLocal __currentConnection = new ThreadLocal<>(); @@ -313,7 +313,7 @@ else if (filled < 0) LOG.debug("{} onFillable exit {} {}", this, _channel.getState(), BufferUtil.toDetailString(_requestBuffer)); } } - + /** * Fill and parse data looking for content * @@ -365,7 +365,7 @@ private int fillRequestBuffer() } catch (IOException e) { - LOG.debug(e); + LOG.debug("Unable to fill from endpoint {}", getEndPoint(), e); _parser.atEOF(); return -1; } @@ -376,7 +376,7 @@ private int fillRequestBuffer() private boolean parseRequestBuffer() { if (LOG.isDebugEnabled()) - LOG.debug("{} parse {} {}", this, BufferUtil.toDetailString(_requestBuffer)); + LOG.debug("{} parse {}", this, BufferUtil.toDetailString(_requestBuffer)); boolean handle = _parser.parseNext(_requestBuffer == null ? BufferUtil.EMPTY_BUFFER : _requestBuffer); @@ -494,9 +494,9 @@ else if (getConnector().isRunning()) catch (RejectedExecutionException e) { if (getConnector().isRunning()) - LOG.warn(e); + LOG.warn("Failed dispatch of {}", this, e); else - LOG.ignore(e); + LOG.trace("IGNORED", e); getEndPoint().close(); } } @@ -641,11 +641,11 @@ public long getBytesOut() public String toConnectionString() { return String.format("%s@%x[p=%s,g=%s]=>%s", - getClass().getSimpleName(), - hashCode(), - _parser, - _generator, - _channel); + getClass().getSimpleName(), + hashCode(), + _parser, + _generator, + _channel); } private class Content extends HttpInput.Content @@ -742,10 +742,10 @@ private boolean reset(MetaData.Request request, MetaData.Response info, ByteBuff _callback = callback; _header = null; _shutdownOut = false; - + if (getConnector().isShutdown()) _generator.setPersistent(false); - + return true; } @@ -780,7 +780,7 @@ public Action process() throws Exception { case NEED_INFO: throw new EofException("request lifecycle violation"); - + case NEED_HEADER: { _header = _bufferPool.acquire(Math.min(_config.getResponseHeaderSize(), _config.getOutputBufferSize()), useDirectByteBuffers); @@ -815,7 +815,7 @@ public Action process() throws Exception BufferUtil.clear(chunk); BufferUtil.clear(_content); } - + byte gatherWrite = 0; long bytes = 0; if (BufferUtil.hasContent(_header)) @@ -858,9 +858,9 @@ public Action process() throws Exception getEndPoint().write(this, _content); break; default: - succeeded(); + succeeded(); } - + return Action.SCHEDULED; } case SHUTDOWN_OUT: @@ -869,7 +869,7 @@ public Action process() throws Exception continue; } case DONE: - { + { // If this is the end of the response and the connector was shutdown after response was committed, // we can't add the Connection:close header, but we are still allowed to close the connection // by shutting down the output. diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java index e38f968bedb7..4d5e142b15bd 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java @@ -36,8 +36,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.component.Destroyable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link HttpInput} provides an implementation of {@link ServletInputStream} for {@link HttpChannel}. @@ -121,7 +121,7 @@ public void destroy() } } - private static final Logger LOG = Log.getLogger(HttpInput.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpInput.class); static final Content EOF_CONTENT = new EofContent("EOF"); static final Content EARLY_EOF_CONTENT = new EofContent("EARLY_EOF"); @@ -660,7 +660,7 @@ public boolean consumeAll() } catch (Throwable e) { - LOG.debug(e); + LOG.debug("Unable to consume all input", e); _state = new ErrorState(e); return false; } @@ -714,7 +714,7 @@ public boolean isReady() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return true; } } @@ -796,7 +796,7 @@ public boolean failed(Throwable x) // without modifying the original failure. Throwable failure = new Throwable(_state.getError()); failure.addSuppressed(x); - LOG.debug(failure); + LOG.debug("HttpInput failure", failure); } } else @@ -887,8 +887,10 @@ else if (aeof) } catch (Throwable e) { - LOG.warn(e.toString()); - LOG.debug(e); + if (LOG.isDebugEnabled()) + LOG.warn("Unable to notify listener", e); + else + LOG.warn("Unable to notify listener: {}", e.toString()); try { if (aeof || error == null) @@ -899,9 +901,12 @@ else if (aeof) } catch (Throwable e2) { - LOG.warn(e2.toString()); - LOG.debug(e2); - throw new RuntimeIOException(e2); + String msg = "Unable to notify error to listener"; + if (LOG.isDebugEnabled()) + LOG.warn(msg, e2); + else + LOG.warn(msg + ": {}", e2.toString()); + throw new RuntimeIOException(msg, e2); } } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index 9b99a4e36541..cf16784070e8 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -43,8 +43,8 @@ import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.SharedBlockingCallback; import org.eclipse.jetty.util.SharedBlockingCallback.Blocker; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

{@link HttpOutput} implements {@link ServletOutputStream} @@ -174,7 +174,7 @@ default void resetBuffer() throws IllegalStateException } } - private static Logger LOG = Log.getLogger(HttpOutput.class); + private static Logger LOG = LoggerFactory.getLogger(HttpOutput.class); private static final ThreadLocal _encoder = new ThreadLocal<>(); private final HttpChannel _channel; @@ -1269,7 +1269,7 @@ public void sendContent(HttpContent httpContent, Callback callback) } catch (Throwable x) { - LOG.debug(x); + LOG.debug("Unable to access ReadableByteChannel for content {}", httpContent, x); } if (rbc != null) { @@ -1285,7 +1285,7 @@ public void sendContent(HttpContent httpContent, Callback callback) } catch (Throwable x) { - LOG.debug(x); + LOG.debug("Unable to access InputStream for content {}", httpContent, x); } if (in != null) { @@ -1452,7 +1452,10 @@ public void run() catch (Throwable t) { if (LOG.isDebugEnabled()) - LOG.debug(t); + { + t.addSuppressed(error); + LOG.debug("Failed in call onError on {}", _writeListener, t); + } } finally { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/InclusiveByteRange.java b/jetty-server/src/main/java/org/eclipse/jetty/server/InclusiveByteRange.java index ab2e5e028c39..931538af2d1d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/InclusiveByteRange.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/InclusiveByteRange.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.StringTokenizer; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Byte range inclusive of end points. @@ -52,7 +52,7 @@ */ public class InclusiveByteRange { - private static final Logger LOG = Log.getLogger(InclusiveByteRange.class); + private static final Logger LOG = LoggerFactory.getLogger(InclusiveByteRange.class); private long first; private long last; @@ -237,14 +237,14 @@ else if (last >= end) catch (NumberFormatException e) { LOG.warn("Bad range format: {}", t); - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } catch (Exception e) { LOG.warn("Bad range format: {}", t); - LOG.ignore(e); + LOG.trace("IGNORED", e); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java index fe8c00737030..93de8472028c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java @@ -278,7 +278,7 @@ public void waitUntilClosed() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Close wait failed", e); } } } @@ -304,7 +304,7 @@ public void waitUntilClosedOrIdleFor(long idleFor, TimeUnit units) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Close wait failed", e); } } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java index 84e753c5bdae..aea31be30a60 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/LowResourceMonitor.java @@ -32,11 +32,11 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.ThreadPool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A monitor for low resources, low resources can be detected by: @@ -51,7 +51,7 @@ @ManagedObject("Monitor for low resource conditions and activate a low resource mode if detected") public class LowResourceMonitor extends ContainerLifeCycle { - private static final Logger LOG = Log.getLogger(LowResourceMonitor.class); + private static final Logger LOG = LoggerFactory.getLogger(LowResourceMonitor.class); protected final Server _server; private Scheduler _scheduler; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java index bc7fe0445b45..12b9555fbadc 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java @@ -45,8 +45,8 @@ import org.eclipse.jetty.util.MultiMap; import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * MultiPartInputStream @@ -89,7 +89,7 @@ private enum State DELETED } - private static final Logger LOG = Log.getLogger(MultiPartFormInputStream.class); + private static final Logger LOG = LoggerFactory.getLogger(MultiPartFormInputStream.class); private final MultiMap _parts = new MultiMap<>(); private final InputStream _in; private final MultipartConfigElement _config; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartParser.java b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartParser.java index 04b6458d647e..ae548530b7c5 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartParser.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartParser.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.SearchPattern; import org.eclipse.jetty.util.Utf8StringBuilder; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A parser for MultiPart content type. @@ -39,7 +39,7 @@ */ public class MultiPartParser { - public static final Logger LOG = Log.getLogger(MultiPartParser.class); + public static final Logger LOG = LoggerFactory.getLogger(MultiPartParser.class); // States public enum FieldState diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java index c94745262b79..41cb9ec42a3d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java @@ -27,12 +27,12 @@ import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class NegotiatingServerConnection extends AbstractConnection { - private static final Logger LOG = Log.getLogger(NegotiatingServerConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(NegotiatingServerConnection.class); public interface CipherDiscriminator { @@ -153,7 +153,7 @@ private int fill() } catch (IOException x) { - LOG.debug(x); + LOG.debug("Unable to fill from endpoint {}", getEndPoint(), x); close(); return -1; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/OptionalSslConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/OptionalSslConnectionFactory.java index 911afadfe6be..120dccc78546 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/OptionalSslConnectionFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/OptionalSslConnectionFactory.java @@ -23,8 +23,8 @@ import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A ConnectionFactory whose connections detect whether the first bytes are @@ -36,7 +36,7 @@ @Deprecated public class OptionalSslConnectionFactory extends DetectorConnectionFactory { - private static final Logger LOG = Log.getLogger(OptionalSslConnectionFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(OptionalSslConnectionFactory.class); private final String _nextProtocol; /** diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java index cd6030d63e54..ddba526aab3d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java @@ -37,8 +37,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

ConnectionFactory for the PROXY Protocol.

@@ -50,7 +50,7 @@ public class ProxyConnectionFactory extends DetectorConnectionFactory { public static final String TLS_VERSION = "TLS_VERSION"; - private static final Logger LOG = Log.getLogger(ProxyConnectionFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(ProxyConnectionFactory.class); public ProxyConnectionFactory() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java b/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java index b87ce48d3fd8..78c78ac55083 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java @@ -28,15 +28,15 @@ import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * */ public class PushBuilderImpl implements PushBuilder { - private static final Logger LOG = Log.getLogger(PushBuilderImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(PushBuilderImpl.class); private static final HttpField JettyPush = new HttpField("x-http2-push", "PushBuilder"); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java index 3837c9b511f2..6abada24f582 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java @@ -95,8 +95,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.UrlEncoded; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Jetty Request. @@ -142,7 +142,7 @@ public class Request implements HttpServletRequest { public static final String __MULTIPART_CONFIG_ELEMENT = "org.eclipse.jetty.multipartConfig"; - private static final Logger LOG = Log.getLogger(Request.class); + private static final Logger LOG = LoggerFactory.getLogger(Request.class); private static final Collection __defaultLocale = Collections.singleton(Locale.getDefault()); private static final int INPUT_NONE = 0; private static final int INPUT_STREAM = 1; @@ -189,7 +189,7 @@ public static Request getBaseRequest(ServletRequest request) return null; } - + public static HttpServletMapping getServletMapping(PathSpec pathSpec, String servletPath, String servletName) { final MappingMatch match; @@ -230,7 +230,7 @@ public static HttpServletMapping getServletMapping(PathSpec pathSpec, String ser match = null; mapping = servletPath; } - + return new HttpServletMapping() { @Override @@ -262,10 +262,10 @@ public MappingMatch getMappingMatch() @Override public String toString() { - return "HttpServletMapping{matchValue=" + getMatchValue() + - ", pattern=" + getPattern() + ", servletName=" + getServletName() + + return "HttpServletMapping{matchValue=" + getMatchValue() + + ", pattern=" + getPattern() + ", servletName=" + getServletName() + ", mappingMatch=" + getMappingMatch() + "}"; - } + } }; } @@ -552,9 +552,9 @@ private void extractQueryParameters() catch (UnsupportedEncodingException e) { if (LOG.isDebugEnabled()) - LOG.warn(e); + LOG.warn("Unable to decode query", e); else - LOG.warn(e.toString()); + LOG.warn("Unable to decode query - {}", e.toString()); } } } @@ -595,8 +595,9 @@ else if (MimeTypes.Type.MULTIPART_FORM_DATA.is(baseType) && } catch (IOException e) { - LOG.debug(e); - throw new RuntimeIOException(e); + String msg = "Unable to extract content parameters"; + LOG.debug(msg, e); + throw new RuntimeIOException(msg, e); } } } @@ -634,8 +635,9 @@ public void extractFormParameters(MultiMap params) } catch (IOException e) { - LOG.debug(e); - throw new RuntimeIOException(e); + String msg = "Unable to extract form parameters"; + LOG.debug(msg, e); + throw new RuntimeIOException(msg, e); } } @@ -1023,7 +1025,7 @@ public String getLocalAddr() } catch (java.net.UnknownHostException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } @@ -1055,7 +1057,7 @@ public String getLocalName() } catch (java.net.UnknownHostException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return null; } @@ -1374,7 +1376,7 @@ private String findServerName() } catch (java.net.UnknownHostException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return null; } @@ -1790,7 +1792,7 @@ protected void recycle() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); _reader = null; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/RequestLogWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/RequestLogWriter.java index da32b803a589..b9c3b9e666d0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/RequestLogWriter.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/RequestLogWriter.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Writer which outputs pre-formatted request log strings to a file using {@link RolloverFileOutputStream}. @@ -37,7 +37,7 @@ @ManagedObject("Request Log writer which writes to file") public class RequestLogWriter extends AbstractLifeCycle implements RequestLog.Writer { - private static final Logger LOG = Log.getLogger(RequestLogWriter.class); + private static final Logger LOG = LoggerFactory.getLogger(RequestLogWriter.class); private String _filename; private boolean _append; @@ -230,7 +230,7 @@ protected void doStop() throws Exception } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } if (_out != null && _closeOut) try @@ -239,7 +239,7 @@ protected void doStop() throws Exception } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } _out = null; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java index 23d9b68af023..b8ce35ebdb28 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java @@ -54,9 +54,9 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.MultiPartOutputStream; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.Arrays.stream; import static java.util.Collections.emptyList; @@ -67,7 +67,7 @@ */ public class ResourceService { - private static final Logger LOG = Log.getLogger(ResourceService.class); + private static final Logger LOG = LoggerFactory.getLogger(ResourceService.class); private static final PreEncodedHttpField ACCEPT_RANGES = new PreEncodedHttpField(HttpHeader.ACCEPT_RANGES, "bytes"); @@ -297,7 +297,7 @@ public boolean doGet(HttpServletRequest request, HttpServletResponse response) } catch (IllegalArgumentException e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Failed to serve resource: {}", pathInContext, e); if (!response.isCommitted()) response.sendError(500, e.getMessage()); } @@ -705,10 +705,11 @@ public void succeeded() @Override public void failed(Throwable x) { + String msg = "Failed to send content"; if (x instanceof IOException) - LOG.debug(x); + LOG.debug(msg, x); else - LOG.warn(x); + LOG.warn(msg, x); context.complete(); content.release(); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index 21ebfb9bc83d..cc5d1e26a6c7 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -62,15 +62,15 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

{@link Response} provides the implementation for {@link HttpServletResponse}.

*/ public class Response implements HttpServletResponse { - private static final Logger LOG = Log.getLogger(Response.class); + private static final Logger LOG = LoggerFactory.getLogger(Response.class); private static final int __MIN_BUFFER_SIZE = 1; private static final HttpField __EXPIRES_01JAN1970 = new PreEncodedHttpField(HttpHeader.EXPIRES, DateGenerator.__01Jan1970); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java index cc8291587be6..58787784d825 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.io.EofException; import org.eclipse.jetty.io.RuntimeIOException; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Specialized PrintWriter for servlet Responses @@ -43,7 +43,7 @@ */ public class ResponseWriter extends PrintWriter { - private static final Logger LOG = Log.getLogger(ResponseWriter.class); + private static final Logger LOG = LoggerFactory.getLogger(ResponseWriter.class); private static final String __lineSeparator = System.getProperty("line.separator"); private static final String __trueln = "true" + __lineSeparator; private static final String __falseln = "false" + __lineSeparator; @@ -114,7 +114,7 @@ private void setError(Throwable th) } if (LOG.isDebugEnabled()) - LOG.debug(th); + LOG.debug("PrintWriter Error is set", th); } @Override @@ -194,7 +194,7 @@ public void write(int c) } catch (InterruptedIOException ex) { - LOG.debug(ex); + LOG.debug("Write interrupted", ex); Thread.currentThread().interrupt(); } catch (IOException ex) @@ -216,7 +216,7 @@ public void write(char[] buf, int off, int len) } catch (InterruptedIOException ex) { - LOG.debug(ex); + LOG.debug("Write interrupted", ex); Thread.currentThread().interrupt(); } catch (IOException ex) @@ -244,7 +244,7 @@ public void write(String s, int off, int len) } catch (InterruptedIOException ex) { - LOG.debug(ex); + LOG.debug("Write interrupted", ex); Thread.currentThread().interrupt(); } catch (IOException ex) @@ -328,7 +328,7 @@ public void println() } catch (InterruptedIOException ex) { - LOG.debug(ex); + LOG.debug("write interrupted", ex); Thread.currentThread().interrupt(); } catch (IOException ex) @@ -356,7 +356,7 @@ public void println(char c) } catch (InterruptedIOException ex) { - LOG.debug(ex); + LOG.debug("Write interrupted", ex); Thread.currentThread().interrupt(); } catch (IOException ex) @@ -403,7 +403,7 @@ public void println(char[] s) } catch (InterruptedIOException ex) { - LOG.debug(ex); + LOG.debug("Write interrupted", ex); Thread.currentThread().interrupt(); } catch (IOException ex) @@ -429,7 +429,7 @@ public void println(String s) } catch (InterruptedIOException ex) { - LOG.debug(ex); + LOG.debug("Write interrupted", ex); Thread.currentThread().interrupt(); } catch (IOException ex) @@ -491,7 +491,7 @@ else if (!_formatter.locale().equals(locale)) } catch (InterruptedIOException ex) { - LOG.debug(ex); + LOG.debug("format interrupted", ex); Thread.currentThread().interrupt(); } catch (IOException ex) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/SameFileAliasChecker.java b/jetty-server/src/main/java/org/eclipse/jetty/server/SameFileAliasChecker.java index f64a4bf5b22d..c56a403598b7 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/SameFileAliasChecker.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/SameFileAliasChecker.java @@ -23,10 +23,10 @@ import java.nio.file.Path; import org.eclipse.jetty.server.handler.ContextHandler.AliasCheck; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Alias checking for working with FileSystems that normalize access to the @@ -47,7 +47,7 @@ */ public class SameFileAliasChecker implements AliasCheck { - private static final Logger LOG = Log.getLogger(SameFileAliasChecker.class); + private static final Logger LOG = LoggerFactory.getLogger(SameFileAliasChecker.class); @Override public boolean check(String uri, Resource resource) @@ -71,7 +71,7 @@ public boolean check(String uri, Resource resource) } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return false; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java index c48c28d31b63..2649849d5543 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java @@ -35,11 +35,11 @@ import org.eclipse.jetty.io.ssl.SslConnection.DecryptedEndPoint; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SniX509ExtendedKeyManager; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.X509; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Customizer that extracts the attribute from an {@link SSLContext} @@ -48,7 +48,7 @@ */ public class SecureRequestCustomizer implements HttpConfiguration.Customizer { - private static final Logger LOG = Log.getLogger(SecureRequestCustomizer.class); + private static final Logger LOG = LoggerFactory.getLogger(SecureRequestCustomizer.class); /** * The name of the SSLSession attribute that will contain any cached information. @@ -298,7 +298,7 @@ else if (_sniHostCheck && !x509.matches(name)) } catch (Exception e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to customize request with encryption details", e); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index 431fe2975989..d9ade6e27d4c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -55,12 +55,12 @@ import org.eclipse.jetty.util.component.AttributeContainerMap; import org.eclipse.jetty.util.component.Graceful; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.util.thread.ThreadPool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Jetty HTTP Servlet Server. @@ -72,7 +72,7 @@ @ManagedObject(value = "Jetty HTTP Servlet server") public class Server extends HandlerWrapper implements Attributes { - private static final Logger LOG = Log.getLogger(Server.class); + private static final Logger LOG = LoggerFactory.getLogger(Server.class); private final AttributeContainerMap _attributes = new AttributeContainerMap(); private final ThreadPool _threadPool; @@ -682,7 +682,7 @@ public URI getURI() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to build server URI", e); return null; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java index 683ed96ec5b7..5baaa6988ffd 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java @@ -367,7 +367,7 @@ public void close() } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to close {}", serverChannel, e); } } } @@ -401,7 +401,7 @@ protected void configure(Socket socket) } catch (SocketException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java index f04b6630cbaa..7b4e440be187 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java @@ -34,8 +34,8 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractHandler. @@ -51,7 +51,7 @@ @ManagedObject("Jetty Handler") public abstract class AbstractHandler extends ContainerLifeCycle implements Handler { - private static final Logger LOG = Log.getLogger(AbstractHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractHandler.class); private Server _server; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java index 6e7f126f39f6..474f61072401 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java @@ -25,8 +25,8 @@ import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HandlerContainer; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract Handler Container. @@ -34,7 +34,7 @@ */ public abstract class AbstractHandlerContainer extends AbstractHandler implements HandlerContainer { - private static final Logger LOG = Log.getLogger(AbstractHandlerContainer.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractHandlerContainer.class); public AbstractHandlerContainer() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java index 54cf6e2b7b2d..6ed9fc448354 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java @@ -22,10 +22,10 @@ import java.nio.file.Path; import org.eclipse.jetty.server.handler.ContextHandler.AliasCheck; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Symbolic Link AliasChecker. @@ -36,7 +36,7 @@ */ public class AllowSymLinkAliasChecker implements AliasCheck { - private static final Logger LOG = Log.getLogger(AllowSymLinkAliasChecker.class); + private static final Logger LOG = LoggerFactory.getLogger(AllowSymLinkAliasChecker.class); @Override public boolean check(String uri, Resource resource) @@ -64,7 +64,7 @@ public boolean check(String uri, Resource resource) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return false; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java index 400d4f6b819c..c7b839ee995e 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java @@ -41,8 +41,8 @@ import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Buffered Response Handler @@ -63,7 +63,7 @@ */ public class BufferedResponseHandler extends HandlerWrapper { - static final Logger LOG = Log.getLogger(BufferedResponseHandler.class); + static final Logger LOG = LoggerFactory.getLogger(BufferedResponseHandler.class); private final IncludeExclude _methods = new IncludeExclude<>(); private final IncludeExclude _paths = new IncludeExclude<>(PathSpecSet.class); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 93b199cfc42e..ef33e3d66b8d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -85,9 +85,8 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.DumpableCollection; import org.eclipse.jetty.util.component.Graceful; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** @@ -129,7 +128,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu private static final String UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER = "Unimplemented {} - use org.eclipse.jetty.servlet.ServletContextHandler"; - private static final Logger LOG = Log.getLogger(ContextHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ContextHandler.class); private static final ThreadLocal __context = new ThreadLocal<>(); @@ -191,7 +190,7 @@ public static void setServerInfo(String serverInfo) private String[] _vhosts; // Host name portion, matching _vconnectors array private boolean[] _vhostswildcard; private String[] _vconnectors; // connector portion, matching _vhosts array - private org.slf4j.Logger _logger; + private Logger _logger; private boolean _allowNullPathInfo; private int _maxFormKeys = Integer.getInteger(MAX_FORM_KEYS_KEY, DEFAULT_MAX_FORM_KEYS); private int _maxFormContentSize = Integer.getInteger(MAX_FORM_CONTENT_SIZE_KEY, DEFAULT_MAX_FORM_CONTENT_SIZE); @@ -521,9 +520,10 @@ public String getClassPath() StringBuilder classpath = new StringBuilder(); for (int i = 0; i < urls.length; i++) { + URL url = urls[i]; try { - Resource resource = newResource(urls[i]); + Resource resource = newResource(url); File file = resource.getFile(); if (file != null && file.exists()) { @@ -534,7 +534,7 @@ public String getClassPath() } catch (IOException e) { - LOG.debug(e); + LOG.debug("Could not found resource: {}", url, e); } } if (classpath.length() == 0) @@ -735,12 +735,12 @@ else if (!available || !isRunning()) } } - public org.slf4j.Logger getLogger() + public Logger getLogger() { return _logger; } - public void setLogger(org.slf4j.Logger logger) + public void setLogger(Logger logger) { _logger = logger; } @@ -944,7 +944,7 @@ protected void doStop() throws Exception } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Unable to exit scope", e); } } } @@ -1259,7 +1259,7 @@ protected void enterScope(Request request, Object reason) } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Unable to enter scope", e); } } } @@ -1280,7 +1280,7 @@ protected void exitScope(Request request) } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Unable to exit scope", e); } } } @@ -1578,7 +1578,7 @@ public void setResourceBase(String resourceBase) catch (Exception e) { LOG.warn(e.toString()); - LOG.debug(e); + LOG.debug("Unable to set baseResource: {}", resourceBase, e); throw new IllegalArgumentException(resourceBase); } } @@ -1791,7 +1791,7 @@ public Resource getResource(String path) throws MalformedURLException } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return null; @@ -1888,7 +1888,7 @@ public Set getResourcePaths(String path) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return Collections.emptySet(); } @@ -2090,7 +2090,7 @@ public RequestDispatcher getRequestDispatcher(String uriInContext) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return null; } @@ -2117,7 +2117,7 @@ else if (path.charAt(0) != '/') } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return null; @@ -2148,7 +2148,7 @@ public InputStream getResourceAsStream(String path) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return null; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java index 340016f7d3d7..a7e72064c5d9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java @@ -38,9 +38,9 @@ import org.eclipse.jetty.util.Trie; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.SerializedExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This {@link org.eclipse.jetty.server.handler.HandlerCollection} is creates a @@ -53,7 +53,7 @@ @ManagedObject("Context Handler Collection") public class ContextHandlerCollection extends HandlerCollection { - private static final Logger LOG = Log.getLogger(ContextHandlerCollection.class); + private static final Logger LOG = LoggerFactory.getLogger(ContextHandlerCollection.class); private final SerializedExecutor _serializedExecutor = new SerializedExecutor(); public ContextHandlerCollection() diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java index 839f25faa628..67c7c1b3efbf 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java @@ -36,9 +36,9 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; @@ -52,7 +52,7 @@ */ public class DefaultHandler extends AbstractHandler { - private static final Logger LOG = Log.getLogger(DefaultHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(DefaultHandler.class); final long _faviconModified = (System.currentTimeMillis() / 1000) * 1000L; final byte[] _favicon; @@ -61,10 +61,11 @@ public class DefaultHandler extends AbstractHandler public DefaultHandler() { + String faviconRef = "/org/eclipse/jetty/favicon.ico"; byte[] favbytes = null; try { - URL fav = getClass().getResource("/org/eclipse/jetty/favicon.ico"); + URL fav = getClass().getResource(faviconRef); if (fav != null) { Resource r = Resource.newResource(fav); @@ -73,7 +74,7 @@ public DefaultHandler() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to find default favicon: {}", faviconRef, e); } finally { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java index 24d131e506e1..3cf51e905eaa 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java @@ -48,8 +48,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Handler for Error pages @@ -61,7 +61,7 @@ public class ErrorHandler extends AbstractHandler { // TODO This classes API needs to be majorly refactored/cleanup in jetty-10 - private static final Logger LOG = Log.getLogger(ErrorHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ErrorHandler.class); public static final String ERROR_PAGE = "org.eclipse.jetty.server.error_page"; public static final String ERROR_CONTEXT = "org.eclipse.jetty.server.error_context"; @@ -113,7 +113,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques } catch (ServletException e) { - LOG.debug(e); + LOG.debug("Unable to call error dispatcher", e); if (response.isCommitted()) return; } @@ -206,7 +206,7 @@ protected Writer getAcceptableWriter(Request baseRequest, HttpServletRequest req } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } return null; @@ -254,7 +254,7 @@ protected void generateAcceptableResponse(Request baseRequest, HttpServletReques } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } if (charset == null) @@ -327,9 +327,10 @@ protected void generateAcceptableResponse(Request baseRequest, HttpServletReques } catch (BufferOverflowException e) { - LOG.warn("Error page too large: {} {} {}", code, message, request); if (LOG.isDebugEnabled()) - LOG.warn(e); + LOG.warn("Error page too large: {} {} {}", code, message, request, e); + else + LOG.warn("Error page too large: {} {} {}", code, message, request); baseRequest.getResponse().resetContent(); if (!_disableStacks) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java index 07d6b2fb347d..e35b6bce96d5 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java @@ -34,8 +34,8 @@ import org.eclipse.jetty.util.InetAddressPattern; import org.eclipse.jetty.util.InetAddressSet; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.server.handler.InetAccessSet.AccessTuple; import static org.eclipse.jetty.server.handler.InetAccessSet.PatternTuple; @@ -51,7 +51,7 @@ */ public class InetAccessHandler extends HandlerWrapper { - private static final Logger LOG = Log.getLogger(InetAccessHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(InetAccessHandler.class); private final IncludeExcludeSet _set = new IncludeExcludeSet<>(InetAccessSet.class); @@ -97,11 +97,14 @@ public void include(String pattern) public void include(String... patterns) { for (String pattern : patterns) + { include(pattern); + } } /** * Includes an InetAccess entry. + * * @param connectorName optional name of a connector to include. * @param addressPattern optional InetAddress pattern to include. * @param pathSpec optional pathSpec to include. @@ -144,11 +147,14 @@ public void exclude(String pattern) public void exclude(String... patterns) { for (String pattern : patterns) + { exclude(pattern); + } } /** * Excludes an InetAccess entry. + * * @param connectorName optional name of a connector to exclude. * @param addressPattern optional InetAddress pattern to exclude. * @param pathSpec optional pathSpec to exclude. @@ -204,7 +210,9 @@ public void includeConnectors(String... names) public void excludeConnectors(String... names) { for (String name : names) + { excludeConnector(name); + } } /** diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java index 88e67a268e4e..e7450c9afb7d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java @@ -26,15 +26,15 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Enable Jetty style JMX MBeans from within a Context */ public class ManagedAttributeListener implements ServletContextListener, ServletContextAttributeListener { - private static final Logger LOG = Log.getLogger(ManagedAttributeListener.class); + private static final Logger LOG = LoggerFactory.getLogger(ManagedAttributeListener.class); final Set _managedAttributes = new HashSet<>(); final ContextHandler _context; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java index 6d99bc104797..b3412f56f11b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java @@ -37,10 +37,10 @@ import org.eclipse.jetty.server.ResourceService.WelcomeFactory; import org.eclipse.jetty.server.handler.ContextHandler.Context; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Resource Handler. @@ -50,7 +50,7 @@ */ public class ResourceHandler extends HandlerWrapper implements ResourceFactory, WelcomeFactory { - private static final Logger LOG = Log.getLogger(ResourceHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ResourceHandler.class); Resource _baseResource; ContextHandler _context; @@ -174,7 +174,7 @@ else if (_context != null) } catch (Exception e) { - LOG.debug(e); + LOG.debug("Unable to get Resource for {}", path, e); } return null; @@ -394,8 +394,7 @@ public void setResourceBase(String resourceBase) } catch (Exception e) { - LOG.warn(e.toString()); - LOG.debug(e); + LOG.warn("Invalid Base Resource reference: {}", resourceBase, e); throw new IllegalArgumentException(resourceBase); } } @@ -416,8 +415,7 @@ public void setStylesheet(String stylesheet) } catch (Exception e) { - LOG.warn(e.toString()); - LOG.debug(e); + LOG.warn("Invalid StyleSheet reference: {}", stylesheet, e); throw new IllegalArgumentException(stylesheet); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java index 939c6c2d538b..17201afb8d10 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java @@ -31,8 +31,8 @@ import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A handler that shuts the server down on a valid request. Used to do "soft" restarts from Java. @@ -74,7 +74,7 @@ */ public class ShutdownHandler extends HandlerWrapper { - private static final Logger LOG = Log.getLogger(ShutdownHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ShutdownHandler.class); private final String _shutdownToken; private boolean _sendShutdownAtStart; @@ -206,7 +206,7 @@ public void run() } catch (InterruptedException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } catch (Exception e) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java index 9c85d0054df5..dac8a1d49dcb 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java @@ -39,15 +39,15 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.component.Graceful; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.statistic.CounterStatistic; import org.eclipse.jetty.util.statistic.SampleStatistic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject("Request Statistics Gathering") public class StatisticsHandler extends HandlerWrapper implements Graceful { - private static final Logger LOG = Log.getLogger(StatisticsHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(StatisticsHandler.class); private final AtomicLong _statsStartedAt = new AtomicLong(); private volatile Shutdown _shutdown; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java index 588438d029e2..5fbf5105d596 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ThreadLimitHandler.java @@ -46,9 +46,9 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.AutoLock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Handler to limit the threads per IP address for DOS protection

@@ -72,7 +72,7 @@ */ public class ThreadLimitHandler extends HandlerWrapper { - private static final Logger LOG = Log.getLogger(ThreadLimitHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ThreadLimitHandler.class); private static final String REMOTE = "o.e.j.s.h.TLH.REMOTE"; private static final String PERMIT = "o.e.j.s.h.TLH.PASS"; @@ -140,7 +140,7 @@ protected int getThreadLimit(String ip) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } return _threadLimit; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java index baa9008fa3de..59da37ce07ec 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java @@ -48,8 +48,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.compression.DeflaterPool; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A Handler that can dynamically GZIP uncompress requests, and compress responses. @@ -155,7 +155,7 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory public static final String DEFLATE = "deflate"; public static final int DEFAULT_MIN_GZIP_SIZE = 32; public static final int BREAK_EVEN_GZIP_SIZE = 23; - private static final Logger LOG = Log.getLogger(GzipHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(GzipHandler.class); private static final HttpField X_CE_GZIP = new PreEncodedHttpField("X-Content-Encoding", "gzip"); private static final HttpField TE_CHUNKED = new PreEncodedHttpField(HttpHeader.TRANSFER_ENCODING, HttpHeaderValue.CHUNKED.asString()); private static final Pattern COMMA_GZIP = Pattern.compile(".*, *gzip"); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java index 0b6d4abe61a2..3ec13e3a46b9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java @@ -36,14 +36,14 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IteratingNestedCallback; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.http.CompressedContentFormat.GZIP; public class GzipHttpOutputInterceptor implements HttpOutput.Interceptor { - public static Logger LOG = Log.getLogger(GzipHttpOutputInterceptor.class); + public static Logger LOG = LoggerFactory.getLogger(GzipHttpOutputInterceptor.class); private static final byte[] GZIP_HEADER = new byte[]{(byte)0x1f, (byte)0x8b, Deflater.DEFLATED, 0, 0, 0, 0, 0, 0, 0}; public static final HttpField VARY_ACCEPT_ENCODING_USER_AGENT = new PreEncodedHttpField(HttpHeader.VARY, HttpHeader.ACCEPT_ENCODING + ", " + HttpHeader.USER_AGENT); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/AbstractHandlerMBean.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/AbstractHandlerMBean.java index 766944974cff..bcbd95d7d0c1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/AbstractHandlerMBean.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/AbstractHandlerMBean.java @@ -25,12 +25,12 @@ import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.AbstractHandlerContainer; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AbstractHandlerMBean extends ObjectMBean { - private static final Logger LOG = Log.getLogger(AbstractHandlerMBean.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractHandlerMBean.class); public AbstractHandlerMBean(Object managedObject) { @@ -93,7 +93,7 @@ protected String getContextName(ContextHandler context) } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); name = context.getBaseResource().getName(); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/resource/HttpContentRangeWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/resource/HttpContentRangeWriter.java index 2ffeb9a8d37a..d47247a0a662 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/resource/HttpContentRangeWriter.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/resource/HttpContentRangeWriter.java @@ -25,15 +25,15 @@ import java.util.Objects; import org.eclipse.jetty.http.HttpContent; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Range Writer selection for HttpContent */ public class HttpContentRangeWriter { - private static final Logger LOG = Log.getLogger(HttpContentRangeWriter.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpContentRangeWriter.class); /** * Obtain a new RangeWriter for the supplied HttpContent. diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java index db995aefdffc..a50daf4e2d87 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java @@ -29,9 +29,9 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.AutoLock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractSessionCache @@ -55,7 +55,7 @@ @ManagedObject public abstract class AbstractSessionCache extends ContainerLifeCycle implements SessionCache { - static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(AbstractSessionCache.class); /** * The authoritative source of session data @@ -732,8 +732,7 @@ public void checkInactiveSession(Session session) } catch (Exception e) { - LOG.warn("Passivation of idle session {} failed", session.getId()); - LOG.warn(e); + LOG.warn("Passivation of idle session {} failed", session.getId(), e); } } } @@ -824,8 +823,7 @@ public Session newSession(HttpServletRequest request, String id, long time, long } catch (Exception e) { - LOG.warn("Save of new session {} failed", id); - LOG.warn(e); + LOG.warn("Save of new session {} failed", id, e); } return session; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java index bec6804ae1d5..cf066e2a7d2c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java @@ -25,8 +25,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractSessionDataStore @@ -34,7 +34,7 @@ @ManagedObject public abstract class AbstractSessionDataStore extends ContainerLifeCycle implements SessionDataStore { - static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(AbstractSessionDataStore.class); protected SessionContext _context; //context associated with this session data store protected int _gracePeriodSec = 60 * 60; //default of 1hr diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java index 68a235047b69..b6c10595b4ba 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java @@ -21,8 +21,8 @@ import java.util.Set; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * CachingSessionDataStore @@ -44,7 +44,7 @@ */ public class CachingSessionDataStore extends ContainerLifeCycle implements SessionDataStore { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(CachingSessionDataStore.class); /** * The actual store for the session data */ @@ -95,7 +95,7 @@ public SessionData load(String id) throws Exception } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to load id {}", id, e); } if (d != null) @@ -168,7 +168,7 @@ public boolean exists(String id) throws Exception } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable test exists on {}", id, e); } //then the delegate store diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java index a0d68c2dc05b..1a587bf31fdc 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java @@ -33,8 +33,8 @@ import javax.naming.NamingException; import javax.sql.DataSource; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DatabaseAdaptor @@ -47,7 +47,7 @@ */ public class DatabaseAdaptor { - static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + static final Logger LOG = LoggerFactory.getLogger(DatabaseAdaptor.class); String _dbName; boolean _isLower; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCache.java index d848298f25c3..aebc561d1aeb 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCache.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCache.java @@ -25,9 +25,9 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.statistic.CounterStatistic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DefaultSessionCache @@ -37,7 +37,7 @@ @ManagedObject public class DefaultSessionCache extends AbstractSessionCache { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(DefaultSessionCache.class); /** * The cache of sessions in a hashmap @@ -148,7 +148,7 @@ public void shutdown() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to store {}", session, e); } doDelete(session.getId()); //remove from memory session.setResident(false); @@ -162,7 +162,7 @@ public void shutdown() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java index 1a4dffee910a..b59836fc5f1f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java @@ -32,8 +32,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DefaultSessionIdManager @@ -50,7 +50,7 @@ @ManagedObject public class DefaultSessionIdManager extends ContainerLifeCycle implements SessionIdManager { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(DefaultSessionIdManager.class); public static final String __NEW_SESSION_ID = "org.eclipse.jetty.server.newSessionId"; @@ -303,8 +303,7 @@ public boolean isIdInUse(String id) } catch (Exception e) { - LOG.warn("Problem checking if id {} is in use", id); - LOG.warn(e); + LOG.warn("Problem checking if id {} is in use", id, e); return false; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java index 638ab27df7fe..ee2201af200a 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java @@ -41,8 +41,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * FileSessionDataStore @@ -52,7 +52,7 @@ @ManagedObject public class FileSessionDataStore extends AbstractSessionDataStore { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(FileSessionDataStore.class); protected File _storeDir; protected boolean _deleteUnrestorableFiles = false; protected Map _sessionFileMap = new ConcurrentHashMap<>(); @@ -166,7 +166,7 @@ public Set doGetExpired(final Set candidates) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get expired for {}", filename, e); } } @@ -220,13 +220,13 @@ public void sweepDisk() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to sweep file {}", p, e); } }); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to walk path {}", _storeDir, e); } } @@ -258,8 +258,7 @@ public void sweepFile(long now, Path p) } catch (NumberFormatException e) { - LOG.warn("Not valid session filename {}", p.getFileName()); - LOG.warn(e); + LOG.warn("Not valid session filename {}", p.getFileName(), e); } } @@ -300,8 +299,7 @@ public SessionData doLoad(String id) throws Exception } catch (Exception x) { - LOG.warn("Unable to delete unrestorable file {} for session {}", filename, id); - LOG.warn(x); + LOG.warn("Unable to delete unrestorable file {} for session {}", filename, id, x); } } throw e; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java index 7dbf640c9395..3179e7771f51 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java @@ -24,10 +24,10 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * HouseKeeper @@ -37,7 +37,7 @@ @ManagedObject public class HouseKeeper extends AbstractLifeCycle { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(HouseKeeper.class); public static final long DEFAULT_PERIOD_MS = 1000L * 60 * 10; protected SessionIdManager _sessionIdManager; @@ -252,7 +252,7 @@ public void scavenge() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to scavenge", e); } } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java index 7c61d2cb9825..248eec4402a0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java @@ -35,8 +35,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JDBCSessionDataStore @@ -46,7 +46,7 @@ @ManagedObject public class JDBCSessionDataStore extends AbstractSessionDataStore { - static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(JDBCSessionDataStore.class); /** * Used for Oracle and other databases where "" is treated as NULL @@ -865,8 +865,7 @@ public Set doGetExpired(Set candidates) } catch (Exception e) { - LOG.warn("{} Problem checking if potentially expired session {} exists in db", _context.getWorkerName(), k); - LOG.warn(e); + LOG.warn("{} Problem checking if potentially expired session {} exists in db", _context.getWorkerName(), k, e); } } } @@ -876,7 +875,7 @@ public Set doGetExpired(Set candidates) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get expired sessions", e); return expiredSessionKeys; //return whatever we got } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java index 9fff4f4d9f93..437e469d61fe 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java @@ -21,6 +21,9 @@ import java.util.function.Function; import javax.servlet.http.HttpServletRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * NullSessionCache * @@ -31,6 +34,8 @@ */ public class NullSessionCache extends AbstractSessionCache { + private static final Logger LOG = LoggerFactory.getLogger(NullSessionCache.class); + /** * @param handler The SessionHandler related to this SessionCache */ diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCacheFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCacheFactory.java index 4f3997b8fe5e..fdf31c7fe1fd 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCacheFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCacheFactory.java @@ -18,8 +18,8 @@ package org.eclipse.jetty.server.session; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * NullSessionCacheFactory @@ -28,7 +28,7 @@ */ public class NullSessionCacheFactory extends AbstractSessionCacheFactory { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(NullSessionCacheFactory.class); @Override public int getEvictionPolicy() diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java index 0bf1d322369b..2ab519ca2b77 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java @@ -34,9 +34,9 @@ import javax.servlet.http.HttpSessionEvent; import org.eclipse.jetty.io.CyclicTimeout; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.AutoLock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Session @@ -55,7 +55,7 @@ */ public class Session implements SessionHandler.SessionIf { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(Session.class); /** * @@ -884,7 +884,7 @@ public void invalidate() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to invalidate Session {}", this, e); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java index 12253bc8fb63..63c5af54d5bd 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.util.ClassLoadingObjectInputStream; import org.eclipse.jetty.util.ClassVisibilityChecker; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * SessionData @@ -41,7 +41,7 @@ */ public class SessionData implements Serializable { - private static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(SessionData.class); private static final long serialVersionUID = 1L; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java index 4477530055cf..a3d624e5163b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java @@ -26,9 +26,11 @@ import java.util.EventListener; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.stream.Collectors; import javax.servlet.DispatcherType; import javax.servlet.ServletException; import javax.servlet.SessionCookieConfig; @@ -55,13 +57,13 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.statistic.CounterStatistic; import org.eclipse.jetty.util.statistic.SampleStatistic; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.lang.Math.round; @@ -71,7 +73,7 @@ @ManagedObject public class SessionHandler extends ScopedHandler { - static final Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); + private static final Logger LOG = LoggerFactory.getLogger(SessionHandler.class); public static final EnumSet DEFAULT_TRACKING = EnumSet.of(SessionTrackingMode.COOKIE, SessionTrackingMode.URL); @@ -128,12 +130,12 @@ public class SessionHandler extends ScopedHandler @SuppressWarnings("unchecked") public static final Class[] SESSION_LISTENER_TYPES = new Class[] - { - HttpSessionAttributeListener.class, - HttpSessionIdListener.class, - HttpSessionListener.class - }; - + { + HttpSessionAttributeListener.class, + HttpSessionIdListener.class, + HttpSessionListener.class + }; + @Deprecated(since = "Servlet API 2.1") static final HttpSessionContext __nullSessionContext = new HttpSessionContext() { @@ -152,7 +154,7 @@ public Enumeration getIds() return Collections.enumeration(Collections.EMPTY_LIST); } }; - + /** * Setting of max inactive interval for new sessions * -1 means no timeout @@ -215,7 +217,7 @@ public int getMaxCookieAge() /** * Called by the {@link SessionHandler} when a session is first accessed by a request. - * + * * Updates the last access time for the session and generates a fresh cookie if necessary. * * @param session the session object @@ -236,7 +238,7 @@ public HttpCookie access(HttpSession session, boolean secure) if (isUsingCookies() && (s.isIdChanged() || (getSessionCookieConfig().getMaxAge() > 0 && getRefreshCookieAge() > 0 && - ((now - s.getCookieSetTime()) / 1000 > getRefreshCookieAge())))) + ((now - s.getCookieSetTime()) / 1000 > getRefreshCookieAge())))) { HttpCookie cookie = getSessionCookie(session, _context == null ? "/" : (_context.getContextPath()), secure); s.cookieSet(); @@ -360,10 +362,10 @@ public void complete(HttpSession session) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to release Session {}", s, e); } } - + /** * Called when a response is about to be committed. * We might take this opportunity to persist the session @@ -382,7 +384,7 @@ public void commit(HttpSession session) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to commit Session {}", s, e); } } @@ -758,7 +760,7 @@ public HttpSession newHttpSession(HttpServletRequest request) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to add Session {}", id, e); return null; } } @@ -791,6 +793,7 @@ public void statsReset() /** * Set if Session cookies should use HTTP Only + * * @param httpOnly True if cookies should be HttpOnly. * @see HttpCookie */ @@ -802,6 +805,7 @@ public void setHttpOnly(boolean httpOnly) /** * Set Session cookie sameSite mode. * Currently this is encoded in the session comment until sameSite is supported by {@link SessionCookieConfig} + * * @param sameSite The sameSite setting for Session cookies (or null for no sameSite setting) */ public void setSameSite(HttpCookie.SameSite sameSite) @@ -860,7 +864,7 @@ public void setSessionIdPathParameterName(String param) { _sessionIdPathParameterName = (param == null || "none".equals(param)) ? null : param; _sessionIdPathParameterNamePrefix = (param == null || "none".equals(param)) - ? null : (";" + _sessionIdPathParameterName + "="); + ? null : (";" + _sessionIdPathParameterName + "="); } /** @@ -894,8 +898,7 @@ public Session getSession(String id) } catch (Exception e) { - LOG.warn("Invalidating session {} found to be expired when requested", id); - LOG.warn(e); + LOG.warn("Invalidating session {} found to be expired when requested", id, e); } return null; @@ -907,8 +910,7 @@ public Session getSession(String id) } catch (UnreadableSessionDataException e) { - LOG.warn("Error loading session {}", id); - LOG.warn(e); + LOG.warn("Error loading session {}", id, e); try { //tell id mgr to remove session from all other contexts @@ -916,14 +918,13 @@ public Session getSession(String id) } catch (Exception x) { - LOG.warn("Error cross-context invalidating unreadable session {}", id); - LOG.warn(x); + LOG.warn("Error cross-context invalidating unreadable session {}", id, x); } return null; } catch (Exception other) { - LOG.warn(other); + LOG.warn("Unable to get Session", other); return null; } } @@ -1008,7 +1009,7 @@ public Session removeSession(String id, boolean invalidate) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to remove Session", e); return null; } } @@ -1131,7 +1132,7 @@ public void renewSessionId(String oldId, String oldExtendedId, String newId, Str } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to renew Session Id {}:{} -> {}:{}", oldId, oldExtendedId, newId, newExtendedId, e); } finally { @@ -1143,7 +1144,7 @@ public void renewSessionId(String oldId, String oldExtendedId, String newId, Str } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to release {}", newId, e); } } } @@ -1192,7 +1193,7 @@ public void invalidate(String id) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Error during Session destroy listener", e); } //call the attribute removed listeners and finally mark it as invalid session.finishInvalidate(); @@ -1201,14 +1202,13 @@ public void invalidate(String id) catch (IllegalStateException e) { if (LOG.isDebugEnabled()) - LOG.debug("Session {} already invalid", session); - LOG.ignore(e); + LOG.debug("Session {} already invalid", session, e); } } } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to delete Session {}", id, e); } } @@ -1243,13 +1243,15 @@ public void scavenge() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to expire Session {}", id, e); } } } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to check expiration on {}", + candidates.stream().map(Objects::toString).collect(Collectors.joining(", ", "[", "]")), + e); } } @@ -1300,7 +1302,7 @@ public void sessionInactivityTimerExpired(Session session, long now) //roundtrips to the persistent store. Only do this if the HouseKeeper that //does the scavenging is configured to actually scavenge if (_sessionIdManager.getSessionHouseKeeper() != null && - _sessionIdManager.getSessionHouseKeeper().getIntervalSec() > 0) + _sessionIdManager.getSessionHouseKeeper().getIntervalSec() > 0) { _candidateSessionIdsForExpiry.add(session.getId()); if (LOG.isDebugEnabled()) @@ -1349,6 +1351,7 @@ public interface SessionIf extends HttpSession * * Implementation of the javax.servlet.SessionCookieConfig. * SameSite configuration can be achieved by using setComment + * * @see HttpCookie */ public final class CookieConfig implements SessionCookieConfig @@ -1533,8 +1536,8 @@ public void doScope(String target, Request baseRequest, HttpServletRequest reque HttpCookie cookie = access(existingSession, request.isSecure()); // Handle changed ID or max-age refresh, but only if this is not a redispatched request if ((cookie != null) && - (request.getDispatcherType() == DispatcherType.ASYNC || - request.getDispatcherType() == DispatcherType.REQUEST)) + (request.getDispatcherType() == DispatcherType.ASYNC || + request.getDispatcherType() == DispatcherType.REQUEST)) baseRequest.getResponse().replaceCookie(cookie); } @@ -1616,7 +1619,7 @@ else if (!DispatcherType.REQUEST.equals(baseRequest.getDispatcherType())) LOG.debug("Got Session ID {} from cookie {}", id, sessionCookie); HttpSession s = getHttpSession(id); - + if (requestedSessionId == null) { //no previous id, always accept this one diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java index ddaa69406a37..17f07daaa054 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java @@ -38,14 +38,14 @@ import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -53,7 +53,7 @@ @Tag("stress") public class AsyncStressTest { - private static final Logger LOG = Log.getLogger(AsyncStressTest.class); + private static final Logger LOG = LoggerFactory.getLogger(AsyncStressTest.class); protected QueuedThreadPool _threads = new QueuedThreadPool(); protected Server _server = new Server(_threads); @@ -252,7 +252,8 @@ public void run() System.err.println(uri + "==" + br.getHttpURI()); System.err.println(asyncContext + "==" + br.getHttpChannelState()); - LOG.warn(e); + LOG.warn("Unable to complete async: request={}, uri={}, asyncContext={}", + br, br.getHttpURI(), br.getHttpChannelState(), e); System.exit(1); } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java index 693dbf1bf023..4540da0d5b52 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java @@ -40,12 +40,12 @@ import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.time.Duration.ofSeconds; import static org.hamcrest.MatcherAssert.assertThat; @@ -63,7 +63,7 @@ public abstract class ConnectorTimeoutTest extends HttpServerTestFixture { - protected static final Logger LOG = Log.getLogger(ConnectorTimeoutTest.class); + protected static final Logger LOG = LoggerFactory.getLogger(ConnectorTimeoutTest.class); protected static final int MAX_IDLE_TIME = 2000; private int sleepTime = MAX_IDLE_TIME + MAX_IDLE_TIME / 5; @@ -540,9 +540,9 @@ public void testMaxIdleNothingSent() throws Exception assertThat(response, is("")); assertEquals(-1, is.read()); } - catch (Exception e) + catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to read stream", e); } }); assertTrue(TimeUnit.NANOSECONDS.toMillis(System.nanoTime()) - start < maximumTestRuntime); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/CustomResourcesMonitorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/CustomResourcesMonitorTest.java index f814f95a9bc2..37b2ceed3ac8 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/CustomResourcesMonitorTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/CustomResourcesMonitorTest.java @@ -28,13 +28,13 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.TimerScheduler; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -132,7 +132,7 @@ public void testFileOnDirectoryMonitor() throws Exception static class FileOnDirectoryMonitor implements LowResourceMonitor.LowResourceCheck { - private static final Logger LOG = Log.getLogger(FileOnDirectoryMonitor.class); + private static final Logger LOG = LoggerFactory.getLogger(FileOnDirectoryMonitor.class); private final Path _pathToMonitor; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java b/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java index 41d15bd3d516..5cc61c2209f1 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java @@ -34,8 +34,8 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.server.handler.AbstractHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Dump request handler. @@ -44,7 +44,7 @@ */ public class DumpHandler extends AbstractHandler { - private static final Logger LOG = Log.getLogger(DumpHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(DumpHandler.class); String label = "Dump HttpHandler"; @@ -223,10 +223,7 @@ else if (values.length == 1) } catch (IOException e) { - if (LOG.isDebugEnabled()) - LOG.warn(e); - else - LOG.warn(e.toString()); + LOG.warn("Failed to copy request content", e); writer.write(e.toString()); } } @@ -259,7 +256,7 @@ else if (values.length == 1) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java index d2acbc5c99c5..579723dcaec5 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java @@ -52,7 +52,6 @@ import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.ErrorHandler; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -800,7 +799,7 @@ public void testHeadChunked() throws Exception @Test public void testBadHostPort() throws Exception { - Log.getLogger(HttpParser.class).info("badMessage: Number formate exception expected ..."); + LOG.info("badMessage: Number formate exception expected ..."); String response; response = connector.getResponse("GET http://localhost:EXPECTED_NUMBER_FORMAT_EXCEPTION/ HTTP/1.1\r\n" + @@ -844,7 +843,7 @@ public void testBadURIencoding() throws Exception @Test public void testBadUTF8FallsbackTo8859() throws Exception { - Log.getLogger(HttpParser.class).info("badMessage: bad encoding expected ..."); + LOG.info("badMessage: bad encoding expected ..."); String response; response = connector.getResponse("GET /foo/bar%c0%00 HTTP/1.1\r\n" + @@ -946,7 +945,7 @@ public void testCharset() throws Exception checkContains(response, offset, "12345"); offset = 0; - Log.getLogger(DumpHandler.class).info("Expecting java.io.UnsupportedEncodingException"); + LOG.info("Expecting java.io.UnsupportedEncodingException"); response = connector.getResponse("GET /R1 HTTP/1.1\r\n" + "Host: localhost\r\n" + "Transfer-Encoding: chunked\r\n" + diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java index bd2e83ce4fcf..ff0cfc23ca91 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java @@ -49,7 +49,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; @@ -72,6 +71,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture { private static final Logger LOG = LoggerFactory.getLogger(HttpServerTestBase.class); + private static final String REQUEST1_HEADER = "POST / HTTP/1.0\n" + "Host: localhost\n" + "Content-Type: text/xml; charset=utf-8\n" + @@ -203,10 +203,10 @@ public void testFullMethod() throws Exception configureServer(new HelloWorldHandler()); try (Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); - StacklessLogging stackless = new StacklessLogging(HttpConnection.class)) + StacklessLogging ignored = new StacklessLogging(HttpConnection.class)) { client.setSoTimeout(10000); - Log.getLogger(HttpConnection.class).info("expect request is too large, then ISE extra data ..."); + LOG.info("expect request is too large, then ISE extra data ..."); OutputStream os = client.getOutputStream(); byte[] buffer = new byte[64 * 1024]; @@ -234,9 +234,9 @@ public void testFullURI() throws Exception _httpConfiguration.setRequestHeaderSize(maxHeaderSize); try (Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); - StacklessLogging stackless = new StacklessLogging(HttpConnection.class)) + StacklessLogging ignored = new StacklessLogging(HttpConnection.class)) { - Log.getLogger(HttpConnection.class).info("expect URI is too large"); + LOG.info("expect URI is too large"); OutputStream os = client.getOutputStream(); // Take into account the initial bytes for the HTTP method. @@ -295,9 +295,9 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); OutputStream os = client.getOutputStream(); - try (StacklessLogging stackless = new StacklessLogging(HttpChannel.class)) + try (StacklessLogging ignored = new StacklessLogging(HttpChannel.class)) { - Log.getLogger(HttpChannel.class).info("Expecting ServletException: TEST handler exception..."); + LOG.info("Expecting ServletException: TEST handler exception..."); os.write(request.toString().getBytes()); os.flush(); @@ -324,9 +324,9 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); OutputStream os = client.getOutputStream(); - try (StacklessLogging stackless = new StacklessLogging(HttpChannel.class)) + try (StacklessLogging ignored = new StacklessLogging(HttpChannel.class)) { - Log.getLogger(HttpChannel.class).info("Expecting ServletException: TEST handler exception..."); + LOG.info("Expecting ServletException: TEST handler exception..."); os.write(request.toString().getBytes()); os.flush(); @@ -394,9 +394,9 @@ public void testFullHeader() throws Exception configureServer(new HelloWorldHandler()); try (Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); - StacklessLogging stackless = new StacklessLogging(HttpConnection.class)) + StacklessLogging ignored = new StacklessLogging(HttpConnection.class)) { - Log.getLogger(HttpConnection.class).info("expect header is too large ..."); + LOG.info("expect header is too large ..."); OutputStream os = client.getOutputStream(); byte[] buffer = new byte[64 * 1024]; @@ -437,7 +437,7 @@ public void testFullHeader() throws Exception } catch (Exception e) { - Log.getLogger(HttpServerTestBase.class).warn("TODO Early close???"); + LOG.warn("TODO Early close???"); // TODO #1832 evaluate why we sometimes get an early close on this test } } @@ -1308,7 +1308,7 @@ public void testCommittedError() throws Exception configureServer(handler); try (Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); - StacklessLogging stackless = new StacklessLogging(HttpChannel.class)) + StacklessLogging ignored = new StacklessLogging(HttpChannel.class)) { LOG.info("Expecting exception after commit then could not send 500...."); OutputStream os = client.getOutputStream(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java index 4600d5c22d72..0c1493b0346e 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java @@ -33,15 +33,17 @@ import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.HotSwapHandler; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +// @checkstyle-disable-check : AvoidEscapedUnicodeCharactersCheck public class HttpServerTestFixture { - // @checkstyle-disable-check : AvoidEscapedUnicodeCharactersCheck - + private static final Logger LOG = LoggerFactory.getLogger(HttpServerTestFixture.class); + // Useful constants protected static final long PAUSE = 10L; protected static final int LOOPS = 50; @@ -115,7 +117,7 @@ public EchoHandler(boolean content) @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - Log.getRootLogger().debug("handle " + target); + LOG.debug("handle " + target); baseRequest.setHandled(true); if (request.getContentType() != null) @@ -157,7 +159,7 @@ else if (request.getCharacterEncoding() != null) if (reader.read() >= 0) throw new IllegalStateException("Not closed"); - Log.getRootLogger().debug("handled " + target); + LOG.debug("handled " + target); } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java index 820fd22fe5d0..7df75c6719c8 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java @@ -32,19 +32,19 @@ import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.server.session.SessionHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; public class LocalAsyncContextTest { - public static final Logger LOG = Log.getLogger(LocalAsyncContextTest.class); + public static final Logger LOG = LoggerFactory.getLogger(LocalAsyncContextTest.class); protected Server _server; protected SuspendHandler _handler; protected Connector _connector; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/NotAcceptingTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/NotAcceptingTest.java index bcee19746bc2..75a846f62ab2 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/NotAcceptingTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/NotAcceptingTest.java @@ -32,12 +32,13 @@ import org.eclipse.jetty.server.LocalConnector.LocalEndPoint; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; import org.hamcrest.Matcher; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -45,6 +46,7 @@ public class NotAcceptingTest { + private static final Logger LOG = LoggerFactory.getLogger(NotAcceptingTest.class); private final long idleTimeout = 2000; Server server; LocalConnector localConnector; @@ -367,7 +369,7 @@ public void testConnectionLimit() throws Exception server.start(); - Log.getLogger(ConnectionLimit.class).debug("CONNECT:"); + LOG.debug("CONNECT:"); try ( LocalEndPoint local0 = localConnector.connect(); LocalEndPoint local1 = localConnector.connect(); @@ -382,7 +384,7 @@ public void testConnectionLimit() throws Exception { String expectedContent = "Hello" + System.lineSeparator(); - Log.getLogger(ConnectionLimit.class).debug("LOCAL:"); + LOG.debug("LOCAL:"); for (LocalEndPoint client : new LocalEndPoint[]{local0, local1, local2}) { client.addInputAndExecute(BufferUtil.toBuffer("GET /test HTTP/1.1\r\nHost:localhost\r\n\r\n")); @@ -391,7 +393,7 @@ public void testConnectionLimit() throws Exception assertThat(response.getContent(), is(expectedContent)); } - Log.getLogger(ConnectionLimit.class).debug("NETWORK:"); + LOG.debug("NETWORK:"); for (Socket client : new Socket[]{blocking0, blocking1, blocking2, async0, async1, async2}) { HttpTester.Input in = HttpTester.from(client.getInputStream()); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java index 198392ae295e..e6c0a0ce660b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java @@ -61,13 +61,13 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -88,7 +88,7 @@ // @checkstyle-disable-check : AvoidEscapedUnicodeCharactersCheck public class RequestTest { - private static final Logger LOG = Log.getLogger(RequestTest.class); + private static final Logger LOG = LoggerFactory.getLogger(RequestTest.class); private Server _server; private LocalConnector _connector; private RequestHandler _handler; @@ -122,13 +122,13 @@ public void destroy() throws Exception _server.stop(); _server.join(); } - + @Test public void testRequestCharacterEncoding() throws Exception { AtomicReference result = new AtomicReference<>(null); AtomicReference overrideCharEncoding = new AtomicReference<>(null); - + _server.stop(); ContextHandler handler = new CharEncodingContextHandler(); _server.setHandler(handler); @@ -154,26 +154,26 @@ public boolean check(HttpServletRequest request, HttpServletResponse response) } }; _server.start(); - + String request = "GET / HTTP/1.1\n" + "Host: whatever\r\n" + "Content-Type: text/html;charset=utf8\n" + "Connection: close\n" + "\n"; - + //test setting the default char encoding - handler.setDefaultRequestCharacterEncoding("ascii"); + handler.setDefaultRequestCharacterEncoding("ascii"); String response = _connector.getResponse(request); assertTrue(response.startsWith("HTTP/1.1 200")); assertEquals("ascii", result.get()); - + //test overriding the default char encoding with explicit encoding result.set(null); overrideCharEncoding.set("utf-16"); response = _connector.getResponse(request); assertTrue(response.startsWith("HTTP/1.1 200")); assertEquals("utf-16", result.get()); - + //test fallback to content-type encoding result.set(null); overrideCharEncoding.set(null); @@ -292,7 +292,7 @@ public boolean check(HttpServletRequest request, HttpServletResponse response) assertNull(request.getCookies()); assertEquals("", request.getHeader("Name")); assertTrue(request.getHeaders("Name").hasMoreElements()); // empty - assertThrows(IllegalArgumentException.class, () -> request.getDateHeader("Name")); + assertThrows(IllegalArgumentException.class, () -> request.getDateHeader("Name")); assertEquals(-1, request.getDateHeader("Other")); return true; } @@ -500,7 +500,9 @@ public void testBadMultiPart() throws Exception assertTimeoutPreemptively(Duration.ofSeconds(5), () -> { while (testTmpDir.list().length > 0) + { Thread.yield(); + } }); } @@ -596,7 +598,7 @@ public void testContentLengthExceedsMaxInteger() throws Exception System.out.println(request); String responses = _connector.getResponse(request); - assertThat(responses,startsWith("HTTP/1.1 200")); + assertThat(responses, startsWith("HTTP/1.1 200")); } /** @@ -929,9 +931,9 @@ public boolean check(HttpServletRequest request, HttpServletResponse response) t "Connection: close\r\n" + "\r\n" + content; - Log.getRootLogger().debug("test l={}", l); + LOG.debug("test l={}", l); String response = _connector.getResponse(request); - Log.getRootLogger().debug(response); + LOG.debug(response); assertThat(response, containsString(" 200 OK")); assertEquals(l, length.get()); content += "x"; @@ -1419,7 +1421,7 @@ public void testHttpServletMapping() throws Exception "Host: whatever\n" + "Connection: close\n" + "\n"; - + _server.stop(); PathMappingHandler handler = new PathMappingHandler(null, null, null); _server.setHandler(handler); @@ -1428,7 +1430,7 @@ public void testHttpServletMapping() throws Exception assertTrue(response.startsWith("HTTP/1.1 200 OK")); assertThat("Response body content", response, containsString("HttpServletMapping{matchValue=, pattern=, servletName=, mappingMatch=null}")); _server.stop(); - + ServletPathSpec spec = new ServletPathSpec(""); handler = new PathMappingHandler(spec, spec.getPathMatch("foo"), "Something"); _server.setHandler(handler); @@ -1437,7 +1439,7 @@ public void testHttpServletMapping() throws Exception assertTrue(response.startsWith("HTTP/1.1 200 OK")); assertThat("Response body content", response, containsString("HttpServletMapping{matchValue=, pattern=, servletName=Something, mappingMatch=CONTEXT_ROOT}")); _server.stop(); - + spec = new ServletPathSpec("/"); handler = new PathMappingHandler(spec, "", "Default"); _server.setHandler(handler); @@ -1446,7 +1448,7 @@ public void testHttpServletMapping() throws Exception assertTrue(response.startsWith("HTTP/1.1 200 OK")); assertThat("Response body content", response, containsString("HttpServletMapping{matchValue=/, pattern=/, servletName=Default, mappingMatch=DEFAULT}")); _server.stop(); - + spec = new ServletPathSpec("/foo/*"); handler = new PathMappingHandler(spec, spec.getPathMatch("/foo/bar"), "BarServlet"); _server.setHandler(handler); @@ -1464,7 +1466,7 @@ public void testHttpServletMapping() throws Exception assertTrue(response.startsWith("HTTP/1.1 200 OK")); assertThat("Response body content", response, containsString("HttpServletMapping{matchValue=/foo/bar, pattern=*.jsp, servletName=JspServlet, mappingMatch=EXTENSION}")); _server.stop(); - + spec = new ServletPathSpec("/catalog"); handler = new PathMappingHandler(spec, spec.getPathMatch("/catalog"), "CatalogServlet"); _server.setHandler(handler); @@ -1474,7 +1476,7 @@ public void testHttpServletMapping() throws Exception assertThat("Response body content", response, containsString("HttpServletMapping{matchValue=catalog, pattern=/catalog, servletName=CatalogServlet, mappingMatch=EXACT}")); _server.stop(); } - + @Test public void testCookies() throws Exception { @@ -1858,7 +1860,7 @@ public void testGetterSafeFromNullPointerException() assertNotNull(request.getParameterMap()); assertEquals(0, request.getParameterMap().size()); } - + interface RequestTester { boolean check(HttpServletRequest request, HttpServletResponse response) throws IOException; @@ -1986,14 +1988,14 @@ private class TestUserIdentityScope implements UserIdentity.Scope private ContextHandler _handler; private String _contextPath; private String _name; - + public TestUserIdentityScope(ContextHandler handler, String contextPath, String name) { _handler = handler; _contextPath = contextPath; _name = name; } - + @Override public ContextHandler getContextHandler() { @@ -2024,14 +2026,14 @@ private class PathMappingHandler extends AbstractHandler private ServletPathSpec _spec; private String _servletPath; private String _servletName; - + public PathMappingHandler(ServletPathSpec spec, String servletPath, String servletName) { _spec = spec; _servletPath = servletPath; _servletName = servletName; } - + @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { @@ -2042,6 +2044,6 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques baseRequest.setUserIdentityScope(new TestUserIdentityScope(null, null, _servletName)); HttpServletMapping mapping = baseRequest.getHttpServletMapping(); response.getWriter().println(mapping); - } + } } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java index 7821cd8a02f3..306269754a83 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java @@ -38,7 +38,6 @@ import java.util.Locale; import java.util.Map; import java.util.stream.Stream; - import javax.servlet.RequestDispatcher; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/StopTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/StopTest.java index 618398b0667a..0e0f5a618705 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/StopTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/StopTest.java @@ -42,11 +42,11 @@ import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -63,6 +63,8 @@ public class StopTest { + private static final Logger LOG = LoggerFactory.getLogger(StopTest.class); + /** * Test completed writes during shutdown do not close output * @@ -248,7 +250,7 @@ public void close() @Test public void testSlowCloseNotGraceful() throws Exception { - Log.getLogger(QueuedThreadPool.class).info("Expect some threads can't be stopped"); + LOG.info("Expect some threads can't be stopped"); testSlowClose(0, 5000, lessThan(750L)); } @@ -260,7 +262,7 @@ public void testSlowCloseNotGraceful() throws Exception @Test public void testSlowCloseTinyGraceful() throws Exception { - Log.getLogger(QueuedThreadPool.class).info("Expect some threads can't be stopped"); + LOG.info("Expect some threads can't be stopped"); testSlowClose(1, 5000, lessThan(1500L)); } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java index ae73c01523e8..e8584388894e 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java @@ -31,8 +31,6 @@ import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -41,6 +39,8 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -54,7 +54,7 @@ @DisabledOnOs(MAC) // TODO: needs investigation public class StressTest { - private static final Logger LOG = Log.getLogger(StressTest.class); + private static final Logger LOG = LoggerFactory.getLogger(StressTest.class); private static QueuedThreadPool _threads; private static Server _server; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/InetAccessHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/InetAccessHandlerTest.java index cd7d54277832..bde3c271a5ee 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/InetAccessHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/InetAccessHandlerTest.java @@ -163,83 +163,89 @@ private void testConnector(int port, String path, String include, String exclude public static Stream data() { Object[][] data = new Object[][] - { - // Empty lists 1 - {"", "", "", "", "", "200;200"}, - - // test simple filters - {"", "127.0.0.1", "", "", "", "200;200"}, - {"", "127.0.0.1-127.0.0.254", "", "", "", "200;200"}, - {"", "127.0.0.1-127.0.0.254", "", "", "", "200;200"}, - {"", "192.0.0.1", "", "", "", "403;403"}, - {"", "192.0.0.1-192.0.0.254", "", "", "", "403;403"}, - - // test includeConnector - {"", "127.0.0.1", "", "http_connector1", "", "200;200"}, - {"", "127.0.0.1-127.0.0.254", "", "http_connector1", "", "200;200"}, - {"", "192.0.0.1", "", "http_connector1", "", "200;403"}, - {"", "192.0.0.1-192.0.0.254", "", "http_connector1", "", "200;403"}, - {"", "192.0.0.1", "", "http_connector2", "", "403;200"}, - {"", "192.0.0.1-192.0.0.254", "", "http_connector2", "", "403;200"}, - - // test includeConnector names where none of them match - {"", "127.0.0.1", "", "nothttp", "", "200;200"}, - {"", "127.0.0.1-127.0.0.254", "", "nothttp", "", "200;200"}, - {"", "192.0.0.1", "", "nothttp", "", "403;403"}, - {"", "192.0.0.1-192.0.0.254", "", "nothttp", "", "403;403"}, - - // text excludeConnector - {"", "127.0.0.1", "", "", "http_connector1", "403;200"}, - {"", "127.0.0.1-127.0.0.254", "", "", "http_connector1", "403;200"}, - {"", "192.0.0.1", "", "", "http_connector1", "403;403"}, - {"", "192.0.0.1-192.0.0.254", "", "", "http_connector1", "403;403"}, - {"", "192.0.0.1", "", "", "http_connector2", "403;403"}, - {"", "192.0.0.1-192.0.0.254", "", "", "http_connector2", "403;403"}, - - // test excludeConnector where none of them match. - {"", "127.0.0.1", "", "", "nothttp", "200;200"}, - {"", "127.0.0.1-127.0.0.254", "", "", "nothttp", "200;200"}, - {"", "192.0.0.1", "", "", "nothttp", "403;403"}, - {"", "192.0.0.1-192.0.0.254", "", "", "nothttp", "403;403"}, - - // both connectors are excluded - {"", "127.0.0.1", "", "", "http_connector1;http_connector2", "403;403"}, - {"", "127.0.0.1-127.0.0.254", "", "", "http_connector1;http_connector2", "403;403"}, - {"", "192.0.0.1", "", "", "http_connector1;http_connector2", "403;403"}, - {"", "192.0.0.1-192.0.0.254", "", "", "http_connector1;http_connector2", "403;403"}, - - // both connectors are included - {"", "127.0.0.1", "", "http_connector1;http_connector2", "", "200;200"}, - {"", "127.0.0.1-127.0.0.254", "", "http_connector1;http_connector2", "", "200;200"}, - {"", "192.0.0.1", "", "http_connector1;http_connector2", "", "200;200"}, - {"", "192.0.0.1-192.0.0.254", "", "http_connector1;http_connector2", "", "200;200"}, - {"", "", "127.0.0.1", "http_connector1;http_connector2", "", "403;403"}, - - // exclude takes precedence over include - {"", "127.0.0.1", "", "http_connector1;http_connector2", "http_connector1;http_connector2", "403;403"}, - {"", "127.0.0.1-127.0.0.254", "", "http_connector1;http_connector2", "http_connector1;http_connector2", "403;403"}, - {"", "192.0.0.1", "", "http_connector1;http_connector2", "http_connector1;http_connector2", "403;403"}, - {"", "192.0.0.1-192.0.0.254", "", "http_connector1;http_connector2", "http_connector1;http_connector2", "403;403"}, - - // Test path specific include/exclude. - {"/testPath", "", "", "http_connector1", "", "200;403"}, - {"/", "127.0.0.1", "127.0.0.1|/testPath", "http_connector1", "", "200;200"}, - {"/testPath", "127.0.0.1", "127.0.0.1|/testPath", "http_connector1", "", "403;403"}, - {"/notTestPath", "127.0.1.11|/testPath", "", "http_connector1", "", "200;403"}, - {"/testPath", "127.0.1.11|/testPath", "", "http_connector1", "", "200;403"}, - {"/testPath", "127.0.0.13|/testPath;127.0.0.1|/testPath", "", "http_connector1", "", "200;200"}, - {"/testPath", "127.0.0.1", "127.0.0.1|/testPath", "http_connector1", "", "403;403"}, - {"/", "127.0.0.1", "127.0.0.1|/testPath", "http_connector1", "", "200;200"}, - {"/a/b", "", "127.0.0.1|/a/*", "", "", "403;403"}, - {"/b/a", "", "127.0.0.1|/a/*", "", "", "200;200"}, - {"/org/eclipse/jetty/test.html", "127.0.0.1|*.html", "127.0.0.1|*.xml", "", "", "200;200"}, - {"/org/eclipse/jetty/test.xml", "127.0.0.1|*.html", "127.0.0.1|*.xml", "", "", "403;403"}, - {"/org/eclipse/jetty/test.pdf", "127.0.0.1|*.html", "127.0.0.1|*.xml", "", "", "403;403"}, - {"/a/test.html", "", "127.0.0.1|*.html;127.0.0.10|/a/*", "", "", "403;403"}, - {"/foo/bar/test.xml", "127.0.0.1|/foo/*", "127.0.0.0-127.0.0.2|*.html", "", "", "200;200"}, - {"/foo/bar/test.html", "127.0.0.1|/foo/*", "127.0.0.0-127.0.0.2|*.html", "", "", "403;403"}, - {"/foo/bar/test.xml", "127.0.0.1|/foo/bar/*", "127.0.0.1|/foo/*", "", "", "403;403"}, - }; + { + // Empty lists 1 + {"", "", "", "", "", "200;200"}, + + // test simple filters + {"", "127.0.0.1", "", "", "", "200;200"}, + {"", "127.0.0.1-127.0.0.254", "", "", "", "200;200"}, + {"", "127.0.0.1-127.0.0.254", "", "", "", "200;200"}, + {"", "192.0.0.1", "", "", "", "403;403"}, + {"", "192.0.0.1-192.0.0.254", "", "", "", "403;403"}, + + // test includeConnector + {"", "127.0.0.1", "", "http_connector1", "", "200;200"}, + {"", "127.0.0.1-127.0.0.254", "", "http_connector1", "", "200;200"}, + {"", "192.0.0.1", "", "http_connector1", "", "200;403"}, + {"", "192.0.0.1-192.0.0.254", "", "http_connector1", "", "200;403"}, + {"", "192.0.0.1", "", "http_connector2", "", "403;200"}, + {"", "192.0.0.1-192.0.0.254", "", "http_connector2", "", "403;200"}, + + // test includeConnector names where none of them match + {"", "127.0.0.1", "", "nothttp", "", "200;200"}, + {"", "127.0.0.1-127.0.0.254", "", "nothttp", "", "200;200"}, + {"", "192.0.0.1", "", "nothttp", "", "403;403"}, + {"", "192.0.0.1-192.0.0.254", "", "nothttp", "", "403;403"}, + + // text excludeConnector + {"", "127.0.0.1", "", "", "http_connector1", "403;200"}, + {"", "127.0.0.1-127.0.0.254", "", "", "http_connector1", "403;200"}, + {"", "192.0.0.1", "", "", "http_connector1", "403;403"}, + {"", "192.0.0.1-192.0.0.254", "", "", "http_connector1", "403;403"}, + {"", "192.0.0.1", "", "", "http_connector2", "403;403"}, + {"", "192.0.0.1-192.0.0.254", "", "", "http_connector2", "403;403"}, + + // test excludeConnector where none of them match. + {"", "127.0.0.1", "", "", "nothttp", "200;200"}, + {"", "127.0.0.1-127.0.0.254", "", "", "nothttp", "200;200"}, + {"", "192.0.0.1", "", "", "nothttp", "403;403"}, + {"", "192.0.0.1-192.0.0.254", "", "", "nothttp", "403;403"}, + + // both connectors are excluded + {"", "127.0.0.1", "", "", "http_connector1;http_connector2", "403;403"}, + {"", "127.0.0.1-127.0.0.254", "", "", "http_connector1;http_connector2", "403;403"}, + {"", "192.0.0.1", "", "", "http_connector1;http_connector2", "403;403"}, + {"", "192.0.0.1-192.0.0.254", "", "", "http_connector1;http_connector2", "403;403"}, + + // both connectors are included + {"", "127.0.0.1", "", "http_connector1;http_connector2", "", "200;200"}, + {"", "127.0.0.1-127.0.0.254", "", "http_connector1;http_connector2", "", "200;200"}, + {"", "192.0.0.1", "", "http_connector1;http_connector2", "", "200;200"}, + {"", "192.0.0.1-192.0.0.254", "", "http_connector1;http_connector2", "", "200;200"}, + {"", "", "127.0.0.1", "http_connector1;http_connector2", "", "403;403"}, + + // exclude takes precedence over include + {"", "127.0.0.1", "", "http_connector1;http_connector2", "http_connector1;http_connector2", "403;403"}, + { + "", "127.0.0.1-127.0.0.254", "", "http_connector1;http_connector2", "http_connector1;http_connector2", + "403;403" + }, + {"", "192.0.0.1", "", "http_connector1;http_connector2", "http_connector1;http_connector2", "403;403"}, + { + "", "192.0.0.1-192.0.0.254", "", "http_connector1;http_connector2", "http_connector1;http_connector2", + "403;403" + }, + + // Test path specific include/exclude. + {"/testPath", "", "", "http_connector1", "", "200;403"}, + {"/", "127.0.0.1", "127.0.0.1|/testPath", "http_connector1", "", "200;200"}, + {"/testPath", "127.0.0.1", "127.0.0.1|/testPath", "http_connector1", "", "403;403"}, + {"/notTestPath", "127.0.1.11|/testPath", "", "http_connector1", "", "200;403"}, + {"/testPath", "127.0.1.11|/testPath", "", "http_connector1", "", "200;403"}, + {"/testPath", "127.0.0.13|/testPath;127.0.0.1|/testPath", "", "http_connector1", "", "200;200"}, + {"/testPath", "127.0.0.1", "127.0.0.1|/testPath", "http_connector1", "", "403;403"}, + {"/", "127.0.0.1", "127.0.0.1|/testPath", "http_connector1", "", "200;200"}, + {"/a/b", "", "127.0.0.1|/a/*", "", "", "403;403"}, + {"/b/a", "", "127.0.0.1|/a/*", "", "", "200;200"}, + {"/org/eclipse/jetty/test.html", "127.0.0.1|*.html", "127.0.0.1|*.xml", "", "", "200;200"}, + {"/org/eclipse/jetty/test.xml", "127.0.0.1|*.html", "127.0.0.1|*.xml", "", "", "403;403"}, + {"/org/eclipse/jetty/test.pdf", "127.0.0.1|*.html", "127.0.0.1|*.xml", "", "", "403;403"}, + {"/a/test.html", "", "127.0.0.1|*.html;127.0.0.10|/a/*", "", "", "403;403"}, + {"/foo/bar/test.xml", "127.0.0.1|/foo/*", "127.0.0.0-127.0.0.2|*.html", "", "", "200;200"}, + {"/foo/bar/test.html", "127.0.0.1|/foo/*", "127.0.0.0-127.0.0.2|*.html", "", "", "403;403"}, + {"/foo/bar/test.xml", "127.0.0.1|/foo/bar/*", "127.0.0.1|/foo/*", "", "", "403;403"} + }; return Arrays.stream(data).map(Arguments::of); } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java index 573e671035c3..4ee0fb69ddfe 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/NcsaRequestLogTest.java @@ -45,7 +45,6 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; @@ -53,12 +52,16 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; public class NcsaRequestLogTest { + private static final Logger LOG = LoggerFactory.getLogger(NcsaRequestLogTest.class); + RequestLog _log; Server _server; LocalConnector _connector; @@ -599,7 +602,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques } catch (IOException | IllegalStateException th) { - Log.getLog().ignore(th); + LOG.trace("IGNORED", th); } finally { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java index a48e15c7ce0b..a8cce77e1e3b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java @@ -41,7 +41,6 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.LeakTrackingByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool; -import org.eclipse.jetty.io.ssl.SslConnection; import org.eclipse.jetty.server.AbstractConnectionFactory; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.HttpServerTestBase; @@ -50,13 +49,14 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -71,6 +71,7 @@ */ public class SelectChannelServerSslTest extends HttpServerTestBase { + private static final Logger LOG = LoggerFactory.getLogger(SelectChannelServerSslTest.class); private SSLContext _sslContext; public SelectChannelServerSslTest() @@ -139,13 +140,13 @@ public void testFullMethod() throws Exception catch (SocketException e) { // TODO This needs to be investigated #2244 - Log.getLogger(SslConnection.class).warn("Close overtook 400 response"); + LOG.warn("Close overtook 400 response", e); } catch (SSLException e) { // TODO This needs to be investigated #2244 if (e.getCause() instanceof SocketException) - Log.getLogger(SslConnection.class).warn("Close overtook 400 response"); + LOG.warn("Close overtook 400 response", e); else throw e; } @@ -161,7 +162,7 @@ public void testFullURI() throws Exception } catch (SocketException e) { - Log.getLogger(SslConnection.class).warn("Close overtook 400 response"); + LOG.warn("Close overtook 400 response", e); } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java index 73c8f9267d2b..2d020a5d2907 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java @@ -39,14 +39,14 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.time.Duration.ofSeconds; @@ -54,7 +54,7 @@ @Disabled public class SlowClientsTest { - private Logger logger = Log.getLogger(getClass()); + private Logger logger = LoggerFactory.getLogger(getClass()); @Test public void testSlowClientsWithSmallThreadPool() throws Exception diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index c705a9f382c2..ec86bc7bc966 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -46,6 +46,10 @@ jetty-security ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-jmx @@ -53,6 +57,12 @@ true + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java index 859856016886..a365c7b93aa6 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.servlet; import java.io.IOException; - import javax.servlet.ServletContext; import javax.servlet.UnavailableException; @@ -29,8 +28,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.Dumpable; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractHolder @@ -43,7 +42,7 @@ */ public abstract class BaseHolder extends AbstractLifeCycle implements Dumpable { - private static final Logger LOG = Log.getLogger(BaseHolder.class); + private static final Logger LOG = LoggerFactory.getLogger(BaseHolder.class); private final Source _source; private Class _class; @@ -93,7 +92,7 @@ public void doStart() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to load class {}", _className, e); throw new UnavailableException("Class loading error for holder " + toString()); } } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index f725b1f27a92..000f84874d6d 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -42,10 +42,10 @@ import org.eclipse.jetty.server.ResourceService.WelcomeFactory; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The default servlet. @@ -129,7 +129,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc { public static final String CONTEXT_INIT = "org.eclipse.jetty.servlet.Default."; - private static final Logger LOG = Log.getLogger(DefaultServlet.class); + private static final Logger LOG = LoggerFactory.getLogger(DefaultServlet.class); private static final long serialVersionUID = 4930458713846881193L; @@ -204,7 +204,7 @@ public void init() } catch (Exception e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to create resourceBase from {}", rb, e); throw new UnavailableException(e.toString()); } } @@ -228,8 +228,9 @@ public void init() } catch (Exception e) { - LOG.warn(e.toString()); - LOG.debug(e); + LOG.warn("Unable to use stylesheet: {} - {}", css, e.toString()); + if (LOG.isDebugEnabled()) + LOG.debug("Unable to use stylesheet: {}", css, e); } int encodingHeaderCacheSize = getInitInt("encodingHeaderCacheSize", -1); @@ -269,7 +270,7 @@ public void init() } catch (Exception e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to setup CachedContentFactory", e); throw new UnavailableException(e.toString()); } @@ -438,7 +439,7 @@ else if (_servletContext instanceof ContextHandler.Context) } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } if ((r == null || !r.exists()) && pathInContext.endsWith("/jetty-dir.css")) diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java index 35473804b707..5ef6ea787ff2 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java @@ -29,8 +29,8 @@ import org.eclipse.jetty.server.Dispatcher; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ErrorHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An ErrorHandler that maps exceptions and status codes to URIs for dispatch using @@ -39,7 +39,7 @@ public class ErrorPageErrorHandler extends ErrorHandler implements ErrorHandler.ErrorPageMapper { public static final String GLOBAL_ERROR_PAGE = "org.eclipse.jetty.server.error_page.global"; - private static final Logger LOG = Log.getLogger(ErrorPageErrorHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ErrorPageErrorHandler.class); private enum PageLookupTechnique { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java index 75e00416bdc9..515ef89f9bf7 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.EnumSet; import java.util.List; - import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterConfig; @@ -35,12 +34,12 @@ import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FilterHolder extends Holder { - private static final Logger LOG = Log.getLogger(FilterHolder.class); + private static final Logger LOG = LoggerFactory.getLogger(FilterHolder.class); private transient Filter _filter; private transient Config _config; diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java index c9d3392bc5f2..dfd1a9b4420a 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java @@ -29,8 +29,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Holder @@ -43,7 +43,7 @@ @ManagedObject("Holder - a container for servlets and the like") public abstract class Holder extends BaseHolder { - private static final Logger LOG = Log.getLogger(Holder.class); + private static final Logger LOG = LoggerFactory.getLogger(Holder.class); private final Map _initParams = new HashMap(3); private String _displayName; diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java index f94134fcef27..75a77c9ed0a8 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java @@ -39,8 +39,8 @@ import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.util.ArrayUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Dynamic Servlet Invoker. @@ -67,7 +67,7 @@ @SuppressWarnings("serial") public class Invoker extends HttpServlet { - private static final Logger LOG = Log.getLogger(Invoker.class); + private static final Logger LOG = LoggerFactory.getLogger(Invoker.class); private ContextHandler _contextHandler; private ServletHandler _servletHandler; @@ -194,7 +194,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response) } catch (Exception e) { - LOG.debug(e); + LOG.debug("Unable to start {}", holder, e); throw new UnavailableException(e.toString()); } @@ -212,7 +212,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } LOG.warn("Dynamic servlet " + s + diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ListenerHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ListenerHolder.java index ab3ec766841c..3259392743a7 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ListenerHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ListenerHolder.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.servlet; import java.util.EventListener; - import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -118,7 +117,7 @@ protected synchronized EventListener createInstance() throws Exception } return listener; } - + @Override public void doStop() throws Exception { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java index 758767d36540..9d2206412875 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java @@ -72,8 +72,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Servlet Context. @@ -91,7 +91,7 @@ @ManagedObject("Servlet Context Handler") public class ServletContextHandler extends ContextHandler { - private static final Logger LOG = Log.getLogger(ServletContextHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletContextHandler.class); public static final int SESSIONS = 1; public static final int SECURITY = 2; @@ -1260,7 +1260,7 @@ protected T createInstance(Class clazz) throws ServletException { return _objFactory.decorate(super.createInstance(clazz)); } - + public T createInstance(BaseHolder holder) throws ServletException { try diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 355b3a28a131..5f4b22f25535 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -70,8 +70,8 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.DumpableCollection; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Servlet HttpHandler. @@ -89,7 +89,7 @@ @ManagedObject("Servlet Handler") public class ServletHandler extends ScopedHandler { - private static final Logger LOG = Log.getLogger(ServletHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletHandler.class); public static final String __DEFAULT_SERVLET = "default"; @@ -232,29 +232,30 @@ protected synchronized void doStop() { for (int i = _filters.length; i-- > 0; ) { + FilterHolder filter = _filters[i]; try { - _filters[i].stop(); + filter.stop(); } catch (Exception e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to stop filter {}", filter, e); } - if (_filters[i].getSource() != Source.EMBEDDED) + if (filter.getSource() != Source.EMBEDDED) { //remove all of the mappings that were for non-embedded filters - _filterNameMap.remove(_filters[i].getName()); + _filterNameMap.remove(filter.getName()); //remove any mappings associated with this filter ListIterator fmitor = filterMappings.listIterator(); while (fmitor.hasNext()) { FilterMapping fm = fmitor.next(); - if (fm.getFilterName().equals(_filters[i].getName())) + if (fm.getFilterName().equals(filter.getName())) fmitor.remove(); } } else - filterHolders.add(_filters[i]); //only retain embedded + filterHolders.add(filter); //only retain embedded } } @@ -274,30 +275,31 @@ protected synchronized void doStop() { for (int i = _servlets.length; i-- > 0; ) { + ServletHolder servlet = _servlets[i]; try { - _servlets[i].stop(); + servlet.stop(); } catch (Exception e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to stop servlet {}", servlet, e); } - if (_servlets[i].getSource() != Source.EMBEDDED) + if (servlet.getSource() != Source.EMBEDDED) { //remove from servlet name map - _servletNameMap.remove(_servlets[i].getName()); + _servletNameMap.remove(servlet.getName()); //remove any mappings associated with this servlet ListIterator smitor = servletMappings.listIterator(); while (smitor.hasNext()) { ServletMapping sm = smitor.next(); - if (sm.getServletName().equals(_servlets[i].getName())) + if (sm.getServletName().equals(servlet.getName())) smitor.remove(); } } else - servletHolders.add(_servlets[i]); //only retain embedded + servletHolders.add(servlet); //only retain embedded } } @@ -313,16 +315,17 @@ protected synchronized void doStop() { for (int i = _listeners.length; i-- > 0; ) { + ListenerHolder listener = _listeners[i]; try { - _listeners[i].stop(); + listener.stop(); } catch (Exception e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to stop listener {}", listener, e); } - if (_listeners[i].getSource() == Source.EMBEDDED) - listenerHolders.add(_listeners[i]); + if (listener.getSource() == Source.EMBEDDED) + listenerHolders.add(listener); } } ListenerHolder[] listeners = (ListenerHolder[])LazyList.toArray(listenerHolders, ListenerHolder.class); @@ -741,7 +744,7 @@ public void initialize() } catch (Throwable e) { - LOG.debug(Log.EXCEPTION, e); + LOG.debug("Unable to start {}", h, e); mx.add(e); } }); diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java index c0785ced4aa4..aef2a26900c1 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java @@ -33,7 +33,6 @@ import java.util.Set; import java.util.Stack; import java.util.concurrent.TimeUnit; - import javax.servlet.GenericServlet; import javax.servlet.MultipartConfigElement; import javax.servlet.Servlet; @@ -59,8 +58,8 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Servlet Instance and Context Holder. @@ -73,7 +72,7 @@ @ManagedObject("Servlet Holder") public class ServletHolder extends Holder implements UserIdentity.Scope, Comparable { - private static final Logger LOG = Log.getLogger(ServletHolder.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletHolder.class); private int _initOrder = -1; private boolean _initOnStartup = false; private Map _roleMap; @@ -365,7 +364,7 @@ public void doStart() makeUnavailable(ex); if (getServletHandler().isStartWithUnavailable()) { - LOG.ignore(ex); + LOG.trace("IGNORED", ex); return; } else @@ -382,7 +381,7 @@ public void doStart() makeUnavailable(ex); if (getServletHandler().isStartWithUnavailable()) { - LOG.ignore(ex); + LOG.trace("IGNORED", ex); return; } else @@ -443,7 +442,7 @@ public void doStop() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to destroy servlet {}", servlet, e); } } _config = null; @@ -595,7 +594,7 @@ else if (_forcedPath != null) { makeUnavailable(e); if (getServletHandler().isStartWithUnavailable()) - LOG.warn(e); + LOG.warn("{} is marked as Unavailable", this, e); else throw e; } @@ -793,8 +792,7 @@ public String getNameOfJspClass(String jsp) String tmp = StringUtil.replace(jsp, '.', '_'); if (LOG.isDebugEnabled()) { - LOG.warn("JspUtil.makeJavaIdentifier failed for jsp " + jsp + " using " + tmp + " instead"); - LOG.warn(e); + LOG.warn("JspUtil.makeJavaIdentifier failed for jsp {} using {} instead", jsp, tmp, e); } return tmp; } @@ -830,8 +828,7 @@ public String getPackageOfJspClass(String jsp) tmp = (".".equals(tmp) ? "" : tmp); if (LOG.isDebugEnabled()) { - LOG.warn("JspUtil.makeJavaPackage failed for " + jsp + " using " + tmp + " instead"); - LOG.warn(e); + LOG.warn("JspUtil.makeJavaPackage failed for {} using {} instead", jsp, tmp, e); } return tmp; } @@ -1014,13 +1011,14 @@ public void destroy() { while (_stack.size() > 0) { + Servlet servlet = _stack.pop(); try { - (_stack.pop()).destroy(); + servlet.destroy(); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to destroy servlet {}", servlet, e); } } } @@ -1209,7 +1207,7 @@ public void destroy() } catch (Throwable th) { - LOG.warn(th); + LOG.warn("Unable to destroy {}", _servlet, th); } } } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Source.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Source.java index 27970faf7470..285232f57c38 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Source.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Source.java @@ -32,7 +32,7 @@ public enum Origin { EMBEDDED, JAVAX_API, DESCRIPTOR, ANNOTATION } - + public Origin _origin; public String _resource; diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java index 8cd560a06138..781c5de37b94 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java @@ -38,12 +38,12 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.util.component.Container; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class StatisticsServlet extends HttpServlet { - private static final Logger LOG = Log.getLogger(StatisticsServlet.class); + private static final Logger LOG = LoggerFactory.getLogger(StatisticsServlet.class); boolean _restrictToLocalhost = true; // defaults to true private StatisticsHandler _statsHandler; diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java index 1929082bdb20..61232e3d2db3 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java @@ -25,8 +25,8 @@ import javax.servlet.ServletContextListener; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ELContextCleaner @@ -39,7 +39,7 @@ */ public class ELContextCleaner implements ServletContextListener { - private static final Logger LOG = Log.getLogger(ELContextCleaner.class); + private static final Logger LOG = LoggerFactory.getLogger(ELContextCleaner.class); @Override public void contextInitialized(ServletContextEvent sce) diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java index b70636f7b6dd..36f3ab7bf2c0 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java @@ -53,13 +53,13 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.ISO_8859_1; import static org.hamcrest.MatcherAssert.assertThat; @@ -75,7 +75,7 @@ // TODO need these on HTTP2 as well! public class AsyncServletIOTest { - private static final Logger LOG = Log.getLogger(AsyncServletIOTest.class); + private static final Logger LOG = LoggerFactory.getLogger(AsyncServletIOTest.class); protected AsyncIOServlet _servlet0 = new AsyncIOServlet(); protected AsyncIOServlet2 _servlet2 = new AsyncIOServlet2(); protected AsyncIOServlet3 _servlet3 = new AsyncIOServlet3(); diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java index 2e4452afcc0f..9cacec898b71 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java @@ -59,10 +59,11 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.UrlEncoded; -import org.eclipse.jetty.util.log.Log; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -74,6 +75,8 @@ public class DispatcherTest { + private static final Logger LOG = LoggerFactory.getLogger(DispatcherTest.class); + private Server _server; private LocalConnector _connector; private ContextHandlerCollection _contextCollection; @@ -170,9 +173,9 @@ public void testForwardWithParam() throws Exception @Test public void testForwardWithBadParams() throws Exception { - try (StacklessLogging nostack = new StacklessLogging(HttpChannel.class)) + try (StacklessLogging ignored = new StacklessLogging(HttpChannel.class)) { - Log.getLogger(ServletHandler.class).info("Expect Not valid UTF8 warnings..."); + LOG.info("Expect Not valid UTF8 warnings..."); _contextHandler.addServlet(AlwaysForwardServlet.class, "/forward/*"); _contextHandler.addServlet(EchoServlet.class, "/echo/*"); @@ -732,7 +735,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t HttpServletMapping fwdMapping = (HttpServletMapping)request.getAttribute(Dispatcher.FORWARD_MAPPING); assertNotNull(fwdMapping); assertEquals("/ForwardServlet", fwdMapping.getMatchValue()); - + List expectedAttributeNames = Arrays.asList(Dispatcher.FORWARD_REQUEST_URI, Dispatcher.FORWARD_CONTEXT_PATH, Dispatcher.FORWARD_SERVLET_PATH, Dispatcher.FORWARD_QUERY_STRING, Dispatcher.FORWARD_MAPPING); List requestAttributeNames = Collections.list(request.getAttributeNames()); @@ -857,7 +860,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t assertEquals("do=end", request.getAttribute(Dispatcher.INCLUDE_QUERY_STRING)); HttpServletMapping incMapping = (HttpServletMapping)request.getAttribute(Dispatcher.INCLUDE_MAPPING); assertNotNull(incMapping); - assertEquals("/AssertForwardIncludeServlet", incMapping.getMatchValue()); + assertEquals("/AssertForwardIncludeServlet", incMapping.getMatchValue()); List expectedAttributeNames = Arrays.asList(Dispatcher.FORWARD_REQUEST_URI, Dispatcher.FORWARD_CONTEXT_PATH, Dispatcher.FORWARD_SERVLET_PATH, Dispatcher.FORWARD_PATH_INFO, Dispatcher.FORWARD_QUERY_STRING, Dispatcher.FORWARD_MAPPING, diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java index 16136b683364..915916ff8667 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java @@ -51,11 +51,12 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerWrapper; -import org.eclipse.jetty.util.log.Log; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -65,6 +66,8 @@ public class ErrorPageTest { + private static final Logger LOG = LoggerFactory.getLogger(ErrorPageTest.class); + private Server _server; private LocalConnector _connector; private StacklessLogging _stackless; @@ -556,7 +559,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t } catch (IllegalStateException e) { - Log.getLog().ignore(e); + LOG.trace("IGNORED", e); } finally { @@ -565,7 +568,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t } catch (IOException e) { - Log.getLog().warn(e); + LOG.warn("Unable to send error", e); } }); hold.await(); @@ -604,7 +607,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t } catch (Throwable ignore) { - Log.getLog().ignore(ignore); + LOG.trace("IGNORED", ignore); } } } diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ListenerHolderTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ListenerHolderTest.java index b2c25bc1592b..cb3122a18504 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ListenerHolderTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ListenerHolderTest.java @@ -31,7 +31,7 @@ public class ListenerHolderTest public static class DummyListener implements EventListener { } - + @Test public void testCreateInstance() throws Exception { @@ -42,7 +42,7 @@ public void testCreateInstance() throws Exception holder.setHeldClass(DummyListener.class); EventListener listener = holder.createInstance(); assertNotNull(listener); - + //test with a ServletContextHandler Server server = new Server(); ServletContextHandler context = new ServletContextHandler(); diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java index 0189d82b9086..f1aa03389310 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java @@ -41,11 +41,11 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -54,7 +54,7 @@ public class MultiPartServletTest { - private static final Logger LOG = Log.getLogger(MultiPartServletTest.class); + private static final Logger LOG = LoggerFactory.getLogger(MultiPartServletTest.class); private Server server; private ServerConnector connector; diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java index 45786127a94e..4e8f63a464fc 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java @@ -29,11 +29,11 @@ import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -45,7 +45,7 @@ public class PostServletTest { - private static final Logger LOG = Log.getLogger(PostServletTest.class); + private static final Logger LOG = LoggerFactory.getLogger(PostServletTest.class); private static final AtomicBoolean posted = new AtomicBoolean(false); private static final AtomicReference ex0 = new AtomicReference<>(); private static final AtomicReference ex1 = new AtomicReference<>(); diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletContextHandlerTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletContextHandlerTest.java index d5149b00ece0..fdd6fab34cd5 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletContextHandlerTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletContextHandlerTest.java @@ -725,7 +725,7 @@ public void testAddServletFromServlet() throws Exception { //A servlet cannot be added by another servlet Logger logger = LoggerFactory.getLogger(ContextHandler.class.getName() + "ROOT"); - + try (StacklessLogging stackless = new StacklessLogging(logger)) { ServletContextHandler context = new ServletContextHandler(); diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletRequestLogTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletRequestLogTest.java index eab3b2ed11bc..0965236b8a42 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletRequestLogTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletRequestLogTest.java @@ -50,13 +50,13 @@ import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.toolchain.test.IO; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.time.Duration.ofSeconds; import static org.hamcrest.MatcherAssert.assertThat; @@ -68,7 +68,7 @@ @Disabled public class ServletRequestLogTest { - private static final Logger LOG = Log.getLogger(ServletRequestLogTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletRequestLogTest.class); public static class CaptureLog extends AbstractLifeCycle implements RequestLog { diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletTester.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletTester.java index 1e075da00df4..8236ba0935ae 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletTester.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletTester.java @@ -35,13 +35,13 @@ import org.eclipse.jetty.util.Attributes; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ServletTester extends ContainerLifeCycle { - private static final Logger LOG = Log.getLogger(ServletTester.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletTester.class); private final Server _server = new Server(); private final LocalConnector _connector = new LocalConnector(_server); diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 6854e8c3eb80..037337044db8 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -63,7 +63,17 @@ jetty-io ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty jetty-jmx diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java index 047d2966dada..1612344f5f63 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CGI.java @@ -41,8 +41,8 @@ import org.eclipse.jetty.util.MultiMap; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.UrlEncoded; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * CGI Servlet. @@ -72,7 +72,7 @@ public class CGI extends HttpServlet { private static final long serialVersionUID = -6182088932884791074L; - private static final Logger LOG = Log.getLogger(CGI.class); + private static final Logger LOG = LoggerFactory.getLogger(CGI.class); private boolean _ok; private File _docRoot; @@ -378,7 +378,7 @@ public void run() } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to copy error stream", e); } } }); @@ -445,17 +445,7 @@ else if ("Status".equals(key)) } finally { - if (os != null) - { - try - { - os.close(); - } - catch (Exception e) - { - LOG.debug(e); - } - } + IO.close(os); p.destroy(); // LOG.debug("CGI: terminated!"); async.complete(); @@ -478,7 +468,7 @@ public void run() } catch (IOException e) { - LOG.debug(e); + LOG.debug("Unable to write out to CGI", e); } } }).start(); @@ -496,13 +486,14 @@ public void run() { try { - OutputStream outToCgi = p.getOutputStream(); - IO.copy(input, outToCgi, len); - outToCgi.close(); + try (OutputStream outToCgi = p.getOutputStream()) + { + IO.copy(input, outToCgi, len); + } } catch (IOException e) { - LOG.debug(e); + LOG.debug("Unable to write out to CGI", e); } } }).start(); diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java index d1ae44c98789..5e055d1a24f4 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java @@ -26,7 +26,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -38,8 +37,8 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implementation of the @@ -125,7 +124,7 @@ */ public class CrossOriginFilter implements Filter { - private static final Logger LOG = Log.getLogger(CrossOriginFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(CrossOriginFilter.class); // Request headers private static final String ORIGIN_HEADER = "Origin"; diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java index 335723a1790e..ab4b85a08696 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java @@ -57,10 +57,10 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Denial of Service filter @@ -127,7 +127,7 @@ @ManagedObject("limits exposure to abuse from request flooding, whether malicious, or as a result of a misconfigured client") public class DoSFilter implements Filter { - private static final Logger LOG = Log.getLogger(DoSFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(DoSFilter.class); private static final String IPv4_GROUP = "(\\d{1,3})"; private static final Pattern IPv4_PATTERN = Pattern.compile(IPv4_GROUP + "\\." + IPv4_GROUP + "\\." + IPv4_GROUP + "\\." + IPv4_GROUP); @@ -426,7 +426,7 @@ protected void doFilter(HttpServletRequest request, HttpServletResponse response } catch (InterruptedException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); response.sendError(getTooManyCode()); } finally @@ -498,14 +498,14 @@ protected void onRequestTimeout(HttpServletRequest request, HttpServletResponse } catch (IllegalStateException ise) { - LOG.ignore(ise); + LOG.trace("IGNORED", ise); // abort instead response.sendError(-1); } } catch (Throwable x) { - LOG.info(x); + LOG.info("Failed to sendError", x); } handlingThread.interrupt(); @@ -749,7 +749,7 @@ protected void stopScheduler() } catch (Exception x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/HeaderFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/HeaderFilter.java index a8c77b6b92cb..642978d12e10 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/HeaderFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/HeaderFilter.java @@ -30,8 +30,8 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Header Filter @@ -57,7 +57,7 @@ public class HeaderFilter extends IncludeExcludeBasedFilter { private List _configuredHeaders = new ArrayList<>(); - private static final Logger LOG = Log.getLogger(HeaderFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(HeaderFilter.class); @Override public void init(FilterConfig filterConfig) throws ServletException diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludeExcludeBasedFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludeExcludeBasedFilter.java index a9d994a64fc6..ec66c9157e7e 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludeExcludeBasedFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludeExcludeBasedFilter.java @@ -31,8 +31,8 @@ import org.eclipse.jetty.util.IncludeExcludeSet; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Include Exclude Based Filter @@ -72,7 +72,7 @@ public abstract class IncludeExcludeBasedFilter implements Filter private final IncludeExclude _mimeTypes = new IncludeExclude<>(); private final IncludeExclude _httpMethods = new IncludeExclude<>(); private final IncludeExclude _paths = new IncludeExclude<>(PathSpecSet.class); - private static final Logger LOG = Log.getLogger(IncludeExcludeBasedFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(IncludeExcludeBasedFilter.class); @Override public void init(FilterConfig filterConfig) throws ServletException diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java index 8a1d8ee73b58..0f4c9eb714d3 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java @@ -50,8 +50,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A filter that builds a cache of secondary resources associated @@ -75,7 +75,7 @@ @ManagedObject("Push cache based on the HTTP 'Referer' header") public class PushCacheFilter implements Filter { - private static final Logger LOG = Log.getLogger(PushCacheFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(PushCacheFilter.class); private final Set _ports = new HashSet<>(); private final Set _hosts = new HashSet<>(); diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushSessionCacheFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushSessionCacheFilter.java index 4ec221eaf92f..ecb6ed02144a 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushSessionCacheFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushSessionCacheFilter.java @@ -39,15 +39,15 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpURI; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PushSessionCacheFilter implements Filter { private static final String RESPONSE_ATTR = "PushSessionCacheFilter.response"; private static final String TARGET_ATTR = "PushSessionCacheFilter.target"; private static final String TIMESTAMP_ATTR = "PushSessionCacheFilter.timestamp"; - private static final Logger LOG = Log.getLogger(PushSessionCacheFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(PushSessionCacheFilter.class); private final ConcurrentMap _cache = new ConcurrentHashMap<>(); private long _associateDelay = 5000L; diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java index d17d2cb6bf28..ba509e8f2711 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java @@ -40,8 +40,8 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Quality of Service Filter. @@ -78,7 +78,7 @@ @ManagedObject("Quality of Service Filter") public class QoSFilter implements Filter { - private static final Logger LOG = Log.getLogger(QoSFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(QoSFilter.class); static final int __DEFAULT_MAX_PRIORITY = 10; static final int __DEFAULT_PASSES = 10; @@ -235,7 +235,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha } catch (IllegalStateException x) { - LOG.warn(x); + LOG.warn("Unable to resume suspended dispatch", x); continue; } } diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AsyncManipFilter.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AsyncManipFilter.java index c15d03b854dd..8c8c74c82067 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AsyncManipFilter.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AsyncManipFilter.java @@ -29,8 +29,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Filter that merely manipulates the AsyncContext. @@ -40,7 +40,7 @@ */ public class AsyncManipFilter implements Filter, AsyncListener { - private static final Logger LOG = Log.getLogger(AsyncManipFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(AsyncManipFilter.class); private static final String MANIP_KEY = AsyncManipFilter.class.getName(); @Override diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java index 0ea1dcdf51b4..28959a4dc423 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java @@ -51,9 +51,9 @@ import org.eclipse.jetty.toolchain.test.IO; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.toolchain.test.Sha1Sum; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.hamcrest.Matchers; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -66,7 +66,7 @@ public class GzipTester { - private static final Logger LOG = Log.getLogger(GzipTester.class); + private static final Logger LOG = LoggerFactory.getLogger(GzipTester.class); public static class ContentMetadata { diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java index 2bb16b6eb1c4..a8c81a609f4c 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java @@ -40,13 +40,13 @@ import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletTester; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -54,7 +54,7 @@ public class QoSFilterTest { - private static final Logger LOG = Log.getLogger(QoSFilterTest.class); + private static final Logger LOG = LoggerFactory.getLogger(QoSFilterTest.class); private ServletTester _tester; private LocalConnector[] _connectors; diff --git a/jetty-servlets/src/test/resources/test.svg b/jetty-servlets/src/test/resources/test.svg index 08fbae335149..6f65269c10bb 100644 --- a/jetty-servlets/src/test/resources/test.svg +++ b/jetty-servlets/src/test/resources/test.svg @@ -1,46 +1,14 @@ - - - - - + + + + + - - + + maven-bundle-plugin true - + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 459c4b98159f..ac54aed8a9be 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -56,12 +56,23 @@ spring-beans ${spring-version} + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-server ${project.version} test + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-spring/src/main/java/org/eclipse/jetty/spring/SpringConfigurationProcessor.java b/jetty-spring/src/main/java/org/eclipse/jetty/spring/SpringConfigurationProcessor.java index ce04eb7fb40b..82ecf83a5ee1 100644 --- a/jetty-spring/src/main/java/org/eclipse/jetty/spring/SpringConfigurationProcessor.java +++ b/jetty-spring/src/main/java/org/eclipse/jetty/spring/SpringConfigurationProcessor.java @@ -23,12 +23,12 @@ import java.util.Map; import java.util.ServiceLoader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.xml.ConfigurationProcessor; import org.eclipse.jetty.xml.ConfigurationProcessorFactory; import org.eclipse.jetty.xml.XmlConfiguration; import org.eclipse.jetty.xml.XmlParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanWrapper; import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.config.BeanDefinition; @@ -60,7 +60,7 @@ */ public class SpringConfigurationProcessor implements ConfigurationProcessor { - private static final Logger LOG = Log.getLogger(SpringConfigurationProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(SpringConfigurationProcessor.class); private XmlConfiguration _configuration; private DefaultListableBeanFactory _beanFactory; diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index fc66c9e5dccd..28ea94f76f8b 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -25,6 +25,10 @@ jetty-client ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty @@ -32,6 +36,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-unixsocket/jetty-unixsocket-client/src/main/java/org/eclipse/jetty/unixsocket/client/HttpClientTransportOverUnixSockets.java b/jetty-unixsocket/jetty-unixsocket-client/src/main/java/org/eclipse/jetty/unixsocket/client/HttpClientTransportOverUnixSockets.java index e731efa2365f..b4b20bd61cc3 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/src/main/java/org/eclipse/jetty/unixsocket/client/HttpClientTransportOverUnixSockets.java +++ b/jetty-unixsocket/jetty-unixsocket-client/src/main/java/org/eclipse/jetty/unixsocket/client/HttpClientTransportOverUnixSockets.java @@ -47,14 +47,14 @@ import org.eclipse.jetty.io.ManagedSelector; import org.eclipse.jetty.io.SelectorManager; import org.eclipse.jetty.unixsocket.common.UnixSocketEndPoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // TODO: this class needs a thorough review. public class HttpClientTransportOverUnixSockets extends AbstractConnectorHttpClientTransport { - private static final Logger LOG = Log.getLogger(HttpClientTransportOverUnixSockets.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpClientTransportOverUnixSockets.class); private final ClientConnectionFactory factory = new HttpClientConnectionFactory(); diff --git a/jetty-unixsocket/jetty-unixsocket-client/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketTest.java b/jetty-unixsocket/jetty-unixsocket-client/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketTest.java index 48aadba29231..8add2ca82b30 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketTest.java +++ b/jetty-unixsocket/jetty-unixsocket-client/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketTest.java @@ -38,12 +38,12 @@ import org.eclipse.jetty.unixsocket.client.HttpClientTransportOverUnixSockets; import org.eclipse.jetty.unixsocket.server.UnixSocketConnector; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -58,7 +58,7 @@ @EnabledOnOs({LINUX, MAC}) public class UnixSocketTest { - private static final Logger log = Log.getLogger(UnixSocketTest.class); + private static final Logger log = LoggerFactory.getLogger(UnixSocketTest.class); private Server server; private HttpClient httpClient; diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 1667195b8100..2469773e7ede 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -25,10 +25,20 @@ jetty-util ${project.version} + + org.slf4j + slf4j-api + com.github.jnr jnr-unixsocket + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + diff --git a/jetty-unixsocket/jetty-unixsocket-common/src/main/java/org/eclipse/jetty/unixsocket/common/UnixSocketEndPoint.java b/jetty-unixsocket/jetty-unixsocket-common/src/main/java/org/eclipse/jetty/unixsocket/common/UnixSocketEndPoint.java index b8af0e3abe77..29c3c11d5e95 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/src/main/java/org/eclipse/jetty/unixsocket/common/UnixSocketEndPoint.java +++ b/jetty-unixsocket/jetty-unixsocket-common/src/main/java/org/eclipse/jetty/unixsocket/common/UnixSocketEndPoint.java @@ -25,13 +25,13 @@ import jnr.unixsocket.UnixSocketChannel; import org.eclipse.jetty.io.ChannelEndPoint; import org.eclipse.jetty.io.ManagedSelector; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class UnixSocketEndPoint extends ChannelEndPoint { - private static final Logger LOG = Log.getLogger(UnixSocketEndPoint.class); + private static final Logger LOG = LoggerFactory.getLogger(UnixSocketEndPoint.class); private final UnixSocketChannel _channel; @@ -65,7 +65,7 @@ protected void doShutdownOutput() } catch (IOException e) { - LOG.debug(e); + LOG.debug("Unable to shutdown output", e); } } } diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/java/org/eclipse/jetty/unixsocket/server/UnixSocketConnector.java b/jetty-unixsocket/jetty-unixsocket-server/src/main/java/org/eclipse/jetty/unixsocket/server/UnixSocketConnector.java index 377a443f79cd..a83a5e8e47dd 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/java/org/eclipse/jetty/unixsocket/server/UnixSocketConnector.java +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/java/org/eclipse/jetty/unixsocket/server/UnixSocketConnector.java @@ -48,10 +48,10 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A server-side connector for UNIX sockets.

@@ -61,7 +61,7 @@ public class UnixSocketConnector extends AbstractConnector { // See SockAddrUnix.ADDR_LENGTH. public static final int MAX_UNIX_SOCKET_PATH_LENGTH = 107; - private static final Logger LOG = Log.getLogger(UnixSocketConnector.class); + private static final Logger LOG = LoggerFactory.getLogger(UnixSocketConnector.class); private final SelectorManager _manager; private String _unixSocket = "/tmp/jetty.sock"; @@ -242,7 +242,7 @@ public void close() } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to close serverChannel: {}", serverChannel, e); } } @@ -252,7 +252,7 @@ public void close() } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to delete UnixSocket at {}", _unixSocket, e); } } } diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 6fcf4b1e14fa..3f4a7e5d7d7c 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -34,6 +34,17 @@ jetty-servlet-api provided + + org.slf4j + slf4j-api + + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java index ecc1f3406b44..5a786af11bc2 100644 --- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java +++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java @@ -32,8 +32,8 @@ import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

JSON parser and generator.

@@ -82,7 +82,7 @@ */ public class JSON { - static final Logger LOG = Log.getLogger(JSON.class); + static final Logger LOG = LoggerFactory.getLogger(JSON.class); private final Map _convertors = new ConcurrentHashMap<>(); private int _stringBufferSize = 1024; diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONDateConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONDateConvertor.java index e192dc4e08ce..02540fefa817 100644 --- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONDateConvertor.java +++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONDateConvertor.java @@ -27,8 +27,8 @@ import org.eclipse.jetty.util.DateCache; import org.eclipse.jetty.util.ajax.JSON.Output; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Convert a {@link Date} to JSON. @@ -38,7 +38,7 @@ */ public class JSONDateConvertor implements JSON.Convertor { - private static final Logger LOG = Log.getLogger(JSONDateConvertor.class); + private static final Logger LOG = LoggerFactory.getLogger(JSONDateConvertor.class); private final boolean _fromJSON; private final DateCache _dateCache; @@ -84,7 +84,7 @@ public Object fromJSON(Map map) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to parse JSON Object", e); } return null; } diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONEnumConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONEnumConvertor.java index 077e47a3c84d..a8753055ba13 100644 --- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONEnumConvertor.java +++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONEnumConvertor.java @@ -22,8 +22,8 @@ import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.ajax.JSON.Output; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Convert an {@link Enum} to JSON. @@ -33,7 +33,7 @@ */ public class JSONEnumConvertor implements JSON.Convertor { - private static final Logger LOG = Log.getLogger(JSONEnumConvertor.class); + private static final Logger LOG = LoggerFactory.getLogger(JSONEnumConvertor.class); private boolean _fromJSON; public JSONEnumConvertor() @@ -51,15 +51,17 @@ public Object fromJSON(Map map) { if (!_fromJSON) throw new UnsupportedOperationException(); + + String clazzname = (String)map.get("class"); try { @SuppressWarnings({"rawtypes", "unchecked"}) - Class type = Loader.loadClass((String)map.get("class")); + Class type = Loader.loadClass(clazzname); return Enum.valueOf(type, (String)map.get("value")); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to load class: {}", clazzname, e); return null; } } diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java index 9e342c5e3de9..3002213a196f 100644 --- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java +++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java @@ -29,8 +29,8 @@ import java.util.Set; import org.eclipse.jetty.util.ajax.JSON.Output; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Converts POJOs to JSON and vice versa.

@@ -43,7 +43,7 @@ */ public class JSONPojoConvertor implements JSON.Convertor { - private static final Logger LOG = Log.getLogger(JSONPojoConvertor.class); + private static final Logger LOG = LoggerFactory.getLogger(JSONPojoConvertor.class); private static final Map, NumberType> __numberTypes = new HashMap<>(); private static final NumberType SHORT = Number::shortValue; private static final NumberType INTEGER = Number::intValue; @@ -344,7 +344,7 @@ else if (_componentType != null && value.getClass().isArray()) catch (Exception e) { // Unusual array with multiple types. - LOG.ignore(e); + LOG.trace("IGNORED", e); _setter.invoke(obj, value); } } @@ -363,7 +363,7 @@ else if (_componentType != null && value.getClass().isArray()) catch (Exception e) { // unusual array with multiple types - LOG.ignore(e); + LOG.trace("IGNORED", e); _setter.invoke(obj, value); } } diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertorFactory.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertorFactory.java index 164658755f13..7ccf6a8a31dd 100644 --- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertorFactory.java +++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertorFactory.java @@ -23,9 +23,12 @@ import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.ajax.JSON.Convertor; import org.eclipse.jetty.util.ajax.JSON.Output; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JSONPojoConvertorFactory implements JSON.Convertor { + private static final Logger LOG = LoggerFactory.getLogger(JSONPojoConvertorFactory.class); private final JSON _json; private final boolean _fromJson; @@ -79,7 +82,7 @@ public Object fromJSON(Map map) } catch (ClassNotFoundException e) { - JSON.LOG.warn(e); + LOG.warn("Unable to find class: " + clsName, e); } } if (convertor != null) diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 90915e321cf6..741117f0edfc 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -69,6 +69,10 @@ + + org.slf4j + slf4j-api + org.eclipse.jetty.toolchain jetty-perf-helper @@ -79,10 +83,6 @@ jetty-test-helper test - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-util/src/main/java/module-info.java b/jetty-util/src/main/java/module-info.java index 1a175df1218b..9fbb9f84c11a 100644 --- a/jetty-util/src/main/java/module-info.java +++ b/jetty-util/src/main/java/module-info.java @@ -35,6 +35,8 @@ // Required by SSL code (for X509). requires transitive java.naming; + + // Standard Jetty Logging now. requires org.slf4j; // Only required if using AppContextLeakPreventer/AWTLeakPreventer. diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java index ba7003737d17..4e8fdc67d5e6 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java @@ -33,8 +33,9 @@ import java.nio.file.StandardOpenOption; import java.util.Arrays; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Buffer utility methods. @@ -93,15 +94,17 @@ */ public class BufferUtil { + private static final Logger LOG = LoggerFactory.getLogger(BufferUtil.class); + static final int TEMP_BUFFER_SIZE = 4096; static final byte SPACE = 0x20; static final byte MINUS = '-'; static final byte[] DIGIT = - { - (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6', (byte)'7', (byte)'8', (byte)'9', - (byte)'A', (byte)'B', (byte)'C', (byte)'D', - (byte)'E', (byte)'F' - }; + { + (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6', (byte)'7', (byte)'8', (byte)'9', + (byte)'A', (byte)'B', (byte)'C', (byte)'D', + (byte)'E', (byte)'F' + }; public static final ByteBuffer EMPTY_BUFFER = ByteBuffer.wrap(new byte[0]); @@ -1175,7 +1178,7 @@ private static void appendDebugString(StringBuilder buf, ByteBuffer buffer) } catch (Throwable x) { - Log.getRootLogger().ignore(x); + LOG.trace("IGNORED", x); buf.append("!!concurrent mod!!"); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java b/jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java index 8ff97741a669..1cdab5b6ce71 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/DecoratedObjectFactory.java @@ -24,8 +24,8 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An ObjectFactory enhanced by {@link Decorator} instances. @@ -39,14 +39,14 @@ */ public class DecoratedObjectFactory implements Iterable { - private static final Logger LOG = Log.getLogger(DecoratedObjectFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(DecoratedObjectFactory.class); /** * ServletContext attribute for the active DecoratedObjectFactory */ public static final String ATTR = DecoratedObjectFactory.class.getName(); - - private static final ThreadLocal decoratorInfo = new ThreadLocal<>(); + + private static final ThreadLocal decoratorInfo = new ThreadLocal<>(); private List decorators = new ArrayList<>(); @@ -54,17 +54,17 @@ public static void associateInfo(Object info) { decoratorInfo.set(info); } - + public static void disassociateInfo() { decoratorInfo.set(null); } - + public static Object getAssociatedInfo() { return decoratorInfo.get(); } - + public void addDecorator(Decorator decorator) { LOG.debug("Adding Decorator: {}", decorator); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/DeprecationWarning.java b/jetty-util/src/main/java/org/eclipse/jetty/util/DeprecationWarning.java index c5522aaac839..1212d61327de 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/DeprecationWarning.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/DeprecationWarning.java @@ -18,12 +18,12 @@ package org.eclipse.jetty.util; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DeprecationWarning implements Decorator { - private static final Logger LOG = Log.getLogger(DeprecationWarning.class); + private static final Logger LOG = LoggerFactory.getLogger(DeprecationWarning.class); @Override public T decorate(T o) @@ -45,7 +45,7 @@ public T decorate(T o) } catch (Throwable t) { - LOG.ignore(t); + LOG.trace("IGNORED", t); } verifyIndirectTypes(clazz.getSuperclass(), clazz, "Class"); @@ -75,7 +75,7 @@ private void verifyIndirectTypes(Class superClazz, Class clazz, String typ } catch (Throwable t) { - LOG.ignore(t); + LOG.trace("IGNORED", t); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/HostPort.java b/jetty-util/src/main/java/org/eclipse/jetty/util/HostPort.java index 6337fec7e010..c3af962219b2 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/HostPort.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/HostPort.java @@ -165,7 +165,6 @@ public static String normalizeHost(String host) * * @param rawPort the port string. * @return the integer value for the port. - * @throws IllegalArgumentException */ public static int parsePort(String rawPort) throws IllegalArgumentException { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java index 5f6861295c46..223833a5c023 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java @@ -35,8 +35,8 @@ import java.nio.channels.GatheringByteChannel; import java.nio.charset.Charset; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * IO Utilities. @@ -45,7 +45,7 @@ */ public class IO { - private static final Logger LOG = Log.getLogger(IO.class); + private static final Logger LOG = LoggerFactory.getLogger(IO.class); public static final String CRLF = "\r\n"; @@ -90,7 +90,7 @@ public void run() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); try { if (out != null) @@ -100,7 +100,7 @@ public void run() } catch (IOException e2) { - LOG.ignore(e2); + LOG.trace("IGNORED", e2); } } } @@ -372,7 +372,7 @@ public static void close(Closeable closeable) } catch (IOException ignore) { - LOG.ignore(ignore); + LOG.trace("IGNORED", ignore); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java index dd79eadc762f..5baa6556e679 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java @@ -22,12 +22,12 @@ import java.time.Instant; import java.util.Properties; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Jetty { - private static final Logger LOG = Log.getLogger(Jetty.class); + private static final Logger LOG = LoggerFactory.getLogger(Jetty.class); public static final String VERSION; public static final String POWERED_BY; @@ -52,7 +52,7 @@ public class Jetty } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } String gitHash = __buildProperties.getProperty("buildNumber", "unknown"); @@ -91,7 +91,7 @@ private static String formatTimestamp(String timestamp) } catch (NumberFormatException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return "unknown"; } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java b/jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java index 82b2c9313f5e..715779eaa30a 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java @@ -25,8 +25,8 @@ import java.util.concurrent.ConcurrentMap; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A facility to detect improper usage of resource pools. @@ -59,7 +59,7 @@ */ public class LeakDetector extends AbstractLifeCycle implements Runnable { - private static final Logger LOG = Log.getLogger(LeakDetector.class); + private static final Logger LOG = LoggerFactory.getLogger(LeakDetector.class); private final ReferenceQueue queue = new ReferenceQueue<>(); private final ConcurrentMap resources = new ConcurrentHashMap<>(); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java b/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java index 66b6979b0fba..7f134eae6910 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java @@ -49,8 +49,8 @@ import java.util.stream.Stream; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE; import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE; @@ -453,7 +453,7 @@ DirAction handleDir(Path path) } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return DirAction.IGNORE; } } @@ -475,7 +475,7 @@ public boolean isHidden(Path path) } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } @@ -715,7 +715,7 @@ public static enum PathWatchEventType } } - static final Logger LOG = Log.getLogger(PathWatcher.class); + static final Logger LOG = LoggerFactory.getLogger(PathWatcher.class); @SuppressWarnings("unchecked") protected static WatchEvent cast(WatchEvent event) @@ -938,7 +938,7 @@ private void createWatchService() throws IOException catch (Throwable t) { // Unknown JVM environment, assuming native. - LOG.ignore(t); + LOG.trace("IGNORED", t); } this.watchModifiers = modifiers; @@ -1157,11 +1157,11 @@ public void run() { if (isRunning()) { - LOG.warn(e); + LOG.warn("Watch failed", e); } else { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } @@ -1220,7 +1220,7 @@ else if (config.getRecurseDepth() == -1) } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to register", e); } } } @@ -1326,7 +1326,7 @@ private void notifyEvents() } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Unable to notify PathWatch Events", t); } } else @@ -1349,7 +1349,7 @@ private void notifyEvents() } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Unable to notify PathWatch Events", t); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Promise.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Promise.java index c3e4161b6251..feb700400abf 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Promise.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Promise.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; -import org.eclipse.jetty.util.log.Log; +import org.slf4j.LoggerFactory; /** *

A callback abstraction that handles completed/failed events of asynchronous operations.

@@ -59,7 +59,7 @@ class Adapter implements Promise @Override public void failed(Throwable x) { - Log.getLogger(this.getClass()).warn(x); + LoggerFactory.getLogger(this.getClass()).warn("Failed", x); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java index 92326b11da14..2ac15ca7b2c2 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java @@ -43,8 +43,8 @@ import java.util.function.Predicate; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Scanner @@ -63,8 +63,8 @@ public class Scanner extends AbstractLifeCycle */ public static final int DEFAULT_SCAN_DEPTH = 1; public static final int MAX_SCAN_DEPTH = Integer.MAX_VALUE; - - private static final Logger LOG = Log.getLogger(Scanner.class); + + private static final Logger LOG = LoggerFactory.getLogger(Scanner.class); private static int __scannerId = 0; private int _scanInterval; private int _scanCount = 0; @@ -235,7 +235,7 @@ else if (_filter == null || _filter.accept(f.getParentFile(), f.getName())) @Override public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException { - LOG.warn(exc); + LOG.warn("FileVisit failed: " + file, exc); return FileVisitResult.CONTINUE; } @@ -338,7 +338,7 @@ public synchronized void addScanDir(File dir) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to add: " + dir, e); } } @@ -652,7 +652,7 @@ public synchronized void scan() } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Unable to scan", e); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java index 4901699a0aaf..ed189c5875de 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java @@ -26,8 +26,8 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Provides a reusable {@link Callback} that can block the thread @@ -47,7 +47,7 @@ */ public class SharedBlockingCallback { - private static final Logger LOG = Log.getLogger(SharedBlockingCallback.class); + private static final Logger LOG = LoggerFactory.getLogger(SharedBlockingCallback.class); private static Throwable IDLE = new ConstantThrowable("IDLE"); private static Throwable SUCCEEDED = new ConstantThrowable("SUCCEEDED"); @@ -85,7 +85,7 @@ protected void notComplete(Blocker blocker) { LOG.warn("Blocker not complete {}", blocker); if (LOG.isDebugEnabled()) - LOG.debug(new Throwable()); + LOG.debug("Blocker not complete stacktrace", new Throwable()); } /** @@ -124,7 +124,7 @@ public void succeeded() { LOG.warn("Succeeded after {}", _state.toString()); if (LOG.isDebugEnabled()) - LOG.debug(_state); + LOG.debug("State", _state); } } finally @@ -157,11 +157,12 @@ else if (_state instanceof BlockerTimeoutException) } else { - LOG.warn("Failed after {}: {}", _state, cause); + String msg = String.format("Failed after %s: %s", _state, cause); + LOG.warn(msg); if (LOG.isDebugEnabled()) { - LOG.debug(_state); - LOG.debug(cause); + LOG.debug(msg, _state); + LOG.debug(msg, cause); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java b/jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java index 41b00d91e940..af21b5ce70dc 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java @@ -31,9 +31,9 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Creates {@link SocketAddress} instances, returning them through a {@link Promise}.

@@ -107,7 +107,7 @@ public void resolve(String host, int port, Promise> prom @ManagedObject("The asynchronous address resolver") public static class Async implements SocketAddressResolver { - private static final Logger LOG = Log.getLogger(SocketAddressResolver.class); + private static final Logger LOG = LoggerFactory.getLogger(SocketAddressResolver.class); private final Executor executor; private final Scheduler scheduler; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java index bb3b80ca2cea..615c4194e417 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java @@ -43,8 +43,8 @@ import java.util.List; import java.util.Optional; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.lang.invoke.MethodType.methodType; @@ -57,7 +57,7 @@ */ public class TypeUtil { - private static final Logger LOG = Log.getLogger(TypeUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(TypeUtil.class); public static final Class[] NO_ARGS = new Class[]{}; public static final int CR = '\r'; public static final int LF = '\n'; @@ -309,13 +309,13 @@ public static Object valueOf(Class type, String value) } catch (NoSuchMethodException | IllegalAccessException | InstantiationException x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } catch (InvocationTargetException x) { if (x.getTargetException() instanceof Error) throw (Error)x.getTargetException(); - LOG.ignore(x); + LOG.trace("IGNORED", x); } return null; } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java index 05ae41d7a3a3..1909e1022425 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java @@ -24,8 +24,8 @@ import java.nio.charset.StandardCharsets; import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * URI Utility methods. @@ -41,7 +41,7 @@ public class URIUtil implements Cloneable { - private static final Logger LOG = Log.getLogger(URIUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(URIUtil.class); public static final String SLASH = "/"; public static final String HTTP = "http"; public static final String HTTPS = "https"; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java b/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java index 34dfd80c925e..32ff9592f672 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.util.TypeUtil.convertHexDigit; @@ -58,21 +58,30 @@ @SuppressWarnings("serial") public class UrlEncoded extends MultiMap implements Cloneable { - static final Logger LOG = Log.getLogger(UrlEncoded.class); + static final Logger LOG = LoggerFactory.getLogger(UrlEncoded.class); public static final Charset ENCODING; static { Charset encoding; + String charset = null; try { - String charset = System.getProperty("org.eclipse.jetty.util.UrlEncoding.charset"); - encoding = charset == null ? StandardCharsets.UTF_8 : Charset.forName(charset); + charset = System.getProperty("org.eclipse.jetty.util.UrlEncoding.charset"); + if (charset == null) + { + charset = StandardCharsets.UTF_8.toString(); + encoding = StandardCharsets.UTF_8; + } + else + { + encoding = Charset.forName(charset); + } } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to set default UrlEncoding charset: " + charset, e); encoding = StandardCharsets.UTF_8; } ENCODING = encoding; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java index 41468849627d..9981a8be6238 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.nio.ByteBuffer; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utf8 Appendable abstract base class @@ -49,7 +49,7 @@ **/ public abstract class Utf8Appendable { - protected static final Logger LOG = Log.getLogger(Utf8Appendable.class); + protected static final Logger LOG = LoggerFactory.getLogger(Utf8Appendable.class); // @checkstyle-disable-check : AvoidEscapedUnicodeCharactersCheck public static final char REPLACEMENT = '\ufffd'; // @checkstyle-enable-check : AvoidEscapedUnicodeCharactersCheck @@ -328,7 +328,7 @@ public String toReplacedString() } Throwable th = new NotUtf8Exception("incomplete UTF8 sequence"); LOG.warn(th.toString()); - LOG.debug(th); + LOG.debug("Unable to get replacement string", th); } return _appendable.toString(); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java index 39dca100a4ac..8925683b1286 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java @@ -26,8 +26,8 @@ import org.eclipse.jetty.util.Uptime; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Basic implementation of the life cycle interface for components. @@ -35,7 +35,7 @@ @ManagedObject("Abstract Implementation of LifeCycle") public abstract class AbstractLifeCycle implements LifeCycle { - private static final Logger LOG = Log.getLogger(AbstractLifeCycle.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractLifeCycle.class); enum State { @@ -99,7 +99,7 @@ public final void start() throws Exception catch (StopException e) { if (LOG.isDebugEnabled()) - LOG.debug(e); + LOG.debug("Unable to stop", e); setStopping(); doStop(); setStopped(); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java index 82c5691f8be0..9d61932492a5 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java @@ -31,8 +31,8 @@ import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A ContainerLifeCycle is an {@link LifeCycle} implementation for a collection of contained beans. @@ -82,7 +82,7 @@ @ManagedObject("Implementation of Container and LifeCycle") public class ContainerLifeCycle extends AbstractLifeCycle implements Container, Destroyable, Dumpable { - private static final Logger LOG = Log.getLogger(ContainerLifeCycle.class); + private static final Logger LOG = LoggerFactory.getLogger(ContainerLifeCycle.class); private final List _beans = new CopyOnWriteArrayList<>(); private final List _listeners = new CopyOnWriteArrayList<>(); private boolean _doStarted; @@ -236,7 +236,7 @@ public void destroy() } catch (Throwable th) { - LOG.warn(th); + LOG.warn("Unable to destroy", th); } } } @@ -711,7 +711,7 @@ public void dumpStdErr() } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to dump", e); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java index 48f32cf61a7b..2550fe99c9f1 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java @@ -25,13 +25,13 @@ import java.util.List; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FileDestroyable implements Destroyable { - private static final Logger LOG = Log.getLogger(FileDestroyable.class); + private static final Logger LOG = LoggerFactory.getLogger(FileDestroyable.class); final List _files = new ArrayList(); public FileDestroyable() diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileNoticeLifeCycleListener.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileNoticeLifeCycleListener.java index e9b3af8ca5f8..c2adf9f265c5 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileNoticeLifeCycleListener.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileNoticeLifeCycleListener.java @@ -21,8 +21,8 @@ import java.io.FileWriter; import java.io.Writer; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A LifeCycle Listener that writes state changes to a file. @@ -30,7 +30,7 @@ */ public class FileNoticeLifeCycleListener implements LifeCycle.Listener { - private static final Logger LOG = Log.getLogger(FileNoticeLifeCycleListener.class); + private static final Logger LOG = LoggerFactory.getLogger(FileNoticeLifeCycleListener.class); private final String _filename; @@ -47,7 +47,7 @@ private void writeState(String action, LifeCycle lifecycle) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to write state", e); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/Graceful.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/Graceful.java index c02a18eba6ff..164a702c99d9 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/Graceful.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/Graceful.java @@ -24,8 +24,8 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Jetty components that wish to be part of a Graceful shutdown implement this interface so that @@ -124,7 +124,7 @@ public void check() */ static CompletableFuture shutdown(Container component) { - Logger log = Log.getLogger(component.getClass()); + Logger log = LoggerFactory.getLogger(component.getClass()); log.info("Shutdown {}", component); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/StopLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/StopLifeCycle.java index eb2cc1b7bc3a..95d89f33d4e2 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/StopLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/StopLifeCycle.java @@ -18,15 +18,15 @@ package org.eclipse.jetty.util.component; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A LifeCycle that when started will stop another LifeCycle */ public class StopLifeCycle extends AbstractLifeCycle implements LifeCycle.Listener { - private static final Logger LOG = Log.getLogger(StopLifeCycle.class); + private static final Logger LOG = LoggerFactory.getLogger(StopLifeCycle.class); private final LifeCycle _lifecycle; @@ -50,7 +50,7 @@ public void lifeCycleStarted(LifeCycle lifecycle) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to stop", e); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java index 7c0ba362fe49..51cd4d85a4d6 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.java @@ -19,8 +19,8 @@ package org.eclipse.jetty.util.preventers; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AbstractLeakPreventer @@ -35,7 +35,7 @@ */ public abstract class AbstractLeakPreventer extends AbstractLifeCycle { - protected static final Logger LOG = Log.getLogger(AbstractLeakPreventer.class); + protected static final Logger LOG = LoggerFactory.getLogger(AbstractLeakPreventer.class); public abstract void prevent(ClassLoader loader); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java index f228536328cf..3e63d2da7509 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java @@ -44,7 +44,7 @@ public void prevent(ClassLoader loader) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to ping document builder", e); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java index 7743d0918da0..a30382045d27 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java @@ -49,11 +49,11 @@ public void prevent(ClassLoader loader) } catch (ClassNotFoundException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to set GC latency", e); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.java index 073bddf3e595..8682f639875d 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.java @@ -38,7 +38,7 @@ public void prevent(ClassLoader loader) } catch (ClassNotFoundException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.java index 696e603c913a..88d605c6577a 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.java @@ -40,7 +40,7 @@ public void prevent(ClassLoader loader) } catch (ClassNotFoundException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.java index 567a3d55d493..e622450c74d0 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.java @@ -39,7 +39,7 @@ public void prevent(ClassLoader loader) } catch (ClassNotFoundException e) { - LOG.warn(e); + LOG.warn("Unable to load login config", e); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java index c53677bc845b..ef488981ff8e 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java @@ -30,12 +30,12 @@ import java.util.jar.JarFile; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JarFileResource extends JarResource { - private static final Logger LOG = Log.getLogger(JarFileResource.class); + private static final Logger LOG = LoggerFactory.getLogger(JarFileResource.class); private JarFile _jarFile; private File _file; private String[] _list; @@ -71,7 +71,7 @@ public synchronized void close() } catch (IOException ioe) { - LOG.ignore(ioe); + LOG.trace("IGNORED", ioe); } } } @@ -138,7 +138,7 @@ public boolean exists() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } @@ -172,7 +172,7 @@ public boolean exists() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } @@ -217,7 +217,7 @@ else if (entry.isDirectory()) } catch (IOException ioe) { - LOG.ignore(ioe); + LOG.trace("IGNORED", ioe); } } } @@ -271,7 +271,7 @@ public synchronized String[] list() //by other code. //So, do one retry to drop a connection and get a fresh JarFile LOG.warn("Retrying list:" + e); - LOG.debug(e); + LOG.debug("JarFile list failure", e); close(); list = listEntries(); } @@ -303,7 +303,7 @@ private List listEntries() { e.printStackTrace(); - LOG.ignore(e); + LOG.trace("IGNORED", e); } if (jarFile == null) throw new IllegalStateException(); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarResource.java index 287af534bd32..ec7e925aec38 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarResource.java @@ -34,12 +34,12 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JarResource extends URLResource { - private static final Logger LOG = Log.getLogger(JarResource.class); + private static final Logger LOG = LoggerFactory.getLogger(JarResource.class); protected JarURLConnection _jarConnection; protected JarResource(URL url) @@ -70,7 +70,7 @@ protected synchronized boolean checkConnection() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); _jarConnection = null; } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java index 2f6a40891ac6..23e4a5ad7ed2 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java @@ -21,12 +21,10 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; import java.nio.channels.SeekableByteChannel; import java.nio.file.DirectoryIteratorException; @@ -42,19 +40,18 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Java NIO Path Resource. */ public class PathResource extends Resource { - private static final Logger LOG = Log.getLogger(PathResource.class); + private static final Logger LOG = LoggerFactory.getLogger(PathResource.class); private static final LinkOption[] NO_FOLLOW_LINKS = new LinkOption[]{LinkOption.NOFOLLOW_LINKS}; private static final LinkOption[] FOLLOW_LINKS = new LinkOption[]{}; @@ -87,7 +84,7 @@ private final Path checkAliasPath() // If the toRealPath() call fails, then let // the alias checking routines continue on // to other techniques. - LOG.ignore(ignored); + LOG.trace("IGNORED", ignored); } } @@ -112,7 +109,7 @@ private final Path checkAliasPath() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } catch (Exception e) { @@ -285,7 +282,7 @@ public PathResource(URI uri) throws IOException } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); throw new IOException("Unable to build Path from: " + uri, e); } @@ -364,7 +361,7 @@ public boolean delete() throws SecurityException } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } @@ -489,7 +486,7 @@ public long lastModified() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return 0; } } @@ -556,11 +553,11 @@ public String[] list() } catch (DirectoryIteratorException e) { - LOG.debug(e); + LOG.debug("Directory list failure", e); } catch (IOException e) { - LOG.debug(e); + LOG.debug("Directory list access failure", e); } return null; } @@ -578,7 +575,7 @@ public boolean renameTo(Resource dest) throws SecurityException } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java index 2a53c8ab495c..e6644971d007 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java @@ -44,8 +44,8 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.UrlEncoded; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; @@ -58,7 +58,7 @@ */ public abstract class Resource implements ResourceFactory, Closeable { - private static final Logger LOG = Log.getLogger(Resource.class); + private static final Logger LOG = LoggerFactory.getLogger(Resource.class); public static boolean __defaultUseCaches = true; volatile Object _associate; @@ -124,7 +124,7 @@ static Resource newResource(URL url, boolean useCaches) catch (Exception e) { LOG.warn(e.toString()); - LOG.debug(Log.EXCEPTION, e); + LOG.debug("Bad PathResource: " + url, e); return new BadResource(url, e.toString()); } } @@ -239,7 +239,7 @@ public static Resource newSystemResource(String resource) throws IOException } catch (IllegalArgumentException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); // Catches scenario where a bad Windows path like "C:\dev" is // improperly escaped, which various downstream classloaders // tend to have a problem with @@ -442,7 +442,7 @@ public Resource getResource(String path) } catch (Exception e) { - LOG.debug(e); + LOG.debug("Unable to addPath", e); return null; } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/URLResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/URLResource.java index 69f274e0c34c..7561dd88b057 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/URLResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/URLResource.java @@ -29,15 +29,15 @@ import java.nio.channels.ReadableByteChannel; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * URL resource class. */ public class URLResource extends Resource { - private static final Logger LOG = Log.getLogger(URLResource.class); + private static final Logger LOG = LoggerFactory.getLogger(URLResource.class); protected final URL _url; protected final String _urlString; @@ -69,7 +69,7 @@ protected synchronized boolean checkConnection() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } return _connection != null; @@ -89,7 +89,7 @@ public synchronized void close() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } _in = null; } @@ -114,7 +114,7 @@ public boolean exists() } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } return _in != null; } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java index 66255023ab60..d22cd559649e 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java @@ -39,8 +39,8 @@ import java.util.Enumeration; import java.util.concurrent.atomic.AtomicLong; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Convenience class to handle validation of certificates, aliases and keystores @@ -54,7 +54,7 @@ */ public class CertificateValidator { - private static final Logger LOG = Log.getLogger(CertificateValidator.class); + private static final Logger LOG = LoggerFactory.getLogger(CertificateValidator.class); private static AtomicLong __aliasCount = new AtomicLong(); private KeyStore _trustStore; @@ -139,7 +139,7 @@ public String validate(KeyStore keyStore, String keyAlias) throws CertificateExc } catch (KeyStoreException kse) { - LOG.debug(kse); + LOG.debug("Unable to validate alias:" + keyAlias, kse); throw new CertificateException("Unable to validate certificate" + " for alias [" + keyAlias + "]: " + kse.getMessage(), kse); } @@ -187,7 +187,7 @@ public void validate(KeyStore keyStore, Certificate cert) throws CertificateExce } catch (KeyStoreException kse) { - LOG.debug(kse); + LOG.debug("Unable to validate certificate", kse); throw new CertificateException("Unable to validate certificate" + (certAlias == null ? "" : " for alias [" + certAlias + "]") + ": " + kse.getMessage(), kse); } @@ -257,7 +257,7 @@ public void validate(Certificate[] certChain) throws CertificateException } catch (GeneralSecurityException gse) { - LOG.debug(gse); + LOG.debug("Unable to validate certificate chain", gse); throw new CertificateException("Unable to validate certificate: " + gse.getMessage(), gse); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java index 1876016dd9d6..d8a832c119c6 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java @@ -24,8 +24,8 @@ import java.util.ServiceLoader; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Credentials. The Credential class represents an abstract mechanism for checking authentication credentials. A credential instance either represents a secret, @@ -41,7 +41,7 @@ public abstract class Credential implements Serializable { private static final long serialVersionUID = -7760551052768181572L; - private static final Logger LOG = Log.getLogger(Credential.class); + private static final Logger LOG = LoggerFactory.getLogger(Credential.class); private static final ServiceLoader CREDENTIAL_PROVIDER_LOADER = ServiceLoader.load(CredentialProvider.class); /** @@ -234,7 +234,7 @@ else if (credentials instanceof Credential) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed message digest", e); return false; } } @@ -262,7 +262,7 @@ public static String digest(String password) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to access MD5 message digest", e); return null; } } @@ -276,7 +276,7 @@ public static String digest(String password) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Message Digest failure", e); return null; } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Password.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Password.java index 20dd31e83e9a..9e45343566eb 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Password.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Password.java @@ -22,8 +22,8 @@ import java.nio.charset.StandardCharsets; import java.util.Locale; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Password utility class. @@ -52,7 +52,7 @@ */ public class Password extends Credential { - private static final Logger LOG = Log.getLogger(Password.class); + private static final Logger LOG = LoggerFactory.getLogger(Password.class); private static final long serialVersionUID = 5062906681431569445L; @@ -229,7 +229,7 @@ public static Password getPassword(String realm, String dft, String promptDft) } catch (IOException e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("EXCEPTION", e); } if (passwd == null || passwd.length() == 0) passwd = promptDft; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java index 03b8afe26c79..ba9e8119b5f8 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java @@ -34,8 +34,8 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.X509ExtendedKeyManager; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A {@link X509ExtendedKeyManager} that selects a key with an alias @@ -45,7 +45,7 @@ public class SniX509ExtendedKeyManager extends X509ExtendedKeyManager { public static final String SNI_X509 = "org.eclipse.jetty.util.ssl.snix509"; - private static final Logger LOG = Log.getLogger(SniX509ExtendedKeyManager.class); + private static final Logger LOG = LoggerFactory.getLogger(SniX509ExtendedKeyManager.class); private final X509ExtendedKeyManager _delegate; private final SslContextFactory.Server _sslContextFactory; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java index 35c14f5177a0..b8b8386b3a72 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java @@ -86,12 +86,12 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.AbstractLifeCycle; 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.resource.Resource; import org.eclipse.jetty.util.security.CertificateUtils; import org.eclipse.jetty.util.security.CertificateValidator; import org.eclipse.jetty.util.security.Password; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

SslContextFactory is used to configure SSL parameters @@ -114,8 +114,8 @@ public abstract class SslContextFactory extends AbstractLifeCycle implements Dum */ public static final String PASSWORD_PROPERTY = "org.eclipse.jetty.ssl.password"; - private static final Logger LOG = Log.getLogger(SslContextFactory.class); - private static final Logger LOG_CONFIG = LOG.getLogger("config"); + private static final Logger LOG = LoggerFactory.getLogger(SslContextFactory.class); + private static final Logger LOG_CONFIG = LoggerFactory.getLogger(LOG.getName() + ".config"); /** * Default Excluded Protocols List */ @@ -402,7 +402,7 @@ public void dump(Appendable out, String indent) throws IOException } catch (NoSuchAlgorithmException x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } } @@ -1621,9 +1621,11 @@ protected CertificateFactory getCertificateFactoryInstance(String type) throws C } catch (Throwable cause) { - LOG.info("Unable to get CertificateFactory instance for type [{}] on provider [{}], using default", type, provider); + String msg = String.format("Unable to get CertificateFactory instance for type [%s] on provider [%s], using default", type, provider); if (LOG.isDebugEnabled()) - LOG.debug(cause); + LOG.debug(msg, cause); + else + LOG.info(msg); } return CertificateFactory.getInstance(type); @@ -1643,9 +1645,11 @@ protected CertStore getCertStoreInstance(Collection crls) throws } catch (Throwable cause) { - LOG.info("Unable to get CertStore instance for type [{}] on provider [{}], using default", type, provider); + String msg = String.format("Unable to get CertStore instance for type [%s] on provider [%s], using default", type, provider); if (LOG.isDebugEnabled()) - LOG.debug(cause); + LOG.debug(msg, cause); + else + LOG.info(msg); } return CertStore.getInstance(type, new CollectionCertStoreParameters(crls)); @@ -1666,9 +1670,11 @@ protected KeyManagerFactory getKeyManagerFactoryInstance() throws NoSuchAlgorith catch (Throwable cause) { // fall back to non-provider option - LOG.info("Unable to get KeyManagerFactory instance for algorithm [{}] on provider [{}], using default", algorithm, provider); + String msg = String.format("Unable to get KeyManagerFactory instance for algorithm [%s] on provider [%s], using default", algorithm, provider); if (LOG.isDebugEnabled()) - LOG.debug(cause); + LOG.debug(msg, cause); + else + LOG.info(msg); } return KeyManagerFactory.getInstance(algorithm); @@ -1691,9 +1697,11 @@ protected SecureRandom getSecureRandomInstance() throws NoSuchAlgorithmException } catch (Throwable cause) { - LOG.info("Unable to get SecureRandom instance for algorithm [{}] on provider [{}], using default", algorithm, provider); + String msg = String.format("Unable to get SecureRandom instance for algorithm [%s] on provider [%s], using default", algorithm, provider); if (LOG.isDebugEnabled()) - LOG.debug(cause); + LOG.debug(msg, cause); + else + LOG.info(msg); } return SecureRandom.getInstance(algorithm); @@ -1716,9 +1724,11 @@ protected SSLContext getSSLContextInstance() throws NoSuchAlgorithmException } catch (Throwable cause) { - LOG.info("Unable to get SSLContext instance for protocol [{}] on provider [{}], using default", protocol, provider); + String msg = String.format("Unable to get SSLContext instance for protocol [%s] on provider [%s], using default", protocol, provider); if (LOG.isDebugEnabled()) - LOG.debug(cause); + LOG.debug(msg, cause); + else + LOG.info(msg); } return SSLContext.getInstance(protocol); @@ -1737,11 +1747,11 @@ protected TrustManagerFactory getTrustManagerFactoryInstance() throws NoSuchAlgo } catch (Throwable cause) { - LOG.info("Unable to get TrustManagerFactory instance for algorithm [{}] on provider [{}], using default", algorithm, provider); + String msg = String.format("Unable to get TrustManagerFactory instance for algorithm [%s] on provider [%s], using default", algorithm, provider); if (LOG.isDebugEnabled()) - { - LOG.debug(cause); - } + LOG.debug(msg, cause); + else + LOG.info(msg); } return TrustManagerFactory.getInstance(algorithm); @@ -1918,7 +1928,7 @@ private static X509Certificate[] getX509CertChain(SslContextFactory sslContextFa } catch (Exception e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to get X509CertChain", e); return null; } } @@ -2114,8 +2124,9 @@ public void setWantClientAuth(boolean wantClientAuth) * Does the default {@link #sniSelect(String, Principal[], SSLSession, String, Collection)} implementation * require an SNI match? Note that if a non SNI handshake is accepted, requests may still be rejected * at the HTTP level for incorrect SNI (see SecureRequestCustomizer). + * * @return true if no SNI match is handled as no certificate match, false if no SNI match is handled by - * delegation to the non SNI matching methods. + * delegation to the non SNI matching methods. */ @ManagedAttribute("Whether the TLS handshake is rejected if there is no SNI host match") public boolean isSniRequired() @@ -2129,8 +2140,9 @@ public boolean isSniRequired() * at the HTTP level for incorrect SNI (see SecureRequestCustomizer). * This setting may have no effect if {@link #sniSelect(String, Principal[], SSLSession, String, Collection)} is * overridden or a non null function is passed to {@link #setSNISelector(SniX509ExtendedKeyManager.SniSelector)}. + * * @param sniRequired true if no SNI match is handled as no certificate match, false if no SNI match is handled by - * delegation to the non SNI matching methods. + * delegation to the non SNI matching methods. */ public void setSniRequired(boolean sniRequired) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/X509.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/X509.java index 46df084105c1..349ef807744e 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/X509.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/X509.java @@ -31,12 +31,12 @@ import javax.security.auth.x500.X500Principal; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class X509 { - private static final Logger LOG = Log.getLogger(X509.class); + private static final Logger LOG = LoggerFactory.getLogger(X509.class); /* * @see {@link X509Certificate#getKeyUsage()} diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java index 07e2fbcafbc6..c4fab5abbfaa 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java @@ -40,14 +40,14 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ThreadPool.SizedThreadPool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject("A thread pool") public class QueuedThreadPool extends ContainerLifeCycle implements ThreadFactory, SizedThreadPool, Dumpable, TryExecutor { - private static final Logger LOG = Log.getLogger(QueuedThreadPool.class); + private static final Logger LOG = LoggerFactory.getLogger(QueuedThreadPool.class); private static Runnable NOOP = () -> { }; @@ -267,7 +267,7 @@ protected void doStop() throws Exception } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Unable to close job: " + job, t); } } else if (job != NOOP) @@ -950,11 +950,11 @@ else if (_counts.getHi() == Integer.MIN_VALUE) { if (LOG.isDebugEnabled()) LOG.debug("interrupted {} in {}", job, QueuedThreadPool.this); - LOG.ignore(e); + LOG.trace("IGNORED", e); } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Job failed", e); } finally { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java index 991cef30cda2..60fe1944f14b 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java @@ -29,8 +29,8 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An Executor using preallocated/reserved Threads from a wrapped Executor. @@ -45,7 +45,7 @@ @ManagedObject("A pool for reserved threads") public class ReservedThreadExecutor extends AbstractLifeCycle implements TryExecutor { - private static final Logger LOG = Log.getLogger(ReservedThreadExecutor.class); + private static final Logger LOG = LoggerFactory.getLogger(ReservedThreadExecutor.class); private static final Runnable STOP = new Runnable() { @Override @@ -248,7 +248,7 @@ private void startReservedThread() } catch (RejectedExecutionException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } @@ -280,7 +280,7 @@ public boolean offer(Runnable task) } catch (Throwable e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); _size.getAndIncrement(); _stack.offerFirst(this); return false; @@ -317,7 +317,7 @@ private Runnable reservedWait() } catch (InterruptedException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } @@ -376,7 +376,7 @@ public void run() } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Unable to run task", e); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java index 539f466ed7ec..045ed9f9b7ce 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import org.eclipse.jetty.util.log.Log; +import org.slf4j.LoggerFactory; /** * An executor than ensurers serial execution of submitted tasks. @@ -55,7 +55,7 @@ protected void onError(Runnable task, Throwable t) { if (task instanceof ErrorHandlingTask) ((ErrorHandlingTask)task).accept(t); - Log.getLogger(task.getClass()).warn(t); + LoggerFactory.getLogger(task.getClass()).error("Error", t); } private void run(Link link) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java index 52dd69d7cf16..5bbf1e1118b7 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java @@ -24,8 +24,8 @@ import org.eclipse.jetty.util.component.Destroyable; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ShutdownThread is a shutdown hook thread implemented as @@ -35,7 +35,7 @@ */ public class ShutdownThread extends Thread { - private static final Logger LOG = Log.getLogger(ShutdownThread.class); + private static final Logger LOG = LoggerFactory.getLogger(ShutdownThread.class); private static final ShutdownThread _thread = new ShutdownThread(); private boolean _hooked; @@ -60,7 +60,7 @@ private synchronized void hook() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); LOG.info("shutdown already commenced"); } } @@ -74,7 +74,7 @@ private synchronized void unhook() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); LOG.debug("shutdown already commenced"); } } @@ -136,7 +136,7 @@ public void run() } catch (Exception ex) { - LOG.debug(ex); + LOG.debug("Unable to stop", ex); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Sweeper.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Sweeper.java index cee148aca5cd..74fb5394ea1d 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Sweeper.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Sweeper.java @@ -24,8 +24,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A utility class to perform periodic sweeping of resources.

@@ -72,7 +72,7 @@ */ public class Sweeper extends AbstractLifeCycle implements Runnable { - private static final Logger LOG = Log.getLogger(Sweeper.class); + private static final Logger LOG = LoggerFactory.getLogger(Sweeper.class); private final AtomicReference> items = new AtomicReference<>(); private final AtomicReference task = new AtomicReference<>(); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPoolBudget.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPoolBudget.java index 20d1d549bdda..84cac543b621 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPoolBudget.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPoolBudget.java @@ -24,8 +24,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A budget of required thread usage, used to warn or error for insufficient configured threads.

@@ -34,7 +34,7 @@ */ public class ThreadPoolBudget { - static final Logger LOG = Log.getLogger(ThreadPoolBudget.class); + static final Logger LOG = LoggerFactory.getLogger(ThreadPoolBudget.class); public interface Lease extends Closeable { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/TimerScheduler.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/TimerScheduler.java index 83f0fcbba306..b68a5aa53692 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/TimerScheduler.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/TimerScheduler.java @@ -24,15 +24,15 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A scheduler based on the the JVM Timer class */ public class TimerScheduler extends AbstractLifeCycle implements Scheduler, Runnable { - private static final Logger LOG = Log.getLogger(TimerScheduler.class); + private static final Logger LOG = LoggerFactory.getLogger(TimerScheduler.class); /* * This class uses the Timer class rather than an ScheduledExecutionService because diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java index ca02ff6847c0..b295092fc066 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java @@ -29,11 +29,11 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ExecutionStrategy; import org.eclipse.jetty.util.thread.Invocable; import org.eclipse.jetty.util.thread.TryExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A strategy where the thread that produces will run the resulting task if it @@ -56,7 +56,7 @@ @ManagedObject("eat what you kill execution strategy") public class EatWhatYouKill extends ContainerLifeCycle implements ExecutionStrategy, Runnable { - private static final Logger LOG = Log.getLogger(EatWhatYouKill.class); + private static final Logger LOG = LoggerFactory.getLogger(EatWhatYouKill.class); private enum State { @@ -174,7 +174,7 @@ private void tryProduce(boolean wasPending) } catch (Throwable th) { - LOG.warn(th); + LOG.warn("Unable to produce", th); } } } @@ -337,7 +337,7 @@ private void runTask(Runnable task) } catch (Throwable x) { - LOG.warn(x); + LOG.warn("Task run failed", x); } } @@ -349,7 +349,7 @@ private void invokeTask(Runnable task) } catch (Throwable x) { - LOG.warn(x); + LOG.warn("Task invoke failed", x); } } @@ -361,7 +361,7 @@ private Runnable produceTask() } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Task produce failed", e); return null; } } @@ -375,9 +375,9 @@ private void execute(Runnable task) catch (RejectedExecutionException e) { if (isRunning()) - LOG.warn(e); + LOG.warn("Execute failed", e); else - LOG.ignore(e); + LOG.trace("IGNORED", e); if (task instanceof Closeable) { @@ -387,7 +387,7 @@ private void execute(Runnable task) } catch (Throwable e2) { - LOG.ignore(e2); + LOG.trace("IGNORED", e2); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java index 1c7d8856fb33..44f501f811c1 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java @@ -20,12 +20,12 @@ import java.util.concurrent.Executor; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.util.thread.ExecutionStrategy; import org.eclipse.jetty.util.thread.Invocable; import org.eclipse.jetty.util.thread.Invocable.InvocationType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A strategy where the thread that produces will always run the resulting task.

@@ -42,7 +42,7 @@ */ public class ExecuteProduceConsume implements ExecutionStrategy, Runnable { - private static final Logger LOG = Log.getLogger(ExecuteProduceConsume.class); + private static final Logger LOG = LoggerFactory.getLogger(ExecuteProduceConsume.class); private final AutoLock _lock = new AutoLock(); private final Runnable _runProduce = new RunProduce(); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceConsume.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceConsume.java index 22a82b2b999c..34fba76184c5 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceConsume.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceConsume.java @@ -20,10 +20,10 @@ import java.util.concurrent.Executor; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.util.thread.ExecutionStrategy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A strategy where the caller thread iterates over task production, submitting each @@ -31,7 +31,7 @@ */ public class ProduceConsume implements ExecutionStrategy, Runnable { - private static final Logger LOG = Log.getLogger(ExecuteProduceConsume.class); + private static final Logger LOG = LoggerFactory.getLogger(ExecuteProduceConsume.class); private final AutoLock _lock = new AutoLock(); private final Producer _producer; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java index 1a0f54c2e572..b215b4247178 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java @@ -20,12 +20,12 @@ import java.util.concurrent.Executor; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.util.thread.ExecutionStrategy; import org.eclipse.jetty.util.thread.Invocable; import org.eclipse.jetty.util.thread.Invocable.InvocationType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

A strategy where the caller thread iterates over task production, submitting each @@ -33,7 +33,7 @@ */ public class ProduceExecuteConsume implements ExecutionStrategy { - private static final Logger LOG = Log.getLogger(ProduceExecuteConsume.class); + private static final Logger LOG = LoggerFactory.getLogger(ProduceExecuteConsume.class); private final AutoLock _lock = new AutoLock(); private final Producer _producer; diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java index 539e06259b5c..780d53a52ca3 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java @@ -25,10 +25,10 @@ import java.util.Arrays; import java.util.concurrent.ThreadLocalRandom; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -233,7 +233,7 @@ public void testToBufferArrayOffsetLength() assertEquals(length, count, "Count of bytes"); } - private static final Logger LOG = Log.getLogger(BufferUtilTest.class); + private static final Logger LOG = LoggerFactory.getLogger(BufferUtilTest.class); @Test @Disabled("Very simple microbenchmark to compare different writeTo implementations. Only for development thus " + diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/HostPortTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/HostPortTest.java index 61c0a37d0c56..f476f805cef6 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/HostPortTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/HostPortTest.java @@ -83,7 +83,7 @@ public static Stream invalidAuthorityProvider() "127.0.0.1:-80", "[0::0::0::0::1]:-80", "127.0.0.1:65536" - ) + ) .map(Arguments::of); } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherDemo.java b/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherDemo.java index d90c05f51e67..153a5f825d8e 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherDemo.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherDemo.java @@ -24,14 +24,16 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import org.eclipse.jetty.util.PathWatcher.PathWatchEvent; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PathWatcherDemo implements PathWatcher.Listener { - private static final Logger LOG = Log.getLogger(PathWatcherDemo.class); + private static final Logger LOG = LoggerFactory.getLogger(PathWatcherDemo.class); public static void main(String[] args) { @@ -54,7 +56,9 @@ public static void main(String[] args) } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Failed to run paths: {}", + paths.stream().map(Objects::toString).collect(Collectors.joining(", ", "[", "]")), + t); } } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java index d0b4a70b37f9..3145088f11fc 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java @@ -37,11 +37,11 @@ import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; import org.eclipse.jetty.util.PathWatcher.PathWatchEvent; import org.eclipse.jetty.util.PathWatcher.PathWatchEventType; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.util.PathWatcher.PathWatchEventType.ADDED; import static org.eclipse.jetty.util.PathWatcher.PathWatchEventType.DELETED; @@ -75,7 +75,7 @@ else if (org.junit.jupiter.api.condition.OS.MAC.isCurrentOs()) public static class PathWatchEventCapture implements PathWatcher.Listener { public static final String FINISH_TAG = "#finished#.tag"; - private static final Logger LOG = Log.getLogger(PathWatcherTest.PathWatchEventCapture.class); + private static final Logger LOG = LoggerFactory.getLogger(PathWatcherTest.PathWatchEventCapture.class); private final Path baseDir; /** diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/QueueBenchmarkTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/QueueBenchmarkTest.java index d21fd121963c..48bd3adaf9c9 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/QueueBenchmarkTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/QueueBenchmarkTest.java @@ -28,10 +28,10 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assumptions.assumeTrue; @@ -41,7 +41,7 @@ @Disabled public class QueueBenchmarkTest { - private static final Logger logger = Log.getLogger(QueueBenchmarkTest.class); + private static final Logger logger = LoggerFactory.getLogger(QueueBenchmarkTest.class); private static final Runnable ELEMENT = () -> { }; diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/SharedBlockingCallbackTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/SharedBlockingCallbackTest.java index fa507c8aff8a..8d891d1d7501 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/SharedBlockingCallbackTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/SharedBlockingCallbackTest.java @@ -25,9 +25,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.eclipse.jetty.util.SharedBlockingCallback.Blocker; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -39,7 +39,7 @@ public class SharedBlockingCallbackTest { - private static final Logger LOG = Log.getLogger(SharedBlockingCallback.class); + private static final Logger LOG = LoggerFactory.getLogger(SharedBlockingCallback.class); final AtomicInteger notComplete = new AtomicInteger(); final SharedBlockingCallback sbcb = new SharedBlockingCallback() diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java index 70e78806714d..9272b94b6368 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java @@ -38,14 +38,14 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -61,7 +61,7 @@ @ExtendWith(WorkDirExtension.class) public class URIUtilTest { - private static final Logger LOG = Log.getLogger(URIUtilTest.class); + private static final Logger LOG = LoggerFactory.getLogger(URIUtilTest.class); public WorkDir workDir; public static Stream encodePathSource() diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/UrlEncodedUtf8Test.java b/jetty-util/src/test/java/org/eclipse/jetty/util/UrlEncodedUtf8Test.java index 68219b515d4f..f253d65af7c8 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/UrlEncodedUtf8Test.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/UrlEncodedUtf8Test.java @@ -22,9 +22,9 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -32,8 +32,7 @@ public class UrlEncodedUtf8Test { - - static final Logger LOG = Log.getLogger(UrlEncodedUtf8Test.class); + private static final Logger LOG = LoggerFactory.getLogger(UrlEncodedUtf8Test.class); @Test public void testIncompleteSequestAtTheEnd() throws Exception @@ -96,7 +95,7 @@ static void fromString(String test, String s, String field, String expected, boo { if (!thrown) throw e; - LOG.ignore(e); + LOG.trace("IGNORED", e); } } @@ -116,7 +115,7 @@ static void fromInputStream(String test, byte[] b, String field, String expected { if (!thrown) throw e; - LOG.ignore(e); + LOG.trace("IGNORED", e); } } } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java index 57c1c1e392b9..458cba3a88e4 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java @@ -18,7 +18,6 @@ package org.eclipse.jetty.util.resource; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -34,7 +33,6 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.junit.jupiter.api.Test; -import static java.nio.charset.StandardCharsets.UTF_8; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceAliasTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceAliasTest.java index 80f5f7259c48..ffd19fc45788 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceAliasTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceAliasTest.java @@ -27,9 +27,10 @@ import org.eclipse.jetty.toolchain.test.FS; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; -import org.eclipse.jetty.util.log.Log; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -41,6 +42,8 @@ @ExtendWith(WorkDirExtension.class) public class ResourceAliasTest { + private static final Logger LOG = LoggerFactory.getLogger(ResourceAliasTest.class); + public WorkDir workDir; @Test @@ -143,7 +146,7 @@ public void testNullCharEndingFilename() throws Exception catch (InvalidPathException e) { // this file system does allow null char ending filenames - Log.getRootLogger().ignore(e); + LOG.trace("IGNORED", e); } } } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/EatWhatYouKillTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/EatWhatYouKillTest.java index 3db735633ac3..4a6dbf0d403e 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/EatWhatYouKillTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/EatWhatYouKillTest.java @@ -61,7 +61,7 @@ public void dispose() throws Exception @Test public void testExceptionThrownByTask() throws Exception { - try (StacklessLogging stackLess = new StacklessLogging(EatWhatYouKill.class)) + try (StacklessLogging ignored = new StacklessLogging(EatWhatYouKill.class)) { AtomicReference detector = new AtomicReference<>(); CountDownLatch latch = new CountDownLatch(2); diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java index 521f31f05e76..770a481b675e 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/QueuedThreadPoolTest.java @@ -24,10 +24,10 @@ import java.util.concurrent.atomic.AtomicInteger; import org.eclipse.jetty.logging.StacklessLogging; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ThreadPool.SizedThreadPool; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @@ -40,7 +40,7 @@ public class QueuedThreadPoolTest extends AbstractThreadPoolTest { - private static final Logger LOG = Log.getLogger(QueuedThreadPoolTest.class); + private static final Logger LOG = LoggerFactory.getLogger(QueuedThreadPoolTest.class); private final AtomicInteger _jobs = new AtomicInteger(); private static class TestQueuedThreadPool extends QueuedThreadPool @@ -138,7 +138,7 @@ public void run() } catch (Exception e) { - LOG.debug(e); + LOG.debug("RunningJob failed", e); } finally { diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/SweeperTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/SweeperTest.java index 7dda9d362630..c24aaef5ee5b 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/SweeperTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/SweeperTest.java @@ -94,7 +94,7 @@ public boolean sweep() @Test public void testSweepThrows() throws Exception { - try (StacklessLogging scope = new StacklessLogging(Sweeper.class)) + try (StacklessLogging ignored = new StacklessLogging(Sweeper.class)) { long period = 500; final CountDownLatch taskLatch = new CountDownLatch(2); diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 350b35c7d730..d81876c49786 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -80,6 +80,10 @@ jetty-xml ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty @@ -87,6 +91,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/CachingWebAppClassLoader.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/CachingWebAppClassLoader.java index 1c966f55419d..ac1ab598e657 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/CachingWebAppClassLoader.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/CachingWebAppClassLoader.java @@ -25,8 +25,8 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A WebAppClassLoader that caches {@link #getResource(String)} results. @@ -37,7 +37,7 @@ @ManagedObject public class CachingWebAppClassLoader extends WebAppClassLoader { - private static final Logger LOG = Log.getLogger(CachingWebAppClassLoader.class); + private static final Logger LOG = LoggerFactory.getLogger(CachingWebAppClassLoader.class); private final Set _notFound = ConcurrentHashMap.newKeySet(); private final ConcurrentHashMap _cache = new ConcurrentHashMap<>(); @@ -104,8 +104,7 @@ public Class loadClass(String name) throws ClassNotFoundException if (_notFound.add(name)) if (LOG.isDebugEnabled()) { - LOG.debug("Caching not found {}", name); - LOG.debug(nfe); + LOG.debug("Caching not found {}", name, nfe); } throw nfe; } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClassMatcher.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClassMatcher.java index 6edeb9a312b1..63ce3599f653 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClassMatcher.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ClassMatcher.java @@ -43,9 +43,9 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A matcher for classes based on package and/or location and/or module/ @@ -70,7 +70,7 @@ public class ClassMatcher extends AbstractSet { - private static final Logger LOG = Log.getLogger(ClassMatcher.class); + private static final Logger LOG = LoggerFactory.getLogger(ClassMatcher.class); public static class Entry { @@ -723,7 +723,7 @@ public boolean match(Class clazz) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to match against {}", clazz, e); } return false; } @@ -745,7 +745,7 @@ public boolean match(String name, URL url) } catch (URISyntaxException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return null; } }); diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Configurations.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Configurations.java index e8ef70913f49..c08673ad0f25 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Configurations.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Configurations.java @@ -40,8 +40,8 @@ import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An ordered list of {@link Configuration} instances. @@ -64,7 +64,7 @@ */ public class Configurations extends AbstractList implements Dumpable { - private static final Logger LOG = Log.getLogger(Configurations.class); + private static final Logger LOG = LoggerFactory.getLogger(Configurations.class); private static final List __known = new ArrayList<>(); private static final List __unavailable = new ArrayList<>(); @@ -77,9 +77,9 @@ public static synchronized List getKnown() ServiceLoader configs = ServiceLoader.load(Configuration.class); for (Iterator i = configs.iterator(); i.hasNext(); ) { + Configuration configuration = i.next(); try { - Configuration configuration = i.next(); if (!configuration.isAvailable()) { if (LOG.isDebugEnabled()) @@ -92,7 +92,7 @@ public static synchronized List getKnown() } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Unable to get known {}", configuration, e); } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Descriptor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Descriptor.java index 2a68f0b4319a..73d8ec543e89 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Descriptor.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Descriptor.java @@ -52,7 +52,7 @@ public void parse(XmlParser parser) } } } - + public boolean isParsed() { return _root != null; diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/DiscoveredAnnotation.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/DiscoveredAnnotation.java index 5e3d6c56dfef..54c8219e3a10 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/DiscoveredAnnotation.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/DiscoveredAnnotation.java @@ -19,9 +19,9 @@ package org.eclipse.jetty.webapp; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DiscoveredAnnotation @@ -31,7 +31,7 @@ */ public abstract class DiscoveredAnnotation { - private static final Logger LOG = Log.getLogger(DiscoveredAnnotation.class); + private static final Logger LOG = LoggerFactory.getLogger(DiscoveredAnnotation.class); protected WebAppContext _context; protected String _className; @@ -51,7 +51,7 @@ public DiscoveredAnnotation(WebAppContext context, String className, Resource re _className = className; _resource = resource; } - + public String getClassName() { return _className; @@ -86,10 +86,10 @@ private void loadClass() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to load {}", _className, e); } } - + @Override public String toString() { diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java index 225501c1d70f..c0fe0531378e 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java @@ -21,8 +21,8 @@ import java.util.ServiceLoader; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

JAAS Configuration

@@ -36,7 +36,7 @@ */ public class JaasConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(JaasConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(JaasConfiguration.class); public JaasConfiguration() { @@ -54,7 +54,7 @@ public boolean isAvailable() } catch (Throwable e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java index 3aab43006bb6..d5d1c152d155 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java @@ -21,10 +21,10 @@ import java.io.IOException; import java.util.Map; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JettyWebConfiguration. @@ -33,7 +33,7 @@ */ public class JettyWebXmlConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(JettyWebXmlConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyWebXmlConfiguration.class); public static final String PROPERTY_WEB_INF_URI = "web-inf.uri"; public static final String PROPERTY_WEB_INF = "web-inf"; diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java index e57b2402ea2a..b3cd43540b53 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java @@ -21,8 +21,8 @@ import java.util.ServiceLoader; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

JMX Configuration

@@ -36,7 +36,7 @@ */ public class JmxConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(JmxConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(JmxConfiguration.class); public JmxConfiguration() { @@ -53,7 +53,7 @@ public boolean isAvailable() } catch (Throwable e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java index 7e1ec4d8300d..a4587c26e620 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java @@ -21,8 +21,8 @@ import java.util.ServiceLoader; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

JNDI Configuration

@@ -36,7 +36,7 @@ */ public class JndiConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(JndiConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(JndiConfiguration.class); public JndiConfiguration() { @@ -54,7 +54,7 @@ public boolean isAvailable() } catch (Throwable e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java index 3f3f1e02ad62..cc4cf28e5182 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java @@ -21,8 +21,8 @@ import java.util.ServiceLoader; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

JSP Configuration

@@ -36,7 +36,7 @@ */ public class JspConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(JspConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(JspConfiguration.class); public JspConfiguration() { @@ -56,7 +56,7 @@ public boolean isAvailable() } catch (Throwable e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java index 818cd7ffa6db..5afc94ae9b9d 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java @@ -19,22 +19,18 @@ package org.eclipse.jetty.webapp; import java.lang.annotation.Annotation; -import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; - import javax.servlet.ServletContext; -import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.EmptyResource; import org.eclipse.jetty.util.resource.Resource; -import org.eclipse.jetty.xml.XmlParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * MetaData @@ -43,7 +39,7 @@ */ public class MetaData { - private static final Logger LOG = Log.getLogger(MetaData.class); + private static final Logger LOG = LoggerFactory.getLogger(MetaData.class); public static final String VALIDATE_XML = "org.eclipse.jetty.webapp.validateXml"; public static final String ORDERED_LIBS = "javax.servlet.context.orderedLibs"; @@ -66,16 +62,15 @@ public class MetaData protected Ordering _ordering;//can be set to RelativeOrdering by web-default.xml, web.xml, web-override.xml protected boolean _allowDuplicateFragmentNames = false; protected boolean _validateXml = false; - + public enum Complete { NotSet, True, False } - + /** - * Metadata regarding where a deployable element was declared: + * Metadata regarding where a deployable element was declared: * by annotation or by descriptor. - * */ public static class OriginInfo { @@ -83,22 +78,22 @@ public static class OriginInfo * Identifier for the deployable element */ private final String name; - + /** * Origin of the deployable element */ private final Origin origin; - + /** * Reference to the descriptor, if declared in one */ private final Descriptor descriptor; - + /** * Reference to the annotation, if declared by one */ private final Annotation annotation; - + /** * The class containing the annotation, if declared by one */ @@ -125,7 +120,7 @@ public OriginInfo(String n, Descriptor d) origin = Origin.of(d); descriptor = d; annotation = null; - annotated = null; + annotated = null; } public OriginInfo(String n) @@ -194,9 +189,8 @@ public void clear() /** * Set the web-default.xml. - * + * * @param descriptor the web-default.xml - * @throws Exception */ public void setDefaultsDescriptor(DefaultsDescriptor descriptor) throws Exception @@ -225,7 +219,6 @@ public void setDefaultsDescriptor(DefaultsDescriptor descriptor) /** * @param descriptor the web.xml descriptor - * @throws Exception */ public void setWebDescriptor(WebDescriptor descriptor) throws Exception @@ -256,9 +249,8 @@ public void setWebDescriptor(WebDescriptor descriptor) /** * Add a override-web.xml descriptor. - * + * * @param descriptor the override-web.xml - * @throws Exception */ public void addOverrideDescriptor(OverrideDescriptor descriptor) throws Exception @@ -314,7 +306,7 @@ public void addFragmentDescriptor(Resource jarResource, FragmentDescriptor descr Objects.requireNonNull(jarResource); Objects.requireNonNull(descriptor); - + //Metadata-complete is not set, or there is no web.xml _webFragmentResourceMap.put(jarResource, descriptor); _webFragmentRoots.add(descriptor); @@ -361,7 +353,7 @@ public void addDiscoveredAnnotations(List annotations) /** * Add an annotation that has been discovered on a class, method or field within a resource * eg a jar or dir. The annotation may also have no associated resource, or that resource - * may be a system or container resource. + * may be a system or container resource. * * This method is synchronized as it is anticipated that it may be called by many threads * during the annotation scanning phase. @@ -404,12 +396,12 @@ public synchronized void addDiscoveredAnnotation(DiscoveredAnnotation annotation list.add(annotation); } - + /** * Check if the resource is contained within one of the list of resources. * In other words, check if the given resource is a sub-resource of one * of the list of resources. - * + * * @param resources the list of resources to check against * @param resource the resource for which to find the parent resource * @return the resource from the list that contains the given resource. @@ -431,7 +423,7 @@ private Resource getEnclosingResource(List resources, Resource resourc } catch (Exception e) { - LOG.warn(e); + LOG.warn("Not contained within?", e); return null; } } @@ -543,7 +535,7 @@ public void resolve(WebAppContext context) * A webapp is distributable if web.xml is metadata-complete and * distributable=true, or if metadata-complete is false, but all * web-fragments.xml are distributable=true. - * + * * @return true if the webapp is distributable, false otherwise */ public boolean isDistributable() @@ -609,7 +601,7 @@ public FragmentDescriptor getFragmentDescriptor(String name) { return _webFragmentNameMap.get(name); } - + /** * @param descriptorResource the web-fragment.xml location as a Resource * @return the FrgmentDescriptor for the web-fragment.xml, or null if none exists @@ -626,19 +618,19 @@ public FragmentDescriptor getFragmentDescriptor(Resource descriptorResource) public Resource getJarForFragmentName(String name) { Resource jar = null; - + FragmentDescriptor f = getFragmentDescriptor(name); if (f == null) return null; - for (Map.Entry entry : _webFragmentResourceMap.entrySet()) + for (Map.Entry entry : _webFragmentResourceMap.entrySet()) { if (entry.getValue().equals(f)) jar = entry.getKey(); } return jar; } - + /** * Get the web-fragment.xml related to a jar * @@ -646,7 +638,7 @@ public Resource getJarForFragmentName(String name) * @return the FragmentDescriptor or null if no web-fragment.xml is associated with the jar */ public FragmentDescriptor getFragmentDescriptorForJar(Resource jar) - { + { return _webFragmentResourceMap.get(jar); } @@ -689,7 +681,7 @@ public void setOrigin(String name, Descriptor d) { if (name == null) return; - + OriginInfo x = new OriginInfo(name, d); _origins.put(name, x); } @@ -727,7 +719,7 @@ public List getWebInfResources(boolean withOrdering) if (!withOrdering) return Collections.unmodifiableList(_webInfJars); else - return Collections.unmodifiableList(_orderedWebInfResources); + return Collections.unmodifiableList(_orderedWebInfResources); } public List getContainerResources() @@ -767,7 +759,7 @@ public boolean isValidateXml() { return _validateXml; } - + /** * @param validateXml if true xml syntax is validated by the parser, false otherwise */ diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaInfConfiguration.java index d81e516eed35..b45e52a088b3 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaInfConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaInfConfiguration.java @@ -42,11 +42,11 @@ import java.util.jar.JarFile; import org.eclipse.jetty.util.PatternMatcher; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.EmptyResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * MetaInfConfiguration @@ -67,7 +67,7 @@ */ public class MetaInfConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(MetaInfConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(MetaInfConfiguration.class); public static final String USE_CONTAINER_METAINF_CACHE = "org.eclipse.jetty.metainf.useCache"; public static final boolean DEFAULT_USE_CONTAINER_METAINF_CACHE = true; @@ -789,7 +789,7 @@ protected List findWebInfLibJars(WebAppContext context) } catch (Exception ex) { - LOG.warn(Log.EXCEPTION, ex); + LOG.warn("Unable to load WEB-INF file {}", files[f], ex); } } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ServletsConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ServletsConfiguration.java index fb48e361bb04..9d76ea4c7c3c 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ServletsConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/ServletsConfiguration.java @@ -19,8 +19,8 @@ package org.eclipse.jetty.webapp; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Jetty Servlets Configuration

@@ -30,7 +30,7 @@ */ public class ServletsConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(ServletsConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(ServletsConfiguration.class); public ServletsConfiguration() { @@ -52,7 +52,7 @@ public boolean isAvailable() } catch (Throwable e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java index 1bea6939ea69..b02c2aae36bb 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; - import javax.servlet.DispatcherType; import javax.servlet.MultipartConfigElement; import javax.servlet.SessionTrackingMode; @@ -51,11 +50,11 @@ import org.eclipse.jetty.servlet.Source; import org.eclipse.jetty.util.ArrayUtil; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.xml.XmlParser; import org.eclipse.jetty.xml.XmlParser.Node; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * StandardDescriptorProcessor. @@ -64,7 +63,7 @@ */ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor { - private static final Logger LOG = Log.getLogger(StandardDescriptorProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(StandardDescriptorProcessor.class); public static final String STANDARD_PROCESSOR = "org.eclipse.jetty.standardDescriptorProcessor"; @@ -153,7 +152,8 @@ public void visitContextParam(WebAppContext context, Descriptor descriptor, XmlP { String name = node.getString("param-name", false, true); String value = node.getString("param-value", false, true); - switch (context.getMetaData().getOrigin("context-param." + name)) + Origin origin = context.getMetaData().getOrigin("context-param." + name); + switch (origin) { case NotSet: { @@ -185,7 +185,7 @@ public void visitContextParam(WebAppContext context, Descriptor descriptor, XmlP break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } if (LOG.isDebugEnabled()) LOG.debug("ContextParam: " + name + "=" + value); @@ -226,7 +226,8 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser String originName = name + ".servlet.init-param." + pname; Descriptor originDescriptor = context.getMetaData().getOriginDescriptor(originName); - switch (context.getMetaData().getOrigin(originName)) + Origin origin = context.getMetaData().getOrigin(originName); + switch (origin) { case NotSet: { @@ -257,7 +258,7 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -283,7 +284,8 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser if (servletClass != null) { ((WebDescriptor)descriptor).addClassName(servletClass); - switch (context.getMetaData().getOrigin(name + ".servlet.servlet-class")) + Origin origin = context.getMetaData().getOrigin(name + ".servlet.servlet-class"); + switch (origin) { case NotSet: { @@ -312,7 +314,7 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -342,11 +344,12 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser catch (Exception e) { LOG.warn("Cannot parse load-on-startup " + s + ". Please use integer"); - LOG.ignore(e); + LOG.trace("IGNORED", e); } } - switch (context.getMetaData().getOrigin(name + ".servlet.load-on-startup")) + Origin origin = context.getMetaData().getOrigin(name + ".servlet.load-on-startup"); + switch (origin) { case NotSet: { @@ -375,7 +378,7 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -389,7 +392,8 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser { if (LOG.isDebugEnabled()) LOG.debug("link role " + roleName + " to " + roleLink + " for " + this); - switch (context.getMetaData().getOrigin(name + ".servlet.role-name." + roleName)) + Origin origin = context.getMetaData().getOrigin(name + ".servlet.role-name." + roleName); + switch (origin) { case NotSet: { @@ -417,7 +421,7 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } else @@ -433,7 +437,8 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser if (roleName != null) { - switch (context.getMetaData().getOrigin(name + ".servlet.run-as")) + Origin origin = context.getMetaData().getOrigin(name + ".servlet.run-as"); + switch (origin) { case NotSet: { @@ -462,7 +467,7 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } } @@ -471,7 +476,8 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser if (async != null) { boolean val = async.length() == 0 || Boolean.parseBoolean(async); - switch (context.getMetaData().getOrigin(name + ".servlet.async-supported")) + Origin origin = context.getMetaData().getOrigin(name + ".servlet.async-supported"); + switch (origin) { case NotSet: { @@ -500,7 +506,7 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -508,7 +514,8 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser if (enabled != null) { boolean isEnabled = enabled.length() == 0 || Boolean.parseBoolean(enabled); - switch (context.getMetaData().getOrigin(name + ".servlet.enabled")) + Origin origin = context.getMetaData().getOrigin(name + ".servlet.enabled"); + switch (origin) { case NotSet: { @@ -537,7 +544,7 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -558,7 +565,8 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser (maxRequest == null || "".equals(maxRequest) ? -1L : Long.parseLong(maxRequest)), (threshold == null || "".equals(threshold) ? 0 : Integer.parseInt(threshold))); - switch (context.getMetaData().getOrigin(name + ".servlet.multipart-config")) + Origin origin = context.getMetaData().getOrigin(name + ".servlet.multipart-config"); + switch (origin) { case NotSet: { @@ -596,7 +604,7 @@ public void visitServlet(WebAppContext context, Descriptor descriptor, XmlParser break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } } @@ -610,7 +618,8 @@ public void visitServletMapping(WebAppContext context, Descriptor descriptor, Xm // declared in web.xml overrides the mapping for the servlet specified in the web-fragment.xml String servletName = node.getString("servlet-name", false, true); - switch (context.getMetaData().getOrigin(servletName + ".servlet.mappings")) + Origin origin = context.getMetaData().getOrigin(servletName + ".servlet.mappings"); + switch (origin) { case NotSet: { @@ -638,7 +647,7 @@ public void visitServletMapping(WebAppContext context, Descriptor descriptor, Xm break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -688,7 +697,7 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(o); } while (iter.hasNext()) @@ -709,7 +718,8 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml String name = cookieConfig.getString("name", false, true); if (name != null) { - switch (context.getMetaData().getOrigin("cookie-config.name")) + Origin origin = context.getMetaData().getOrigin("cookie-config.name"); + switch (origin) { case NotSet: { @@ -738,7 +748,7 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -746,7 +756,8 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml String domain = cookieConfig.getString("domain", false, true); if (domain != null) { - switch (context.getMetaData().getOrigin("cookie-config.domain")) + Origin origin = context.getMetaData().getOrigin("cookie-config.domain"); + switch (origin) { case NotSet: { @@ -775,7 +786,7 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -783,7 +794,8 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml String path = cookieConfig.getString("path", false, true); if (path != null) { - switch (context.getMetaData().getOrigin("cookie-config.path")) + Origin origin = context.getMetaData().getOrigin("cookie-config.path"); + switch (origin) { case NotSet: { @@ -812,7 +824,7 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -820,7 +832,8 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml String comment = cookieConfig.getString("comment", false, true); if (comment != null) { - switch (context.getMetaData().getOrigin("cookie-config.comment")) + Origin origin = context.getMetaData().getOrigin("cookie-config.comment"); + switch (origin) { case NotSet: { @@ -849,7 +862,7 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -858,7 +871,8 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml if (tNode != null) { boolean httpOnly = Boolean.parseBoolean(tNode.toString(false, true)); - switch (context.getMetaData().getOrigin("cookie-config.http-only")) + Origin origin = context.getMetaData().getOrigin("cookie-config.http-only"); + switch (origin) { case NotSet: { @@ -887,7 +901,7 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -896,7 +910,8 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml if (tNode != null) { boolean secure = Boolean.parseBoolean(tNode.toString(false, true)); - switch (context.getMetaData().getOrigin("cookie-config.secure")) + Origin origin = context.getMetaData().getOrigin("cookie-config.secure"); + switch (origin) { case NotSet: { @@ -925,7 +940,7 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -934,7 +949,8 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml if (tNode != null) { int maxAge = Integer.parseInt(tNode.toString(false, true)); - switch (context.getMetaData().getOrigin("cookie-config.max-age")) + Origin origin = context.getMetaData().getOrigin("cookie-config.max-age"); + switch (origin) { case NotSet: { @@ -963,7 +979,7 @@ public void visitSessionConfig(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } } @@ -977,7 +993,8 @@ public void visitMimeMapping(WebAppContext context, Descriptor descriptor, XmlPa String mimeType = node.getString("mime-type", false, true); if (extension != null) { - switch (context.getMetaData().getOrigin("extension." + extension)) + Origin origin = context.getMetaData().getOrigin("extension." + extension); + switch (origin) { case NotSet: { @@ -1006,14 +1023,15 @@ public void visitMimeMapping(WebAppContext context, Descriptor descriptor, XmlPa break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } } public void visitWelcomeFileList(WebAppContext context, Descriptor descriptor, XmlParser.Node node) { - switch (context.getMetaData().getOrigin("welcome-file-list")) + Origin origin = context.getMetaData().getOrigin("welcome-file-list"); + switch (origin) { case NotSet: { @@ -1051,7 +1069,7 @@ public void visitWelcomeFileList(WebAppContext context, Descriptor descriptor, X break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -1066,7 +1084,8 @@ public void visitLocaleEncodingList(WebAppContext context, Descriptor descriptor if (encoding != null) { - switch (context.getMetaData().getOrigin("locale-encoding." + locale)) + Origin origin = context.getMetaData().getOrigin("locale-encoding." + locale); + switch (origin) { case NotSet: { @@ -1095,7 +1114,7 @@ public void visitLocaleEncodingList(WebAppContext context, Descriptor descriptor break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } } @@ -1119,7 +1138,8 @@ public void visitErrorPage(WebAppContext context, Descriptor descriptor, XmlPars throw new IllegalStateException("Missing leading '/' for location: " + location); ErrorPageErrorHandler handler = (ErrorPageErrorHandler)context.getErrorHandler(); String originName = "error." + error; - switch (context.getMetaData().getOrigin(originName)) + Origin origin = context.getMetaData().getOrigin(originName); + switch (origin) { case NotSet: { @@ -1159,7 +1179,7 @@ public void visitErrorPage(WebAppContext context, Descriptor descriptor, XmlPars break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -1539,7 +1559,7 @@ else if (ommissions.hasNext()) } catch (CloneNotSupportedException e) { - LOG.warn(e); + LOG.warn("Unable to clone {}", scBase, e); } } @@ -1552,7 +1572,8 @@ public void visitLoginConfig(WebAppContext context, Descriptor descriptor, XmlPa if (method != null) { //handle auth-method merge - switch (context.getMetaData().getOrigin("auth-method")) + Origin origin = context.getMetaData().getOrigin("auth-method"); + switch (origin) { case NotSet: { @@ -1581,13 +1602,14 @@ public void visitLoginConfig(WebAppContext context, Descriptor descriptor, XmlPa break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } //handle realm-name merge XmlParser.Node name = node.get("realm-name"); String nameStr = (name == null ? "default" : name.toString(false, true)); - switch (context.getMetaData().getOrigin("realm-name")) + Origin originRealmName = context.getMetaData().getOrigin("realm-name"); + switch (originRealmName) { case NotSet: { @@ -1616,7 +1638,7 @@ public void visitLoginConfig(WebAppContext context, Descriptor descriptor, XmlPa break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(originRealmName); } if (Constraint.__FORM_AUTH.equalsIgnoreCase(context.getSecurityHandler().getAuthMethod())) @@ -1634,7 +1656,8 @@ public void visitLoginConfig(WebAppContext context, Descriptor descriptor, XmlPa errorPageName = errorPage.toString(false, true); //handle form-login-page - switch (context.getMetaData().getOrigin("form-login-page")) + Origin originFormLoginPage = context.getMetaData().getOrigin("form-login-page"); + switch (originFormLoginPage) { case NotSet: { @@ -1663,11 +1686,12 @@ public void visitLoginConfig(WebAppContext context, Descriptor descriptor, XmlPa break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(originFormLoginPage); } //handle form-error-page - switch (context.getMetaData().getOrigin("form-error-page")) + Origin originFormErrorPage = context.getMetaData().getOrigin("form-error-page"); + switch (originFormErrorPage) { case NotSet: { @@ -1696,7 +1720,7 @@ public void visitLoginConfig(WebAppContext context, Descriptor descriptor, XmlPa break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(originFormErrorPage); } } else @@ -1737,7 +1761,8 @@ public void visitFilter(WebAppContext context, Descriptor descriptor, XmlParser. { ((WebDescriptor)descriptor).addClassName(filterClass); - switch (context.getMetaData().getOrigin(name + ".filter.filter-class")) + Origin origin = context.getMetaData().getOrigin(name + ".filter.filter-class"); + switch (origin) { case NotSet: { @@ -1766,7 +1791,7 @@ public void visitFilter(WebAppContext context, Descriptor descriptor, XmlParser. break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -1777,7 +1802,8 @@ public void visitFilter(WebAppContext context, Descriptor descriptor, XmlParser. String pname = paramNode.getString("param-name", false, true); String pvalue = paramNode.getString("param-value", false, true); - switch (context.getMetaData().getOrigin(name + ".filter.init-param." + pname)) + Origin origin = context.getMetaData().getOrigin(name + ".filter.init-param." + pname); + switch (origin) { case NotSet: { @@ -1807,7 +1833,7 @@ public void visitFilter(WebAppContext context, Descriptor descriptor, XmlParser. break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -1817,7 +1843,8 @@ public void visitFilter(WebAppContext context, Descriptor descriptor, XmlParser. if (async != null) { boolean val = async.length() == 0 || Boolean.parseBoolean(async); - switch (context.getMetaData().getOrigin(name + ".filter.async-supported")) + Origin origin = context.getMetaData().getOrigin(name + ".filter.async-supported"); + switch (origin) { case NotSet: { @@ -1846,7 +1873,7 @@ public void visitFilter(WebAppContext context, Descriptor descriptor, XmlParser. break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } } @@ -1858,7 +1885,8 @@ public void visitFilterMapping(WebAppContext context, Descriptor descriptor, Xml //Maintenance update 3.0a to spec: // Updated 8.2.3.g.v to say elements are additive across web-fragments. String filterName = node.getString("filter-name", false, true); - switch (context.getMetaData().getOrigin(filterName + ".filter.mappings")) + Origin origin = context.getMetaData().getOrigin(filterName + ".filter.mappings"); + switch (origin) { case NotSet: { @@ -1885,7 +1913,7 @@ public void visitFilterMapping(WebAppContext context, Descriptor descriptor, Xml break; } default: - LOG.warn(new Throwable()); // TODO throw ISE? + unknownOrigin(origin); } } @@ -2008,4 +2036,9 @@ public void visitResponseCharacterEncoding(WebAppContext context, Descriptor des context.getMetaData().setOrigin("response-character-encoding", descriptor); } } + + private void unknownOrigin(Origin origin) + { + LOG.warn("Unknown descriptor origin {}", origin, new Throwable()); // TODO throw ISE? + } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java index 346182692301..82806a3eb7e4 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java @@ -43,10 +43,10 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ClassLoader for HttpContext. @@ -73,7 +73,7 @@ public class WebAppClassLoader extends URLClassLoader implements ClassVisibility registerAsParallelCapable(); } - private static final Logger LOG = Log.getLogger(WebAppClassLoader.class); + private static final Logger LOG = LoggerFactory.getLogger(WebAppClassLoader.class); private static final ThreadLocal __loadServerClasses = new ThreadLocal<>(); private final Context _context; @@ -342,7 +342,7 @@ public void addJars(Resource lib) } catch (Exception ex) { - LOG.warn(Log.EXCEPTION, ex); + LOG.warn("Unable to load WEB-INF/lib JAR {}", files[f], ex); } } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java index 9e7f78c089f6..5b55d08712f2 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java @@ -67,10 +67,10 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.DumpableCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Web Application Context Handler. @@ -154,7 +154,7 @@ @ManagedObject("Web Application ContextHandler") public class WebAppContext extends ServletContextHandler implements WebAppClassLoader.Context { - static final Logger LOG = Log.getLogger(WebAppContext.class); + static final Logger LOG = LoggerFactory.getLogger(WebAppContext.class); public static final String TEMPDIR = "javax.servlet.context.tempdir"; public static final String BASETEMPDIR = "org.eclipse.jetty.webapp.basetempdir"; @@ -420,7 +420,7 @@ public Resource getResource(String uriInContext) throws MalformedURLException } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); if (ioe == null) ioe = e; } @@ -1163,7 +1163,7 @@ public void setTempDirectory(File dir) } catch (IOException e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to find canonical path for {}", dir, e); } } diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebDescriptor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebDescriptor.java index 64bff6779fdf..e0e911c48e77 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebDescriptor.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebDescriptor.java @@ -24,10 +24,10 @@ import java.util.List; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; /** @@ -37,7 +37,7 @@ */ public class WebDescriptor extends Descriptor { - private static final Logger LOG = Log.getLogger(WebDescriptor.class); + private static final Logger LOG = LoggerFactory.getLogger(WebDescriptor.class); public static XmlParser __nonValidatingStaticParser = newParser(false); protected MetaData.Complete _metaDataComplete; @@ -47,13 +47,12 @@ public class WebDescriptor extends Descriptor protected boolean _distributable; protected boolean _isOrdered = false; protected List _ordering = new ArrayList<>(); - + /** * Check if the descriptor is metadata-complete. - * - * @param d the descriptor (web.xml, web-fragment.xml, + * + * @param d the descriptor (web.xml, web-fragment.xml, * web-default.xml, web-override.xml) to check - * * @return true iff metadata-complete=true is declared in the * descriptor */ @@ -64,7 +63,7 @@ public static boolean isMetaDataComplete(WebDescriptor d) /** * Get a parser for parsing web descriptor content. - * + * * @param validating true if the parser should validate syntax, false otherwise * @return an XmlParser for web descriptors */ @@ -75,10 +74,10 @@ public static XmlParser getParser(boolean validating) else return newParser(true); } - + /** * Create a new parser for parsing web descriptors. - * + * * @param validating if true, the parser will validate syntax * @return an XmlParser */ @@ -148,7 +147,7 @@ void mapResources() } catch (Exception e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } finally { @@ -234,7 +233,7 @@ public WebDescriptor(Resource xml) { super(xml); } - + @Override public void parse(XmlParser parser) throws Exception @@ -327,7 +326,7 @@ else if (node.getTag().equalsIgnoreCase("name")) _ordering.add(node.toString(false, true)); } } - + public void processDistributable() { XmlParser.Node distributable = _root.get("distributable"); diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java index ad19b2d4d11f..04caf29857ba 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java @@ -29,16 +29,16 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.JarFileResource; import org.eclipse.jetty.util.resource.JarResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class WebInfConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(WebInfConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(WebInfConfiguration.class); public static final String TEMPDIR_CONFIGURED = "org.eclipse.jetty.tmpdirConfigured"; public static final String TEMPORARY_RESOURCE_BASE = "org.eclipse.jetty.webapp.tmpResourceBase"; diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java index 0caa47b4b9a0..0d587e6305d5 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java @@ -22,16 +22,16 @@ import java.net.MalformedURLException; import org.eclipse.jetty.servlet.ErrorPageErrorHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Configure by parsing default web.xml and web.xml */ public class WebXmlConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(WebXmlConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(WebXmlConfiguration.class); public WebXmlConfiguration() { diff --git a/jetty-webapp/src/test/java/org/acme/webapp/TestAnnotation.java b/jetty-webapp/src/test/java/org/acme/webapp/TestAnnotation.java index 34563b6a78c8..9b5d0c23e7d3 100644 --- a/jetty-webapp/src/test/java/org/acme/webapp/TestAnnotation.java +++ b/jetty-webapp/src/test/java/org/acme/webapp/TestAnnotation.java @@ -27,7 +27,7 @@ public class TestAnnotation extends DiscoveredAnnotation { private List applications; - + public TestAnnotation(WebAppContext context, String className, Resource resource, List applications) { super(context, className, resource); diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/TestMetaData.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/TestMetaData.java index f02158bfe6cb..1b226cc69266 100644 --- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/TestMetaData.java +++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/TestMetaData.java @@ -87,7 +87,7 @@ public void testAddWebInfResource() throws Exception assertTrue(wac.getMetaData().getWebInfResources(false).contains(fragResource)); assertTrue(wac.getMetaData().getWebInfResources(false).contains(nonFragResource)); } - + @Test public void testGetFragmentForJar() throws Exception { @@ -103,7 +103,7 @@ public void testGetFragmentForJar() throws Exception assertNull(wac.getMetaData().getFragmentDescriptorForJar(nonFragResource)); assertNull(wac.getMetaData().getFragmentDescriptorForJar(null)); } - + @Test public void testGetFragmentDescriptorByName() throws Exception { @@ -113,7 +113,7 @@ public void testGetFragmentDescriptorByName() throws Exception wac.getMetaData().addFragmentDescriptor(fragResource, fragDescriptor); assertNotNull(wac.getMetaData().getFragmentDescriptor(fragDescriptor.getName())); } - + @Test public void testGetFragmentDescriptorByLocation() throws Exception { @@ -123,7 +123,7 @@ public void testGetFragmentDescriptorByLocation() throws Exception wac.getMetaData().addFragmentDescriptor(fragResource, fragDescriptor); assertNotNull(wac.getMetaData().getFragmentDescriptor(webfragxml)); } - + @Test public void testGetJarForFragmentName() throws Exception { @@ -132,14 +132,13 @@ public void testGetJarForFragmentName() throws Exception wac.getMetaData().addFragmentDescriptor(fragResource, new FragmentDescriptor(webfragxml)); FragmentDescriptor descriptor = wac.getMetaData().getFragmentDescriptorForJar(fragResource); assertNotNull(descriptor); - + assertNotNull(wac.getMetaData().getJarForFragmentName(descriptor.getName())); assertNull(wac.getMetaData().getJarForFragmentName(null)); assertNull(wac.getMetaData().getJarForFragmentName("")); assertNull(wac.getMetaData().getJarForFragmentName("xxx")); - } - + @Test public void testAddDiscoveredAnnotation() throws Exception { @@ -164,23 +163,23 @@ public void testAddDiscoveredAnnotation() throws Exception list = wac.getMetaData()._annotations.get(nonFragResource); assertThat(list, contains(annotationB)); assertThat(list, hasSize(1)); - + //test an annotation that didn't have an associated resource list = wac.getMetaData()._annotations.get(EmptyResource.INSTANCE); assertThat(list, contains(annotationC)); assertThat(list, hasSize(1)); - + //test an annotation that came from the container path list = wac.getMetaData()._annotations.get(containerDir); assertThat(list, contains(annotationD)); assertThat(list, hasSize(1)); - + //test an annoation from web-inf classes list = wac.getMetaData()._annotations.get(webInfClassesDir); assertThat(list, contains(annotationE)); assertThat(list, hasSize(1)); } - + @Test public void testResolve() throws Exception { @@ -189,13 +188,13 @@ public void testResolve() throws Exception wac.getMetaData().addFragmentDescriptor(fragResource, new FragmentDescriptor(webfragxml)); wac.getMetaData().addContainerResource(containerDir); wac.getMetaData().setWebInfClassesResources(Collections.singletonList(webInfClassesDir)); - + wac.getMetaData().addDiscoveredAnnotation(annotationA); wac.getMetaData().addDiscoveredAnnotation(annotationB); wac.getMetaData().addDiscoveredAnnotation(annotationC); wac.getMetaData().addDiscoveredAnnotation(annotationD); wac.getMetaData().addDiscoveredAnnotation(annotationE); - + wac.getMetaData().resolve(wac); //test that annotations are applied from resources in order: //no resource associated, container resources, web-inf classes resources, web-inf lib resources diff --git a/jetty-websocket/websocket-core/pom.xml b/jetty-websocket/websocket-core/pom.xml index be8510562c76..db70afa34be8 100644 --- a/jetty-websocket/websocket-core/pom.xml +++ b/jetty-websocket/websocket-core/pom.xml @@ -30,6 +30,10 @@ jetty-http ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-xml @@ -47,6 +51,12 @@ ${project.version} + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java index bb9a9d2e849e..c4806edbc303 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java @@ -24,8 +24,8 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.compression.DeflaterPool; import org.eclipse.jetty.util.compression.InflaterPool; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject("Abstract Extension") public class AbstractExtension implements Extension @@ -41,7 +41,7 @@ public class AbstractExtension implements Extension public AbstractExtension() { - log = Log.getLogger(this.getClass()); + log = LoggerFactory.getLogger(this.getClass()); } @Override diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Frame.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Frame.java index 5cd15ad0f33c..5c44d9c4e77a 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Frame.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Frame.java @@ -225,6 +225,7 @@ public ByteBuffer getPayload() * Get the payload of the frame as a UTF-8 string. *

Should only be used in testing, does not validate the * UTF-8 and a non fin frame can contain partial UTF-8 characters.

+ * * @return the payload as a UTF-8 string. */ public String getPayloadAsUTF8() diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java index ca32eac00403..4a2620ddf4d6 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java @@ -27,10 +27,10 @@ import org.eclipse.jetty.util.IteratingNestedCallback; import org.eclipse.jetty.util.Utf8Appendable; import org.eclipse.jetty.util.Utf8StringBuilder; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.exception.BadPayloadException; import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A utility implementation of FrameHandler that defragments @@ -87,7 +87,7 @@ protected void onBinary(ByteBuffer message, Callback callback) }; } - protected static final Logger LOG = Log.getLogger(MessageHandler.class); + protected static final Logger LOG = LoggerFactory.getLogger(MessageHandler.class); private CoreSession coreSession; private Utf8StringBuilder textMessageBuffer; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java index 4678bddb4204..c37918952fe0 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java @@ -47,8 +47,6 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Behavior; import org.eclipse.jetty.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.CoreSession; @@ -61,6 +59,8 @@ import org.eclipse.jetty.websocket.core.internal.Negotiated; import org.eclipse.jetty.websocket.core.internal.WebSocketConnection; import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class ClientUpgradeRequest extends HttpRequest implements Response.CompleteListener, HttpUpgrader.Factory { @@ -76,7 +76,7 @@ public FrameHandler getFrameHandler() }; } - private static final Logger LOG = Log.getLogger(ClientUpgradeRequest.class); + private static final Logger LOG = LoggerFactory.getLogger(ClientUpgradeRequest.class); protected final CompletableFuture futureCoreSession; private final WebSocketCoreClient wsClient; private FrameHandler frameHandler; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java index e46906a6af3a..194cddab347d 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java @@ -19,8 +19,8 @@ package org.eclipse.jetty.websocket.core.client; import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.slf4j.LoggerFactory; public interface HttpClientProvider { @@ -35,7 +35,7 @@ static HttpClient get() } catch (Throwable x) { - Log.getLogger(HttpClientProvider.class).ignore(x); + LoggerFactory.getLogger(HttpClientProvider.class).trace("IGNORED", x); } return HttpClientProvider.newDefaultHttpClient(); diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java index ad83ad95d531..e4aa450d1813 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java @@ -26,19 +26,19 @@ import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.util.DecoratedObjectFactory; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class WebSocketCoreClient extends ContainerLifeCycle { public static final String WEBSOCKET_CORECLIENT_ATTRIBUTE = WebSocketCoreClient.class.getName(); - private static final Logger LOG = Log.getLogger(WebSocketCoreClient.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketCoreClient.class); private final HttpClient httpClient; private WebSocketComponents components; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java index 0058a4f376c0..266613853000 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java @@ -21,12 +21,15 @@ import java.net.URL; import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class XmlHttpClientProvider implements HttpClientProvider { + private static final Logger LOG = LoggerFactory.getLogger(XmlHttpClientProvider.class); + @Override public HttpClient newHttpClient() { @@ -43,7 +46,7 @@ public HttpClient newHttpClient() } catch (Throwable t) { - Log.getLogger(XmlHttpClientProvider.class).warn("Unable to load: " + resource, t); + LOG.warn("Unable to load: {}", resource, t); } return null; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java index c1e0cc448e98..28f3232c8167 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java @@ -30,8 +30,6 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; 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.websocket.core.Behavior; import org.eclipse.jetty.websocket.core.Extension; import org.eclipse.jetty.websocket.core.ExtensionConfig; @@ -40,6 +38,8 @@ import org.eclipse.jetty.websocket.core.OutgoingFrames; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.exception.WebSocketException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Represents the stack of Extensions. @@ -47,7 +47,7 @@ @ManagedObject("Extension Stack") public class ExtensionStack implements IncomingFrames, OutgoingFrames, Dumpable { - private static final Logger LOG = Log.getLogger(ExtensionStack.class); + private static final Logger LOG = LoggerFactory.getLogger(ExtensionStack.class); private final WebSocketComponents components; private final Behavior behavior; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java index 6d1cecab62a6..c4dd10da8649 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java @@ -19,20 +19,20 @@ package org.eclipse.jetty.websocket.core.internal; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.AbstractExtension; import org.eclipse.jetty.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.WebSocketComponents; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Fragment Extension */ public class FragmentExtension extends AbstractExtension { - private static final Logger LOG = Log.getLogger(FragmentExtension.class); + private static final Logger LOG = LoggerFactory.getLogger(FragmentExtension.class); private final FragmentingFlusher flusher; private final Configuration configuration = new Configuration.ConfigurationCustomizer(); diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java index aa818c950736..142f4b5a871b 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java @@ -21,11 +21,11 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Used to split large data frames into multiple frames below the maxFrameSize. @@ -34,7 +34,7 @@ */ public abstract class FragmentingFlusher extends TransformingFlusher { - private static final Logger LOG = Log.getLogger(FragmentingFlusher.class); + private static final Logger LOG = LoggerFactory.getLogger(FragmentingFlusher.class); private final Configuration configuration; private FrameEntry current; private ByteBuffer payload; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java index fe9b4894b41f..a4b7ccb73f4c 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java @@ -30,19 +30,19 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.AbstractExtension; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.WebSocketComponents; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.file.StandardOpenOption.CREATE; import static java.nio.file.StandardOpenOption.WRITE; public class FrameCaptureExtension extends AbstractExtension { - private static final Logger LOG = Log.getLogger(FrameCaptureExtension.class); + private static final Logger LOG = LoggerFactory.getLogger(FrameCaptureExtension.class); private static final int BUFSIZE = 32768; private Generator generator; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java index 6bd8684add02..c7633d291e54 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java @@ -35,19 +35,19 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.exception.WebSocketException; import org.eclipse.jetty.websocket.core.exception.WebSocketWriteTimeoutException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FrameFlusher extends IteratingCallback { public static final Frame FLUSH_FRAME = new Frame(OpCode.BINARY); - private static final Logger LOG = Log.getLogger(FrameFlusher.class); + private static final Logger LOG = LoggerFactory.getLogger(FrameFlusher.class); private static final Throwable CLOSED_CHANNEL = new ClosedChannelException(); private final LongAdder messagesOut = new LongAdder(); diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java index 9ba506a8218a..204dbec29b80 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java @@ -24,8 +24,6 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.Frame; @@ -33,6 +31,8 @@ import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException; import org.eclipse.jetty.websocket.core.exception.ProtocolException; import org.eclipse.jetty.websocket.core.exception.WebSocketException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Parsing of a frames in WebSocket land. @@ -50,7 +50,7 @@ private enum State FRAGMENT } - private static final Logger LOG = Log.getLogger(Parser.class); + private static final Logger LOG = LoggerFactory.getLogger(Parser.class); private final ByteBufferPool bufferPool; private final Configuration configuration; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java index 64f961255490..a5df5908c34d 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java @@ -27,8 +27,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.AbstractExtension; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.Frame; @@ -37,6 +35,8 @@ import org.eclipse.jetty.websocket.core.exception.BadPayloadException; import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException; import org.eclipse.jetty.websocket.core.exception.ProtocolException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Per Message Deflate Compression extension for WebSocket. @@ -47,7 +47,7 @@ public class PerMessageDeflateExtension extends AbstractExtension { private static final byte[] TAIL_BYTES = new byte[]{0x00, 0x00, (byte)0xFF, (byte)0xFF}; private static final ByteBuffer TAIL_BYTES_BUF = ByteBuffer.wrap(TAIL_BYTES); - private static final Logger LOG = Log.getLogger(PerMessageDeflateExtension.class); + private static final Logger LOG = LoggerFactory.getLogger(PerMessageDeflateExtension.class); private static final int DEFAULT_BUF_SIZE = 8 * 1024; private final TransformingFlusher outgoingFlusher; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java index e6111f759da6..28d30165aa38 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java @@ -23,9 +23,9 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IteratingCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Frame; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This is used to iteratively transform or process a frame into one or more other frames. @@ -36,7 +36,7 @@ */ public abstract class TransformingFlusher { - private final Logger log = Log.getLogger(this.getClass()); + private final Logger log = LoggerFactory.getLogger(this.getClass()); private final Queue entries = new ArrayDeque<>(); private final IteratingCallback flusher = new Flusher(); diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java index 3cc5f0166eec..3a35ae691b00 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java @@ -21,14 +21,14 @@ import java.util.Map; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.AbstractExtension; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.exception.ProtocolException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.websocket.core.OpCode.CONTINUATION; import static org.eclipse.jetty.websocket.core.OpCode.TEXT; @@ -36,7 +36,7 @@ public class ValidationExtension extends AbstractExtension { - private static final Logger LOG = Log.getLogger(ValidationExtension.class); + private static final Logger LOG = LoggerFactory.getLogger(ValidationExtension.class); private WebSocketCoreSession coreSession; private FrameSequence incomingSequence = null; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java index 133a44f972c4..e83759e72851 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java @@ -34,19 +34,19 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; 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.thread.Scheduler; import org.eclipse.jetty.websocket.core.Behavior; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Provides the implementation of {@link org.eclipse.jetty.io.Connection} that is suitable for WebSocket */ public class WebSocketConnection extends AbstractConnection implements Connection.UpgradeTo, Dumpable, Runnable { - private static final Logger LOG = Log.getLogger(WebSocketConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketConnection.class); /** * Minimum size of a buffer is the determined to be what would be the maximum framing header size (not including payload) diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java index 18d9b079c769..984269d4a652 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java @@ -33,8 +33,6 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Utf8Appendable; 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.websocket.core.Behavior; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Configuration; @@ -53,6 +51,8 @@ import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException; import org.eclipse.jetty.websocket.core.exception.WebSocketWriteTimeoutException; import org.eclipse.jetty.websocket.core.internal.Parser.ParsedFrame; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.util.Callback.NOOP; @@ -61,7 +61,7 @@ */ public class WebSocketCoreSession implements IncomingFrames, CoreSession, Dumpable { - private static final Logger LOG = Log.getLogger(WebSocketCoreSession.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketCoreSession.class); private static final CloseStatus NO_CODE = new CloseStatus(CloseStatus.NO_CODE); private final WebSocketComponents components; @@ -354,7 +354,7 @@ public void closeConnection(CloseStatus closeStatus, Callback callback) } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Failure from onClosed on handler {}", handler, e); callback.failed(e); } }); @@ -368,7 +368,7 @@ public void closeConnection(CloseStatus closeStatus, Callback callback) { if (e != cause) cause.addSuppressed(e); - LOG.warn(cause); + LOG.warn("Failure from onError on handler {}", handler, cause); errorCallback.failed(cause); } } @@ -380,7 +380,7 @@ public void closeConnection(CloseStatus closeStatus, Callback callback) } catch (Throwable e) { - LOG.warn(e); + LOG.warn("Failure from onClosed on handler {}", handler, e); callback.failed(e); } } diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java index 58b727ab030b..e85fda1d2be7 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java @@ -28,13 +28,13 @@ import org.eclipse.jetty.http.pathmap.PathSpecSet; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.HandlerWrapper; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.FrameHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class WebSocketUpgradeHandler extends HandlerWrapper { - static final Logger LOG = Log.getLogger(WebSocketUpgradeHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketUpgradeHandler.class); final Handshaker handshaker = Handshaker.newInstance(); final PathSpecSet paths = new PathSpecSet(); final WebSocketNegotiator negotiator; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java index 7946371e847a..77062cfc100d 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java @@ -34,8 +34,6 @@ import org.eclipse.jetty.server.HttpTransport; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.websocket.core.Behavior; import org.eclipse.jetty.websocket.core.Configuration; @@ -51,10 +49,12 @@ import org.eclipse.jetty.websocket.core.server.Handshaker; import org.eclipse.jetty.websocket.core.server.Negotiation; import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractHandshaker implements Handshaker { - protected static final Logger LOG = Log.getLogger(AbstractHandshaker.class); + protected static final Logger LOG = LoggerFactory.getLogger(AbstractHandshaker.class); private static final HttpField SERVER_VERSION = new PreEncodedHttpField(HttpHeader.SERVER, HttpConfiguration.SERVER_VERSION); @Override diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java index 51e0c0a14001..5456640b22ee 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java @@ -28,8 +28,6 @@ import org.eclipse.jetty.toolchain.test.Hex; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.exception.ProtocolException; import org.eclipse.jetty.websocket.core.exception.WebSocketException; import org.eclipse.jetty.websocket.core.internal.ExtensionStack; @@ -38,6 +36,8 @@ import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -45,7 +45,7 @@ public class GeneratorTest { - private static final Logger LOG = Log.getLogger(Helper.class); + private static final Logger LOG = LoggerFactory.getLogger(Helper.class); private static Generator generator = new Generator(); private static WebSocketCoreSession coreSession = newWebSocketCoreSession(Behavior.SERVER); diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java index aafff9b7539a..626cb32df8a8 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java @@ -23,12 +23,12 @@ import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestAsyncFrameHandler implements FrameHandler { - protected static final Logger LOG = Log.getLogger(TestAsyncFrameHandler.class); + protected static final Logger LOG = LoggerFactory.getLogger(TestAsyncFrameHandler.class); protected final String name; public CoreSession coreSession; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java index f1e6e28968c9..b5f0f5317cb6 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java @@ -24,12 +24,12 @@ import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestFrameHandler implements SynchronousFrameHandler { - private static Logger LOG = Log.getLogger(TestFrameHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(TestFrameHandler.class); protected CoreSession coreSession; public BlockingQueue receivedFrames = new BlockingArrayQueue<>(); diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java index caa0d8e5282f..9cabd34c4833 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java @@ -24,12 +24,12 @@ import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestMessageHandler extends MessageHandler { - protected static final Logger LOG = Log.getLogger(TestMessageHandler.class); + protected static final Logger LOG = LoggerFactory.getLogger(TestMessageHandler.class); public CoreSession coreSession; public BlockingQueue textMessages = new BlockingArrayQueue<>(); diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java index 4a47c433aaf9..334b39842387 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java @@ -36,8 +36,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession; @@ -47,6 +45,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.util.Callback.NOOP; import static org.hamcrest.MatcherAssert.assertThat; @@ -66,7 +66,7 @@ */ public class WebSocketCloseTest extends WebSocketTester { - private static Logger LOG = Log.getLogger(WebSocketCloseTest.class); + private static Logger LOG = LoggerFactory.getLogger(WebSocketCloseTest.class); private static final String WS_SCHEME = "ws"; private static final String WSS_SCHEME = "wss"; @@ -601,7 +601,7 @@ public void sendText(String text) static class WebSocketServer extends AbstractLifeCycle { - private static Logger LOG = Log.getLogger(WebSocketServer.class); + private static Logger LOG = LoggerFactory.getLogger(WebSocketServer.class); private final Server server; private final DemandingTestFrameHandler handler; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java index 4d3b32a0600a..a96241d613d8 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java @@ -25,12 +25,12 @@ import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.internal.Parser; import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.util.Callback.NOOP; import static org.hamcrest.MatcherAssert.assertThat; @@ -46,7 +46,7 @@ */ public class WebSocketOpenTest extends WebSocketTester { - private static Logger LOG = Log.getLogger(WebSocketOpenTest.class); + private static Logger LOG = LoggerFactory.getLogger(WebSocketOpenTest.class); private WebSocketServer server; private DemandingAsyncFrameHandler serverHandler; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java index b6984a5c56cd..79252a0c1a34 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java @@ -27,11 +27,11 @@ import org.eclipse.jetty.util.Jetty; import org.eclipse.jetty.util.UrlEncoded; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.TestMessageHandler; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -137,7 +137,7 @@ public static void main(String[] args) } } - private static final Logger LOG = Log.getLogger(CoreAutobahnClient.class); + private static final Logger LOG = LoggerFactory.getLogger(CoreAutobahnClient.class); private URI baseWebsocketUri; private WebSocketCoreClient client; private String userAgent; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java index 01363db55f16..e5192c37dc3c 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java @@ -28,15 +28,15 @@ import java.util.regex.Pattern; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.MessageHandler; import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ChatWebSocketClient { - private static Logger LOG = Log.getLogger(ChatWebSocketClient.class); + private static Logger LOG = LoggerFactory.getLogger(ChatWebSocketClient.class); private URI baseWebsocketUri; private WebSocketCoreClient client; @@ -102,7 +102,7 @@ private void chat(String line) } LOG.debug("sending {}...", line); - handler.sendText(Callback.from(() -> LOG.debug("message sent"), LOG::warn), false, name, ": ", line); + handler.sendText(Callback.from(() -> LOG.debug("message sent"), (cause) -> LOG.warn("message send failure", cause)), false, name, ": ", line); } public static void main(String[] args) diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java index 59754fbc0d99..8a4260cad67a 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java @@ -24,8 +24,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -35,6 +33,8 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -45,7 +45,7 @@ */ public class WebSocketClientServerTest { - private static Logger LOG = Log.getLogger(WebSocketClientServerTest.class); + private static Logger LOG = LoggerFactory.getLogger(WebSocketClientServerTest.class); private WebSocketServer server; private TestFrameHandler serverHandler; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java index 095c49df49e8..2039144db031 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Behavior; import org.eclipse.jetty.websocket.core.Extension; import org.eclipse.jetty.websocket.core.ExtensionConfig; @@ -35,6 +33,8 @@ import org.eclipse.jetty.websocket.core.internal.IdentityExtension; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -42,7 +42,7 @@ public class ExtensionStackTest { - private static final Logger LOG = Log.getLogger(ExtensionStackTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ExtensionStackTest.class); private static ExtensionStack stack; @BeforeAll diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java index 2cf27eb1fd6e..2e376571e18c 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java @@ -35,8 +35,6 @@ import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.websocket.core.CloseStatus; @@ -47,6 +45,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; import static org.hamcrest.MatcherAssert.assertThat; @@ -276,7 +276,7 @@ public void write(Callback callback, ByteBuffer... buffers) throws WritePendingE public static class BlockingEndpoint extends CapturingEndPoint { - private static final Logger LOG = Log.getLogger(BlockingEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(BlockingEndpoint.class); private long blockTime = 0; public CountDownLatch closeLatch = new CountDownLatch(1); diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java index b014fcd33804..5d6944e0bdc6 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java @@ -26,18 +26,18 @@ import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class WebSocketProxy { - protected static final Logger LOG = Log.getLogger(WebSocketProxy.class); + protected static final Logger LOG = LoggerFactory.getLogger(WebSocketProxy.class); enum State { diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java index 04d77ef5ab6d..66f235de234b 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java @@ -27,8 +27,6 @@ import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; @@ -40,6 +38,8 @@ import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -53,7 +53,7 @@ */ public class WebSocketServerTest extends WebSocketTester { - private static Logger LOG = Log.getLogger(WebSocketServerTest.class); + private static Logger LOG = LoggerFactory.getLogger(WebSocketServerTest.class); private WebSocketServer server; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java index c38a6af71764..ab86f54b4bd7 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java @@ -28,18 +28,18 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.util.TextUtil; import org.eclipse.jetty.websocket.util.messages.MessageOutputStream; import org.eclipse.jetty.websocket.util.messages.MessageWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JavaxWebSocketAsyncRemote extends JavaxWebSocketRemoteEndpoint implements javax.websocket.RemoteEndpoint.Async { - static final Logger LOG = Log.getLogger(JavaxWebSocketAsyncRemote.class); + static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketAsyncRemote.class); protected JavaxWebSocketAsyncRemote(JavaxWebSocketSession session, CoreSession coreSession) { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java index 53c02f78083b..a119ebf1f9cf 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java @@ -28,18 +28,18 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.util.TextUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; public class JavaxWebSocketBasicRemote extends JavaxWebSocketRemoteEndpoint implements RemoteEndpoint.Basic { - private static final Logger LOG = Log.getLogger(JavaxWebSocketBasicRemote.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketBasicRemote.class); protected JavaxWebSocketBasicRemote(JavaxWebSocketSession session, CoreSession coreSession) { @@ -121,7 +121,6 @@ public void sendText(String text) throws IOException LOG.debug("sendText({})", TextUtil.hint(text)); } - FutureCallback b = new FutureCallback(); sendFrame(new Frame(OpCode.TEXT).setPayload(text), b, false); b.block(getBlockingTimeout(), TimeUnit.MILLISECONDS); diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java index e9b241e0a701..44c07a2815bb 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java @@ -31,15 +31,15 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.DecoratedObjectFactory; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class JavaxWebSocketContainer extends ContainerLifeCycle implements javax.websocket.WebSocketContainer { - private static final Logger LOG = Log.getLogger(JavaxWebSocketContainer.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketContainer.class); private final SessionTracker sessionTracker = new SessionTracker(); private final List sessionListeners = new ArrayList<>(); protected final Configuration.ConfigurationCustomizer defaultCustomizer = new Configuration.ConfigurationCustomizer(); diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java index 911ed9f824ec..dcd6ad1189bf 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java @@ -38,8 +38,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; @@ -57,6 +55,8 @@ import org.eclipse.jetty.websocket.util.messages.PartialByteArrayMessageSink; import org.eclipse.jetty.websocket.util.messages.PartialByteBufferMessageSink; import org.eclipse.jetty.websocket.util.messages.PartialStringMessageSink; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JavaxWebSocketFrameHandler implements FrameHandler { @@ -119,13 +119,13 @@ public JavaxWebSocketFrameHandler(JavaxWebSocketContainer container, MethodHandle pongHandle, EndpointConfig endpointConfig) { - this.logger = Log.getLogger(endpointInstance.getClass()); + this.logger = LoggerFactory.getLogger(endpointInstance.getClass()); this.container = container; if (endpointInstance instanceof ConfiguredEndpoint) { RuntimeException oops = new RuntimeException("ConfiguredEndpoint needs to be unwrapped"); - logger.warn(oops); + logger.warn("Unexpected ConfiguredEndpoint", oops); throw oops; } this.endpointInstance = endpointInstance; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java index 9f541a0e83c6..82c23d3bb3ee 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java @@ -29,8 +29,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -38,10 +36,12 @@ import org.eclipse.jetty.websocket.core.exception.WebSocketException; import org.eclipse.jetty.websocket.util.messages.MessageOutputStream; import org.eclipse.jetty.websocket.util.messages.MessageWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JavaxWebSocketRemoteEndpoint implements javax.websocket.RemoteEndpoint, OutgoingFrames { - private static final Logger LOG = Log.getLogger(JavaxWebSocketRemoteEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketRemoteEndpoint.class); protected final JavaxWebSocketSession session; private final CoreSession coreSession; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java index 2c7377c37eea..9cbe7d6056d6 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java @@ -40,20 +40,20 @@ import javax.websocket.WebSocketContainer; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; import org.eclipse.jetty.websocket.util.ReflectUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Client Session for the JSR. */ public class JavaxWebSocketSession implements javax.websocket.Session { - private static final Logger LOG = Log.getLogger(JavaxWebSocketSession.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketSession.class); private final JavaxWebSocketContainer container; private final CoreSession coreSession; @@ -199,7 +199,7 @@ public void close(CloseReason closeReason) } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java index afb500d7fa8c..6010f9bae72e 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java @@ -26,12 +26,12 @@ import javax.websocket.Session; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SessionTracker extends AbstractLifeCycle implements JavaxWebSocketSessionListener { - private static final Logger LOG = Log.getLogger(SessionTracker.class); + private static final Logger LOG = LoggerFactory.getLogger(SessionTracker.class); private CopyOnWriteArraySet sessions = new CopyOnWriteArraySet<>(); @@ -64,7 +64,7 @@ protected void doStop() throws Exception } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java index f784f661f559..1c6e195fbaae 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java @@ -22,12 +22,12 @@ import javax.websocket.Decoder; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.util.messages.AbstractMessageSink; import org.eclipse.jetty.websocket.util.messages.MessageSink; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class DecodedMessageSink extends AbstractMessageSink { @@ -40,7 +40,7 @@ public DecodedMessageSink(CoreSession session, T decoder, MethodHandle methodHan throws NoSuchMethodException, IllegalAccessException { super(session, methodHandle); - this.logger = Log.getLogger(this.getClass()); + this.logger = LoggerFactory.getLogger(this.getClass()); this.decoder = decoder; this.rawMethodHandle = newRawMethodHandle(); this.rawMessageSink = newRawMessageSink(session, rawMethodHandle); diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java index 0e66a3d192d5..5a24ae41dc69 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java +++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java @@ -27,12 +27,12 @@ import javax.websocket.MessageHandler; import javax.websocket.Session; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.javax.common.Defaults; import org.hamcrest.Matcher; import org.hamcrest.Matchers; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -42,7 +42,7 @@ */ public abstract class AbstractStringEndpoint extends Endpoint implements MessageHandler.Whole { - private static final Logger LOG = Log.getLogger(AbstractStringEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractStringEndpoint.class); public CountDownLatch closeLatch = new CountDownLatch(1); public AtomicReference closeInfo = new AtomicReference<>(); protected Session session; diff --git a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod index 62ba7f8f59b2..2f0ae30c75b1 100644 --- a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod +++ b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod @@ -12,10 +12,12 @@ annotations [lib] lib/websocket/websocket-core-${jetty.version}.jar -lib/websocket/websocket-util-${jetty.version}.jar lib/websocket/websocket-servlet-${jetty.version}.jar +lib/websocket/websocket-util-${jetty.version}.jar lib/websocket/jetty-javax-websocket-api-1.1.2.jar -lib/websocket/websocket-javax-*.jar +lib/websocket/websocket-javax-client-${jetty.version}.jar +lib/websocket/websocket-javax-common-${jetty.version}.jar +lib/websocket/websocket-javax-server-${jetty.version}.jar [jpms] # The implementation needs to access method handles in diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java index c3adac067480..0c33c0ad38d2 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java +++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java @@ -27,8 +27,8 @@ import javax.websocket.server.ServerEndpointConfig; import javax.websocket.server.ServerEndpointConfig.Configurator; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The "Container Default Configurator" per the JSR-356 spec. @@ -37,7 +37,7 @@ */ public final class ContainerDefaultConfigurator extends Configurator { - private static final Logger LOG = Log.getLogger(ContainerDefaultConfigurator.class); + private static final Logger LOG = LoggerFactory.getLogger(ContainerDefaultConfigurator.class); private static final String NO_SUBPROTOCOL = ""; /** diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java index 2b5bbfe79f5c..797c9c1f1a8e 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java +++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java @@ -35,13 +35,13 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.listener.ContainerInitializer; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ThreadClassLoaderScope; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer; import org.eclipse.jetty.websocket.servlet.WebSocketMapping; import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @HandlesTypes({ServerApplicationConfig.class, ServerEndpoint.class, Endpoint.class}) public class JavaxWebSocketServletContainerInitializer implements ServletContainerInitializer @@ -54,7 +54,7 @@ public class JavaxWebSocketServletContainerInitializer implements ServletContain public static final String ENABLE_KEY = "org.eclipse.jetty.websocket.javax"; public static final String HTTPCLIENT_ATTRIBUTE = "org.eclipse.jetty.websocket.javax.HttpClient"; - private static final Logger LOG = Log.getLogger(JavaxWebSocketServletContainerInitializer.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketServletContainerInitializer.class); /** * Test a ServletContext for {@code init-param} or {@code attribute} at {@code keyName} for diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java index 2c5c56f7dbd6..de98982caac1 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java +++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java @@ -31,8 +31,6 @@ import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint; @@ -42,13 +40,15 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import org.eclipse.jetty.websocket.servlet.WebSocketCreator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JavaxWebSocketCreator implements WebSocketCreator { public static final String PROP_REMOTE_ADDRESS = "javax.websocket.endpoint.remoteAddress"; public static final String PROP_LOCAL_ADDRESS = "javax.websocket.endpoint.localAddress"; public static final String PROP_LOCALES = "javax.websocket.upgrade.locales"; - private static final Logger LOG = Log.getLogger(JavaxWebSocketCreator.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketCreator.class); private final JavaxWebSocketContainer containerScope; private final ServerEndpointConfig baseConfig; private final WebSocketExtensionRegistry extensionRegistry; diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java index 0c84a4ab83d1..2248dd02933d 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java +++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java @@ -34,20 +34,20 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; import org.eclipse.jetty.websocket.core.exception.WebSocketException; import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer; import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; import org.eclipse.jetty.websocket.servlet.WebSocketMapping; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject("JSR356 Server Container") public class JavaxWebSocketServerContainer extends JavaxWebSocketClientContainer implements javax.websocket.server.ServerContainer, LifeCycle.Listener { public static final String JAVAX_WEBSOCKET_CONTAINER_ATTRIBUTE = javax.websocket.server.ServerContainer.class.getName(); - private static final Logger LOG = Log.getLogger(JavaxWebSocketServerContainer.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketServerContainer.class); public static JavaxWebSocketServerContainer getContainer(ServletContext servletContext) { diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java index f77b365005e6..230660402393 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java +++ b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java @@ -30,10 +30,10 @@ import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Tool to help debug JSR based websocket circumstances reported around browsers. @@ -43,7 +43,7 @@ */ public class JsrBrowserDebugTool { - private static final Logger LOG = Log.getLogger(JsrBrowserDebugTool.class); + private static final Logger LOG = LoggerFactory.getLogger(JsrBrowserDebugTool.class); public static void main(String[] args) { @@ -68,7 +68,7 @@ public static void main(String[] args) } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Unable to start {}", JsrBrowserDebugTool.class.getName(), t); } } diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java index a083a7332731..4cbe0f0e343e 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java +++ b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java @@ -33,8 +33,8 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint(value = "/", subprotocols = {"tool"}, configurator = JsrBrowserConfigurator.class) public class JsrBrowserSocket @@ -74,7 +74,7 @@ public void run() } } - private static final Logger LOG = Log.getLogger(JsrBrowserSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(JsrBrowserSocket.class); private Session session; private Async remote; private String userAgent; diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java index 15d177e121cc..22c96ca9772e 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java +++ b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java @@ -41,21 +41,21 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Credential; import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; public class WebSocketServerExamplesTest { - private static final Logger LOG = Log.getLogger(WebSocketServerExamplesTest.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketServerExamplesTest.class); @ClientEndpoint public static class ClientSocket @@ -86,7 +86,7 @@ public void onClose(CloseReason closeReason) @OnError public void onError(Throwable cause) { - LOG.debug(cause); + LOG.debug("ClientSocket error", cause); } } diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index f7f26a83c423..9fc1fac0bdd4 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -34,6 +34,11 @@ org.eclipse.jetty.toolchain jetty-javax-websocket-api + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java index f65fb4f69440..a69db90ba456 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java @@ -33,14 +33,14 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.BlockingArrayQueue; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/") @ClientEndpoint() public class EventSocket { - private static final Logger LOG = Log.getLogger(EventSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(EventSocket.class); public Session session; public EndpointConfig endpointConfig; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java index e2e7366613fc..d6a2056d0754 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java +++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java @@ -25,11 +25,11 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.ByteBufferAssert; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -120,7 +120,7 @@ abstract class Adapter public Adapter() { - logger = Log.getLogger(this.getClass()); + logger = LoggerFactory.getLogger(this.getClass()); } public void expectMessage(BlockingQueue framesQueue, byte expectedDataOp, ByteBuffer expectedMessage) throws InterruptedException diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java index 89e8ef04481b..01170fd2a8bf 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java +++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java @@ -43,8 +43,6 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.core.internal.Parser; @@ -57,6 +55,8 @@ import org.eclipse.jetty.websocket.servlet.WebSocketCreator; import org.eclipse.jetty.websocket.servlet.WebSocketServlet; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class LocalServer extends ContainerLifeCycle implements LocalFuzzer.Provider { @@ -70,7 +70,7 @@ public String echo(String msg) } } - private static final Logger LOG = Log.getLogger(LocalServer.class); + private static final Logger LOG = LoggerFactory.getLogger(LocalServer.class); private final ByteBufferPool bufferPool = new MappedByteBufferPool(); private Server server; private ServerConnector connector; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java index 72210ab2e3a2..c0825c90383a 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java +++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java @@ -29,9 +29,9 @@ import javax.websocket.EndpointConfig; import javax.websocket.Session; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.hamcrest.Matcher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -61,7 +61,7 @@ public WSEndpointTracker() public WSEndpointTracker(String id) { - logger = Log.getLogger(this.getClass().getName() + "." + id); + logger = LoggerFactory.getLogger(this.getClass().getName() + "." + id); logger.debug("init"); } diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java index 3f14ad774451..4f80e889d646 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java +++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java @@ -31,9 +31,9 @@ import javax.websocket.OnOpen; import javax.websocket.Session; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.hamcrest.Matcher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -90,7 +90,7 @@ public WSEventTracker() public WSEventTracker(String id) { - logger = Log.getLogger(this.getClass().getName() + "." + id); + logger = LoggerFactory.getLogger(this.getClass().getName() + "." + id); logger.debug("init"); } diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java index 0ddcbca31a48..92a9fa0913b7 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java +++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java @@ -32,11 +32,11 @@ import org.eclipse.jetty.toolchain.test.JAR; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -49,7 +49,7 @@ */ public class WSServer extends LocalServer implements LocalFuzzer.Provider { - private static final Logger LOG = Log.getLogger(WSServer.class); + private static final Logger LOG = LoggerFactory.getLogger(WSServer.class); private final Path contextDir; private final String contextPath; private ContextHandlerCollection contexts; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java index 9b6b932320ec..313d5e540eda 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java +++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java @@ -19,16 +19,16 @@ package org.eclipse.jetty.websocket.javax.tests.framehandlers; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FrameEcho implements FrameHandler { - private static final Logger LOG = Log.getLogger(FrameEcho.class); + private static final Logger LOG = LoggerFactory.getLogger(FrameEcho.class); private CoreSession coreSession; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java index 278eb5918638..8ce8ecc630fd 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java @@ -25,10 +25,10 @@ import org.eclipse.jetty.util.Jetty; import org.eclipse.jetty.util.UrlEncoded; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer; import org.eclipse.jetty.websocket.javax.tests.EventSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -134,7 +134,7 @@ public static void main(String[] args) } } - private static final Logger LOG = Log.getLogger(JavaxAutobahnClient.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxAutobahnClient.class); private URI baseWebsocketUri; private JavaxWebSocketClientContainer clientContainer; private String userAgent; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java index 1bce1ebd76ea..5e5f239be36a 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java @@ -29,14 +29,14 @@ import javax.websocket.Session; import javax.websocket.server.ServerEndpoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ClientEndpoint @ServerEndpoint("/") public class JavaxAutobahnSocket { - private static final Logger LOG = Log.getLogger(JavaxAutobahnSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxAutobahnSocket.class); public Session session; public CountDownLatch closeLatch = new CountDownLatch(1); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java index 6da56e34586c..5161bf2c05eb 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java @@ -39,8 +39,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; @@ -55,6 +53,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; import static org.hamcrest.MatcherAssert.assertThat; @@ -66,7 +66,7 @@ */ public class MessageReceivingTest { - private static final Logger LOG = Log.getLogger(MessageReceivingTest.class); + private static final Logger LOG = LoggerFactory.getLogger(MessageReceivingTest.class); private static CoreServer server; private WebSocketContainer container; @@ -305,7 +305,7 @@ public void onBinary(ByteBuffer wholeMessage, Callback callback) @Override public void onError(Throwable cause, Callback callback) { - LOG.warn(cause); + LOG.warn("SendPartialBinaryFrameHandler Error", cause); callback.succeeded(); } } @@ -337,7 +337,7 @@ public void onText(String wholeMessage, Callback callback) @Override public void onError(Throwable cause, Callback callback) { - LOG.warn(cause); + LOG.warn("EchoWholeMessageFrameHandler Error", cause); callback.succeeded(); } } @@ -414,7 +414,7 @@ public void onClose(Session session, CloseReason closeReason) @Override public void onError(Session session, Throwable thr) { - LOG.warn(thr); + LOG.warn("TestEndpoint Error", thr); } } diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java index 022e192e5cc0..3504bf418cee 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java @@ -25,12 +25,12 @@ import javax.websocket.Decoder; import javax.websocket.EndpointConfig; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class QuotesDecoder implements Decoder.TextStream { - private static final Logger LOG = Log.getLogger(QuotesDecoder.class); + private static final Logger LOG = LoggerFactory.getLogger(QuotesDecoder.class); @Override public Quotes decode(Reader reader) throws DecodeException, IOException diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java index 36748ea07367..d500ee004fd0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java @@ -25,12 +25,12 @@ import javax.websocket.Decoder; import javax.websocket.EndpointConfig; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class QuotesDecoder implements Decoder.TextStream { - private static final Logger LOG = Log.getLogger(QuotesDecoder.class); + private static final Logger LOG = LoggerFactory.getLogger(QuotesDecoder.class); @SuppressWarnings("RedundantThrows") @Override diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java index 3df1a07ec6e1..9b36099fddca 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java @@ -31,14 +31,14 @@ import javax.websocket.WebSocketContainer; import javax.websocket.server.ServerEndpoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -88,7 +88,7 @@ public void onOpenResource(String filename) } } - private static final Logger LOG = Log.getLogger(QuotesDecoderTest.class); + private static final Logger LOG = LoggerFactory.getLogger(QuotesDecoderTest.class); private LocalServer server; private WebSocketContainer client; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java index 25361f40d458..e63c75994f25 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java @@ -31,8 +31,6 @@ import javax.websocket.server.ServerEndpoint; import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -42,6 +40,8 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class BinaryStreamTest { @@ -128,7 +128,7 @@ public void testMoreThanLargestMessageOneByteAtATime() throws Exception @ServerEndpoint(PATH) public static class ServerBinaryStreamer { - private static final Logger LOG = Log.getLogger(ServerBinaryStreamer.class); + private static final Logger LOG = LoggerFactory.getLogger(ServerBinaryStreamer.class); @OnMessage public void echo(Session session, InputStream input) throws IOException diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java index 884a4b21f968..573ccd47b3c9 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java @@ -51,8 +51,6 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -68,13 +66,15 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; public class ConfiguratorTest { - private static final Logger LOG = Log.getLogger(ConfiguratorTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ConfiguratorTest.class); public static class EmptyConfigurator extends ServerEndpointConfig.Configurator { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java index 0d0b712eadee..57d9f839f375 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java @@ -27,8 +27,6 @@ import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; @@ -38,6 +36,8 @@ import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -49,7 +49,7 @@ @ExtendWith(WorkDirExtension.class) public class EndpointViaConfigTest { - private static final Logger LOG = Log.getLogger(EndpointViaConfigTest.class); + private static final Logger LOG = LoggerFactory.getLogger(EndpointViaConfigTest.class); public WorkDir testdir; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java index 14effe53593c..d7cf252ea8cd 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java @@ -28,8 +28,6 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -38,13 +36,15 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test various {@link javax.websocket.Decoder.BinaryStream Decoder.BinaryStream} echo behavior of Java InputStreams */ public class InputStreamEchoTest { - private static final Logger LOG = Log.getLogger(InputStreamEchoTest.class); + private static final Logger LOG = LoggerFactory.getLogger(InputStreamEchoTest.class); public static class BaseSocket { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java index 1cc20fbde058..f2da4b4a1ec1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java @@ -27,8 +27,6 @@ import javax.websocket.Session; import javax.websocket.server.ServerEndpoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -37,6 +35,8 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Sends raw TEXT or BINARY messages to server. @@ -46,7 +46,7 @@ */ public class PartialEchoTest { - private static final Logger LOG = Log.getLogger(PartialEchoTest.class); + private static final Logger LOG = LoggerFactory.getLogger(PartialEchoTest.class); public static class BaseSocket { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java index 63231b8492d7..ce1d2d82d5be 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint(value = "/pong-socket", configurator = PongContextListener.Config.class) public class PongSocket { - private static final Logger LOG = Log.getLogger(PongSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(PongSocket.class); private String path = "?"; private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java index ea89adc46f42..a1bef5dec69f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java @@ -28,8 +28,6 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.Hex; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -40,13 +38,15 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test various {@link javax.websocket.Decoder.Binary Decoder.Binary} / {@link javax.websocket.Encoder.Binary Encoder.Binary} echo behavior of Java Primitives */ public class PrimitivesBinaryEchoTest { - private static final Logger LOG = Log.getLogger(PrimitivesBinaryEchoTest.class); + private static final Logger LOG = LoggerFactory.getLogger(PrimitivesBinaryEchoTest.class); public static class BaseSocket { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java index b62f4406b26d..da646af8a582 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java @@ -27,8 +27,6 @@ import javax.websocket.server.ServerContainer; import javax.websocket.server.ServerEndpoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -39,13 +37,15 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test various {@link javax.websocket.Decoder.Text Decoder.Text} / {@link javax.websocket.Encoder.Text Encoder.Text} echo behavior of Java Primitives */ public class PrimitivesTextEchoTest { - private static final Logger LOG = Log.getLogger(PrimitivesTextEchoTest.class); + private static final Logger LOG = LoggerFactory.getLogger(PrimitivesTextEchoTest.class); public static class BaseSocket { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java index 9461c0198d70..794b24709991 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java @@ -28,8 +28,6 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -38,13 +36,15 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test various {@link javax.websocket.Decoder.TextStream Decoder.TextStream} and {@link javax.websocket.Encoder.TextStream Encoder.TextStream} echo behavior of Java Readers */ public class ReaderEchoTest { - private static final Logger LOG = Log.getLogger(ReaderEchoTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ReaderEchoTest.class); public static class BaseSocket { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java index 9af2bb1e614b..ce70a7f39d9e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java @@ -51,14 +51,14 @@ import org.eclipse.jetty.toolchain.test.FS; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider; import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.eclipse.jetty.websocket.javax.tests.Sha1Sum; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalToIgnoringCase; @@ -67,7 +67,7 @@ public class StreamTest { - private static final Logger LOG = Log.getLogger(StreamTest.class); + private static final Logger LOG = LoggerFactory.getLogger(StreamTest.class); private static File outputDir; private static LocalServer server; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java index e420db47bbc3..046608a90f21 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java @@ -44,8 +44,6 @@ import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -59,6 +57,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -67,7 +67,7 @@ public class TextStreamTest { - private static final Logger LOG = Log.getLogger(TextStreamTest.class); + private static final Logger LOG = LoggerFactory.getLogger(TextStreamTest.class); private static final BlockingArrayQueue serverEndpoints = new BlockingArrayQueue<>(); private final ClientEndpointConfig clientConfig = ClientEndpointConfig.Builder.create().build(); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java index 21fdae4b7def..2accaf59ce2c 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java @@ -26,8 +26,6 @@ import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; @@ -36,10 +34,12 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class UriTemplateParameterTest { - private static final Logger LOG = Log.getLogger(UriTemplateParameterTest.class); + private static final Logger LOG = LoggerFactory.getLogger(UriTemplateParameterTest.class); @ServerEndpoint("/echo/params/{a}/{b}") public static class IntParamTextSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java index 03c129ec7dbb..29f0b43fe494 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java @@ -27,13 +27,13 @@ import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/binary/bytebuffer") public class ByteBufferSocket { - private static final Logger LOG = Log.getLogger(ByteBufferSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(ByteBufferSocket.class); @OnMessage public String onByteBuffer(ByteBuffer bbuf) diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java index adcf19f2b69b..62f885d837de 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java @@ -27,15 +27,15 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; import org.eclipse.jetty.websocket.javax.tests.coders.DateEncoder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint(value = "/echo/beans/date", decoders = {DateDecoder.class}, encoders = {DateEncoder.class}) public class DateTextSocket { - private static final Logger LOG = Log.getLogger(DateTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(DateTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java index 0fd4a8328910..95001d54f3ce 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java @@ -27,13 +27,13 @@ import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/binary/bytebuffer") public class ByteBufferSocket { - private static final Logger LOG = Log.getLogger(ByteBufferSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(ByteBufferSocket.class); @OnMessage public String onByteBuffer(ByteBuffer bbuf) diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java index db2264a24d0d..94e6748af765 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java @@ -25,13 +25,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/partial/textsession") public class PartialTextSessionSocket { - private static final Logger LOG = Log.getLogger(PartialTextSessionSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(PartialTextSessionSocket.class); private StringBuilder buf = new StringBuilder(); @OnMessage diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java index 6428e446f031..72b64f102ba3 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/partial/text") public class PartialTextSocket { - private static final Logger LOG = Log.getLogger(PartialTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(PartialTextSocket.class); private Session session; private StringBuilder buf = new StringBuilder(); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java index 860139941717..56f572f0aac5 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/booleanobject/params/{a}") public class BooleanObjectTextParamSocket { - private static final Logger LOG = Log.getLogger(BooleanObjectTextParamSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(BooleanObjectTextParamSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java index 9925aa9d6019..a7f0ffd1fdfb 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/booleanobject") public class BooleanObjectTextSocket { - private static final Logger LOG = Log.getLogger(BooleanObjectTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(BooleanObjectTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java index 13bde14f282e..c45c25059e97 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/boolean/params/{a}") public class BooleanTextParamSocket { - private static final Logger LOG = Log.getLogger(BooleanTextParamSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(BooleanTextParamSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java index 2970f0b8d6e4..d73bafcdd787 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/boolean") public class BooleanTextSocket { - private static final Logger LOG = Log.getLogger(BooleanTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(BooleanTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java index c282107f4a08..676a29d955bc 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/byteobject") public class ByteObjectTextSocket { - private static final Logger LOG = Log.getLogger(ByteObjectTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(ByteObjectTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java index 15a21089d80e..014fc4e55eb1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/byte") public class ByteTextSocket { - private static final Logger LOG = Log.getLogger(ByteTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(ByteTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java index 59cd1c655f12..471a5c7646d7 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/char") public class CharTextSocket { - private static final Logger LOG = Log.getLogger(CharTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(CharTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java index 5cb41fc75376..635ca8736cb8 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/characterobject") public class CharacterObjectTextSocket { - private static final Logger LOG = Log.getLogger(CharacterObjectTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(CharacterObjectTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java index 143d02018392..24d3471b5e67 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/doubleobject") public class DoubleObjectTextSocket { - private static final Logger LOG = Log.getLogger(DoubleObjectTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(DoubleObjectTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java index 2ab63440a9a7..2bb42b77d4b4 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/double") public class DoubleTextSocket { - private static final Logger LOG = Log.getLogger(DoubleTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(DoubleTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java index bde739ad1396..700cf6cb1e5d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/floatobject") public class FloatObjectTextSocket { - private static final Logger LOG = Log.getLogger(FloatObjectTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(FloatObjectTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java index 3cfc53de667b..a862539626e0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/float") public class FloatTextSocket { - private static final Logger LOG = Log.getLogger(FloatTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(FloatTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java index cf9d2e14e47b..d82a0a2837fc 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/integer/params/{a}") public class IntParamTextSocket { - private static final Logger LOG = Log.getLogger(IntParamTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(IntParamTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java index deb1d1c0ca6f..8a0e05e712b8 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/integer") public class IntTextSocket { - private static final Logger LOG = Log.getLogger(IntTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(IntTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java index 13a56e398b5b..e8aaa7f271f2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java @@ -27,13 +27,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/integerobject/params/{a}") public class IntegerObjectParamTextSocket { - private static final Logger LOG = Log.getLogger(IntegerObjectParamTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(IntegerObjectParamTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java index 4cd7b50a3ac0..df438c93cf38 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/integerobject") public class IntegerObjectTextSocket { - private static final Logger LOG = Log.getLogger(IntegerObjectTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(IntegerObjectTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java index 65b41d1f9ea3..24c800e2d5aa 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/longobject") public class LongObjectTextSocket { - private static final Logger LOG = Log.getLogger(LongObjectTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(LongObjectTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java index e12aeacf6eca..e8850a95af95 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/long") public class LongTextSocket { - private static final Logger LOG = Log.getLogger(LongTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(LongTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java index 5b601d016174..c9cabf12fd65 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/shortobject") public class ShortObjectTextSocket { - private static final Logger LOG = Log.getLogger(ShortObjectTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(ShortObjectTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java index b437f52bd2d4..8a6974b52e30 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java @@ -26,13 +26,13 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/primitives/short") public class ShortTextSocket { - private static final Logger LOG = Log.getLogger(ShortTextSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(ShortTextSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java index edcd062a26a0..361f44c3bc71 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java @@ -28,13 +28,13 @@ import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/streaming/inputstream") public class InputStreamSocket { - private static final Logger LOG = Log.getLogger(InputStreamSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(InputStreamSocket.class); @OnMessage public String onInputStream(InputStream stream) throws IOException diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java index 37f0cd2e0667..113a51a1a9e2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java @@ -29,13 +29,13 @@ import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/streaming/readerparam/{param}") public class ReaderParamSocket { - private static final Logger LOG = Log.getLogger(ReaderParamSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(ReaderParamSocket.class); private Session session; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java index 82c9b16e05c8..538ff9885996 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java @@ -27,13 +27,13 @@ import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/streaming/reader") public class ReaderSocket { - private static final Logger LOG = Log.getLogger(ReaderSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(ReaderSocket.class); @OnMessage public String onReader(Reader reader) throws IOException diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java index 1b0c0ef9e51b..3e5176f92cf0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java @@ -28,13 +28,13 @@ import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/echo/streaming/readerparam2/{param}") public class StringReturnReaderParamSocket { - private static final Logger LOG = Log.getLogger(StringReturnReaderParamSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(StringReturnReaderParamSocket.class); @OnMessage public String onReader(Reader reader, @PathParam("param") String param) throws IOException diff --git a/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java index 80cccfffb36c..6183b8bf172f 100644 --- a/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java +++ b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java @@ -38,8 +38,6 @@ import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.util.DecoratedObjectFactory; import org.eclipse.jetty.util.component.ContainerLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.websocket.api.Session; @@ -56,10 +54,12 @@ import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.client.UpgradeListener; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class WebSocketClient extends ContainerLifeCycle implements WebSocketPolicy, WebSocketContainer { - private static final Logger LOG = Log.getLogger(WebSocketClient.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketClient.class); private final WebSocketCoreClient coreClient; private final int id = ThreadLocalRandom.current().nextInt(); private final JettyWebSocketFrameHandlerFactory frameHandlerFactory; diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java index 9f8548f176ea..c522ccbd1605 100644 --- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java +++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java @@ -26,8 +26,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.BatchMode; import org.eclipse.jetty.websocket.api.UpgradeRequest; import org.eclipse.jetty.websocket.api.UpgradeResponse; @@ -48,6 +46,8 @@ import org.eclipse.jetty.websocket.util.InvalidSignatureException; import org.eclipse.jetty.websocket.util.InvokerUtils; import org.eclipse.jetty.websocket.util.messages.MessageSink; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JettyWebSocketFrameHandler implements FrameHandler { @@ -96,7 +96,7 @@ public JettyWebSocketFrameHandler(WebSocketContainer container, BatchMode batchMode, Configuration.Customizer customizer) { - this.log = Log.getLogger(endpointInstance.getClass()); + this.log = LoggerFactory.getLogger(endpointInstance.getClass()); this.container = container; this.endpointInstance = endpointInstance; diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java index 4307c3600dea..cd06286f3e30 100644 --- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java +++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java @@ -27,8 +27,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.BatchMode; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.api.WriteCallback; @@ -36,12 +34,14 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.exception.ProtocolException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; public class JettyWebSocketRemoteEndpoint implements org.eclipse.jetty.websocket.api.RemoteEndpoint { - private static final Logger LOG = Log.getLogger(JettyWebSocketRemoteEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyWebSocketRemoteEndpoint.class); private final CoreSession coreSession; private byte messageType = -1; @@ -80,7 +80,7 @@ public void close(int statusCode, String reason) } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java index 6cd0e5c9b8ab..6f1c2a5988aa 100644 --- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java +++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java @@ -24,8 +24,6 @@ import java.util.Objects; 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.websocket.api.CloseStatus; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.SuspendToken; @@ -33,10 +31,12 @@ import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.api.WebSocketBehavior; import org.eclipse.jetty.websocket.core.CoreSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class WebSocketSession implements Session, SuspendToken, Dumpable { - private static final Logger LOG = Log.getLogger(WebSocketSession.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketSession.class); private final CoreSession coreSession; private final JettyWebSocketFrameHandler frameHandler; private final JettyWebSocketRemoteEndpoint remoteEndpoint; diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java index 8645de9cc6b1..f090d20a4de9 100644 --- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java +++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java @@ -23,12 +23,12 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.util.messages.MessageOutputStream; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.endsWith; @@ -36,7 +36,7 @@ public class MessageOutputStreamTest { - private static final Logger LOG = Log.getLogger(MessageOutputStreamTest.class); + private static final Logger LOG = LoggerFactory.getLogger(MessageOutputStreamTest.class); private static final int OUTPUT_BUFFER_SIZE = 4096; public TestableLeakTrackingBufferPool bufferPool = new TestableLeakTrackingBufferPool("Test"); diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java index 11fb55188c75..7976f7d66ebb 100644 --- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java +++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java @@ -27,8 +27,6 @@ import org.eclipse.jetty.toolchain.test.Hex; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; @@ -36,10 +34,12 @@ import org.eclipse.jetty.websocket.util.messages.ByteBufferMessageSink; import org.eclipse.jetty.websocket.util.messages.MessageSink; import org.eclipse.jetty.websocket.util.messages.StringMessageSink; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class OutgoingMessageCapture extends CoreSession.Empty implements CoreSession { - private static final Logger LOG = Log.getLogger(OutgoingMessageCapture.class); + private static final Logger LOG = LoggerFactory.getLogger(OutgoingMessageCapture.class); public BlockingQueue textMessages = new LinkedBlockingDeque<>(); public BlockingQueue binaryMessages = new LinkedBlockingDeque<>(); diff --git a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod index 6f6469bb54cb..1f3f6189a646 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod +++ b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod @@ -12,11 +12,13 @@ annotations [lib] lib/websocket/websocket-core-${jetty.version}.jar -lib/websocket/websocket-util-${jetty.version}.jar lib/websocket/websocket-servlet-${jetty.version}.jar -lib/websocket/websocket-jetty-*.jar +lib/websocket/websocket-util-${jetty.version}.jar +lib/websocket/websocket-jetty-api-${jetty.version}.jar +lib/websocket/websocket-jetty-common-${jetty.version}.jar +lib/websocket/websocket-jetty-server-${jetty.version}.jar [jpms] # The implementation needs to access method handles in # classes that are in the web application classloader. -add-reads: org.eclipse.jetty.websocket.common=ALL-UNNAMED +add-reads: org.eclipse.jetty.websocket.jetty.common=ALL-UNNAMED diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java index c9da57fff82f..df0b75821848 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java +++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java @@ -30,8 +30,6 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.WebSocketBehavior; import org.eclipse.jetty.websocket.api.WebSocketPolicy; @@ -45,6 +43,8 @@ import org.eclipse.jetty.websocket.server.internal.JettyServerFrameHandlerFactory; import org.eclipse.jetty.websocket.servlet.FrameHandlerFactory; import org.eclipse.jetty.websocket.servlet.WebSocketMapping; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JettyWebSocketServerContainer extends ContainerLifeCycle implements WebSocketContainer, WebSocketPolicy, LifeCycle.Listener { @@ -82,7 +82,7 @@ public static JettyWebSocketServerContainer ensureContainer(ServletContext servl return container; } - private static final Logger LOG = Log.getLogger(JettyWebSocketServerContainer.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyWebSocketServerContainer.class); private final WebSocketMapping webSocketMapping; private final WebSocketComponents webSocketComponents; diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java index 152f0438744d..c0a54dddef84 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java +++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java @@ -21,8 +21,6 @@ import java.util.ServiceLoader; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.FragmentConfiguration; @@ -30,6 +28,8 @@ import org.eclipse.jetty.webapp.WebAppConfiguration; import org.eclipse.jetty.webapp.WebInfConfiguration; import org.eclipse.jetty.webapp.WebXmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

Websocket Configuration

@@ -43,7 +43,7 @@ */ public class JettyWebSocketConfiguration extends AbstractConfiguration { - private static final Logger LOG = Log.getLogger(JettyWebSocketConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyWebSocketConfiguration.class); public JettyWebSocketConfiguration() { @@ -78,7 +78,7 @@ private boolean isAvailable(String classname) } catch (Throwable e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); return false; } } diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java index 3f4023d656a0..82c3f79383a0 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java +++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java @@ -25,19 +25,19 @@ import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.listener.ContainerInitializer; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer; import org.eclipse.jetty.websocket.servlet.WebSocketMapping; import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ServletContext configuration for Jetty Native WebSockets API. */ public class JettyWebSocketServletContainerInitializer implements ServletContainerInitializer { - private static final Logger LOG = Log.getLogger(JettyWebSocketServletContainerInitializer.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyWebSocketServletContainerInitializer.class); public interface Configurator { diff --git a/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java b/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java index 1939fa3368f6..88ea12759822 100644 --- a/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java +++ b/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java @@ -35,8 +35,6 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig; @@ -46,6 +44,8 @@ import org.eclipse.jetty.websocket.server.JettyWebSocketServlet; import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory; import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Tool to help debug websocket circumstances reported around browsers. @@ -55,7 +55,7 @@ */ public class BrowserDebugTool { - private static final Logger LOG = Log.getLogger(BrowserDebugTool.class); + private static final Logger LOG = LoggerFactory.getLogger(BrowserDebugTool.class); public static void main(String[] args) { @@ -78,7 +78,7 @@ public static void main(String[] args) } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Unable to start {}", BrowserDebugTool.class.getName(), t); } } diff --git a/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java b/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java index 059a05dadda0..14264e68a228 100644 --- a/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java +++ b/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java @@ -33,8 +33,6 @@ import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.StringUtil; 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.websocket.api.RemoteEndpoint; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose; @@ -42,6 +40,8 @@ import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; import org.eclipse.jetty.websocket.api.annotations.WebSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @WebSocket public class BrowserSocket @@ -81,7 +81,7 @@ public void run() } } - private static final Logger LOG = Log.getLogger(BrowserSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(BrowserSocket.class); private Session session; private final String userAgent; @@ -198,7 +198,7 @@ public void onTextMessage(String message) } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to send ping", e); } break; } diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 9976ed6809d0..6c935a89e7a8 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -63,6 +63,13 @@ ${project.version} test + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java index a3e4166cad82..1a7a2f306e66 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java @@ -26,14 +26,14 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.WebSocketAdapter; import org.eclipse.jetty.websocket.common.WebSocketSession; import org.eclipse.jetty.websocket.core.internal.WebSocketConnection; import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession; import org.hamcrest.Matcher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; @@ -42,7 +42,7 @@ public class CloseTrackingEndpoint extends WebSocketAdapter { - private static final Logger LOG = Log.getLogger(CloseTrackingEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(CloseTrackingEndpoint.class); public int closeCode = -1; public String closeReason = null; diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java index 441e132bf535..69d3fcb9e717 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java @@ -24,8 +24,6 @@ import java.util.concurrent.CountDownLatch; import org.eclipse.jetty.util.BlockingArrayQueue; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose; @@ -33,11 +31,13 @@ import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; import org.eclipse.jetty.websocket.api.annotations.WebSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @WebSocket public class EventSocket { - private static final Logger LOG = Log.getLogger(EventSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(EventSocket.class); public Session session; private String behavior; diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java index f1171adc9d89..662bbaa7bf56 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java @@ -28,13 +28,13 @@ import org.eclipse.jetty.util.Jetty; import org.eclipse.jetty.util.UrlEncoded; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.tests.EchoSocket; import org.eclipse.jetty.websocket.tests.EventSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -140,7 +140,7 @@ public static void main(String[] args) } } - private static final Logger LOG = Log.getLogger(JettyAutobahnClient.class); + private static final Logger LOG = LoggerFactory.getLogger(JettyAutobahnClient.class); private URI baseWebsocketUri; private WebSocketClient client; private String userAgent; diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java index c788edb43347..4efcc4ab8ca9 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java @@ -30,8 +30,6 @@ import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.api.WebSocketListener; @@ -44,6 +42,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; @@ -150,7 +150,7 @@ public void testAbruptServerClose() throws Exception public static class ServerEndpoint implements WebSocketListener { - private static final Logger LOG = Log.getLogger(ClientCloseTest.ServerEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(ClientCloseTest.ServerEndpoint.class); private Session session; @Override @@ -175,7 +175,7 @@ public void onWebSocketText(String message) } catch (IOException e) { - LOG.warn(e); + LOG.warn("Failed to send string", e); } } @@ -195,7 +195,7 @@ public void onWebSocketError(Throwable cause) { if (LOG.isDebugEnabled()) { - LOG.debug(cause); + LOG.debug("ServerEndpoint error", cause); } } } diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java index 1d857ee5a2a5..5d3534fc585d 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java @@ -36,8 +36,6 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.BlockingArrayQueue; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Frame; import org.eclipse.jetty.websocket.api.MessageTooLargeException; import org.eclipse.jetty.websocket.api.Session; @@ -56,6 +54,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.nio.charset.StandardCharsets.UTF_8; import static java.time.Duration.ofSeconds; @@ -425,7 +425,7 @@ public void testWriteException() throws Exception public static class ServerEndpoint implements WebSocketFrameListener, WebSocketListener { - private static final Logger LOG = Log.getLogger(ServerEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(ServerEndpoint.class); private Session session; CountDownLatch block = new CountDownLatch(1); @@ -461,7 +461,7 @@ else if (message.equals("block")) } catch (Throwable t) { - LOG.debug(t); + LOG.debug("send text failure", t); throw new RuntimeException(t); } } @@ -514,7 +514,7 @@ else if (reason.equals("abort")) } catch (Throwable ignore) { - LOG.ignore(ignore); + LOG.trace("IGNORED", ignore); } } else if (reason.startsWith("sleep|")) @@ -528,7 +528,7 @@ else if (reason.startsWith("sleep|")) } catch (InterruptedException ignore) { - LOG.ignore(ignore); + LOG.trace("IGNORED", ignore); } } } diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java index c7f30583475e..1f15c7ebfeb0 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java @@ -21,16 +21,16 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.BatchMode; import org.eclipse.jetty.websocket.api.RemoteEndpoint; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.tests.util.FutureWriteCallback; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ClientWriteThread extends Thread { - private static final Logger LOG = Log.getLogger(ClientWriteThread.class); + private static final Logger LOG = LoggerFactory.getLogger(ClientWriteThread.class); private final Session session; private int slowness = -1; private int messageCount = 100; @@ -63,7 +63,7 @@ public void run() try { - LOG.debug("Writing {} messages to connection {}", messageCount); + LOG.debug("Writing {} messages to {}", messageCount, session); LOG.debug("Artificial Slowness {} ms", slowness); FutureWriteCallback lastMessage = null; RemoteEndpoint remote = session.getRemote(); @@ -87,7 +87,7 @@ public void run() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to write messages", e); } } diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java index 65986dc4c31d..4f3ffc2f4698 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java @@ -22,11 +22,11 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.WebSocketAdapter; import org.hamcrest.Matcher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -43,7 +43,7 @@ public abstract class AbstractCloseEndpoint extends WebSocketAdapter public AbstractCloseEndpoint() { - this.log = Log.getLogger(this.getClass().getName()); + this.log = LoggerFactory.getLogger(this.getClass().getName()); } @Override diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java index affc8e7a7acb..37d676bb02cc 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java @@ -23,16 +23,16 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; import org.eclipse.jetty.websocket.api.annotations.WebSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @WebSocket public class SlowServerEndpoint { - private static final Logger LOG = Log.getLogger(SlowServerEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(SlowServerEndpoint.class); @OnWebSocketMessage public void onMessage(Session session, String msg) @@ -55,7 +55,7 @@ public void onMessage(Session session, String msg) } catch (Throwable cause) { - LOG.warn(cause); + LOG.warn("failed to send text", cause); } } }); @@ -69,7 +69,7 @@ public void onMessage(Session session, String msg) } catch (IOException ignore) { - LOG.ignore(ignore); + LOG.trace("IGNORED", ignore); } } } diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java index 24467abd5bb4..204c6a1bcab9 100644 --- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java +++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java @@ -21,16 +21,16 @@ import java.util.concurrent.Future; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.WriteCallback; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Allows events to a {@link WriteCallback} to drive a {@link Future} for the user. */ public class FutureWriteCallback extends FutureCallback implements WriteCallback { - private static final Logger LOG = Log.getLogger(FutureWriteCallback.class); + private static final Logger LOG = LoggerFactory.getLogger(FutureWriteCallback.class); @Override public void writeFailed(Throwable cause) diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketMapping.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketMapping.java index cfe489215cc4..30bf8098e2ba 100644 --- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketMapping.java +++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketMapping.java @@ -34,8 +34,6 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.FrameHandler; @@ -44,6 +42,8 @@ import org.eclipse.jetty.websocket.core.server.Handshaker; import org.eclipse.jetty.websocket.core.server.Negotiation; import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; @@ -59,7 +59,7 @@ */ public class WebSocketMapping implements Dumpable, LifeCycle.Listener { - private static final Logger LOG = Log.getLogger(WebSocketMapping.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketMapping.class); public static WebSocketMapping getMapping(ServletContext servletContext, String mappingKey) { diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java index adfae0a629fa..6a3e00a84bf0 100644 --- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java +++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java @@ -29,11 +29,11 @@ import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract Servlet used to bridge the Servlet API to the WebSocket API. @@ -88,7 +88,7 @@ @SuppressWarnings("serial") public abstract class WebSocketServlet extends HttpServlet { - private static final Logger LOG = Log.getLogger(WebSocketServlet.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketServlet.class); private final CustomizedWebSocketServletFactory customizer = new CustomizedWebSocketServletFactory(); private WebSocketMapping mapping; diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketUpgradeFilter.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketUpgradeFilter.java index 148449fed04e..6829d6219a94 100644 --- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketUpgradeFilter.java +++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketUpgradeFilter.java @@ -38,10 +38,10 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; 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.websocket.core.Configuration; import org.eclipse.jetty.websocket.core.WebSocketComponents; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Inline Servlet Filter to capture WebSocket upgrade requests. @@ -73,7 +73,7 @@ @ManagedObject("WebSocket Upgrade Filter") public class WebSocketUpgradeFilter implements Filter, Dumpable { - private static final Logger LOG = Log.getLogger(WebSocketUpgradeFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(WebSocketUpgradeFilter.class); private static FilterHolder getFilter(ServletContext servletContext) { diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageInputStream.java b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageInputStream.java index 6b6528ee19e9..54ed65b55bdc 100644 --- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageInputStream.java +++ b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageInputStream.java @@ -29,9 +29,9 @@ import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Frame; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Support class for reading a WebSocket BINARY message via a InputStream. @@ -41,7 +41,7 @@ */ public class MessageInputStream extends InputStream implements MessageSink { - private static final Logger LOG = Log.getLogger(MessageInputStream.class); + private static final Logger LOG = LoggerFactory.getLogger(MessageInputStream.class); private static final Entry EOF = new Entry(BufferUtil.EMPTY_BUFFER, Callback.NOOP); private static final Entry CLOSED = new Entry(BufferUtil.EMPTY_BUFFER, Callback.NOOP); private final BlockingArrayQueue buffers = new BlockingArrayQueue<>(); diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageOutputStream.java b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageOutputStream.java index 8d60377d580d..389fd20eaf56 100644 --- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageOutputStream.java +++ b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageOutputStream.java @@ -26,18 +26,18 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Support for writing a single WebSocket BINARY message via a {@link OutputStream} */ public class MessageOutputStream extends OutputStream { - private static final Logger LOG = Log.getLogger(MessageOutputStream.class); + private static final Logger LOG = LoggerFactory.getLogger(MessageOutputStream.class); private final CoreSession coreSession; private final ByteBufferPool bufferPool; diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index be891ef3f1b6..c835bc526ccd 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -40,6 +40,12 @@ jetty-util ${project.version} + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java index 1445a23e7ea9..5ce72c1281f5 100644 --- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java +++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java @@ -60,9 +60,9 @@ import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; /** @@ -82,7 +82,7 @@ */ public class XmlConfiguration { - private static final Logger LOG = Log.getLogger(XmlConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(XmlConfiguration.class); private static final Class[] PRIMITIVES = { Boolean.TYPE, Character.TYPE, Byte.TYPE, Short.TYPE, Integer.TYPE, Long.TYPE, Float.TYPE, Double.TYPE, Void.TYPE @@ -219,7 +219,7 @@ public void setJettyStandardIdsAndProperties(Object server, Resource webapp) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to get webapp file reference", e); } } @@ -578,7 +578,7 @@ private void set(Object obj, XmlParser.Node node) throws Exception } catch (IllegalArgumentException | IllegalAccessException | NoSuchMethodException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); me.add(e); } @@ -593,7 +593,7 @@ private void set(Object obj, XmlParser.Node node) throws Exception } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException | NoSuchMethodException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); me.add(e); } @@ -630,7 +630,7 @@ private void set(Object obj, XmlParser.Node node) throws Exception } catch (NoSuchFieldException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); me.add(e); } @@ -654,7 +654,7 @@ private void set(Object obj, XmlParser.Node node) throws Exception } catch (IllegalArgumentException | IllegalAccessException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); me.add(e); } @@ -672,7 +672,7 @@ private void set(Object obj, XmlParser.Node node) throws Exception } catch (IllegalAccessException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); me.add(e); } } @@ -704,7 +704,7 @@ private void set(Object obj, XmlParser.Node node) throws Exception } catch (NoSuchMethodException | IllegalAccessException | InstantiationException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); me.add(e); } } @@ -947,7 +947,7 @@ private Object call(Class oClass, String methodName, Object obj, Args args) t } catch (IllegalAccessException | IllegalArgumentException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } @@ -1007,7 +1007,7 @@ private Object construct(Class klass, Args args) throws InvocationTargetExcep } catch (InstantiationException | IllegalAccessException | IllegalArgumentException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } throw new NoSuchMethodException(""); @@ -1861,7 +1861,7 @@ else if (arg.toLowerCase(Locale.ENGLISH).endsWith(".properties")) } catch (Error | Exception e) { - LOG.warn(e); + LOG.warn("Unable to execute XmlConfiguration", e); throw e; } } diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java index c492cb48f9b8..9d30e84faf79 100644 --- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java +++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java @@ -34,9 +34,9 @@ import javax.xml.parsers.SAXParserFactory; import org.eclipse.jetty.util.LazyList; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; @@ -54,7 +54,7 @@ */ public class XmlParser { - private static final Logger LOG = Log.getLogger(XmlParser.class); + private static final Logger LOG = LoggerFactory.getLogger(XmlParser.class); private Map _redirectMap = new HashMap(); private SAXParser _parser; @@ -99,7 +99,7 @@ public void setValidating(boolean validating) if (validating) LOG.warn("Schema validation may not be supported: ", e); else - LOG.ignore(e); + LOG.trace("IGNORED", e); } _parser.getXMLReader().setFeature("http://xml.org/sax/features/validation", validating); @@ -117,7 +117,7 @@ public void setValidating(boolean validating) } catch (Exception e) { - LOG.warn(Log.EXCEPTION, e); + LOG.warn("Unable to set validating on XML Parser", e); throw new Error(e.toString()); } } @@ -286,7 +286,7 @@ protected InputSource resolveEntity(String pid, String sid) } catch (IOException e) { - LOG.ignore(e); + LOG.trace("IGNORED", e); } } return null; @@ -425,7 +425,7 @@ public void characters(char[] buf, int offset, int len) throws SAXException @Override public void warning(SAXParseException ex) { - LOG.debug(Log.EXCEPTION, ex); + LOG.debug("SAX Parse Issue", ex); LOG.warn("WARNING@" + getLocationString(ex) + " : " + ex.toString()); } @@ -435,16 +435,16 @@ public void error(SAXParseException ex) throws SAXException // Save error and continue to report other errors if (_error == null) _error = ex; - LOG.debug(Log.EXCEPTION, ex); - LOG.warn("ERROR@" + getLocationString(ex) + " : " + ex.toString()); + LOG.debug("SAX Parse Issue", ex); + LOG.error("ERROR@" + getLocationString(ex) + " : " + ex.toString()); } @Override public void fatalError(SAXParseException ex) throws SAXException { _error = ex; - LOG.debug(Log.EXCEPTION, ex); - LOG.warn("FATAL@" + getLocationString(ex) + " : " + ex.toString()); + LOG.debug("SAX Parse Issue", ex); + LOG.error("FATAL@" + getLocationString(ex) + " : " + ex.toString()); throw ex; } diff --git a/logos/jetty-avatar.svg b/logos/jetty-avatar.svg index f667369af46f..3e7e3fd206d3 100644 --- a/logos/jetty-avatar.svg +++ b/logos/jetty-avatar.svg @@ -1,44 +1,11 @@ - - - - - + + + + - - - - - + + + + - - - - + + + + - true - oss.snapshots OSS Snapshots @@ -1589,29 +1579,4 @@ scp://build.eclipse.org:/home/data/httpd/download.eclipse.org/jetty/${project.version}/ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestConnection.java b/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestConnection.java index 047b4fe2e789..ed168ffb98f4 100644 --- a/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestConnection.java +++ b/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestConnection.java @@ -25,13 +25,16 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentLinkedQueue; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.thread.ExecutionStrategy.Producer; import org.eclipse.jetty.util.thread.Invocable; import org.openjdk.jmh.infra.Blackhole; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestConnection implements Producer { + private static final Logger LOG = LoggerFactory.getLogger(TestConnection.class); + private final TestServer _server; private final String _sessionid; private final boolean _sleeping; @@ -125,7 +128,7 @@ public void run() } catch (InterruptedException e) { - Log.getLogger(TestConnection.class).ignore(e); + LOG.trace("IGNORED", e); } } else diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 6a20341f837b..b12251953325 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -385,8 +385,6 @@ public void testWebAppWithProxyAndJPMS() throws Exception Path logFile = distribution.getJettyBase().resolve("resources").resolve("jetty-logging.properties"); try (BufferedWriter writer = Files.newBufferedWriter(logFile, StandardCharsets.UTF_8, StandardOpenOption.CREATE)) { - writer.write("org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog"); - writer.newLine(); writer.write("org.eclipse.jetty.LEVEL=INFO"); } diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 84d9d7de5b9c..0df91f68a13c 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -101,6 +101,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientLoadTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientLoadTest.java index 9d01af09eee6..8524afc7ffc3 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientLoadTest.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientLoadTest.java @@ -58,20 +58,20 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.LeakDetector; import org.eclipse.jetty.util.ProcessorUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.Scheduler; import org.hamcrest.Matchers; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; public class HttpClientLoadTest extends AbstractTest { - private final Logger logger = Log.getLogger(HttpClientLoadTest.class); + private final Logger logger = LoggerFactory.getLogger(HttpClientLoadTest.class); private final AtomicLong requestCount = new AtomicLong(); private final AtomicLong connectionLeaks = new AtomicLong(); diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientTest.java index a9d7279c1c9c..35872c0da3c4 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientTest.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientTest.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.io.InterruptedIOException; import java.util.List; -import java.util.Optional; import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ProxyWithDynamicTransportTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ProxyWithDynamicTransportTest.java index de0a19f82b97..7dbd499b0639 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ProxyWithDynamicTransportTest.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ProxyWithDynamicTransportTest.java @@ -78,8 +78,6 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FuturePromise; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.hamcrest.Matchers; @@ -88,6 +86,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -95,7 +95,7 @@ public class ProxyWithDynamicTransportTest { - private static final Logger LOG = Log.getLogger(ProxyWithDynamicTransportTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ProxyWithDynamicTransportTest.class); private Server server; private ServerConnector serverConnector; diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportScenario.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportScenario.java index 14b066508253..da381546d1c1 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportScenario.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportScenario.java @@ -62,18 +62,18 @@ import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.SocketAddressResolver; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.Assumptions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.eclipse.jetty.http.client.Transport.UNIX_SOCKET; import static org.junit.jupiter.api.Assumptions.assumeTrue; public class TransportScenario { - private static final Logger LOG = Log.getLogger(TransportScenario.class); + private static final Logger LOG = LoggerFactory.getLogger(TransportScenario.class); protected final HttpConfiguration httpConfig = new HttpConfiguration(); protected final Transport transport; @@ -391,7 +391,7 @@ public void stop() } catch (Exception x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } try @@ -400,7 +400,7 @@ public void stop() } catch (Exception x) { - LOG.ignore(x); + LOG.trace("IGNORED", x); } if (sockFile != null) @@ -411,7 +411,7 @@ public void stop() } catch (IOException e) { - LOG.warn(e); + LOG.warn("Unable to delete sockFile: {}", sockFile, e); } } } diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index e716552fb150..9537a2bb6ae7 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -105,6 +105,12 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/FailedSelectorTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/FailedSelectorTest.java index 685b940ec00f..f31db9e212fc 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/FailedSelectorTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/FailedSelectorTest.java @@ -55,13 +55,13 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.Scheduler; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -70,7 +70,7 @@ public class FailedSelectorTest { - private static final Logger LOG = Log.getLogger(FailedSelectorTest.class); + private static final Logger LOG = LoggerFactory.getLogger(FailedSelectorTest.class); private HttpClient client; private Server server; private StacklessLogging stacklessManagedSelector; @@ -306,7 +306,7 @@ protected void onSelectFailed(Throwable cause) private static class RestartSelectorTask implements Consumer { - private static final Logger LOG = Log.getLogger(RestartSelectorTask.class); + private static final Logger LOG = LoggerFactory.getLogger(RestartSelectorTask.class); private final CountDownLatch latch; public RestartSelectorTask(CountDownLatch latch) @@ -324,7 +324,7 @@ public void accept(CustomManagedSelector customManagedSelector) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to restart selector: {}", customManagedSelector, e); } finally { @@ -335,7 +335,7 @@ public void accept(CustomManagedSelector customManagedSelector) private static class RestartServerTask implements Consumer { - private static final Logger LOG = Log.getLogger(RestartServerTask.class); + private static final Logger LOG = LoggerFactory.getLogger(RestartServerTask.class); private final Server server; private final CountDownLatch latch; @@ -355,7 +355,7 @@ public void accept(CustomManagedSelector customManagedSelector) } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to restart server {}", server, e); } finally { @@ -366,7 +366,7 @@ public void accept(CustomManagedSelector customManagedSelector) private static class ForceCloseSelectorTask implements Runnable { - private static final Logger LOG = Log.getLogger(ForceCloseSelectorTask.class); + private static final Logger LOG = LoggerFactory.getLogger(ForceCloseSelectorTask.class); private final ServerConnector connector; public ForceCloseSelectorTask(ServerConnector connector) diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithAliasesTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithAliasesTest.java index f345ad2b742c..1c3422f3b7cb 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithAliasesTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithAliasesTest.java @@ -35,13 +35,13 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -54,7 +54,7 @@ */ public class JspAndDefaultWithAliasesTest { - private static final Logger LOG = Log.getLogger(JspAndDefaultWithAliasesTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JspAndDefaultWithAliasesTest.class); private static Server server; private static URI serverURI; diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java index 93486567cdf5..6bef5cd697cc 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java @@ -35,11 +35,11 @@ import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -50,7 +50,7 @@ */ public class XmlBasedJettyServer { - private static final Logger LOG = Log.getLogger(XmlBasedJettyServer.class); + private static final Logger LOG = LoggerFactory.getLogger(XmlBasedJettyServer.class); private List _xmlConfigurations; private final Map _properties = new HashMap<>(); private Server _server; diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpsSocketImpl.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpsSocketImpl.java index 85422c7a3348..806f986d4321 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpsSocketImpl.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpsSocketImpl.java @@ -29,16 +29,16 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An HTTPS Socket Impl */ public class HttpsSocketImpl implements HttpSocket { - private static final Logger LOG = Log.getLogger(HttpsSocketImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpsSocketImpl.class); private SSLContext sslContext; private SSLSocketFactory sslfactory; diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxSimpleEchoSocket.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxSimpleEchoSocket.java index f9457fb7baca..a0b66e578ef2 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxSimpleEchoSocket.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxSimpleEchoSocket.java @@ -27,8 +27,8 @@ import javax.websocket.OnOpen; import javax.websocket.Session; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.fail; @@ -36,7 +36,7 @@ subprotocols = {"chat"}) public class JavaxSimpleEchoSocket { - private static final Logger LOG = Log.getLogger(JavaxSimpleEchoSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaxSimpleEchoSocket.class); private Session session; public CountDownLatch messageLatch = new CountDownLatch(1); public CountDownLatch closeLatch = new CountDownLatch(1); @@ -44,7 +44,7 @@ public class JavaxSimpleEchoSocket @OnError public void onError(Throwable t) { - LOG.warn(t); + LOG.warn("Error", t); fail(t.getMessage()); } diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JettySimpleEchoSocket.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JettySimpleEchoSocket.java index 427d7694a68c..6daebda51f0d 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JettySimpleEchoSocket.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JettySimpleEchoSocket.java @@ -21,14 +21,14 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; import org.eclipse.jetty.websocket.api.annotations.WebSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Basic Echo Client Socket @@ -36,7 +36,7 @@ @WebSocket(maxTextMessageSize = 64 * 1024) public class JettySimpleEchoSocket { - private static final Logger LOG = Log.getLogger(JettySimpleEchoSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(JettySimpleEchoSocket.class); private final CountDownLatch closeLatch; @SuppressWarnings("unused") private Session session; @@ -71,7 +71,7 @@ public void onConnect(Session session) } catch (Throwable t) { - LOG.warn(t); + LOG.warn("Unable to send string+close", t); } } diff --git a/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/CommonComponent.java b/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/CommonComponent.java index 8dd329ed2fb3..089fb638821c 100644 --- a/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/CommonComponent.java +++ b/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/CommonComponent.java @@ -21,13 +21,13 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ManagedObject("A common component available in the webapp") public class CommonComponent extends AbstractLifeCycle { - private static final Logger LOG = Log.getLogger(CommonComponent.class); + private static final Logger LOG = LoggerFactory.getLogger(CommonComponent.class); public CommonComponent() { diff --git a/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/MyContainerInitializer.java b/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/MyContainerInitializer.java index 4a84b02c9246..3cc7a92409f9 100644 --- a/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/MyContainerInitializer.java +++ b/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/MyContainerInitializer.java @@ -23,12 +23,12 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MyContainerInitializer implements ServletContainerInitializer { - private static final Logger LOG = Log.getLogger(MyContainerInitializer.class); + private static final Logger LOG = LoggerFactory.getLogger(MyContainerInitializer.class); @Override public void onStartup(Set> c, ServletContext ctx) throws ServletException diff --git a/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/PingServlet.java b/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/PingServlet.java index f845866ea5cd..db36fe437849 100644 --- a/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/PingServlet.java +++ b/tests/test-jmx/jmx-webapp/src/main/java/org/eclipse/jetty/test/jmx/PingServlet.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Simple ping into this webapp to see if it is here. @@ -38,7 +38,7 @@ @ManagedObject("Ping Servlet") public class PingServlet extends HttpServlet { - private static final Logger LOG = Log.getLogger(PingServlet.class); + private static final Logger LOG = LoggerFactory.getLogger(PingServlet.class); @Override public void init(ServletConfig config) throws ServletException diff --git a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureJNDIWar.java b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureJNDIWar.java index 6089cc387d04..ec7001ba6d7b 100644 --- a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureJNDIWar.java +++ b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureJNDIWar.java @@ -23,13 +23,13 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PreconfigureJNDIWar { private static final long __start = System.nanoTime(); - private static final Logger LOG = Log.getLogger(Server.class); + private static final Logger LOG = LoggerFactory.getLogger(Server.class); public static void main(String[] args) throws Exception { diff --git a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureSpecWar.java b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureSpecWar.java index e2aec048514c..654e81a0497f 100644 --- a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureSpecWar.java +++ b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureSpecWar.java @@ -26,13 +26,13 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PreconfigureSpecWar { private static final long __start = System.nanoTime(); - private static final Logger LOG = Log.getLogger(Server.class); + private static final Logger LOG = LoggerFactory.getLogger(Server.class); public static void main(String[] args) throws Exception { diff --git a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureStandardTestWar.java b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureStandardTestWar.java index a54658626f1e..9d0bfce50afc 100644 --- a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureStandardTestWar.java +++ b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/PreconfigureStandardTestWar.java @@ -23,9 +23,9 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * PreconfigureStandardTestWar @@ -33,7 +33,7 @@ public class PreconfigureStandardTestWar { private static final long __start = System.nanoTime(); - private static final Logger LOG = Log.getLogger(Server.class); + private static final Logger LOG = LoggerFactory.getLogger(Server.class); public static void main(String[] args) throws Exception { diff --git a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/QuickStartTest.java b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/QuickStartTest.java index 93ce194b9da4..6c09ede8afbb 100644 --- a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/QuickStartTest.java +++ b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/QuickStartTest.java @@ -31,7 +31,6 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.WebAppContext; @@ -55,7 +54,7 @@ public void testStandardTestWar() throws Exception PreconfigureStandardTestWar.main(new String[]{}); WebDescriptor descriptor = new WebDescriptor(Resource.newResource("./target/test-standard-preconfigured/WEB-INF/quickstart-web.xml")); - descriptor.parse(WebDescriptor.getParser(!Log.getLogger(QuickStartGeneratorConfiguration.class).isDebugEnabled())); + descriptor.parse(WebDescriptor.getParser(!QuickStartGeneratorConfiguration.LOG.isDebugEnabled())); Node node = descriptor.getRoot(); assertThat(node, Matchers.notNullValue()); @@ -71,9 +70,9 @@ public void testStandardTestWar() throws Exception WebAppContext webapp = new WebAppContext(); webapp.addConfiguration(new QuickStartConfiguration(), - new EnvConfiguration(), - new PlusConfiguration(), - new AnnotationConfiguration()); + new EnvConfiguration(), + new PlusConfiguration(), + new AnnotationConfiguration()); webapp.setAttribute(QuickStartConfiguration.MODE, QuickStartConfiguration.Mode.QUICKSTART); webapp.setWar(war); webapp.setContextPath("/"); @@ -108,7 +107,7 @@ public void testSpecWar() throws Exception assertTrue(Files.exists(webXmlPath), "Path should exist:" + webXmlPath); WebDescriptor descriptor = new WebDescriptor(new PathResource(webXmlPath)); - descriptor.parse(WebDescriptor.getParser(!Log.getLogger(QuickStartGeneratorConfiguration.class).isDebugEnabled())); + descriptor.parse(WebDescriptor.getParser(!QuickStartGeneratorConfiguration.LOG.isDebugEnabled())); Node node = descriptor.getRoot(); assertThat(node, Matchers.notNullValue()); @@ -124,9 +123,9 @@ public void testSpecWar() throws Exception WebAppContext webapp = new WebAppContext(); webapp.addConfiguration(new QuickStartConfiguration(), - new EnvConfiguration(), - new PlusConfiguration(), - new AnnotationConfiguration()); + new EnvConfiguration(), + new PlusConfiguration(), + new AnnotationConfiguration()); webapp.setAttribute(QuickStartConfiguration.MODE, QuickStartConfiguration.Mode.QUICKSTART); webapp.setWar(war); webapp.setContextPath("/"); @@ -158,7 +157,7 @@ public void testJNDIWar() throws Exception PreconfigureJNDIWar.main(new String[]{}); WebDescriptor descriptor = new WebDescriptor(Resource.newResource("./target/test-jndi-preconfigured/WEB-INF/quickstart-web.xml")); - descriptor.parse(WebDescriptor.getParser(!Log.getLogger(QuickStartGeneratorConfiguration.class).isDebugEnabled())); + descriptor.parse(WebDescriptor.getParser(!QuickStartGeneratorConfiguration.LOG.isDebugEnabled())); Node node = descriptor.getRoot(); assertThat(node, Matchers.notNullValue()); @@ -174,9 +173,9 @@ public void testJNDIWar() throws Exception WebAppContext webapp = new WebAppContext(); webapp.addConfiguration(new QuickStartConfiguration(), - new EnvConfiguration(), - new PlusConfiguration(), - new AnnotationConfiguration()); + new EnvConfiguration(), + new PlusConfiguration(), + new AnnotationConfiguration()); webapp.setAttribute(QuickStartConfiguration.MODE, QuickStartConfiguration.Mode.QUICKSTART); webapp.setWar(war); webapp.setContextPath("/"); diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties index 07faa86dbce0..c2be11c689ac 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties @@ -1 +1 @@ -org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog \ No newline at end of file +org.eclipse.jetty.LEVEL=INFO \ No newline at end of file diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index a07a9b80ba44..c2c2e8007f37 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -45,6 +45,10 @@ test-sessions-common ${project.version} + + org.slf4j + slf4j-api + org.apache.derby derby @@ -55,6 +59,12 @@ derbytools test + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java index 8f58af33d80a..28c0ebe0ca57 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java @@ -32,8 +32,8 @@ import com.mongodb.WriteConcern; import org.eclipse.jetty.server.session.SessionData; import org.eclipse.jetty.util.ClassLoadingObjectInputStream; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -44,7 +44,7 @@ */ public class MongoTestHelper { - private static final Logger LOG = Log.getLogger(MongoTestHelper.class); + private static final Logger LOG = LoggerFactory.getLogger(MongoTestHelper.class); public static final String DB_NAME = "HttpSessions"; public static final String COLLECTION_NAME = "testsessions"; diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index a423ae8630a5..906c26ddeb89 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -29,6 +29,11 @@ jetty-client ${project.version} + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/AbstractSessionCacheTest.java b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/AbstractSessionCacheTest.java index 31704601f437..d67ca6785ffb 100644 --- a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/AbstractSessionCacheTest.java +++ b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/AbstractSessionCacheTest.java @@ -41,8 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** - * Base class for all tests on all flavours of SessionCache - * + * Base class for all tests on all flavours of SessionCache */ public abstract class AbstractSessionCacheTest { diff --git a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DuplicateCookieTest.java b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DuplicateCookieTest.java index ff4d3f1b5f8d..a254d2fe3cd3 100644 --- a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DuplicateCookieTest.java +++ b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DuplicateCookieTest.java @@ -49,7 +49,7 @@ public void testMultipleSessionCookiesOnlyOneExists() throws Exception String contextPath = ""; String servletMapping = "/server"; HttpClient client = null; - + DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index f26a2c4c3063..dbe6348563ab 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -134,6 +134,14 @@ + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + org.eclipse.jetty jetty-servlets diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java index f00f4164ece9..3ab0374ddcf6 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java @@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // Simple asynchronous Chat room. // This does not handle duplicate usernames or multiple frames/tabs from the same browser @@ -41,7 +41,7 @@ @SuppressWarnings("serial") public class ChatServlet extends HttpServlet { - private static final Logger LOG = Log.getLogger(ChatServlet.class); + private static final Logger LOG = LoggerFactory.getLogger(ChatServlet.class); private long asyncTimeout = 10000; diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java index 29fa75c43b3e..cda240ce815b 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java @@ -56,7 +56,7 @@ import javax.servlet.http.HttpServletResponseWrapper; import javax.servlet.http.Part; -import org.eclipse.jetty.util.log.Log; +import org.slf4j.LoggerFactory; /** * Dump Servlet Request. @@ -346,12 +346,12 @@ public void run() } catch (IOException e2) { - Log.getLogger(Dump.class).ignore(e2); + LoggerFactory.getLogger(Dump.class).trace("IGNORED", e2); } } catch (IOException e) { - Log.getLogger(Dump.class).ignore(e); + LoggerFactory.getLogger(Dump.class).trace("IGNORED", e); } return; } diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java index d822b22a7a7d..326568a74737 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java @@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Dump Servlet Request. @@ -41,7 +41,7 @@ @SuppressWarnings("serial") public class SecureModeServlet extends HttpServlet { - private static final Logger LOG = Log.getLogger(SecureModeServlet.class); + private static final Logger LOG = LoggerFactory.getLogger(SecureModeServlet.class); @Override public void init(ServletConfig config) throws ServletException diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java index cb215dbad7da..4aa03d552350 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java @@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * TestFilter. @@ -44,7 +44,7 @@ */ public class TestFilter implements Filter { - private static final Logger LOG = Log.getLogger(TestFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(TestFilter.class); private boolean _remote; private ServletContext _context; diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java index 30b8d52bde0f..31b249b63406 100644 --- a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java +++ b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java @@ -47,18 +47,18 @@ import org.eclipse.jetty.server.handler.ResourceHandler; import org.eclipse.jetty.server.session.DefaultSessionCache; import org.eclipse.jetty.server.session.FileSessionDataStore; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.webapp.Configurations; import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppContext; import org.junit.jupiter.api.Disabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Disabled("Not a test case") public class TestServer { - private static final Logger LOG = Log.getLogger(TestServer.class); + private static final Logger LOG = LoggerFactory.getLogger(TestServer.class); public static void main(String[] args) throws Exception { @@ -81,7 +81,6 @@ public static void main(String[] args) throws Exception // Setup JMX MBeanContainer mbContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer()); server.addBean(mbContainer); - server.addBean(Log.getLog()); // Common HTTP configuration HttpConfiguration config = new HttpConfiguration(); @@ -181,7 +180,7 @@ public void run() } catch (Exception e) { - LOG.warn(e); + LOG.warn("Unable to restart server", e); } } }.start(); diff --git a/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java b/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java index 697941589c9f..1bd261c11112 100644 --- a/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java +++ b/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java @@ -35,7 +35,6 @@ import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.webapp.WebAppContext; @@ -59,7 +58,6 @@ public static void main(String[] args) throws Exception // Setup JMX MBeanContainer mbContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer()); server.addBean(mbContainer); - server.addBean(Log.getLog()); // Common HTTP configuration HttpConfiguration httpConfig = new HttpConfiguration(); diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 4a0126dbd582..d75a82a5097d 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -3,11 +3,15 @@ - The test-spec webapp is deployed. DO NOT USE IN PRODUCTION! + + The test-spec webapp is deployed. DO NOT USE IN PRODUCTION! + + - + + org.eclipse.jetty + + WEB-INF/lib/jetty-util.jar logging used! + + diff --git a/tests/test-webapps/test-webapp-rfc2616/src/main/webapp/WEB-INF/web.xml b/tests/test-webapps/test-webapp-rfc2616/src/main/webapp/WEB-INF/web.xml index 068597763817..92ead9c5ce0a 100644 --- a/tests/test-webapps/test-webapp-rfc2616/src/main/webapp/WEB-INF/web.xml +++ b/tests/test-webapps/test-webapp-rfc2616/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,5 @@ - + rfc2616-webapp diff --git a/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnCloseServerEndpoint.java b/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnCloseServerEndpoint.java index d0353e8a9de1..11467a865f4f 100644 --- a/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnCloseServerEndpoint.java +++ b/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnCloseServerEndpoint.java @@ -19,20 +19,19 @@ package org.eclipse.jetty.tests.webapp.websocket; import java.io.IOException; - import javax.websocket.OnClose; import javax.websocket.OnError; import javax.websocket.OnMessage; import javax.websocket.Session; import javax.websocket.server.ServerEndpoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/onclose/{arg}") public class OnCloseServerEndpoint { - private static final Logger LOGGER = Log.getLogger(OnCloseServerEndpoint.class); + private static final Logger LOGGER = LoggerFactory.getLogger(OnCloseServerEndpoint.class); private static String close = ""; @OnMessage diff --git a/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnOpenServerEndpoint.java b/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnOpenServerEndpoint.java index b69f62a0abd3..32b79f14a67b 100644 --- a/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnOpenServerEndpoint.java +++ b/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnOpenServerEndpoint.java @@ -19,20 +19,19 @@ package org.eclipse.jetty.tests.webapp.websocket; import java.io.IOException; - import javax.websocket.OnError; import javax.websocket.OnMessage; import javax.websocket.OnOpen; import javax.websocket.Session; import javax.websocket.server.ServerEndpoint; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ServerEndpoint("/onopen/{arg}") public class OnOpenServerEndpoint { - private static final Logger LOGGER = Log.getLogger(OnOpenServerEndpoint.class); + private static final Logger LOGGER = LoggerFactory.getLogger(OnOpenServerEndpoint.class); private static String open = ""; @OnMessage