diff --git a/README.TXT b/README.TXT index 12c781192c9..9157b3eaa56 100644 --- a/README.TXT +++ b/README.TXT @@ -1,6 +1,5 @@ This is a source checkout of the Jetty webserver. - To build, use: mvn clean install diff --git a/VERSION.txt b/VERSION.txt index 3659df3faa5..e1b0835f12b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-9.2.2-SNAPSHOT + jetty-9.2.1.v20140609 - 09 June 2014 + 347110 Supprt ClassFileTransormers in WebAppClassLoader + 432192 jetty-start / Allow JETTY_LOGS use for start-log-file diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java index bd0540fe6ea..482194f351a 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java @@ -29,6 +29,7 @@ public class SimplestServer { Server server = new Server(8080); server.start(); + server.dumpStdErr(); server.join(); } } diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml b/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml index 293de040bca..5d2ac7ae2c2 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml +++ b/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml @@ -3,14 +3,17 @@ - - spdy/3 - spdy/2 - http/1.1 - + + spdy/3 + spdy/2 + http/1.1 + - + http/1.1 + + + diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_65.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_65.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_65.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_11.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_11.mod new file mode 100644 index 00000000000..65e6cb3c4db --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_11.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar 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 509682eb647..e3223c423b2 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 @@ -62,7 +62,8 @@ public class ALPNServerConnection extends NegotiatingServerConnection implements { negotiated = getDefaultProtocol(); } - LOG.debug("{} protocol selected {}", this, negotiated); + if (LOG.isDebugEnabled()) + LOG.debug("{} protocol selected {}", this, negotiated); setProtocol(negotiated); ALPN.remove(getSSLEngine()); return negotiated; 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 4845caaa591..8b8d7e28df1 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 @@ -36,7 +36,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; - import javax.servlet.ServletContainerInitializer; import javax.servlet.annotation.HandlesTypes; @@ -442,14 +441,14 @@ public class AnnotationConfiguration extends AbstractConfiguration // Resolve container initializers List initializers = - (List)context.getAttribute(AnnotationConfiguration.CONTAINER_INITIALIZERS); + (List)context.getAttribute(AnnotationConfiguration.CONTAINER_INITIALIZERS); if (initializers != null && initializers.size()>0) { Map> map = ( Map>) context.getAttribute(AnnotationConfiguration.CLASS_INHERITANCE_MAP); if (map == null) LOG.warn ("ServletContainerInitializers: detected. Class hierarchy: empty"); for (ContainerInitializer i : initializers) - i.resolveClasses(context,map); + i.resolveClasses(context,map); } } @@ -557,16 +556,16 @@ public class AnnotationConfiguration extends AbstractConfiguration boolean timeout = !latch.await(getMaxScanWait(context), TimeUnit.SECONDS); if (LOG.isDebugEnabled()) - { + { for (ParserTask p:_parserTasks) LOG.debug("Scanned {} in {}ms", p.getResource(), TimeUnit.MILLISECONDS.convert(p.getStatistic().getElapsed(), TimeUnit.NANOSECONDS)); + + LOG.debug("Scanned {} container path jars, {} WEB-INF/lib jars, {} WEB-INF/classes dirs in {}ms for context {}", + _containerPathStats.getTotal(), _webInfLibStats.getTotal(), _webInfClassesStats.getTotal(), + (TimeUnit.MILLISECONDS.convert(System.nanoTime()-start, TimeUnit.NANOSECONDS)), + context); } - - LOG.debug("Scanned {} container path jars, {} WEB-INF/lib jars, {} WEB-INF/classes dirs in {}ms for context {}", - _containerPathStats.getTotal(), _webInfLibStats.getTotal(), _webInfClassesStats.getTotal(), - (TimeUnit.MILLISECONDS.convert(System.nanoTime()-start, TimeUnit.NANOSECONDS)), - context); - + if (timeout) me.add(new Exception("Timeout scanning annotations")); me.ifExceptionThrow(); 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 2ebaa9623a1..387c6f9e368 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 @@ -19,12 +19,8 @@ package org.eclipse.jetty.annotations; import java.util.List; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - import org.eclipse.jetty.plus.annotation.ContainerInitializer; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.util.ConcurrentHashSet; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; 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 743826793a4..8020101faa2 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 @@ -35,7 +35,6 @@ 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.Origin; import org.eclipse.jetty.webapp.WebAppContext; /** 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 f6eabb6a3b6..306565ed2b9 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 @@ -86,7 +86,8 @@ public abstract class AuthenticationProtocolHandler implements ProtocolHandler if (result.isFailed()) { Throwable failure = result.getFailure(); - LOG.debug("Authentication challenge failed {}", failure); + if (LOG.isDebugEnabled()) + LOG.debug("Authentication challenge failed {}", failure); forwardFailureComplete(request, result.getRequestFailure(), response, result.getResponseFailure()); return; } @@ -95,7 +96,8 @@ public abstract class AuthenticationProtocolHandler implements ProtocolHandler if (conversation.getAttribute(AUTHENTICATION_ATTRIBUTE) != null) { // We have already tried to authenticate, but we failed again - LOG.debug("Bad credentials for {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Bad credentials for {}", request); forwardSuccessComplete(request, response); return; } @@ -104,7 +106,8 @@ public abstract class AuthenticationProtocolHandler implements ProtocolHandler List headerInfos = parseAuthenticateHeader(response, header); if (headerInfos.isEmpty()) { - LOG.debug("Authentication challenge without {} header", header); + if (LOG.isDebugEnabled()) + LOG.debug("Authentication challenge without {} header", header); forwardFailureComplete(request, null, response, new HttpResponseException("HTTP protocol violation: Authentication challenge without " + header + " header", response)); return; } @@ -126,13 +129,15 @@ public abstract class AuthenticationProtocolHandler implements ProtocolHandler } if (authentication == null) { - LOG.debug("No authentication available for {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("No authentication available for {}", request); forwardSuccessComplete(request, response); return; } final Authentication.Result authnResult = authentication.authenticate(request, response, headerInfo, conversation); - LOG.debug("Authentication result {}", authnResult); + if (LOG.isDebugEnabled()) + LOG.debug("Authentication result {}", authnResult); if (authnResult == null) { forwardSuccessComplete(request, response); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java index 627228b3e38..53fe5ae2e01 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java @@ -81,21 +81,24 @@ public class ConnectionPool implements Closeable, Dumpable if (next > maxConnections) { - LOG.debug("Max connections {}/{} reached", current, maxConnections); + if (LOG.isDebugEnabled()) + LOG.debug("Max connections {}/{} reached", current, maxConnections); // Try again the idle connections return acquireIdleConnection(); } if (connectionCount.compareAndSet(current, next)) { - LOG.debug("Connection {}/{} creation", next, maxConnections); + if (LOG.isDebugEnabled()) + LOG.debug("Connection {}/{} creation", next, maxConnections); destination.newConnection(new Promise() { @Override public void succeeded(Connection connection) { - LOG.debug("Connection {}/{} creation succeeded {}", next, maxConnections, connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection {}/{} creation succeeded {}", next, maxConnections, connection); if (activate(connection)) connectionPromise.succeeded(connection); } @@ -103,7 +106,8 @@ public class ConnectionPool implements Closeable, Dumpable @Override public void failed(Throwable x) { - LOG.debug("Connection " + next + "/" + maxConnections + " creation failed", x); + if (LOG.isDebugEnabled()) + LOG.debug("Connection " + next + "/" + maxConnections + " creation failed", x); connectionCount.decrementAndGet(); connectionPromise.failed(x); } @@ -127,13 +131,15 @@ public class ConnectionPool implements Closeable, Dumpable { if (activeConnections.offer(connection)) { - LOG.debug("Connection active {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection active {}", connection); acquired(connection); return true; } else { - LOG.debug("Connection active overflow {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection active overflow {}", connection); connection.close(); return false; } @@ -151,12 +157,14 @@ public class ConnectionPool implements Closeable, Dumpable // Make sure we use "hot" connections first if (idleConnections.offerFirst(connection)) { - LOG.debug("Connection idle {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection idle {}", connection); return true; } else { - LOG.debug("Connection idle overflow {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection idle overflow {}", connection); connection.close(); } } @@ -177,7 +185,8 @@ public class ConnectionPool implements Closeable, Dumpable if (removed) { int pooled = connectionCount.decrementAndGet(); - LOG.debug("Connection removed {} - pooled: {}", connection, pooled); + if (LOG.isDebugEnabled()) + LOG.debug("Connection removed {} - pooled: {}", connection, pooled); } return removed; } @@ -227,6 +236,11 @@ public class ConnectionPool implements Closeable, Dumpable @Override public String toString() { - return String.format("%s %d/%d", getClass().getSimpleName(), connectionCount.get(), maxConnections); + return String.format("%s[c=%d/%d,a=%d,i=%d]", + getClass().getSimpleName(), + connectionCount.get(), + maxConnections, + activeConnections.size(), + idleConnections.size()); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java b/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java index ab8f2a40b5f..6a7d6fa8ac0 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java @@ -251,7 +251,7 @@ public class GZIPContentDecoder implements ContentDecoder else { // Accumulate inflated bytes and loop to see if we have finished - byte[] newOutput = Arrays.copyOf(output, output.length+decoded); + byte[] newOutput = Arrays.copyOf(output, output.length + decoded); System.arraycopy(bytes, 0, newOutput, output.length, decoded); output = newOutput; } 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 f4ee52bf144..3e6c31c0d80 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 @@ -46,7 +46,8 @@ public abstract class HttpChannel if (this.exchange.compareAndSet(null, exchange)) { exchange.associate(this); - LOG.debug("{} associated to {}", exchange, this); + if (LOG.isDebugEnabled()) + LOG.debug("{} associated to {}", exchange, this); } else { @@ -59,7 +60,8 @@ public abstract class HttpChannel HttpExchange exchange = this.exchange.getAndSet(null); if (exchange != null) exchange.disassociate(this); - LOG.debug("{} disassociated from {}", exchange, this); + if (LOG.isDebugEnabled()) + LOG.debug("{} disassociated from {}", exchange, this); return exchange; } 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 3486c811039..646c36122d9 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 @@ -24,7 +24,6 @@ import java.net.CookiePolicy; import java.net.CookieStore; import java.net.SocketAddress; import java.net.URI; -import java.nio.channels.SocketChannel; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -480,9 +479,14 @@ public class HttpClient extends ContainerLifeCycle { HttpDestination existing = destinations.putIfAbsent(origin, destination); if (existing != null) + { destination = existing; + } else - LOG.debug("Created {}", destination); + { + if (LOG.isDebugEnabled()) + LOG.debug("Created {}", destination); + } if (!isRunning()) destinations.remove(origin); } 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 37476d7f6bd..598d11e133f 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 @@ -24,7 +24,6 @@ import java.util.Collections; import java.util.Iterator; import org.eclipse.jetty.client.api.ContentProvider; -import org.eclipse.jetty.client.util.DeferredContentProvider; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; @@ -130,7 +129,8 @@ public class HttpContent implements Callback, Closeable if (content != AFTER) { content = buffer = AFTER; - LOG.debug("Advanced content past last chunk"); + if (LOG.isDebugEnabled()) + LOG.debug("Advanced content past last chunk"); } return false; } 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 cc83372c437..20bbb12ab5a 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 @@ -175,14 +175,16 @@ public abstract class HttpDestination implements Destination, Closeable, Dumpabl } else { - LOG.debug("Queued {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Queued {} for {}", request, this); requestNotifier.notifyQueued(request); send(); } } else { - LOG.debug("Max queue size {} exceeded by {}", client.getMaxRequestsQueuedPerDestination(), request); + if (LOG.isDebugEnabled()) + LOG.debug("Max queue size {} exceeded by {} for {}", client.getMaxRequestsQueuedPerDestination(), request, this); request.abort(new RejectedExecutionException("Max requests per destination " + client.getMaxRequestsQueuedPerDestination() + " exceeded for " + this)); } } @@ -212,7 +214,8 @@ public abstract class HttpDestination implements Destination, Closeable, Dumpabl public void close() { abort(new AsynchronousCloseException()); - LOG.debug("Closed {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Closed {}", this); } public void release(Connection connection) @@ -256,9 +259,10 @@ public abstract class HttpDestination implements Destination, Closeable, Dumpabl @Override public String toString() { - return String.format("%s(%s)%s", + return String.format("%s[%s]%s,queue=%d", HttpDestination.class.getSimpleName(), asString(), - proxy == null ? "" : " via " + proxy); + proxy == null ? "" : "(via " + proxy + ")", + exchanges.size()); } } 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 704c9c3ccef..a7fde41be98 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 @@ -151,7 +151,8 @@ public class HttpExchange if ((current & terminated) == terminated) { // Request and response terminated - LOG.debug("{} terminated", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} terminated", this); return new Result(getRequest(), getRequestFailure(), getResponse(), getResponseFailure()); } return null; @@ -174,7 +175,8 @@ public class HttpExchange requestFailure = failure; if ((code & 0b0100) == 0b0100) responseFailure = failure; - LOG.debug("{} updated", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} updated", this); } break; } @@ -185,7 +187,8 @@ public class HttpExchange { if (destination.remove(this)) { - LOG.debug("Aborting while queued {}: {}", this, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Aborting while queued {}: {}", this, cause); return fail(cause); } else @@ -195,7 +198,8 @@ public class HttpExchange return fail(cause); boolean aborted = channel.abort(cause); - LOG.debug("Aborted while active ({}) {}: {}", aborted, this, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Aborted while active ({}) {}: {}", aborted, this, cause); return aborted; } } @@ -204,7 +208,8 @@ public class HttpExchange { if (update(0b0101, cause) == 0b0101) { - LOG.debug("Failing {}: {}", this, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Failing {}: {}", this, cause); destination.getRequestNotifier().notifyFailure(request, cause); List listeners = getConversation().getResponseListeners(); ResponseNotifier responseNotifier = destination.getResponseNotifier(); 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 0faf25e9ea2..5c3ac764fa0 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 @@ -186,7 +186,8 @@ public class HttpProxy extends ProxyConfiguration.Proxy // Avoid setting fill interest in the old Connection, // without closing the underlying EndPoint. oldConnection.softClose(); - LOG.debug("HTTP tunnel established: {} over {}", oldConnection, newConnection); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP tunnel established: {} over {}", oldConnection, newConnection); } catch (Throwable x) { 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 becab10b57a..4b8546594cd 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 @@ -21,6 +21,7 @@ package org.eclipse.jetty.client; import java.io.IOException; import java.net.URI; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -49,9 +50,8 @@ import org.eclipse.jetty.util.log.Logger; * is available *
  • {@link #responseHeader(HttpExchange, HttpField)}, when a HTTP field is available
    • *
  • {@link #responseHeaders(HttpExchange)}, when all HTTP headers are available
    • - *
  • {@link #responseContent(HttpExchange, ByteBuffer, Callback)}, when HTTP content is available; this is the only - * method that may be invoked multiple times with different buffers containing different content
    • - *
  • {@link #responseSuccess(HttpExchange)}, when the response is complete
    • + *
  • {@link #responseContent(HttpExchange, ByteBuffer, Callback)}, when HTTP content is available
    • + *
  • {@link #responseSuccess(HttpExchange)}, when the response is successful
    • * * At any time, subclasses may invoke {@link #responseFailure(Throwable)} to indicate that the response has failed * (for example, because of I/O exceptions). @@ -69,7 +69,8 @@ public abstract class HttpReceiver private final AtomicReference responseState = new AtomicReference<>(ResponseState.IDLE); private final HttpChannel channel; - private volatile ContentDecoder decoder; + private ContentDecoder decoder; + private Throwable failure; protected HttpReceiver(HttpChannel channel) { @@ -104,7 +105,7 @@ public abstract class HttpReceiver */ protected boolean responseBegin(HttpExchange exchange) { - if (!updateResponseState(ResponseState.IDLE, ResponseState.BEGIN)) + if (!updateResponseState(ResponseState.IDLE, ResponseState.TRANSIENT)) return false; HttpConversation conversation = exchange.getConversation(); @@ -117,14 +118,19 @@ public abstract class HttpReceiver if (protocolHandler != null) { handlerListener = protocolHandler.getResponseListener(); - LOG.debug("Found protocol handler {}", protocolHandler); + if (LOG.isDebugEnabled()) + LOG.debug("Found protocol handler {}", protocolHandler); } exchange.getConversation().updateResponseListeners(handlerListener); - LOG.debug("Response begin {}", response); + if (LOG.isDebugEnabled()) + LOG.debug("Response begin {}", response); ResponseNotifier notifier = destination.getResponseNotifier(); notifier.notifyBegin(conversation.getResponseListeners(), response); + if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.BEGIN)) + terminateResponse(exchange, failure); + return true; } @@ -150,7 +156,7 @@ public abstract class HttpReceiver case BEGIN: case HEADER: { - if (updateResponseState(current, ResponseState.HEADER)) + if (updateResponseState(current, ResponseState.TRANSIENT)) break out; break; } @@ -186,6 +192,9 @@ public abstract class HttpReceiver } } + if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.HEADER)) + terminateResponse(exchange, failure); + return true; } @@ -203,7 +212,8 @@ public abstract class HttpReceiver } catch (IOException x) { - LOG.debug(x); + if (LOG.isDebugEnabled()) + LOG.debug(x); } } @@ -225,7 +235,7 @@ public abstract class HttpReceiver case BEGIN: case HEADER: { - if (updateResponseState(current, ResponseState.HEADERS)) + if (updateResponseState(current, ResponseState.TRANSIENT)) break out; break; } @@ -258,6 +268,9 @@ public abstract class HttpReceiver } } + if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.HEADERS)) + terminateResponse(exchange, failure); + return true; } @@ -270,7 +283,7 @@ public abstract class HttpReceiver * @param buffer the response HTTP content buffer * @return whether the processing should continue */ - protected boolean responseContent(HttpExchange exchange, ByteBuffer buffer, Callback callback) + protected boolean responseContent(HttpExchange exchange, ByteBuffer buffer, final Callback callback) { out: while (true) { @@ -280,7 +293,7 @@ public abstract class HttpReceiver case HEADERS: case CONTENT: { - if (updateResponseState(current, ResponseState.CONTENT)) + if (updateResponseState(current, ResponseState.TRANSIENT)) break out; break; } @@ -295,16 +308,49 @@ public abstract class HttpReceiver if (LOG.isDebugEnabled()) LOG.debug("Response content {}{}{}", response, System.lineSeparator(), BufferUtil.toDetailString(buffer)); + ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); + List listeners = exchange.getConversation().getResponseListeners(); + ContentDecoder decoder = this.decoder; - if (decoder != null) + if (decoder == null) { - buffer = decoder.decode(buffer); - if (LOG.isDebugEnabled()) - LOG.debug("Response content decoded ({}) {}{}{}", decoder, response, System.lineSeparator(), BufferUtil.toDetailString(buffer)); + notifier.notifyContent(listeners, response, buffer, callback); + } + else + { + List decodeds = new ArrayList<>(2); + while (buffer.hasRemaining()) + { + ByteBuffer decoded = decoder.decode(buffer); + if (!decoded.hasRemaining()) + continue; + decodeds.add(decoded); + if (LOG.isDebugEnabled()) + LOG.debug("Response content decoded ({}) {}{}{}", decoder, response, System.lineSeparator(), BufferUtil.toDetailString(decoded)); + } + + if (decodeds.isEmpty()) + { + callback.succeeded(); + } + else + { + Callback partial = new Callback.Adapter() + { + @Override + public void failed(Throwable x) + { + callback.failed(x); + } + }; + + for (int i = 1, size = decodeds.size(); i <= size; ++i) + notifier.notifyContent(listeners, response, decodeds.get(i - 1), i < size ? partial : callback); + } } - ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); - notifier.notifyContent(exchange.getConversation().getResponseListeners(), response, buffer, callback); + if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.CONTENT)) + terminateResponse(exchange, failure); return true; } @@ -326,32 +372,25 @@ public abstract class HttpReceiver if (!completed) return false; - // Reset to be ready for another response + responseState.set(ResponseState.IDLE); + + // Reset to be ready for another response. reset(); // Mark atomically the response as terminated and succeeded, // with respect to concurrency between request and response. - // If there is a non-null result, then both sender and - // receiver are reset and ready to be reused, and the - // connection closed/pooled (depending on the transport). Result result = exchange.terminateResponse(null); + // It is important to notify *after* we reset and terminate + // because the notification may trigger another request/response. HttpResponse response = exchange.getResponse(); - LOG.debug("Response success {}", response); + if (LOG.isDebugEnabled()) + LOG.debug("Response success {}", response); List listeners = exchange.getConversation().getResponseListeners(); ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifySuccess(listeners, response); - if (result != null) - { - boolean ordered = getHttpDestination().getHttpClient().isStrictEventOrdering(); - if (!ordered) - channel.exchangeTerminated(result); - LOG.debug("Request/Response succeeded {}", response); - notifier.notifyComplete(listeners, result); - if (ordered) - channel.exchangeTerminated(result); - } + terminateResponse(exchange, result); return true; } @@ -380,7 +419,20 @@ public abstract class HttpReceiver if (!completed) return false; - // Dispose to avoid further responses + this.failure = failure; + + // Update the state to avoid more response processing. + boolean fail; + while (true) + { + ResponseState current = responseState.get(); + if (updateResponseState(current, ResponseState.FAILURE)) + { + fail = current != ResponseState.TRANSIENT; + break; + } + } + dispose(); // Mark atomically the response as terminated and failed, @@ -388,23 +440,51 @@ public abstract class HttpReceiver Result result = exchange.terminateResponse(failure); HttpResponse response = exchange.getResponse(); - LOG.debug("Response failure {} {}", response, failure); + if (LOG.isDebugEnabled()) + LOG.debug("Response failure {} {}", response, failure); List listeners = exchange.getConversation().getResponseListeners(); ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifyFailure(listeners, response, failure); + if (fail) + { + terminateResponse(exchange, result); + } + else + { + if (LOG.isDebugEnabled()) + LOG.debug("Concurrent failure: response termination skipped, performed by helpers"); + } + + return true; + } + + private void terminateResponse(HttpExchange exchange, Throwable failure) + { + Result result = exchange.terminateResponse(failure); + terminateResponse(exchange, result); + } + + private void terminateResponse(HttpExchange exchange, Result result) + { + HttpResponse response = exchange.getResponse(); + + if (LOG.isDebugEnabled()) + LOG.debug("Response complete {}", response); + if (result != null) { boolean ordered = getHttpDestination().getHttpClient().isStrictEventOrdering(); if (!ordered) channel.exchangeTerminated(result); - LOG.debug("Request/Response failed {}", response); + if (LOG.isDebugEnabled()) + LOG.debug("Request/Response {} {}", failure == null ? "succeeded" : "failed", response); + List listeners = exchange.getConversation().getResponseListeners(); + ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifyComplete(listeners, result); if (ordered) channel.exchangeTerminated(result); } - - return true; } /** @@ -417,7 +497,6 @@ public abstract class HttpReceiver protected void reset() { decoder = null; - responseState.set(ResponseState.IDLE); } /** @@ -430,7 +509,6 @@ public abstract class HttpReceiver protected void dispose() { decoder = null; - responseState.set(ResponseState.FAILURE); } public boolean abort(Throwable cause) @@ -442,7 +520,10 @@ public abstract class HttpReceiver { boolean updated = responseState.compareAndSet(from, to); if (!updated) - LOG.debug("State update failed: {} -> {}: {}", from, to, responseState.get()); + { + if (LOG.isDebugEnabled()) + LOG.debug("State update failed: {} -> {}: {}", from, to, responseState.get()); + } return updated; } @@ -451,6 +532,10 @@ public abstract class HttpReceiver */ private enum ResponseState { + /** + * One of the response*() methods is being executed. + */ + TRANSIENT, /** * The response is not yet received, the initial state */ 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 3d7f42d69ec..abcdd40db52 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 @@ -156,7 +156,8 @@ public class HttpRedirector URI newURI = extractRedirectURI(response); if (newURI != null) { - LOG.debug("Redirecting to {} (Location: {})", newURI, location); + if (LOG.isDebugEnabled()) + LOG.debug("Redirecting to {} (Location: {})", newURI, location); return redirect(request, response, listener, newURI); } else 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 d2e26bdafd2..85d4d0b55ad 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 @@ -65,7 +65,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener private final IteratingCallback contentCallback = new ContentCallback(); private final Callback lastCallback = new LastContentCallback(); private final HttpChannel channel; - private volatile HttpContent content; + private HttpContent content; + private Throwable failure; protected HttpSender(HttpChannel channel) { @@ -99,7 +100,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener SenderState newSenderState = SenderState.SENDING; if (updateSenderState(current, newSenderState)) { - LOG.debug("Deferred content available, {} -> {}", current, newSenderState); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {} -> {}", current, newSenderState); contentCallback.iterate(); return; } @@ -110,7 +112,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener SenderState newSenderState = SenderState.SENDING_WITH_CONTENT; if (updateSenderState(current, newSenderState)) { - LOG.debug("Deferred content available, {} -> {}", current, newSenderState); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {} -> {}", current, newSenderState); return; } break; @@ -120,7 +123,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener SenderState newSenderState = SenderState.EXPECTING_WITH_CONTENT; if (updateSenderState(current, newSenderState)) { - LOG.debug("Deferred content available, {} -> {}", current, newSenderState); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {} -> {}", current, newSenderState); return; } break; @@ -130,7 +134,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener SenderState newSenderState = SenderState.PROCEEDING_WITH_CONTENT; if (updateSenderState(current, newSenderState)) { - LOG.debug("Deferred content available, {} -> {}", current, newSenderState); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {} -> {}", current, newSenderState); return; } break; @@ -140,7 +145,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener case PROCEEDING_WITH_CONTENT: case WAITING: { - LOG.debug("Deferred content available, {}", current); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {}", current); return; } default: @@ -192,32 +198,40 @@ public abstract class HttpSender implements AsyncContentProvider.Listener protected boolean queuedToBegin(Request request) { - if (!updateRequestState(RequestState.QUEUED, RequestState.BEGIN)) + if (!updateRequestState(RequestState.QUEUED, RequestState.TRANSIENT)) return false; - LOG.debug("Request begin {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request begin {}", request); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyBegin(request); + if (!updateRequestState(RequestState.TRANSIENT, RequestState.BEGIN)) + terminateRequest(getHttpExchange(), failure, false); return true; } protected boolean beginToHeaders(Request request) { - if (!updateRequestState(RequestState.BEGIN, RequestState.HEADERS)) + if (!updateRequestState(RequestState.BEGIN, RequestState.TRANSIENT)) return false; if (LOG.isDebugEnabled()) LOG.debug("Request headers {}{}{}", request, System.getProperty("line.separator"), request.getHeaders().toString().trim()); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyHeaders(request); + if (!updateRequestState(RequestState.TRANSIENT, RequestState.HEADERS)) + terminateRequest(getHttpExchange(), failure, false); return true; } protected boolean headersToCommit(Request request) { - if (!updateRequestState(RequestState.HEADERS, RequestState.COMMIT)) + if (!updateRequestState(RequestState.HEADERS, RequestState.TRANSIENT)) return false; - LOG.debug("Request committed {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request committed {}", request); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyCommit(request); + if (!updateRequestState(RequestState.TRANSIENT, RequestState.COMMIT)) + terminateRequest(getHttpExchange(), failure, true); return true; } @@ -229,21 +243,19 @@ public abstract class HttpSender implements AsyncContentProvider.Listener case COMMIT: case CONTENT: { - if (!updateRequestState(current, RequestState.CONTENT)) + if (!updateRequestState(current, RequestState.TRANSIENT_CONTENT)) return false; if (LOG.isDebugEnabled()) LOG.debug("Request content {}{}{}", request, System.getProperty("line.separator"), BufferUtil.toDetailString(content)); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyContent(request, content); + if (!updateRequestState(RequestState.TRANSIENT_CONTENT, RequestState.CONTENT)) + terminateRequest(getHttpExchange(), failure, true); return true; } - case FAILURE: - { - return false; - } default: { - throw new IllegalStateException(current.toString()); + return false; } } } @@ -262,41 +274,28 @@ public abstract class HttpSender implements AsyncContentProvider.Listener if (!completed) return false; - // Reset to be ready for another request + requestState.set(RequestState.QUEUED); + + // Reset to be ready for another request. reset(); // Mark atomically the request as terminated and succeeded, // with respect to concurrency between request and response. Result result = exchange.terminateRequest(null); - // It is important to notify completion *after* we reset because - // the notification may trigger another request/response Request request = exchange.getRequest(); - LOG.debug("Request success {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request success {}", request); HttpDestination destination = getHttpChannel().getHttpDestination(); destination.getRequestNotifier().notifySuccess(exchange.getRequest()); - if (result != null) - { - boolean ordered = destination.getHttpClient().isStrictEventOrdering(); - if (!ordered) - channel.exchangeTerminated(result); - LOG.debug("Request/Response succeded {}", request); - HttpConversation conversation = exchange.getConversation(); - destination.getResponseNotifier().notifyComplete(conversation.getResponseListeners(), result); - if (ordered) - channel.exchangeTerminated(result); - } + terminateRequest(exchange, null, true, result); return true; } - case FAILURE: - { - return false; - } default: { - throw new IllegalStateException(current.toString()); + return false; } } } @@ -313,42 +312,86 @@ public abstract class HttpSender implements AsyncContentProvider.Listener if (!completed) return false; - // Dispose to avoid further requests - RequestState requestState = dispose(); + this.failure = failure; + + // Update the state to avoid more request processing. + RequestState current; + boolean fail; + while (true) + { + current = requestState.get(); + if (updateRequestState(current, RequestState.FAILURE)) + { + fail = current != RequestState.TRANSIENT && current != RequestState.TRANSIENT_CONTENT; + break; + } + } + + dispose(); // Mark atomically the request as terminated and failed, // with respect to concurrency between request and response. Result result = exchange.terminateRequest(failure); Request request = exchange.getRequest(); - LOG.debug("Request failure {} {}", exchange, failure); + if (LOG.isDebugEnabled()) + LOG.debug("Request failure {} {}", exchange, failure); HttpDestination destination = getHttpChannel().getHttpDestination(); destination.getRequestNotifier().notifyFailure(request, failure); - boolean notCommitted = isBeforeCommit(requestState); - if (result == null && notCommitted && request.getAbortCause() == null) + if (fail) + { + terminateRequest(exchange, failure, !isBeforeCommit(current), result); + } + else + { + if (LOG.isDebugEnabled()) + LOG.debug("Concurrent failure: request termination skipped, performed by helpers"); + } + + return true; + } + + private void terminateRequest(HttpExchange exchange, Throwable failure, boolean committed) + { + if (exchange != null) + { + Result result = exchange.terminateRequest(failure); + terminateRequest(exchange, failure, committed, result); + } + } + + private void terminateRequest(HttpExchange exchange, Throwable failure, boolean committed, Result result) + { + Request request = exchange.getRequest(); + + if (LOG.isDebugEnabled()) + LOG.debug("Terminating request {}", request); + + if (failure != null && !committed && result == null && request.getAbortCause() == null) { // Complete the response from here if (exchange.responseComplete()) { result = exchange.terminateResponse(failure); - LOG.debug("Failed response from request {}", exchange); + if (LOG.isDebugEnabled()) + LOG.debug("Failed response from request {}", exchange); } } if (result != null) { + HttpDestination destination = getHttpChannel().getHttpDestination(); boolean ordered = destination.getHttpClient().isStrictEventOrdering(); if (!ordered) channel.exchangeTerminated(result); - LOG.debug("Request/Response failed {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request/Response {} {}", failure == null ? "succeeded" : "failed", request); HttpConversation conversation = exchange.getConversation(); destination.getResponseNotifier().notifyComplete(conversation.getResponseListeners(), result); if (ordered) channel.exchangeTerminated(result); } - - return true; } /** @@ -386,23 +429,14 @@ public abstract class HttpSender implements AsyncContentProvider.Listener { content.close(); content = null; - requestState.set(RequestState.QUEUED); senderState.set(SenderState.IDLE); } - protected RequestState dispose() + protected void dispose() { - while (true) - { - RequestState current = requestState.get(); - if (updateRequestState(current, RequestState.FAILURE)) - { - HttpContent content = this.content; - if (content != null) - content.close(); - return current; - } - } + HttpContent content = this.content; + if (content != null) + content.close(); } public void proceed(HttpExchange exchange, Throwable failure) @@ -426,7 +460,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener // We are still sending the headers, but we already got the 100 Continue. if (updateSenderState(current, SenderState.PROCEEDING)) { - LOG.debug("Proceeding while expecting"); + if (LOG.isDebugEnabled()) + LOG.debug("Proceeding while expecting"); return; } break; @@ -441,7 +476,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener // WritePendingException). if (updateSenderState(current, SenderState.PROCEEDING_WITH_CONTENT)) { - LOG.debug("Proceeding while scheduled"); + if (LOG.isDebugEnabled()) + LOG.debug("Proceeding while scheduled"); return; } break; @@ -451,7 +487,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener // We received the 100 Continue, now send the content if any. if (!updateSenderState(current, SenderState.SENDING)) throw illegalSenderState(current); - LOG.debug("Proceeding while waiting"); + if (LOG.isDebugEnabled()) + LOG.debug("Proceeding while waiting"); contentCallback.iterate(); return; } @@ -470,7 +507,7 @@ public abstract class HttpSender implements AsyncContentProvider.Listener return abortable && anyToFailure(failure); } - protected boolean updateRequestState(RequestState from, RequestState to) + private boolean updateRequestState(RequestState from, RequestState to) { boolean updated = requestState.compareAndSet(from, to); if (!updated) @@ -490,6 +527,7 @@ public abstract class HttpSender implements AsyncContentProvider.Listener { switch (requestState) { + case TRANSIENT: case QUEUED: case BEGIN: case HEADERS: @@ -503,6 +541,7 @@ public abstract class HttpSender implements AsyncContentProvider.Listener { switch (requestState) { + case TRANSIENT_CONTENT: case COMMIT: case CONTENT: return true; @@ -519,8 +558,16 @@ public abstract class HttpSender implements AsyncContentProvider.Listener /** * The request states {@link HttpSender} goes through when sending a request. */ - protected enum RequestState + private enum RequestState { + /** + * One of the state transition methods is being executed. + */ + TRANSIENT, + /** + * The content transition method is being executed. + */ + TRANSIENT_CONTENT, /** * The request is queued, the initial state */ @@ -758,15 +805,14 @@ public abstract class HttpSender implements AsyncContentProvider.Listener } @Override - public void failed(Throwable failure) + public void onCompleteFailure(Throwable failure) { content.failed(failure); - super.failed(failure); anyToFailure(failure); } @Override - protected void completed() + protected void onCompleteSuccess() { // Nothing to do, since we always return false from process(). // Termination is obtained via LastContentCallback. diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java index 475007523fc..e95ecb96a57 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java @@ -94,7 +94,8 @@ public abstract class MultiplexHttpDestination extends Htt { HttpClient client = getHttpClient(); final HttpExchange exchange = getHttpExchanges().poll(); - LOG.debug("Processing {} on {}", exchange, connection); + if (LOG.isDebugEnabled()) + LOG.debug("Processing {} on {}", exchange, connection); if (exchange == null) return false; @@ -102,7 +103,8 @@ public abstract class MultiplexHttpDestination extends Htt Throwable cause = request.getAbortCause(); if (cause != null) { - LOG.debug("Aborted before processing {}: {}", exchange, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Aborted before processing {}: {}", exchange, cause); // It may happen that the request is aborted before the exchange // is created. Aborting the exchange a second time will result in // a no-operation, so we just abort here to cover that edge case. diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java index 24c77e84d8e..2803276a464 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java @@ -93,7 +93,8 @@ public abstract class PoolingHttpDestination extends HttpD { HttpClient client = getHttpClient(); final HttpExchange exchange = getHttpExchanges().poll(); - LOG.debug("Processing exchange {} on connection {}", exchange, connection); + if (LOG.isDebugEnabled()) + LOG.debug("Processing exchange {} on {} of {}", exchange, connection, this); if (exchange == null) { if (!connectionPool.release(connection)) @@ -101,7 +102,8 @@ public abstract class PoolingHttpDestination extends HttpD if (!client.isRunning()) { - LOG.debug("{} is stopping", client); + if (LOG.isDebugEnabled()) + LOG.debug("{} is stopping", client); connection.close(); } } @@ -111,7 +113,8 @@ public abstract class PoolingHttpDestination extends HttpD Throwable cause = request.getAbortCause(); if (cause != null) { - LOG.debug("Aborted before processing {}: {}", exchange, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Aborted before processing {}: {}", exchange, cause); // It may happen that the request is aborted before the exchange // is created. Aborting the exchange a second time will result in // a no-operation, so we just abort here to cover that edge case. @@ -145,18 +148,25 @@ public abstract class PoolingHttpDestination extends HttpD { @SuppressWarnings("unchecked") C connection = (C)c; - LOG.debug("{} released", connection); + if (LOG.isDebugEnabled()) + LOG.debug("{} released", connection); HttpClient client = getHttpClient(); if (client.isRunning()) { if (connectionPool.isActive(connection)) + { process(connection, false); + } else - LOG.debug("{} explicit", connection); + { + if (LOG.isDebugEnabled()) + LOG.debug("{} explicit", connection); + } } else { - LOG.debug("{} is stopped", client); + if (LOG.isDebugEnabled()) + LOG.debug("{} is stopped", client); close(connection); connection.close(); } @@ -203,4 +213,10 @@ public abstract class PoolingHttpDestination extends HttpD { ContainerLifeCycle.dump(out, indent, Arrays.asList(connectionPool)); } + + @Override + public String toString() + { + return String.format("%s,pool=%s", super.toString(), connectionPool); + } } 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 037871e22fc..6886ef1aa29 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 @@ -133,7 +133,8 @@ public class Socks4Proxy extends ProxyConfiguration.Proxy @Override public void succeeded() { - LOG.debug("Written SOCKS4 connect request"); + if (LOG.isDebugEnabled()) + LOG.debug("Written SOCKS4 connect request"); fillInterested(); } @@ -153,7 +154,8 @@ public class Socks4Proxy extends ProxyConfiguration.Proxy { ByteBuffer buffer = BufferUtil.allocate(8); int filled = getEndPoint().fill(buffer); - LOG.debug("Read SOCKS4 connect response, {} bytes", filled); + if (LOG.isDebugEnabled()) + LOG.debug("Read SOCKS4 connect response, {} bytes", filled); if (filled != 8) throw new IOException("Invalid response from SOCKS4 proxy"); int result = buffer.get(1); @@ -179,7 +181,8 @@ public class Socks4Proxy extends ProxyConfiguration.Proxy connectionFactory = new SslClientConnectionFactory(client.getSslContextFactory(), client.getByteBufferPool(), client.getExecutor(), connectionFactory); org.eclipse.jetty.io.Connection connection = connectionFactory.newConnection(getEndPoint(), context); ClientConnectionFactory.Helper.replaceConnection(this, connection); - LOG.debug("SOCKS4 tunnel established: {} over {}", this, connection); + if (LOG.isDebugEnabled()) + LOG.debug("SOCKS4 tunnel established: {} over {}", this, connection); } catch (Throwable x) { diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java index 80859a439b5..e8e7cebbcd1 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java @@ -48,7 +48,8 @@ public class TimeoutCompleteListener implements Response.CompleteListener, Runna if (task != null) { boolean cancelled = task.cancel(); - LOG.debug("Cancelled (successfully: {}) timeout task {}", cancelled, task); + if (LOG.isDebugEnabled()) + LOG.debug("Cancelled (successfully: {}) timeout task {}", cancelled, task); } } @@ -58,14 +59,16 @@ public class TimeoutCompleteListener implements Response.CompleteListener, Runna Scheduler.Task task = scheduler.schedule(this, timeout, TimeUnit.MILLISECONDS); if (this.task.getAndSet(task) != null) throw new IllegalStateException(); - LOG.debug("Scheduled timeout task {} in {} ms for {}", task, timeout, request); + if (LOG.isDebugEnabled()) + LOG.debug("Scheduled timeout task {} in {} ms for {}", task, timeout, request); return true; } @Override public void run() { - LOG.debug("Executing timeout task {} for {}", task, request); + if (LOG.isDebugEnabled()) + LOG.debug("Executing timeout task {} for {}", task, request); request.abort(new TimeoutException("Total timeout elapsed")); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Connection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Connection.java index 3c2d2604fa8..a7ab28ce080 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Connection.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Connection.java @@ -20,8 +20,6 @@ package org.eclipse.jetty.client.api; import java.io.Closeable; -import org.eclipse.jetty.util.Promise; - /** * {@link Connection} represent a connection to a {@link Destination} and allow applications to send * requests via {@link #send(Request, Response.CompleteListener)}. diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentProvider.java index 371b22bd821..9833e5beed9 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/api/ContentProvider.java @@ -18,13 +18,7 @@ package org.eclipse.jetty.client.api; -import java.io.Closeable; -import java.io.InputStream; import java.nio.ByteBuffer; -import java.util.Iterator; - -import org.eclipse.jetty.client.util.ByteBufferContentProvider; -import org.eclipse.jetty.client.util.PathContentProvider; /** * {@link ContentProvider} provides a source of request content. diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Destination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Destination.java index 9a155644673..53a6f006ef8 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Destination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Destination.java @@ -18,8 +18,6 @@ package org.eclipse.jetty.client.api; -import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.util.Promise; /** diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java index f37988cc4bf..3e28e8e759e 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java @@ -21,7 +21,6 @@ package org.eclipse.jetty.client.api; import java.io.IOException; import java.net.HttpCookie; import java.net.URI; -import java.net.URLEncoder; import java.nio.ByteBuffer; import java.nio.file.Path; import java.util.EventListener; @@ -31,8 +30,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.client.util.InputStreamResponseListener; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java index 77d2d597b08..1f92b1eb74d 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java @@ -22,7 +22,6 @@ import java.nio.ByteBuffer; import java.util.EventListener; import java.util.List; -import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpVersion; 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 0b1b1b0fcf2..d02574417fa 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 @@ -85,7 +85,8 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec @Override protected boolean onReadTimeout() { - LOG.debug("{} idle timeout", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} idle timeout", this); close(new TimeoutException()); return false; } @@ -127,9 +128,11 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec // from an onFailure() handler or by blocking code waiting for completion. getHttpDestination().close(this); getEndPoint().shutdownOutput(); - LOG.debug("{} oshut", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} oshut", this); getEndPoint().close(); - LOG.debug("{} closed", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} closed", this); abort(failure); } 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 f98f4828942..37dfdaa802e 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 @@ -120,7 +120,8 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res } catch (Throwable x) { - LOG.debug(x); + if (LOG.isDebugEnabled()) + LOG.debug(x); failAndClose(x); return true; } @@ -230,7 +231,8 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res @Override public void resume() { - LOG.debug("Content consumed asynchronously, resuming processing"); + if (LOG.isDebugEnabled()) + LOG.debug("Content consumed asynchronously, resuming processing"); process(); } 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 d176826fc94..c8ce04168ab 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 @@ -123,7 +123,8 @@ public class HttpSenderOverHTTP extends HttpSender } catch (Throwable x) { - LOG.debug(x); + if (LOG.isDebugEnabled()) + LOG.debug(x); callback.failed(x); } } @@ -181,7 +182,8 @@ public class HttpSenderOverHTTP extends HttpSender } catch (Exception x) { - LOG.debug(x); + if (LOG.isDebugEnabled()) + LOG.debug(x); callback.failed(x); } } @@ -194,12 +196,11 @@ public class HttpSenderOverHTTP extends HttpSender } @Override - protected RequestState dispose() + protected void dispose() { generator.abort(); - RequestState result = super.dispose(); + super.dispose(); shutdownOutput(); - return result; } private void shutdownOutput() diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/BasicAuthentication.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/BasicAuthentication.java index 4302374e79e..7c283464aa1 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/BasicAuthentication.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/BasicAuthentication.java @@ -21,9 +21,7 @@ package org.eclipse.jetty.client.util; import java.net.URI; import java.nio.charset.StandardCharsets; -import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.Authentication; -import org.eclipse.jetty.client.api.AuthenticationStore; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.http.HttpHeader; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/ByteBufferContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/ByteBufferContentProvider.java index e8a695f0d63..724e3bddb6c 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/ByteBufferContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/ByteBufferContentProvider.java @@ -22,8 +22,6 @@ import java.nio.ByteBuffer; import java.util.Iterator; import java.util.NoSuchElementException; -import org.eclipse.jetty.client.api.ContentProvider; - /** * A {@link ContentProvider} for {@link ByteBuffer}s. *

    diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/BytesContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/BytesContentProvider.java index 7b356ef1a63..d64fa2385c3 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/BytesContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/BytesContentProvider.java @@ -22,8 +22,6 @@ import java.nio.ByteBuffer; import java.util.Iterator; import java.util.NoSuchElementException; -import org.eclipse.jetty.client.api.ContentProvider; - /** * A {@link ContentProvider} for byte arrays. */ diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/DeferredContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/DeferredContentProvider.java index 3f34a23a6d7..106983190b4 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/DeferredContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/DeferredContentProvider.java @@ -30,9 +30,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.client.AsyncContentProvider; -import org.eclipse.jetty.client.api.ContentProvider; -import org.eclipse.jetty.client.api.Request; -import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.util.ArrayQueue; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java index b7a32ab35b5..98b9f940d3a 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java @@ -33,9 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.Authentication; -import org.eclipse.jetty.client.api.AuthenticationStore; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.http.HttpHeader; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/FormContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/FormContentProvider.java index 39c490a570d..cb626dbfda1 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/FormContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/FormContentProvider.java @@ -24,7 +24,6 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.charset.UnsupportedCharsetException; -import org.eclipse.jetty.client.api.ContentProvider; import org.eclipse.jetty.util.Fields; /** 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 89d3022ae27..0a7e0ae1f9e 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 @@ -149,7 +149,8 @@ public class InputStreamContentProvider implements ContentProvider byte[] bytes = new byte[bufferSize]; int read = stream.read(bytes); - LOG.debug("Read {} bytes from {}", read, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Read {} bytes from {}", read, stream); if (read > 0) { hasNext = Boolean.TRUE; @@ -172,7 +173,8 @@ public class InputStreamContentProvider implements ContentProvider } catch (Throwable x) { - LOG.debug(x); + if (LOG.isDebugEnabled()) + LOG.debug(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 734e32d0bda..789b525365d 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 @@ -32,7 +32,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Response.Listener; import org.eclipse.jetty.client.api.Result; @@ -116,23 +115,27 @@ public class InputStreamResponseListener extends Listener.Adapter byte[] bytes = new byte[remaining]; content.get(bytes); - LOG.debug("Queuing {}/{} bytes", bytes, remaining); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {}/{} bytes", bytes, remaining); queue.offer(bytes); long newLength = length.addAndGet(remaining); while (newLength >= maxBufferSize) { - LOG.debug("Queued bytes limit {}/{} exceeded, waiting", newLength, maxBufferSize); + if (LOG.isDebugEnabled()) + LOG.debug("Queued bytes limit {}/{} exceeded, waiting", newLength, maxBufferSize); // Block to avoid infinite buffering if (!await()) break; newLength = length.get(); - LOG.debug("Queued bytes limit {}/{} exceeded, woken up", newLength, maxBufferSize); + if (LOG.isDebugEnabled()) + LOG.debug("Queued bytes limit {}/{} exceeded, woken up", newLength, maxBufferSize); } } else { - LOG.debug("Queuing skipped, empty content {}", content); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing skipped, empty content {}", content); } } else @@ -141,26 +144,41 @@ public class InputStreamResponseListener extends Listener.Adapter } } + @Override + public void onSuccess(Response response) + { + if (LOG.isDebugEnabled()) + LOG.debug("Queuing end of content {}{}", EOF, ""); + queue.offer(EOF); + signal(); + } + + @Override + public void onFailure(Response response, Throwable failure) + { + fail(failure); + signal(); + } + @Override public void onComplete(Result result) { + if (result.isFailed() && failure == null) + fail(result.getFailure()); this.result = result; - if (result.isSucceeded()) - { - LOG.debug("Queuing end of content {}{}", EOF, ""); - queue.offer(EOF); - } - else - { - LOG.debug("Queuing failure {} {}", FAILURE, failure); - queue.offer(FAILURE); - this.failure = result.getFailure(); - responseLatch.countDown(); - } resultLatch.countDown(); signal(); } + private void fail(Throwable failure) + { + if (LOG.isDebugEnabled()) + LOG.debug("Queuing failure {} {}", FAILURE, failure); + queue.offer(FAILURE); + this.failure = failure; + responseLatch.countDown(); + } + protected boolean await() { try @@ -288,7 +306,8 @@ public class InputStreamResponseListener extends Listener.Adapter else { bytes = take(); - LOG.debug("Dequeued {}/{} bytes", bytes, bytes.length); + if (LOG.isDebugEnabled()) + LOG.debug("Dequeued {}/{} bytes", bytes, bytes.length); } } } @@ -319,7 +338,8 @@ public class InputStreamResponseListener extends Listener.Adapter if (!closed) { super.close(); - LOG.debug("Queuing close {}{}", CLOSED, ""); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing close {}{}", CLOSED, ""); queue.offer(CLOSED); closed = true; signal(); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/OutputStreamContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/OutputStreamContentProvider.java index cc90b5178ce..d9203380bea 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/OutputStreamContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/OutputStreamContentProvider.java @@ -24,9 +24,6 @@ import java.nio.ByteBuffer; import java.util.Iterator; import org.eclipse.jetty.client.AsyncContentProvider; -import org.eclipse.jetty.client.api.ContentProvider; -import org.eclipse.jetty.client.api.Request; -import org.eclipse.jetty.client.api.Response; /** * A {@link ContentProvider} that provides content asynchronously through an {@link OutputStream} 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 676c7916091..e69a2e6e6ac 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 @@ -30,7 +30,6 @@ import java.nio.file.StandardOpenOption; import java.util.Iterator; import java.util.NoSuchElementException; -import org.eclipse.jetty.client.api.ContentProvider; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; @@ -107,7 +106,8 @@ public class PathContentProvider extends AbstractTypedContentProvider if (channel == null) { channel = Files.newByteChannel(filePath, StandardOpenOption.READ); - LOG.debug("Opened file {}", filePath); + if (LOG.isDebugEnabled()) + LOG.debug("Opened file {}", filePath); } buffer.clear(); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/StringContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/StringContentProvider.java index 7475c3febf7..d6a58177ea1 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/StringContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/StringContentProvider.java @@ -21,8 +21,6 @@ package org.eclipse.jetty.client.util; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import org.eclipse.jetty.client.api.ContentProvider; - /** * A {@link ContentProvider} for strings. *

    diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HostnameVerificationTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HostnameVerificationTest.java index 838932fbcac..9147704e970 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HostnameVerificationTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HostnameVerificationTest.java @@ -116,6 +116,11 @@ public class HostnameVerificationTest // ExecutionException wraps an SSLHandshakeException Throwable cause = x.getCause(); + if (cause==null) + { + x.printStackTrace(); + Assert.fail("No cause?"); + } if (cause instanceof SSLHandshakeException) Assert.assertThat(cause.getCause().getCause(), Matchers.instanceOf(CertificateException.class)); else diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java index 4c287cbdaaf..a0f70f5c18e 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -46,6 +47,7 @@ import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; +import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.junit.Assert; @@ -187,7 +189,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest { baseRequest.setHandled(true); if (requests.incrementAndGet() == 1) - response.sendRedirect(scheme + "://" + request.getServerName() + ":" + request.getServerPort() + request.getRequestURI()); + response.sendRedirect(URIUtil.newURI(scheme,request.getServerName(),request.getServerPort(),request.getRequestURI(),null)); } }); @@ -226,7 +228,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest { baseRequest.setHandled(true); if (request.getRequestURI().endsWith("/redirect")) - response.sendRedirect(scheme + "://" + request.getServerName() + ":" + request.getServerPort() + "/secure"); + response.sendRedirect(URIUtil.newURI(scheme,request.getServerName(),request.getServerPort(),"/secure",null)); } }); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java new file mode 100644 index 00000000000..98aaf9966c6 --- /dev/null +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java @@ -0,0 +1,209 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.client; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; +import java.util.zip.GZIPOutputStream; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.client.api.ContentResponse; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.junit.Assert; +import org.junit.Test; + +public class HttpClientGZIPTest extends AbstractHttpClientServerTest +{ + public HttpClientGZIPTest(SslContextFactory sslContextFactory) + { + super(sslContextFactory); + } + + @Test + public void testGZIPContentEncoding() throws Exception + { + final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + start(new AbstractHandler() + { + @Override + public void handle(String target, org.eclipse.jetty.server.Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setHeader("Content-Encoding", "gzip"); + GZIPOutputStream gzipOutput = new GZIPOutputStream(response.getOutputStream()); + gzipOutput.write(data); + gzipOutput.finish(); + } + }); + + ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .timeout(5, TimeUnit.SECONDS) + .send(); + + Assert.assertEquals(200, response.getStatus()); + Assert.assertArrayEquals(data, response.getContent()); + } + + @Test + public void testGZIPContentOneByteAtATime() throws Exception + { + final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + start(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setHeader("Content-Encoding", "gzip"); + + ByteArrayOutputStream gzipData = new ByteArrayOutputStream(); + GZIPOutputStream gzipOutput = new GZIPOutputStream(gzipData); + gzipOutput.write(data); + gzipOutput.finish(); + + ServletOutputStream output = response.getOutputStream(); + byte[] gzipBytes = gzipData.toByteArray(); + for (byte gzipByte : gzipBytes) + { + output.write(gzipByte); + output.flush(); + sleep(100); + } + } + }); + + ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .send(); + + Assert.assertEquals(200, response.getStatus()); + Assert.assertArrayEquals(data, response.getContent()); + } + + @Test + public void testGZIPContentSentTwiceInOneWrite() throws Exception + { + final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + start(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setHeader("Content-Encoding", "gzip"); + + ByteArrayOutputStream gzipData = new ByteArrayOutputStream(); + GZIPOutputStream gzipOutput = new GZIPOutputStream(gzipData); + gzipOutput.write(data); + gzipOutput.finish(); + + byte[] gzipBytes = gzipData.toByteArray(); + byte[] content = Arrays.copyOf(gzipBytes, 2 * gzipBytes.length); + System.arraycopy(gzipBytes, 0, content, gzipBytes.length, gzipBytes.length); + + ServletOutputStream output = response.getOutputStream(); + output.write(content); + } + }); + + ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .send(); + + Assert.assertEquals(200, response.getStatus()); + + byte[] expected = Arrays.copyOf(data, 2 * data.length); + System.arraycopy(data, 0, expected, data.length, data.length); + Assert.assertArrayEquals(expected, response.getContent()); + } + + @Test + public void testGZIPContentFragmentedBeforeTrailer() throws Exception + { + // There are 8 trailer bytes to gzip encoding. + testGZIPContentFragmented(9); + } + + @Test + public void testGZIPContentFragmentedAtTrailer() throws Exception + { + // There are 8 trailer bytes to gzip encoding. + testGZIPContentFragmented(1); + } + + private void testGZIPContentFragmented(final int fragment) throws Exception + { + final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + start(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setHeader("Content-Encoding", "gzip"); + + ByteArrayOutputStream gzipData = new ByteArrayOutputStream(); + GZIPOutputStream gzipOutput = new GZIPOutputStream(gzipData); + gzipOutput.write(data); + gzipOutput.finish(); + + byte[] gzipBytes = gzipData.toByteArray(); + byte[] chunk1 = Arrays.copyOfRange(gzipBytes, 0, gzipBytes.length - fragment); + byte[] chunk2 = Arrays.copyOfRange(gzipBytes, gzipBytes.length - fragment, gzipBytes.length); + + ServletOutputStream output = response.getOutputStream(); + output.write(chunk1); + output.flush(); + + sleep(500); + + output.write(chunk2); + output.flush(); + } + }); + + ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .send(); + + Assert.assertEquals(200, response.getStatus()); + Assert.assertArrayEquals(data, response.getContent()); + } + + private static void sleep(long ms) throws IOException + { + try + { + TimeUnit.MILLISECONDS.sleep(ms); + } + catch (InterruptedException x) + { + throw new InterruptedIOException(); + } + } +} diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java index 9b77675ff08..1cab93ae99a 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java @@ -43,8 +43,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import java.util.zip.GZIPOutputStream; - import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; @@ -672,32 +670,6 @@ public class HttpClientTest extends AbstractHttpClientServerTest Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); } - @Test - public void test_GZIP_ContentEncoding() throws Exception - { - final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - start(new AbstractHandler() - { - @Override - public void handle(String target, org.eclipse.jetty.server.Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException - { - baseRequest.setHandled(true); - response.setHeader("Content-Encoding", "gzip"); - GZIPOutputStream gzipOutput = new GZIPOutputStream(response.getOutputStream()); - gzipOutput.write(data); - gzipOutput.finish(); - } - }); - - ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) - .scheme(scheme) - .timeout(5, TimeUnit.SECONDS) - .send(); - - Assert.assertEquals(200, response.getStatus()); - Assert.assertArrayEquals(data, response.getContent()); - } - @Slow @Test public void test_Request_IdleTimeout() throws Exception diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java index 84a18b66fec..dced77f5b78 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; + import javax.net.ssl.SSLEngine; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -56,6 +57,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Assume; +import org.junit.Ignore; import org.junit.Test; public class HttpClientTimeoutTest extends AbstractHttpClientServerTest @@ -299,6 +301,7 @@ public class HttpClientTimeoutTest extends AbstractHttpClientServerTest } } + @Ignore @Slow @Test public void testConnectTimeoutFailsRequest() throws Exception @@ -330,6 +333,7 @@ public class HttpClientTimeoutTest extends AbstractHttpClientServerTest Assert.assertNotNull(request.getAbortCause()); } + @Ignore @Slow @Test public void testConnectTimeoutIsCancelledByShorterTimeout() throws Exception diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpResponseConcurrentAbortTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpResponseConcurrentAbortTest.java new file mode 100644 index 00000000000..a6089421150 --- /dev/null +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpResponseConcurrentAbortTest.java @@ -0,0 +1,198 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.client; + +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.client.api.Response; +import org.eclipse.jetty.client.api.Result; +import org.eclipse.jetty.http.HttpField; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.junit.Assert; +import org.junit.Test; + +public class HttpResponseConcurrentAbortTest extends AbstractHttpClientServerTest +{ + private final CountDownLatch callbackLatch = new CountDownLatch(1); + private final CountDownLatch failureLatch = new CountDownLatch(1); + private final CountDownLatch completeLatch = new CountDownLatch(1); + private final AtomicBoolean success = new AtomicBoolean(); + + public HttpResponseConcurrentAbortTest(SslContextFactory sslContextFactory) + { + super(sslContextFactory); + } + + @Test + public void testAbortOnBegin() throws Exception + { + start(new EmptyServerHandler()); + + client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .onResponseBegin(new Response.BeginListener() + { + @Override + public void onBegin(Response response) + { + abort(response); + } + }) + .send(new TestResponseListener()); + Assert.assertTrue(callbackLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(completeLatch.await(6, TimeUnit.SECONDS)); + Assert.assertTrue(success.get()); + } + + @Test + public void testAbortOnHeader() throws Exception + { + start(new EmptyServerHandler()); + + client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .onResponseHeader(new Response.HeaderListener() + { + @Override + public boolean onHeader(Response response, HttpField field) + { + abort(response); + return true; + } + }) + .send(new TestResponseListener()); + Assert.assertTrue(callbackLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(completeLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(success.get()); + } + + @Test + public void testAbortOnHeaders() throws Exception + { + start(new EmptyServerHandler()); + + client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .onResponseHeaders(new Response.HeadersListener() + { + @Override + public void onHeaders(Response response) + { + abort(response); + } + }) + .send(new TestResponseListener()); + Assert.assertTrue(callbackLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(completeLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(success.get()); + } + + @Test + public void testAbortOnContent() throws Exception + { + start(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + OutputStream output = response.getOutputStream(); + output.write(1); + output.flush(); + } + }); + + client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .onResponseContent(new Response.ContentListener() + { + @Override + public void onContent(Response response, ByteBuffer content) + { + abort(response); + } + }) + .send(new TestResponseListener()); + Assert.assertTrue(callbackLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(completeLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(success.get()); + } + + private void abort(final Response response) + { + Logger logger = Log.getLogger(getClass()); + + new Thread("abort") + { + @Override + public void run() + { + response.abort(new Exception()); + } + }.start(); + + try + { + // The failure callback must be executed asynchronously. + boolean latched = failureLatch.await(4, TimeUnit.SECONDS); + success.set(latched); + logger.info("SIMON - STEP 1"); + + // The complete callback must not be executed + // until we return from this callback. + latched = completeLatch.await(1, TimeUnit.SECONDS); + success.set(!latched); + logger.info("SIMON - STEP 2"); + + callbackLatch.countDown(); + } + catch (InterruptedException x) + { + throw new RuntimeException(x); + } + } + + private class TestResponseListener extends Response.Listener.Adapter + { + @Override + public void onFailure(Response response, Throwable failure) + { + failureLatch.countDown(); + } + + @Override + public void onComplete(Result result) + { + Assert.assertTrue(result.isFailed()); + completeLatch.countDown(); + } + } +} diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java index 0be2b913973..e7564b5e641 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java @@ -18,23 +18,18 @@ package org.eclipse.jetty.client.http; -import java.io.ByteArrayOutputStream; import java.io.EOFException; -import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Collections; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.zip.GZIPOutputStream; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpExchange; import org.eclipse.jetty.client.HttpRequest; import org.eclipse.jetty.client.HttpResponseException; import org.eclipse.jetty.client.Origin; -import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.util.FutureResponseListener; import org.eclipse.jetty.http.HttpFields; @@ -205,58 +200,4 @@ public class HttpReceiverOverHTTPTest Assert.assertTrue(e.getCause() instanceof HttpResponseException); } } - - @Test - public void test_Receive_GZIPResponseContent_Fragmented() throws Exception - { - byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - try (GZIPOutputStream gzipOutput = new GZIPOutputStream(baos)) - { - gzipOutput.write(data); - } - byte[] gzip = baos.toByteArray(); - - endPoint.setInput("" + - "HTTP/1.1 200 OK\r\n" + - "Content-Length: " + gzip.length + "\r\n" + - "Content-Encoding: gzip\r\n" + - "\r\n"); - - HttpRequest request = (HttpRequest)client.newRequest("http://localhost"); - final CountDownLatch latch = new CountDownLatch(1); - FutureResponseListener listener = new FutureResponseListener(request) - { - @Override - public void onContent(Response response, ByteBuffer content) - { - super.onContent(response, content); - latch.countDown(); - } - }; - HttpExchange exchange = new HttpExchange(destination, request, Collections.singletonList(listener)); - connection.getHttpChannel().associate(exchange); - exchange.requestComplete(); - exchange.terminateRequest(null); - connection.getHttpChannel().receive(); - endPoint.reset(); - - ByteBuffer buffer = ByteBuffer.wrap(gzip); - int fragment = buffer.limit() - 1; - buffer.limit(fragment); - endPoint.setInput(buffer); - connection.getHttpChannel().receive(); - endPoint.reset(); - - buffer.limit(gzip.length); - buffer.position(fragment); - endPoint.setInput(buffer); - connection.getHttpChannel().receive(); - - ContentResponse response = listener.get(5, TimeUnit.SECONDS); - Assert.assertNotNull(response); - Assert.assertEquals(200, response.getStatus()); - Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); - Assert.assertArrayEquals(data, response.getContent()); - } } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java index bdef5f21fd9..1f4077f83c3 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java @@ -1049,9 +1049,9 @@ public class SslBytesServerTest extends SslBytesTest @Test public void testRequestWithBigContentWriteBlockedThenReset() throws Exception { - // Don't run on Windows (buggy JVM) - Assume.assumeTrue(!OS.IS_WINDOWS); - + // Don't run on Windows (buggy JVM) + Assume.assumeTrue(!OS.IS_WINDOWS); + final SSLSocket client = newClient(); SimpleProxy.AutomaticFlow automaticProxyFlow = proxy.startAutomaticFlow(); @@ -1110,10 +1110,10 @@ public class SslBytesServerTest extends SslBytesTest @Test public void testRequestWithBigContentReadBlockedThenReset() throws Exception { - // Don't run on Windows (buggy JVM) - Assume.assumeTrue(!OS.IS_WINDOWS); - - final SSLSocket client = newClient(); + // Don't run on Windows (buggy JVM) + Assume.assumeTrue(!OS.IS_WINDOWS); + + final SSLSocket client = newClient(); SimpleProxy.AutomaticFlow automaticProxyFlow = proxy.startAutomaticFlow(); client.startHandshake(); diff --git a/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Continuation.java b/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Continuation.java index 0eb8ca0efdc..da0239cb7e3 100644 --- a/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Continuation.java +++ b/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Continuation.java @@ -18,12 +18,7 @@ package org.eclipse.jetty.continuation; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.Servlet; -import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.ServletResponseWrapper; /* ------------------------------------------------------------ */ /** diff --git a/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationListener.java b/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationListener.java index 4b960d5f098..b6c337e9dd8 100644 --- a/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationListener.java +++ b/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationListener.java @@ -20,8 +20,6 @@ package org.eclipse.jetty.continuation; import java.util.EventListener; -import javax.servlet.ServletRequestListener; - /* ------------------------------------------------------------ */ /** A Continuation Listener diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/AppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/AppProvider.java index 1ad17bc235f..a0e84ee3628 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/AppProvider.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/AppProvider.java @@ -18,8 +18,6 @@ package org.eclipse.jetty.deploy; -import java.io.IOException; - import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.component.LifeCycle; diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java index 7e50a964333..d8d5b150538 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java @@ -25,7 +25,6 @@ import java.util.Locale; import org.eclipse.jetty.deploy.App; import org.eclipse.jetty.deploy.ConfigurationManager; import org.eclipse.jetty.deploy.util.FileID; -import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.annotation.ManagedAttribute; diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCycleTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCycleTest.java index 78f113967d9..d296611946d 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCycleTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCycleTest.java @@ -36,10 +36,10 @@ import org.junit.Test; */ public class AppLifeCycleTest { - @Rule - public TestingDir testdir = new TestingDir(); + @Rule + public TestingDir testdir = new TestingDir(); - private void assertNoPath(String from, String to) + private void assertNoPath(String from, String to) { assertPath(from,to,new ArrayList()); } diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java index 3acec97f295..7d80fc092c2 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java @@ -26,7 +26,6 @@ import static org.hamcrest.Matchers.not; import java.io.File; import java.util.List; -import org.eclipse.jetty.deploy.providers.ScanningAppProvider; import org.eclipse.jetty.deploy.test.XmlConfiguredJetty; import org.eclipse.jetty.toolchain.test.IO; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderStartupTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderStartupTest.java index eb7e0c0e698..949acfd626f 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderStartupTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderStartupTest.java @@ -30,8 +30,8 @@ import org.junit.Test; */ public class ScanningAppProviderStartupTest { - @Rule - public TestingDir testdir = new TestingDir(); + @Rule + public TestingDir testdir = new TestingDir(); private static XmlConfiguredJetty jetty; @Before diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index bf5ae62b310..c08257930b2 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -302,7 +302,7 @@ org.eclipse.jetty org.eclipse.jetty.orbit,org.eclipse.jetty.spdy,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs - jetty-all,jetty-jsp,apache-jsp,jetty-start,jetty-monitor + jetty-all,jetty-jsp,apache-jsp,jetty-start,jetty-monitor,jetty-spring jar ${assembly-directory}/lib @@ -332,6 +332,19 @@ ${assembly-directory}/lib/fcgi + + copy-lib-spring-deps + generate-resources + + copy-dependencies + + + org.eclipse.jetty + jetty-spring + jar + ${assembly-directory}/lib/spring + + copy-lib-monitor-deps generate-resources @@ -765,6 +778,11 @@ fcgi-server ${project.version} + + org.eclipse.jetty + jetty-spring + ${project.version} + {} {}",state,next,this); + if (LOG.isDebugEnabled()) + LOG.debug("{}-->{} {}",state,next,this); if (next!=state) next.onEnter(AbstractConnection.this); return true; 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 8fa2cc86ef9..6f2b011db66 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 @@ -94,7 +94,8 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint @Override public void onOpen() { - LOG.debug("onOpen {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("onOpen {}",this); super.onOpen(); } @@ -102,7 +103,8 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint public void onClose() { super.onClose(); - LOG.debug("onClose {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("onClose {}",this); _writeFlusher.onClose(); _fillInterest.onClose(); } 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 c65ca0ccfc8..7c80d06bcad 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 @@ -61,7 +61,8 @@ public class ChannelEndPoint extends AbstractEndPoint protected void shutdownInput() { - LOG.debug("ishut {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("ishut {}", this); _ishut=true; if (_oshut) close(); @@ -70,7 +71,8 @@ public class ChannelEndPoint extends AbstractEndPoint @Override public void shutdownOutput() { - LOG.debug("oshut {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("oshut {}", this); _oshut = true; if (_channel.isOpen()) { @@ -109,7 +111,8 @@ public class ChannelEndPoint extends AbstractEndPoint public void close() { super.close(); - LOG.debug("close {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("close {}", this); try { _channel.close(); diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java index 96baa01676f..7bd08ad66fd 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java @@ -20,8 +20,6 @@ package org.eclipse.jetty.io; import java.io.Closeable; -import org.eclipse.jetty.util.Callback; - /** *

    A {@link Connection} is associated to an {@link EndPoint} so that I/O events * happening on the {@link EndPoint} can be processed by the {@link Connection}.

    diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java index 87adb40be1f..4aa404fe3ba 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java @@ -26,8 +26,6 @@ import java.nio.channels.ReadPendingException; import java.nio.channels.WritePendingException; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.FutureCallback; - /** * 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 8b251ac862c..64b996f021e 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 @@ -142,13 +142,15 @@ public abstract class IdleTimeout long idleElapsed = System.currentTimeMillis() - idleTimestamp; long idleLeft = idleTimeout - idleElapsed; - LOG.debug("{} idle timeout check, elapsed: {} ms, remaining: {} ms", this, idleElapsed, idleLeft); + if (LOG.isDebugEnabled()) + LOG.debug("{} idle timeout check, elapsed: {} ms, remaining: {} ms", this, idleElapsed, idleLeft); if (idleTimestamp != 0 && idleTimeout > 0) { if (idleLeft <= 0) { - LOG.debug("{} idle timeout expired", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} idle timeout expired", this); try { onIdleExpired(new TimeoutException("Idle timeout expired: " + idleElapsed + "/" + idleTimeout + " ms")); 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 a4b6f7d2a16..25093f02bc4 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,7 +25,6 @@ import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; import java.util.List; -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.Scheduler; diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java index 30504029947..e60c9fa706b 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java @@ -132,18 +132,21 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements SelectorMa { if (_interestOps.compareAndSet(oldInterestOps, newInterestOps)) { - LOG.debug("Local interests updated {} -> {} for {}", oldInterestOps, newInterestOps, this); + if (LOG.isDebugEnabled()) + LOG.debug("Local interests updated {} -> {} for {}", oldInterestOps, newInterestOps, this); _selector.updateKey(_updateTask); } else { - LOG.debug("Local interests update conflict: now {}, was {}, attempted {} for {}", _interestOps.get(), oldInterestOps, newInterestOps, this); + if (LOG.isDebugEnabled()) + LOG.debug("Local interests update conflict: now {}, was {}, attempted {} for {}", _interestOps.get(), oldInterestOps, newInterestOps, this); continue; } } else { - LOG.debug("Ignoring local interests update {} -> {} for {}", oldInterestOps, newInterestOps, this); + if (LOG.isDebugEnabled()) + LOG.debug("Ignoring local interests update {} -> {} for {}", oldInterestOps, newInterestOps, this); } break; } @@ -152,7 +155,8 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements SelectorMa private void setKeyInterests(int oldInterestOps, int newInterestOps) { - LOG.debug("Key interests updated {} -> {}", oldInterestOps, newInterestOps); + if (LOG.isDebugEnabled()) + LOG.debug("Key interests updated {} -> {}", oldInterestOps, newInterestOps); _key.interestOps(newInterestOps); } 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 fd3c6c6b9ee..0e6fd889da6 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 @@ -21,8 +21,6 @@ package org.eclipse.jetty.io; import java.io.Closeable; import java.io.IOException; import java.net.ConnectException; -import java.net.Socket; -import java.net.SocketAddress; import java.net.SocketTimeoutException; import java.nio.channels.CancelledKeyException; import java.nio.channels.SelectionKey; @@ -377,11 +375,13 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa @Override protected void doStop() throws Exception { - LOG.debug("Stopping {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Stopping {}", this); Stop stop = new Stop(); submit(stop); stop.await(getStopTimeout()); - LOG.debug("Stopped {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Stopped {}", this); } /** @@ -419,7 +419,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa // change to the queue and process the state. _changes.offer(change); - LOG.debug("Queued change {}", change); + if (LOG.isDebugEnabled()) + LOG.debug("Queued change {}", change); out: while (true) { @@ -463,7 +464,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa { try { - LOG.debug("Running change {}", change); + if (LOG.isDebugEnabled()) + LOG.debug("Running change {}", change); change.run(); } catch (Throwable x) @@ -480,14 +482,17 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa try { _thread.setName(name + "-selector-" + SelectorManager.this.getClass().getSimpleName()+"@"+Integer.toHexString(SelectorManager.this.hashCode())+"/"+_id); - LOG.debug("Starting {} on {}", _thread, this); + if (LOG.isDebugEnabled()) + LOG.debug("Starting {} on {}", _thread, this); while (isRunning()) select(); - runChanges(); + while(isStopping()) + runChanges(); } finally { - LOG.debug("Stopped {} on {}", _thread, this); + if (LOG.isDebugEnabled()) + LOG.debug("Stopped {} on {}", _thread, this); _thread.setName(name); } } @@ -671,13 +676,15 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa Connection connection = newConnection(channel, endPoint, selectionKey.attachment()); endPoint.setConnection(connection); connectionOpened(connection); - LOG.debug("Created {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Created {}", endPoint); return endPoint; } public void destroyEndPoint(EndPoint endPoint) { - LOG.debug("Destroyed {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Destroyed {}", endPoint); Connection connection = endPoint.getConnection(); if (connection != null) connectionClosed(connection); @@ -792,7 +799,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa try { SelectionKey key = _channel.register(_selector, SelectionKey.OP_ACCEPT, null); - LOG.debug("{} acceptor={}", this, key); + if (LOG.isDebugEnabled()) + LOG.debug("{} acceptor={}", this, key); } catch (Throwable x) { @@ -881,7 +889,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa SocketChannel channel = connect.channel; if (channel.isConnectionPending()) { - LOG.debug("Channel {} timed out while connecting, closing it", channel); + if (LOG.isDebugEnabled()) + LOG.debug("Channel {} timed out while connecting, closing it", channel); connect.failed(new SocketTimeoutException()); } } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedPrintWriter.java b/jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedPrintWriter.java index 6898ddfb93f..66e90a2c746 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedPrintWriter.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedPrintWriter.java @@ -129,7 +129,8 @@ public class UncheckedPrintWriter extends PrintWriter _ioException.initCause(th); } - LOG.debug(th); + if (LOG.isDebugEnabled()) + LOG.debug(th); } 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 ee9e449b151..95b9c8bcd12 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 @@ -38,7 +38,6 @@ import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.EofException; import org.eclipse.jetty.io.FillInterest; import org.eclipse.jetty.io.RuntimeIOException; -import org.eclipse.jetty.io.SelectChannelEndPoint; import org.eclipse.jetty.io.WriteFlusher; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; @@ -820,7 +819,6 @@ public class SslConnection extends AbstractConnection } catch (Exception e) { - getEndPoint().close(); throw 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 a46ff320348..d850e65ad4c 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 @@ -210,7 +210,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService } else if (callback instanceof RequestParameterCallback) { - HttpChannel channel = HttpChannel.getCurrentHttpChannel(); + HttpChannel channel = HttpChannel.getCurrentHttpChannel(); if (channel == null) return; diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java index fbe2b62b950..9215eddaf00 100644 --- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java +++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java @@ -92,6 +92,9 @@ public class FormAuthModule extends BaseAuthModule setErrorPage(errorPage); } + /** + * @deprecated + */ public FormAuthModule(CallbackHandler callbackHandler, CrossContextPsuedoSession ssoSource, String loginPage, String errorPage) { 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 40624001859..343de02d9b3 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 @@ -82,23 +82,23 @@ public class ConnectorServer extends AbstractLifeCycle public ConnectorServer(JMXServiceURL svcUrl, Map environment, String name) throws Exception { - String urlPath = svcUrl.getURLPath(); - int idx = urlPath.indexOf("rmi://"); - if (idx > 0) - { - String hostPort = urlPath.substring(idx+6, urlPath.indexOf('/', idx+6)); - String regHostPort = startRegistry(hostPort); - if (regHostPort != null) { - urlPath = urlPath.replace(hostPort,regHostPort); - svcUrl = new JMXServiceURL(svcUrl.getProtocol(), svcUrl.getHost(), svcUrl.getPort(), urlPath); - } - } + String urlPath = svcUrl.getURLPath(); + int idx = urlPath.indexOf("rmi://"); + if (idx > 0) + { + String hostPort = urlPath.substring(idx+6, urlPath.indexOf('/', idx+6)); + String regHostPort = startRegistry(hostPort); + if (regHostPort != null) { + urlPath = urlPath.replace(hostPort,regHostPort); + svcUrl = new JMXServiceURL(svcUrl.getProtocol(), svcUrl.getHost(), svcUrl.getPort(), urlPath); + } + } MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); _connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(svcUrl, environment, mbeanServer); mbeanServer.registerMBean(_connectorServer,new ObjectName(name)); } - /* ------------------------------------------------------------ */ + /* ------------------------------------------------------------ */ /** * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() */ 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 35be7d6177f..e5386f19b2b 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 @@ -128,7 +128,8 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable @Override public void beanAdded(Container parent, Object obj) { - LOG.debug("beanAdded {}->{}",parent,obj); + if (LOG.isDebugEnabled()) + LOG.debug("beanAdded {}->{}",parent,obj); // Is their an object name for the parent ObjectName pname=null; @@ -206,7 +207,8 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable } ObjectInstance oinstance = _mbeanServer.registerMBean(mbean, oname); - LOG.debug("Registered {}", oinstance.getObjectName()); + if (LOG.isDebugEnabled()) + LOG.debug("Registered {}", oinstance.getObjectName()); _beans.put(obj, oinstance.getObjectName()); } @@ -219,7 +221,8 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable @Override public void beanRemoved(Container parent, Object obj) { - LOG.debug("beanRemoved {}",obj); + if (LOG.isDebugEnabled()) + LOG.debug("beanRemoved {}",obj); ObjectName bean = _beans.remove(obj); if (bean != null) @@ -227,7 +230,8 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable try { _mbeanServer.unregisterMBean(bean); - LOG.debug("Unregistered {}", bean); + if (LOG.isDebugEnabled()) + LOG.debug("Unregistered {}", bean); } catch (javax.management.InstanceNotFoundException e) { 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 4445294a2f6..5a7ab0b4851 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 @@ -132,7 +132,8 @@ public class ObjectMBean implements DynamicMBean { Class mClass = (Object.class.equals(oClass))?oClass=ObjectMBean.class:Loader.loadClass(oClass,mName); - LOG.debug("ObjectMbean: mbeanFor {} mClass={}", o, mClass); + if (LOG.isDebugEnabled()) + LOG.debug("ObjectMbean: mbeanFor {} mClass={}", o, mClass); try { @@ -149,7 +150,8 @@ public class ObjectMBean implements DynamicMBean } } - LOG.debug("mbeanFor {} is {}", o, mbean); + if (LOG.isDebugEnabled()) + LOG.debug("mbeanFor {} is {}", o, mbean); return mbean; } @@ -241,7 +243,8 @@ public class ObjectMBean implements DynamicMBean Class o_class=_managed.getClass(); List> influences = findInfluences(new ArrayList>(), _managed.getClass()); - LOG.debug("Influence Count: {}", influences.size() ); + if (LOG.isDebugEnabled()) + LOG.debug("Influence Count: {}", influences.size() ); // Process Type Annotations ManagedObject primary = o_class.getAnnotation( ManagedObject.class); @@ -252,7 +255,8 @@ public class ObjectMBean implements DynamicMBean } else { - LOG.debug("No @ManagedObject declared on {}", _managed.getClass()); + if (LOG.isDebugEnabled()) + LOG.debug("No @ManagedObject declared on {}", _managed.getClass()); } @@ -263,10 +267,13 @@ public class ObjectMBean implements DynamicMBean ManagedObject typeAnnotation = oClass.getAnnotation( ManagedObject.class ); - LOG.debug("Influenced by: " + oClass.getCanonicalName() ); + if (LOG.isDebugEnabled()) + LOG.debug("Influenced by: " + oClass.getCanonicalName() ); + if ( typeAnnotation == null ) { - LOG.debug("Annotations not found for: {}", oClass.getCanonicalName() ); + if (LOG.isDebugEnabled()) + LOG.debug("Annotations not found for: {}", oClass.getCanonicalName() ); continue; } @@ -279,7 +286,8 @@ public class ObjectMBean implements DynamicMBean if (methodAttributeAnnotation != null) { // TODO sort out how a proper name could get here, its a method name as an attribute at this point. - LOG.debug("Attribute Annotation found for: {}", method.getName()); + if (LOG.isDebugEnabled()) + LOG.debug("Attribute Annotation found for: {}", method.getName()); MBeanAttributeInfo mai = defineAttribute(method,methodAttributeAnnotation); if ( mai != null ) { @@ -291,9 +299,9 @@ public class ObjectMBean implements DynamicMBean if (methodOperationAnnotation != null) { - LOG.debug("Method Annotation found for: {}", method.getName()); + if (LOG.isDebugEnabled()) + LOG.debug("Method Annotation found for: {}", method.getName()); MBeanOperationInfo oi = defineOperation(method,methodOperationAnnotation); - if (oi != null) { operations.add(oi); @@ -480,7 +488,8 @@ public class ObjectMBean implements DynamicMBean /* ------------------------------------------------------------ */ public AttributeList setAttributes(AttributeList attrs) { - LOG.debug("setAttributes"); + if (LOG.isDebugEnabled()) + LOG.debug("setAttributes"); AttributeList results = new AttributeList(attrs.size()); Iterator iter = attrs.iterator(); @@ -503,7 +512,8 @@ public class ObjectMBean implements DynamicMBean /* ------------------------------------------------------------ */ public Object invoke(String name, Object[] params, String[] signature) throws MBeanException, ReflectionException { - LOG.debug("ObjectMBean:invoke " + name); + if (LOG.isDebugEnabled()) + LOG.debug("ObjectMBean:invoke " + name); String methodKey = name + "("; if (signature != null) @@ -562,12 +572,14 @@ public class ObjectMBean implements DynamicMBean try { Class mbeanClazz = Class.forName(mName); - LOG.debug("MBean Influence found for " + aClass.getSimpleName()); + if (LOG.isDebugEnabled()) + LOG.debug("MBean Influence found for " + aClass.getSimpleName()); influences.add(mbeanClazz); } catch (ClassNotFoundException cnfe) { - LOG.debug("No MBean Influence for " + aClass.getSimpleName()); + if (LOG.isDebugEnabled()) + LOG.debug("No MBean Influence for " + aClass.getSimpleName()); } // So are the super classes @@ -637,7 +649,8 @@ public class ObjectMBean implements DynamicMBean String uName = name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1); Class oClass = onMBean ? this.getClass() : _managed.getClass(); - LOG.debug("defineAttribute {} {}:{}:{}:{}",name,onMBean,readonly,oClass,description); + if (LOG.isDebugEnabled()) + LOG.debug("defineAttribute {} {}:{}:{}:{}",name,onMBean,readonly,oClass,description); Method setter = null; @@ -646,7 +659,9 @@ public class ObjectMBean implements DynamicMBean { String declaredSetter = attributeAnnotation.setter(); - LOG.debug("DeclaredSetter: {}", declaredSetter); + if (LOG.isDebugEnabled()) + LOG.debug("DeclaredSetter: {}", declaredSetter); + Method[] methods = oClass.getMethods(); for (int m = 0; m < methods.length; m++) { @@ -670,7 +685,8 @@ public class ObjectMBean implements DynamicMBean LOG.warn("Type conflict for mbean attr {} in {}", name, oClass); continue; } - LOG.debug("Declared Setter: " + declaredSetter); + if (LOG.isDebugEnabled()) + LOG.debug("Declared Setter: " + declaredSetter); } } @@ -696,16 +712,17 @@ public class ObjectMBean implements DynamicMBean { if (component_type==null) { - LOG.warn("No mbean type for {} on {}", name, _managed.getClass()); - return null; - } + LOG.warn("No mbean type for {} on {}", name, _managed.getClass()); + return null; + } if (component_type.isPrimitive() && !component_type.isArray()) { - LOG.warn("Cannot convert mbean primative {}", name); - return null; - } - LOG.debug("passed convert checks {} for type {}", name, component_type); + LOG.warn("Cannot convert mbean primative {}", name); + return null; + } + if (LOG.isDebugEnabled()) + LOG.debug("passed convert checks {} for type {}", name, component_type); } try @@ -772,7 +789,8 @@ public class ObjectMBean implements DynamicMBean if ( returnType.isArray() ) { - LOG.debug("returnType is array, get component type"); + if (LOG.isDebugEnabled()) + LOG.debug("returnType is array, get component type"); returnType = returnType.getComponentType(); } @@ -783,8 +801,8 @@ public class ObjectMBean implements DynamicMBean String impactName = methodAnnotation.impact(); - - LOG.debug("defineOperation {} {}:{}:{}", method.getName(), onMBean, impactName, description); + if (LOG.isDebugEnabled()) + LOG.debug("defineOperation {} {}:{}:{}", method.getName(), onMBean, impactName, description); String signature = method.getName(); @@ -836,7 +854,9 @@ public class ObjectMBean implements DynamicMBean signature += ")"; Class returnClass = method.getReturnType(); - LOG.debug("Method Cache: " + signature ); + + if (LOG.isDebugEnabled()) + LOG.debug("Method Cache: " + signature ); if ( _methods.containsKey(signature) ) { 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 acdf3149e9d..6df677e0aee 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 @@ -24,7 +24,6 @@ import java.sql.Statement; import javax.sql.DataSource; -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; diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java index ac3e45f3f59..3e524b05be7 100644 --- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java +++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java @@ -82,6 +82,21 @@ public class JspcMojo extends AbstractMojo public static final String PRECOMPILED_FLAG = "org.eclipse.jetty.jsp.precompiled"; + /** + * JettyJspC + * + * Add some extra setters to standard JspC class to help configure it + * for running in maven. + */ + public static class JettyJspC extends JspC + { + public void setClassLoader (ClassLoader loader) + { + this.loader = loader; + } + } + + /** * Whether or not to include dependencies on the plugin's classpath with <scope>provided</scope> * Use WITH CAUTION as you may wind up with duplicate jars/classes. @@ -219,7 +234,7 @@ public class JspcMojo extends AbstractMojo * * @parameter */ - private JspC jspc; + private JettyJspC jspc; @@ -286,19 +301,22 @@ public class JspcMojo extends AbstractMojo if (i+1 + + org.eclipse.jetty + jetty-quickstart + ${project.version} + org.eclipse.jetty jetty-jaas diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java index 5c98d231d6c..5b95c269622 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java @@ -449,7 +449,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo - + /** * @throws Exception */ @@ -458,28 +458,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo if (getJettyXmlFiles() == null) return; - XmlConfiguration last = null; - for ( File xmlFile : getJettyXmlFiles() ) - { - getLog().info( "Configuring Jetty from xml configuration file = " + xmlFile.getCanonicalPath() ); - XmlConfiguration xmlConfiguration = new XmlConfiguration(Resource.toURL(xmlFile)); - - //chain ids from one config file to another - if (last == null) - xmlConfiguration.getIdMap().put("Server", this.server); - else - xmlConfiguration.getIdMap().putAll(last.getIdMap()); - - //Set the system properties each time in case the config file set a new one - Enumeration ensysprop = System.getProperties().propertyNames(); - while (ensysprop.hasMoreElements()) - { - String name = (String)ensysprop.nextElement(); - xmlConfiguration.getProperties().put(name,System.getProperty(name)); - } - last = xmlConfiguration; - xmlConfiguration.configure(); - } + this.server.applyXmlConfigurations(getJettyXmlFiles()); } @@ -704,7 +683,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo /** * */ - private void printSystemProperties () + protected void printSystemProperties () { // print out which system properties were set up if (getLog().isDebugEnabled()) diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java new file mode 100644 index 00000000000..6c607c85df5 --- /dev/null +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java @@ -0,0 +1,157 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + + +package org.eclipse.jetty.maven.plugin; + +import java.io.File; +import java.io.IOException; + +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.eclipse.jetty.annotations.AnnotationConfiguration; +import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.resource.Resource; +import org.eclipse.jetty.util.thread.QueuedThreadPool; + +/** + * JettyEffectiveWebXml + * + * @goal effective-web-xml + * @requiresDependencyResolution test + * @execute phase="test-compile" + * @description Runs jetty on the unassembled webapp to generate the effective web.xml + */ +public class JettyEffectiveWebXml extends JettyRunMojo +{ + /** + * The target directory + * + * @parameter expression="${project.build.directory}" + * @required + * @readonly + */ + protected File target; + + /** + * The target directory + * + * @parameter + */ + protected File effectiveWebXml; + + + protected boolean deleteOnExit = true; + + + /** + * @see org.apache.maven.plugin.Mojo#execute() + */ + public void execute() throws MojoExecutionException, MojoFailureException + { + super.execute(); + } + + + @Override + public void startJetty() throws MojoExecutionException + { + //Only do enough setup to be able to produce a quickstart-web.xml file to + //pass onto the forked process to run + + //if the user didn't nominate a file to generate into, pick the name and + //make sure that it is deleted on exit + if (effectiveWebXml == null) + { + deleteOnExit = true; + effectiveWebXml = new File(target, "effective-web.xml"); + effectiveWebXml.deleteOnExit(); + } + + Resource descriptor = Resource.newResource(effectiveWebXml); + + QueuedThreadPool tpool = null; + + try + { + printSystemProperties(); + + //apply any config from a jetty.xml file first to our "fake" server instance + //TODO probably not necessary + applyJettyXml (); + + + server.configureHandlers(); + + //ensure config of the webapp based on settings in plugin + configureWebApplication(); + + + //set the webapp up to do very little other than generate the quickstart-web.xml + webApp.setCopyWebDir(false); + webApp.setCopyWebInf(false); + webApp.setGenerateQuickStart(true); + + if (!effectiveWebXml.getParentFile().exists()) + effectiveWebXml.getParentFile().mkdirs(); + if (!effectiveWebXml.exists()) + effectiveWebXml.createNewFile(); + + webApp.setQuickStartWebDescriptor(descriptor); + + server.addWebApplication(webApp); + + //if our server has a thread pool associated we can do any annotation scanning multithreaded, + //otherwise scanning will be single threaded + tpool = server.getBean(QueuedThreadPool.class); + if (tpool != null) + tpool.start(); + else + webApp.setAttribute(AnnotationConfiguration.MULTI_THREADED, Boolean.FALSE.toString()); + + webApp.start(); //just enough to generate the quickstart + + } + catch (Exception e) + { + throw new MojoExecutionException("Effective web.xml generation failed", e); + } + finally + { + try {webApp.stop();}catch (Exception x) {}; + + try {if (tpool != null) tpool.stop();} catch (Exception x) {}; + } + + + if (deleteOnExit) + { + try + { + //just show the result in the log + getLog().info(IO.toString(descriptor.getInputStream())); + } + catch (IOException e) + { + throw new MojoExecutionException("Unable to output effective web.xml", e); + } + + } + + } +} diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java index efb1284c014..97b7219ca08 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java @@ -39,34 +39,36 @@ import java.util.Random; import java.util.Set; import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.descriptor.PluginDescriptor; -import org.apache.maven.project.MavenProject; +import org.eclipse.jetty.annotations.AnnotationConfiguration; +import org.eclipse.jetty.quickstart.QuickStartDescriptorGenerator; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceCollection; +import org.eclipse.jetty.util.thread.QueuedThreadPool; /** *

    - * This goal is used to assemble your webapp into a war and automatically deploy it to Jetty in a forked JVM. + * This goal is used to deploy your unassembled webapp into a forked JVM. *

    *

    - * You need to define a jetty.xml file to configure connectors etc and a context xml file that sets up anything special - * about your webapp. This plugin will fill in the: - *

      - *
    • context path - *
    • classes - *
    • web.xml - *
    • root of the webapp - *
    - * Based on a combination of information that you supply and the location of files in your unassembled webapp. + * You need to define a jetty.xml file to configure connectors etc. You can use the normal setters of o.e.j.webapp.WebAppContext on the webApp + * configuration element for this plugin. You may also need context xml file for any particularly complex webapp setup. + * about your webapp. *

    *

    - * There is a reference guide to the configuration parameters for this plugin, and more detailed information - * with examples in the Configuration Guide. + * Unlike the other jetty goals, this does NOT support the scanIntervalSeconds parameter: the webapp will be deployed only once. + *

    + *

    + * The stopKey, stopPort configuration elements can be used to control the stopping of the forked process. By default, this plugin will launch + * the forked jetty instance and wait for it to complete (in which case it acts much like the jetty:run goal, and you will need to Cntrl-C to stop). + * By setting the configuration element waitForChild to false, the plugin will terminate after having forked the jetty process. In this case + * you can use the jetty:stop goal to terminate the process. + *

    + * See http://www.eclipse.org/jetty/documentation for more information on this and other jetty plugins. *

    * * @goal run-forked @@ -75,50 +77,18 @@ import org.eclipse.jetty.util.resource.ResourceCollection; * @description Runs Jetty in forked JVM on an unassembled webapp * */ -public class JettyRunForkedMojo extends AbstractMojo +public class JettyRunForkedMojo extends JettyRunMojo { public static final String DEFAULT_WEBAPP_SRC = "src"+File.separator+"main"+File.separator+"webapp"; public static final String FAKE_WEBAPP = "webapp-tmp"; public String PORT_SYSPROPERTY = "jetty.port"; - - /** - * Whether or not to include dependencies on the plugin's classpath with <scope>provided</scope> - * Use WITH CAUTION as you may wind up with duplicate jars/classes. - * @parameter default-value="false" - */ - protected boolean useProvidedScope; - - - /** - * The maven project. - * - * @parameter expression="${project}" - * @required - * @readonly - */ - private MavenProject project; - /** - * If true, the <testOutputDirectory> - * and the dependencies of <scope>test<scope> - * will be put first on the runtime classpath. - * @parameter alias="useTestClasspath" default-value="false" - */ - private boolean useTestScope; + - /** - * The default location of the web.xml file. Will be used - * if <webAppConfig><descriptor> is not set. - * - * @parameter expression="${basedir}/src/main/webapp/WEB-INF/web.xml" - * @readonly - */ - private String webXml; - /** * The target directory @@ -129,118 +99,13 @@ public class JettyRunForkedMojo extends AbstractMojo */ protected File target; - /** - * The temporary directory to use for the webapp. - * Defaults to target/tmp - * - * @parameter alias="tmpDirectory" expression="${project.build.directory}/tmp" - * @required - * @readonly - */ - protected File tempDirectory; - - - - /** - * Whether temporary directory contents should survive webapp restarts. + * The file into which to generate the quickstart web xml for the forked process to use * - * @parameter default-value="false" + * @parameter expression="${project.build.directory}/fork-web.xml" */ - private boolean persistTempDirectory; - + protected File forkWebXml; - /** - * The directory containing generated classes. - * - * @parameter expression="${project.build.outputDirectory}" - * @required - * - */ - private File classesDirectory; - - - /** - * The directory containing generated test classes. - * - * @parameter expression="${project.build.testOutputDirectory}" - * @required - */ - private File testClassesDirectory; - - - /** - * Root directory for all html/jsp etc files - * - * @parameter expression="${basedir}/src/main/webapp" - * - */ - private File webAppSourceDirectory; - - /** - * Resource Bases - * - * @parameter - * - */ - private String[] resourceBases; - - /** - * If true, the webAppSourceDirectory will be first on the list of - * resources that form the resource base for the webapp. If false, - * it will be last. - * - * @parameter default-value="true" - */ - private boolean baseAppFirst; - - - /** - * Location of jetty xml configuration files whose contents - * will be applied before any plugin configuration. Optional. - * @parameter - */ - private String jettyXml; - - /** - * The context path for the webapp. Defaults to / for jetty-9 - * - * @parameter expression="/" - */ - private String contextPath; - - - /** - * Location of a context xml configuration file whose contents - * will be applied to the webapp AFTER anything in <webAppConfig>.Optional. - * @parameter - */ - private String contextXml; - - - /** - * @parameter expression="${jetty.skip}" default-value="false" - */ - private boolean skip; - - - /** - * Port to listen to stop jetty on executing -DSTOP.PORT=<stopPort> - * -DSTOP.KEY=<stopKey> -jar start.jar --stop - * @parameter - * @required - */ - protected int stopPort; - - - /** - * Key to provide when stopping jetty on executing java -DSTOP.KEY=<stopKey> - * -DSTOP.PORT=<stopPort> -jar start.jar --stop - * @parameter - * @required - */ - protected String stopKey; - /** * Arbitrary jvm args to pass to the forked process @@ -284,9 +149,9 @@ public class JettyRunForkedMojo extends AbstractMojo */ private Random random; + - - + private Resource originalBaseResource; /** @@ -360,332 +225,71 @@ public class JettyRunForkedMojo extends AbstractMojo */ public void execute() throws MojoExecutionException, MojoFailureException { - getLog().info("Configuring Jetty for project: " + project.getName()); - if (skip) - { - getLog().info("Skipping Jetty start: jetty.skip==true"); - return; - } - PluginLog.setLog(getLog()); Runtime.getRuntime().addShutdownHook(new ShutdownThread()); random = new Random(); - startJettyRunner(); + super.execute(); } - - - /** - * @return - * @throws MojoExecutionException - */ - public List getProvidedJars() throws MojoExecutionException - { - //if we are configured to include the provided dependencies on the plugin's classpath - //(which mimics being on jetty's classpath vs being on the webapp's classpath), we first - //try and filter out ones that will clash with jars that are plugin dependencies, then - //create a new classloader that we setup in the parent chain. - if (useProvidedScope) - { - - List provided = new ArrayList(); - for ( Iterator iter = project.getArtifacts().iterator(); iter.hasNext(); ) - { - Artifact artifact = iter.next(); - if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope()) && !isPluginArtifact(artifact)) - { - provided.add(artifact.getFile().getAbsolutePath()); - if (getLog().isDebugEnabled()) { getLog().debug("Adding provided artifact: "+artifact);} - } - } - return provided; - } - else - return null; - } - - - - - /** - * @return - * @throws MojoExecutionException - */ - public File prepareConfiguration() throws MojoExecutionException + + @Override + public void startJetty() throws MojoExecutionException { - try - { - //work out the configuration based on what is configured in the pom - File propsFile = new File (target, "fork.props"); - if (propsFile.exists()) - propsFile.delete(); - - propsFile.createNewFile(); - //propsFile.deleteOnExit(); - - Properties props = new Properties(); - - - //web.xml - if (webXml != null) - props.put("web.xml", webXml); - - //sort out the context path - if (contextPath != null) - props.put("context.path", contextPath); - - //sort out the tmp directory (make it if it doesn't exist) - if (tempDirectory != null) - { - if (!tempDirectory.exists()) - tempDirectory.mkdirs(); - props.put("tmp.dir", tempDirectory.getAbsolutePath()); - } - - props.put("tmp.dir.persist", Boolean.toString(persistTempDirectory)); - - if (resourceBases == null) - { - //sort out base dir of webapp - if (webAppSourceDirectory == null || !webAppSourceDirectory.exists()) - { - webAppSourceDirectory = new File (project.getBasedir(), DEFAULT_WEBAPP_SRC); - if (!webAppSourceDirectory.exists()) - { - //try last resort of making a fake empty dir - File target = new File(project.getBuild().getDirectory()); - webAppSourceDirectory = new File(target, FAKE_WEBAPP); - if (!webAppSourceDirectory.exists()) - webAppSourceDirectory.mkdirs(); - } - } - resourceBases = new String[] { webAppSourceDirectory.getAbsolutePath() }; - } - StringBuffer rb = new StringBuffer(resourceBases[0]); - for (int i=1; i classDirs = getClassesDirs(); - StringBuffer strbuff = new StringBuffer(); - for (int i=0; i deps = getDependencyFiles(); - strbuff.setLength(0); - for (int i=0; i warArtifacts = getWarArtifacts(); - for (int i=0; i configs = warPlugin.getMavenWarOverlayConfigs(); - int i=0; - for (OverlayConfig c:configs) - { - props.put("maven.war.overlay."+(i++), c.toString()); - } - - try (OutputStream out = new BufferedOutputStream(new FileOutputStream(propsFile))) - { - props.store(out, "properties for forked webapp"); - } - return propsFile; - } - catch (Exception e) - { - throw new MojoExecutionException("Prepare webapp configuration", e); - } - } - - - - - /** - * @return - */ - private List getClassesDirs () - { - List classesDirs = new ArrayList(); + //Only do enough setup to be able to produce a quickstart-web.xml file to + //pass onto the forked process to run - //if using the test classes, make sure they are first - //on the list - if (useTestScope && (testClassesDirectory != null)) - classesDirs.add(testClassesDirectory); + if (forkWebXml == null) + forkWebXml = new File (target, "fork-web.xml"); - if (classesDirectory != null) - classesDirs.add(classesDirectory); - - return classesDirs; - } - - - - - /** - * @return - * @throws MalformedURLException - * @throws IOException - */ - private List getWarArtifacts() - throws MalformedURLException, IOException - { - List warArtifacts = new ArrayList(); - for ( Iterator iter = project.getArtifacts().iterator(); iter.hasNext(); ) - { - Artifact artifact = (Artifact) iter.next(); - - if (artifact.getType().equals("war")) - warArtifacts.add(artifact); - } - - return warArtifacts; - } - - - - - /** - * @return - */ - private List getDependencyFiles () - { - List dependencyFiles = new ArrayList(); - - for ( Iterator iter = project.getArtifacts().iterator(); iter.hasNext(); ) - { - Artifact artifact = (Artifact) iter.next(); - // Test never appears here ! - if (((!Artifact.SCOPE_PROVIDED.equals(artifact.getScope())) && (!Artifact.SCOPE_TEST.equals( artifact.getScope()))) - || - (useTestScope && Artifact.SCOPE_TEST.equals( artifact.getScope()))) - { - dependencyFiles.add(artifact.getFile()); - getLog().debug( "Adding artifact " + artifact.getFile().getName() + " for WEB-INF/lib " ); - } - } - - return dependencyFiles; - } - - - - - /** - * @param artifact - * @return - */ - public boolean isPluginArtifact(Artifact artifact) - { - if (pluginArtifacts == null || pluginArtifacts.isEmpty()) - return false; - - boolean isPluginArtifact = false; - for (Iterator iter = pluginArtifacts.iterator(); iter.hasNext() && !isPluginArtifact; ) - { - Artifact pluginArtifact = iter.next(); - if (getLog().isDebugEnabled()) { getLog().debug("Checking "+pluginArtifact);} - if (pluginArtifact.getGroupId().equals(artifact.getGroupId()) && pluginArtifact.getArtifactId().equals(artifact.getArtifactId())) - isPluginArtifact = true; - } - - return isPluginArtifact; - } - - - - - /** - * @return - * @throws Exception - */ - private Set getExtraJars() - throws Exception - { - Set extraJars = new HashSet(); - - - List l = pluginArtifacts; - Artifact pluginArtifact = null; - - if (l != null) - { - Iterator itor = l.iterator(); - while (itor.hasNext() && pluginArtifact == null) - { - Artifact a = (Artifact)itor.next(); - if (a.getArtifactId().equals(plugin.getArtifactId())) //get the jetty-maven-plugin jar - { - extraJars.add(a); - } - } - } - - return extraJars; - } - - - - - /** - * @throws MojoExecutionException - */ - public void startJettyRunner() throws MojoExecutionException - { try { - + printSystemProperties(); + + //do NOT apply the jettyXml configuration - as the jvmArgs may be needed for it to work + + //ensure handler structure enabled + server.configureHandlers(); + + //ensure config of the webapp based on settings in plugin + configureWebApplication(); + + //copy the base resource as configured by the plugin + originalBaseResource = webApp.getBaseResource(); + + //set the webapp up to do very little other than generate the quickstart-web.xml + webApp.setCopyWebDir(false); + webApp.setCopyWebInf(false); + webApp.setGenerateQuickStart(true); + + if (!forkWebXml.getParentFile().exists()) + forkWebXml.getParentFile().mkdirs(); + if (!forkWebXml.exists()) + forkWebXml.createNewFile(); + + webApp.setQuickStartWebDescriptor(Resource.newResource(forkWebXml)); + + //add webapp to our fake server instance + server.addWebApplication(webApp); + + //if our server has a thread pool associated we can do annotation scanning multithreaded, + //otherwise scanning will be single threaded + QueuedThreadPool tpool = server.getBean(QueuedThreadPool.class); + if (tpool != null) + tpool.start(); + else + webApp.setAttribute(AnnotationConfiguration.MULTI_THREADED, Boolean.FALSE.toString()); + + webApp.start(); //just enough to generate the quickstart + + //save config of the webapp BEFORE we stop File props = prepareConfiguration(); + webApp.stop(); + + if (tpool != null) + tpool.stop(); + List cmd = new ArrayList(); cmd.add(getJavaBin()); @@ -699,7 +303,7 @@ public class JettyRunForkedMojo extends AbstractMojo } } - String classPath = getClassPath(); + String classPath = getContainerClassPath(); if (classPath != null && classPath.length() > 0) { cmd.add("-cp"); @@ -803,15 +407,262 @@ public class JettyRunForkedMojo extends AbstractMojo throw new MojoExecutionException("Failed to create Jetty process", ex); } } + + + + + /** + * @return + * @throws MojoExecutionException + */ + public List getProvidedJars() throws MojoExecutionException + { + //if we are configured to include the provided dependencies on the plugin's classpath + //(which mimics being on jetty's classpath vs being on the webapp's classpath), we first + //try and filter out ones that will clash with jars that are plugin dependencies, then + //create a new classloader that we setup in the parent chain. + if (useProvidedScope) + { + + List provided = new ArrayList(); + for ( Iterator iter = project.getArtifacts().iterator(); iter.hasNext(); ) + { + Artifact artifact = iter.next(); + if (Artifact.SCOPE_PROVIDED.equals(artifact.getScope()) && !isPluginArtifact(artifact)) + { + provided.add(artifact.getFile().getAbsolutePath()); + if (getLog().isDebugEnabled()) { getLog().debug("Adding provided artifact: "+artifact);} + } + } + return provided; + + } + else + return null; + } - + + + + /** + * @return + * @throws MojoExecutionException + */ + public File prepareConfiguration() throws MojoExecutionException + { + try + { + //work out the configuration based on what is configured in the pom + File propsFile = new File (target, "fork.props"); + if (propsFile.exists()) + propsFile.delete(); + + propsFile.createNewFile(); + //propsFile.deleteOnExit(); + + Properties props = new Properties(); + + + //web.xml + if (webApp.getDescriptor() != null) + { + props.put("web.xml", webApp.getDescriptor()); + } + + if (webApp.getQuickStartWebDescriptor() != null) + { + props.put("quickstart.web.xml", webApp.getQuickStartWebDescriptor().getFile().getAbsolutePath()); + } + + //sort out the context path + if (webApp.getContextPath() != null) + { + props.put("context.path", webApp.getContextPath()); + } + + //tmp dir + props.put("tmp.dir", webApp.getTempDirectory().getAbsolutePath()); + props.put("tmp.dir.persist", Boolean.toString(webApp.isPersistTempDirectory())); + + //resource bases - these are what has been configured BEFORE the webapp started and + //potentially reordered them and included any resources from META-INF + if (originalBaseResource != null) + { + StringBuffer rb = new StringBuffer(); + if (originalBaseResource instanceof ResourceCollection) + { + ResourceCollection resources = ((ResourceCollection)originalBaseResource); + for (Resource r:resources.getResources()) + { + if (rb.length() > 0) rb.append(","); + rb.append(r.toString()); + } + } + else + rb.append(originalBaseResource.toString()); + + props.put("base.dirs", rb.toString()); + } + + //sort out the resource base directories of the webapp + props.put("base.first", Boolean.toString(webApp.getBaseAppFirst())); + + //web-inf classes + if (webApp.getClasses() != null) + { + props.put("classes.dir",webApp.getClasses().getAbsolutePath()); + } + + if (useTestScope && webApp.getTestClasses() != null) + { + props.put("testClasses.dir", webApp.getTestClasses().getAbsolutePath()); + } + + //web-inf lib + List deps = webApp.getWebInfLib(); + StringBuffer strbuff = new StringBuffer(); + for (int i=0; i warArtifacts = getWarArtifacts(); + for (int i=0; i configs = warPlugin.getMavenWarOverlayConfigs(); + int i=0; + for (OverlayConfig c:configs) + { + props.put("maven.war.overlay."+(i++), c.toString()); + } + + try (OutputStream out = new BufferedOutputStream(new FileOutputStream(propsFile))) + { + props.store(out, "properties for forked webapp"); + } + return propsFile; + } + catch (Exception e) + { + throw new MojoExecutionException("Prepare webapp configuration", e); + } + } + + + + + + + /** + * @return + * @throws MalformedURLException + * @throws IOException + */ + private List getWarArtifacts() + throws MalformedURLException, IOException + { + List warArtifacts = new ArrayList(); + for ( Iterator iter = project.getArtifacts().iterator(); iter.hasNext(); ) + { + Artifact artifact = (Artifact) iter.next(); + + if (artifact.getType().equals("war")) + warArtifacts.add(artifact); + } + + return warArtifacts; + } + + + + + + + /** + * @param artifact + * @return + */ + public boolean isPluginArtifact(Artifact artifact) + { + if (pluginArtifacts == null || pluginArtifacts.isEmpty()) + return false; + + boolean isPluginArtifact = false; + for (Iterator iter = pluginArtifacts.iterator(); iter.hasNext() && !isPluginArtifact; ) + { + Artifact pluginArtifact = iter.next(); + if (getLog().isDebugEnabled()) { getLog().debug("Checking "+pluginArtifact);} + if (pluginArtifact.getGroupId().equals(artifact.getGroupId()) && pluginArtifact.getArtifactId().equals(artifact.getArtifactId())) + isPluginArtifact = true; + } + + return isPluginArtifact; + } + + + + + /** + * @return + * @throws Exception + */ + private Set getExtraJars() + throws Exception + { + Set extraJars = new HashSet(); + + + List l = pluginArtifacts; + Artifact pluginArtifact = null; + + if (l != null) + { + Iterator itor = l.iterator(); + while (itor.hasNext() && pluginArtifact == null) + { + Artifact a = (Artifact)itor.next(); + if (a.getArtifactId().equals(plugin.getArtifactId())) //get the jetty-maven-plugin jar + { + extraJars.add(a); + } + } + } + + return extraJars; + } + + + + /** * @return * @throws Exception */ - public String getClassPath() throws Exception + public String getContainerClassPath() throws Exception { StringBuilder classPath = new StringBuilder(); for (Object obj : pluginArtifacts) diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java index 41147fca0de..130dd52504a 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java @@ -55,8 +55,7 @@ import org.eclipse.jetty.webapp.WebAppContext; * This can be used, for example, to deploy a static webapp that is not part of your maven build. *

    *

    - * There is a reference guide to the configuration parameters for this plugin, and more detailed information - * with examples in the Configuration Guide. + * There is a reference guide to the configuration parameters for this plugin. *

    * * diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyServer.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyServer.java index de5da154e1d..3e60e1008b3 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyServer.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyServer.java @@ -19,6 +19,12 @@ package org.eclipse.jetty.maven.plugin; +import java.io.File; +import java.util.Collections; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; + import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.RequestLog; import org.eclipse.jetty.server.handler.ContextHandlerCollection; @@ -27,6 +33,8 @@ import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.xml.XmlConfiguration; + /** * JettyServer @@ -109,4 +117,43 @@ public class JettyServer extends org.eclipse.jetty.server.Server } } } + + /** + * Apply xml files to server startup, passing in ourselves as the + * "Server" instance. + * + * @param files + * @throws Exception + */ + public void applyXmlConfigurations (List files) + throws Exception + { + if (files == null || files.isEmpty()) + return; + + Map lastMap = Collections.singletonMap("Server", (Object)this); + + for ( File xmlFile : files ) + { + if (PluginLog.getLog() != null) + PluginLog.getLog().info( "Configuring Jetty from xml configuration file = " + xmlFile.getCanonicalPath() ); + + + XmlConfiguration xmlConfiguration = new XmlConfiguration(Resource.toURL(xmlFile)); + + //chain ids from one config file to another + if (lastMap != null) + xmlConfiguration.getIdMap().putAll(lastMap); + + //Set the system properties each time in case the config file set a new one + Enumeration ensysprop = System.getProperties().propertyNames(); + while (ensysprop.hasMoreElements()) + { + String name = (String)ensysprop.nextElement(); + xmlConfiguration.getProperties().put(name,System.getProperty(name)); + } + xmlConfiguration.configure(); + lastMap = xmlConfiguration.getIdMap(); + } + } } diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java index 700d0b9372b..6bdb0134128 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java @@ -19,6 +19,7 @@ package org.eclipse.jetty.maven.plugin; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.net.MalformedURLException; import java.util.ArrayList; @@ -32,6 +33,8 @@ import java.util.TreeSet; import org.eclipse.jetty.annotations.AnnotationConfiguration; import org.eclipse.jetty.plus.webapp.EnvConfiguration; import org.eclipse.jetty.plus.webapp.PlusConfiguration; +import org.eclipse.jetty.quickstart.PreconfigureDescriptorProcessor; +import org.eclipse.jetty.quickstart.QuickStartDescriptorGenerator; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.FilterMapping; import org.eclipse.jetty.servlet.ServletHolder; @@ -61,20 +64,40 @@ import org.eclipse.jetty.webapp.WebXmlConfiguration; public class JettyWebAppContext extends WebAppContext { private static final Logger LOG = Log.getLogger(JettyWebAppContext.class); + + - private static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/javax.servlet-[^/]*\\.jar$|.*/servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar"; + private static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/javax.servlet-[^/]*\\.jar$|.*/servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar"; private static final String WEB_INF_CLASSES_PREFIX = "/WEB-INF/classes"; private static final String WEB_INF_LIB_PREFIX = "/WEB-INF/lib"; + private final Configuration[] _defaultConfigurations = { + new MavenWebInfConfiguration(), + new WebXmlConfiguration(), + new MetaInfConfiguration(), + new FragmentConfiguration(), + new EnvConfiguration(), + new PlusConfiguration(), + new AnnotationConfiguration(), + new JettyWebXmlConfiguration() + }; + + private final Configuration[] _quickStartConfigurations = { + new MavenQuickStartConfiguration(), + new EnvConfiguration(), + new PlusConfiguration(), + new JettyWebXmlConfiguration() + }; + private File _classes = null; private File _testClasses = null; private final List _webInfClasses = new ArrayList(); private final List _webInfJars = new ArrayList(); private final Map _webInfJarMap = new HashMap(); - private final EnvConfiguration _envConfig; private List _classpathFiles; //webInfClasses+testClasses+webInfJars private String _jettyEnvXml; private List _overlays; + private Resource _quickStartWebXml; @@ -99,28 +122,24 @@ public class JettyWebAppContext extends WebAppContext */ private boolean _baseAppFirst = true; + + + private boolean _isGenerateQuickStart; + private PreconfigureDescriptorProcessor _preconfigProcessor; + + public JettyWebAppContext () throws Exception { super(); - setConfigurations(new Configuration[]{ - new MavenWebInfConfiguration(), - new WebXmlConfiguration(), - new MetaInfConfiguration(), - new FragmentConfiguration(), - _envConfig = new EnvConfiguration(), - new PlusConfiguration(), - new AnnotationConfiguration(), - new JettyWebXmlConfiguration() - }); // Turn off copyWebInf option as it is not applicable for plugin. super.setCopyWebInf(false); } public void setContainerIncludeJarPattern(String pattern) { - _containerIncludeJarPattern = pattern; + _containerIncludeJarPattern = pattern; } public String getContainerIncludeJarPattern() @@ -131,7 +150,7 @@ public class JettyWebAppContext extends WebAppContext public String getWebInfIncludeJarPattern() { - return _webInfIncludeJarPattern; + return _webInfIncludeJarPattern; } public void setWebInfIncludeJarPattern(String pattern) { @@ -209,7 +228,19 @@ public class JettyWebAppContext extends WebAppContext { return _baseAppFirst; } - + + /* ------------------------------------------------------------ */ + public void setQuickStartWebDescriptor (Resource quickStartWebXml) + { + _quickStartWebXml = quickStartWebXml; + } + + /* ------------------------------------------------------------ */ + public Resource getQuickStartWebDescriptor () + { + return _quickStartWebXml; + } + /* ------------------------------------------------------------ */ /** * This method is provided as a convenience for jetty maven plugin configuration @@ -233,9 +264,65 @@ public class JettyWebAppContext extends WebAppContext { return _webInfJars; } + + public void setGenerateQuickStart (boolean quickStart) + { + _isGenerateQuickStart = quickStart; + } + + public boolean isGenerateQuickStart() + { + return _isGenerateQuickStart; + } + + + + + @Override + protected void startWebapp() throws Exception + { + if (isGenerateQuickStart()) + { + if (getQuickStartWebDescriptor() == null) + throw new IllegalStateException ("No location to generate quickstart descriptor"); + QuickStartDescriptorGenerator generator = new QuickStartDescriptorGenerator(this, _preconfigProcessor.getXML()); + try (FileOutputStream fos = new FileOutputStream(getQuickStartWebDescriptor().getFile())) + { + generator.generateQuickStartWebXml(fos); + } + } + else + super.startWebapp(); + } + + + @Override public void doStart () throws Exception { + //choose if this will be a quickstart or normal start + if (!isGenerateQuickStart() && getQuickStartWebDescriptor() != null) + setConfigurations(_quickStartConfigurations); + else + { + setConfigurations(_defaultConfigurations); + if (isGenerateQuickStart()) + { + _preconfigProcessor = new PreconfigureDescriptorProcessor(); + getMetaData().addDescriptorProcessor(_preconfigProcessor); + } + } + + + //inject configurations with config from maven plugin + for (Configuration c:getConfigurations()) + { + if (c instanceof EnvConfiguration && getJettyEnvXml() != null) + ((EnvConfiguration)c).setJettyEnvXml(Resource.toURL(new File(getJettyEnvXml()))); + else if (c instanceof MavenQuickStartConfiguration && getQuickStartWebDescriptor() != null) + ((MavenQuickStartConfiguration)c).setQuickStartWebXml(getQuickStartWebDescriptor()); + } + //Set up the pattern that tells us where the jars are that need scanning //Allow user to set up pattern for names of jars from the container classpath @@ -273,9 +360,6 @@ public class JettyWebAppContext extends WebAppContext if (fileName.endsWith(".jar")) _webInfJarMap.put(fileName, file); } - - if (this._jettyEnvXml != null) - _envConfig.setJettyEnvXml(Resource.toURL(new File(this._jettyEnvXml))); // CHECK setShutdown(false); super.doStart(); diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenQuickStartConfiguration.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenQuickStartConfiguration.java new file mode 100644 index 00000000000..295bd062424 --- /dev/null +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenQuickStartConfiguration.java @@ -0,0 +1,92 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + + +package org.eclipse.jetty.maven.plugin; + +import java.io.File; +import java.util.Iterator; + +import org.eclipse.jetty.quickstart.QuickStartConfiguration; +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; + +/** + * MavenQuickStartConfiguration + * + * + */ +public class MavenQuickStartConfiguration extends QuickStartConfiguration +{ + private static final Logger LOG = Log.getLogger(QuickStartConfiguration.class); + + private Resource _quickStartWebXml; + + + public void setQuickStartWebXml (Resource r) + { + _quickStartWebXml = r; + } + + + + @Override + public Resource getQuickStartWebXml(WebAppContext context) throws Exception + { + return _quickStartWebXml; + } + + + + @Override + public void configure(WebAppContext context) throws Exception + { + + JettyWebAppContext jwac = (JettyWebAppContext)context; + + //put the classes dir and all dependencies into the classpath + if (jwac.getClassPathFiles() != null) + { + if (LOG.isDebugEnabled()) LOG.debug("Setting up classpath ..."); + Iterator itor = jwac.getClassPathFiles().iterator(); + while (itor.hasNext()) + ((WebAppClassLoader)context.getClassLoader()).addClassPath(((File)itor.next()).getCanonicalPath()); + } + + //Set up the quickstart environment for the context + super.configure(context); + + // knock out environmental maven and plexus classes from webAppContext + String[] existingServerClasses = context.getServerClasses(); + String[] newServerClasses = new String[2+(existingServerClasses==null?0:existingServerClasses.length)]; + newServerClasses[0] = "org.apache.maven."; + newServerClasses[1] = "org.codehaus.plexus."; + System.arraycopy( existingServerClasses, 0, newServerClasses, 2, existingServerClasses.length ); + if (LOG.isDebugEnabled()) + { + LOG.debug("Server classes:"); + for (int i=0;i fragAndRequiredBundles = (Set)context.getAttribute(OSGiWebInfConfiguration.FRAGMENT_AND_REQUIRED_BUNDLES); if (fragAndRequiredBundles != null) { //index and scan fragments 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 deleted file mode 100644 index 7b85f62a2d2..00000000000 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiMetaInfConfiguration.java +++ /dev/null @@ -1,129 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.osgi.boot; - -import java.net.URL; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelperFactory; -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.webapp.MetaInfConfiguration; -import org.eclipse.jetty.webapp.WebAppContext; -import org.osgi.framework.Bundle; - -/** - * OSGiMetaInfConfiguration - * - * Extension of standard Jetty MetaInfConfiguration class to handle OSGi bundle - * fragments that may also need to be scanned for META-INF info. - * - * @deprecated - */ -public class OSGiMetaInfConfiguration extends MetaInfConfiguration -{ - private static final Logger LOG = Log.getLogger(OSGiMetaInfConfiguration.class); - - - /** - * Inspect bundle fragments associated with the bundle of the webapp for web-fragment, resources, tlds. - * - * @see org.eclipse.jetty.webapp.MetaInfConfiguration#preConfigure(org.eclipse.jetty.webapp.WebAppContext) - */ - @Override - public void preConfigure(final WebAppContext context) throws Exception - { - Map frags = (Map) context.getAttribute(METAINF_FRAGMENTS); - Set resfrags = (Set) context.getAttribute(METAINF_RESOURCES); - List tldfrags = (List) context.getAttribute(METAINF_TLDS); - - Bundle[] fragments = PackageAdminServiceTracker.INSTANCE.getFragmentsAndRequiredBundles((Bundle)context.getAttribute(OSGiWebappConstants.JETTY_OSGI_BUNDLE)); - //TODO not convinced we need to do this, as we added any fragment jars to the MetaData.webInfJars in OSGiWebInfConfiguration, - //so surely the web-fragments and resources tlds etc can be discovered normally? - for (Bundle frag : fragments) - { - URL webFrag = frag.getEntry("/META-INF/web-fragment.xml"); - Enumeration resEnum = frag.findEntries("/META-INF/resources", "*", true); - Enumeration tldEnum = frag.findEntries("/META-INF", "*.tld", false); - if (webFrag != null || (resEnum != null && resEnum.hasMoreElements()) || (tldEnum != null && tldEnum.hasMoreElements())) - { - try - { - if (webFrag != null) - { - if (frags == null) - { - frags = new HashMap(); - context.setAttribute(METAINF_FRAGMENTS, frags); - } - frags.put(Resource.newResource(BundleFileLocatorHelperFactory.getFactory().getHelper().getBundleInstallLocation(frag).toURI()), - Resource.newResource(webFrag)); - } - if (resEnum != null && resEnum.hasMoreElements()) - { - URL resourcesEntry = frag.getEntry("/META-INF/resources/"); - if (resourcesEntry == null) - { - // probably we found some fragments to a - // bundle. - // those are already contributed. - // so we skip this. - } - else - { - if (resfrags == null) - { - resfrags = new HashSet(); - context.setAttribute(METAINF_RESOURCES, resfrags); - } - resfrags.add(Resource.newResource(BundleFileLocatorHelperFactory.getFactory().getHelper().getLocalURL(resourcesEntry))); - } - } - if (tldEnum != null && tldEnum.hasMoreElements()) - { - if (tldfrags == null) - { - tldfrags = new ArrayList(); - context.setAttribute(METAINF_TLDS, tldfrags); - } - while (tldEnum.hasMoreElements()) - { - URL tldUrl = tldEnum.nextElement(); - tldfrags.add(Resource.newResource(BundleFileLocatorHelperFactory.getFactory().getHelper().getLocalURL(tldUrl))); - } - } - } - catch (Exception e) - { - LOG.warn("Unable to locate the bundle " + frag.getBundleId(), e); - } - } - } - - super.preConfigure(context); - } -} diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java index ce3c141ae5a..69a7ce8cdb9 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java @@ -23,6 +23,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.StringTokenizer; import java.util.TreeMap; import java.util.regex.Pattern; @@ -51,6 +52,9 @@ public class OSGiWebInfConfiguration extends WebInfConfiguration public static final String CONTAINER_BUNDLE_PATTERN = "org.eclipse.jetty.server.webapp.containerIncludeBundlePattern"; + public static final String FRAGMENT_AND_REQUIRED_BUNDLES = "org.eclipse.jetty.osgi.fragmentAndRequiredBundles"; + public static final String FRAGMENT_AND_REQUIRED_RESOURCES = "org.eclipse.jetty.osgi.fragmentAndRequiredResources"; + /* ------------------------------------------------------------ */ /** @@ -87,7 +91,6 @@ public class OSGiWebInfConfiguration extends WebInfConfiguration while (tokenizer.hasMoreTokens()) names.add(tokenizer.nextToken()); } - HashSet matchingResources = new HashSet(); if ( !names.isEmpty() || pattern != null) { @@ -111,14 +114,20 @@ public class OSGiWebInfConfiguration extends WebInfConfiguration matchingResources.addAll(getBundleAsResource(bundle)); } } - } - + } for (Resource r:matchingResources) { context.getMetaData().addContainerResource(r); } } + @Override + public void postConfigure(WebAppContext context) throws Exception + { + context.setAttribute(FRAGMENT_AND_REQUIRED_BUNDLES, null); + context.setAttribute(FRAGMENT_AND_REQUIRED_RESOURCES, null); + super.postConfigure(context); + } /* ------------------------------------------------------------ */ /** @@ -137,12 +146,34 @@ public class OSGiWebInfConfiguration extends WebInfConfiguration if (webInfJars != null) mergedResources.addAll(webInfJars); - //add fragment jars as if in WEB-INF/lib of the associated webapp - Bundle[] fragments = PackageAdminServiceTracker.INSTANCE.getFragmentsAndRequiredBundles((Bundle)context.getAttribute(OSGiWebappConstants.JETTY_OSGI_BUNDLE)); - for (Bundle frag : fragments) + //add fragment jars and any Required-Bundles as if in WEB-INF/lib of the associated webapp + Bundle[] bundles = PackageAdminServiceTracker.INSTANCE.getFragmentsAndRequiredBundles((Bundle)context.getAttribute(OSGiWebappConstants.JETTY_OSGI_BUNDLE)); + if (bundles != null && bundles.length > 0) { - File fragFile = BundleFileLocatorHelperFactory.getFactory().getHelper().getBundleInstallLocation(frag); - mergedResources.add(Resource.newResource(fragFile.toURI())); + Set fragsAndReqsBundles = (Set)context.getAttribute(FRAGMENT_AND_REQUIRED_BUNDLES); + if (fragsAndReqsBundles == null) + { + fragsAndReqsBundles = new HashSet(); + context.setAttribute(FRAGMENT_AND_REQUIRED_BUNDLES, fragsAndReqsBundles); + } + + Set fragsAndReqsResources = (Set)context.getAttribute(FRAGMENT_AND_REQUIRED_RESOURCES); + if (fragsAndReqsResources == null) + { + fragsAndReqsResources = new HashSet(); + context.setAttribute(FRAGMENT_AND_REQUIRED_RESOURCES, fragsAndReqsResources); + } + + for (Bundle b : bundles) + { + //add to context attribute storing associated fragments and required bundles + fragsAndReqsBundles.add(b); + File f = BundleFileLocatorHelperFactory.getFactory().getHelper().getBundleInstallLocation(b); + Resource r = Resource.newResource(f.toURI()); + //add to convenience context attribute storing fragments and required bundles as Resources + fragsAndReqsResources.add(r); + mergedResources.add(r); + } } return mergedResources; @@ -165,9 +196,8 @@ public class OSGiWebInfConfiguration extends WebInfConfiguration Bundle bundle = (Bundle)context.getAttribute(OSGiWebappConstants.JETTY_OSGI_BUNDLE); if (bundle != null) { - //TODO anything we need to do to improve PackageAdminServiceTracker? - Bundle[] fragments = PackageAdminServiceTracker.INSTANCE.getFragmentsAndRequiredBundles(bundle); - if (fragments != null && fragments.length != 0) + Set fragments = (Set)context.getAttribute(FRAGMENT_AND_REQUIRED_BUNDLES); + if (fragments != null && !fragments.isEmpty()) { // sorted extra resource base found in the fragments. // the resources are either overriding the resourcebase found in the diff --git a/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorHandlerHelper.java b/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorHandlerHelper.java index 35f186681fd..f8fdc636f8a 100644 --- a/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorHandlerHelper.java +++ b/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorHandlerHelper.java @@ -30,16 +30,16 @@ import javax.servlet.http.HttpServlet; */ public class HttpServiceErrorHandlerHelper { - private static HttpServlet _customErrorHandler; + private static HttpServlet _customErrorHandler; - public static HttpServlet getCustomErrorHandler() - { - return _customErrorHandler; - } - - public static void setHttpServiceErrorHandler(HttpServlet servlet) - { - _customErrorHandler = servlet; - } - + public static HttpServlet getCustomErrorHandler() + { + return _customErrorHandler; + } + + public static void setHttpServiceErrorHandler(HttpServlet servlet) + { + _customErrorHandler = servlet; + } + } diff --git a/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorPageErrorHandler.java b/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorPageErrorHandler.java index 1b08f9b13a9..e9ebc855620 100644 --- a/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorPageErrorHandler.java +++ b/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorPageErrorHandler.java @@ -35,46 +35,46 @@ import org.eclipse.jetty.servlet.ErrorPageErrorHandler; public class HttpServiceErrorPageErrorHandler extends ErrorPageErrorHandler { - private static HttpServiceErrorPageErrorHandler INSTANCE; - - public static HttpServiceErrorPageErrorHandler getInstance() - { - return INSTANCE; - } - - public HttpServiceErrorPageErrorHandler() - { - INSTANCE = this; - } + private static HttpServiceErrorPageErrorHandler INSTANCE; + + public static HttpServiceErrorPageErrorHandler getInstance() + { + return INSTANCE; + } + + public HttpServiceErrorPageErrorHandler() + { + INSTANCE = this; + } - @Override - public void handle(String target, Request baseRequest, - HttpServletRequest request, HttpServletResponse response) - throws IOException { - if (HttpServiceErrorHandlerHelper.getCustomErrorHandler() != null) - { - try - { - HttpServiceErrorHandlerHelper.getCustomErrorHandler().service(request, response); - } - catch (ServletException e) - { - //well - } - } - if (!response.isCommitted()) - { - super.handle(target, baseRequest, request, response); - } - } + @Override + public void handle(String target, Request baseRequest, + HttpServletRequest request, HttpServletResponse response) + throws IOException { + if (HttpServiceErrorHandlerHelper.getCustomErrorHandler() != null) + { + try + { + HttpServiceErrorHandlerHelper.getCustomErrorHandler().service(request, response); + } + catch (ServletException e) + { + //well + } + } + if (!response.isCommitted()) + { + super.handle(target, baseRequest, request, response); + } + } - @Override - protected void doStop() throws Exception - { - INSTANCE = null; - super.doStop(); - } - - - + @Override + protected void doStop() throws Exception + { + INSTANCE = null; + super.doStop(); + } + + + } diff --git a/jetty-overlay-deployer/src/test/java/org/eclipse/jetty/overlays/OverlayServer.java b/jetty-overlay-deployer/src/test/java/org/eclipse/jetty/overlays/OverlayServer.java index 8a6f4e7f7a1..c7cb7d977e7 100644 --- a/jetty-overlay-deployer/src/test/java/org/eclipse/jetty/overlays/OverlayServer.java +++ b/jetty-overlay-deployer/src/test/java/org/eclipse/jetty/overlays/OverlayServer.java @@ -86,7 +86,7 @@ public class OverlayServer server.setStopAtShutdown(true); //server.setSendServerVersion(true); - // Uncomment to work with JNDI examples + // Uncomment to work with JNDI examples // new org.eclipse.jetty.plus.jndi.Transaction(new com.atomikos.icatch.jta.UserTransactionImp()); 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 321a9ab7f5f..8176916cc54 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 @@ -19,7 +19,6 @@ package org.eclipse.jetty.plus.annotation; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -158,7 +157,7 @@ public class ContainerInitializer interested.add(c.getName()); } - return String.format("ContainerInitializer{%s,interested=%s,applicable=%s,annotated=%s}",_target.getClass().getName(),interested,_applicableTypeNames,_annotatedTypeNames); + return String.format("ContainerInitializer{%s,interested=%s,applicable=%s,annotated=%s}",_target.getClass().getName(),interested,_applicableTypeNames,_annotatedTypeNames); } public void resolveClasses(WebAppContext context, Map> classMap) 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 b315682f8fc..1c8edde16ba 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 @@ -41,12 +41,11 @@ import org.eclipse.jetty.server.Server; 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.Password; +import org.eclipse.jetty.util.security.Credential; /** * - * //TODO JASPI cf JDBCLoginService * DataSourceUserRealm * * Obtain user/password/role information from a database @@ -70,6 +69,7 @@ public class DataSourceLoginService extends MappedLoginService private String _userRoleTableUserKey = "user_id"; private String _userRoleTableRoleKey = "role_id"; private int _cacheMs = 30000; + private long _lastPurge = 0; private String _userSql; private String _roleSql; private boolean _createTables = false; @@ -282,7 +282,9 @@ public class DataSourceLoginService extends MappedLoginService protected void loadUsers() { } - + + + /* ------------------------------------------------------------ */ /** Load user's info from database. * @@ -293,9 +295,8 @@ public class DataSourceLoginService extends MappedLoginService { try { - initDb(); try (Connection connection = getConnection(); - PreparedStatement statement1 = connection.prepareStatement(_userSql)) + PreparedStatement statement1 = connection.prepareStatement(_userSql)) { statement1.setObject(1, userName); try (ResultSet rs1 = statement1.executeQuery()) @@ -311,10 +312,12 @@ public class DataSourceLoginService extends MappedLoginService try (ResultSet rs2 = statement2.executeQuery()) { while (rs2.next()) + { roles.add(rs2.getString(_roleTableRoleField)); + } } } - return putUser(userName,new Password(credentials), roles.toArray(new String[roles.size()])); + return putUser(userName, Credential.getCredential(credentials), roles.toArray(new String[roles.size()])); } } } @@ -329,6 +332,22 @@ public class DataSourceLoginService extends MappedLoginService } return null; } + + + + /* ------------------------------------------------------------ */ + @Override + public UserIdentity login(String username, Object credentials) + { + long now = System.currentTimeMillis(); + if (now - _lastPurge > _cacheMs || _cacheMs == 0) + { + _users.clear(); + _lastPurge = now; + } + + return super.login(username,credentials); + } /* ------------------------------------------------------------ */ /** @@ -347,7 +366,7 @@ public class DataSourceLoginService extends MappedLoginService InitialContext ic = new InitialContext(); assert ic!=null; - //TODO webapp scope? + //TODO Should we try webapp scope too? //try finding the datasource in the Server scope if (_server != null) 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 068c03b0afd..ed609ba2a47 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 @@ -40,7 +40,6 @@ 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.webapp.AbstractConfiguration; -import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.xml.XmlConfiguration; diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncProxyServlet.java index 6ebc85ca219..518051d6901 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncProxyServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncProxyServlet.java @@ -60,7 +60,8 @@ public class AsyncProxyServlet extends ProxyServlet { try { - _log.debug("{} proxying content to downstream: {} bytes", getRequestId(request), length); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to downstream: {} bytes", getRequestId(request), length); StreamWriter writeListener = (StreamWriter)request.getAttribute(WRITE_LISTENER_ATTRIBUTE); if (writeListener == null) { @@ -130,24 +131,30 @@ public class AsyncProxyServlet extends ProxyServlet { int requestId = getRequestId(request); ServletInputStream input = request.getInputStream(); - _log.debug("{} asynchronous read start on {}", requestId, input); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous read start on {}", requestId, input); // First check for isReady() because it has // side effects, and then for isFinished(). while (input.isReady() && !input.isFinished()) { int read = input.read(buffer); - _log.debug("{} asynchronous read {} bytes on {}", requestId, read, input); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous read {} bytes on {}", requestId, read, input); if (read > 0) { - _log.debug("{} proxying content to upstream: {} bytes", requestId, read); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to upstream: {} bytes", requestId, read); onRequestContent(proxyRequest, request, provider, buffer, 0, read, this); // Do not call isReady() so that we can apply backpressure. break; } } if (!input.isFinished()) - _log.debug("{} asynchronous read pending on {}", requestId, input); + { + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous read pending on {}", requestId, input); + } } protected void onRequestContent(Request proxyRequest, HttpServletRequest request, DeferredContentProvider provider, byte[] buffer, int offset, int length, Callback callback) @@ -158,7 +165,8 @@ public class AsyncProxyServlet extends ProxyServlet @Override public void onAllDataRead() throws IOException { - _log.debug("{} proxying content to upstream completed", getRequestId(request)); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to upstream completed", getRequestId(request)); provider.close(); } @@ -225,23 +233,27 @@ public class AsyncProxyServlet extends ProxyServlet if (state == WriteState.READY) { // There is data to write. - _log.debug("{} asynchronous write start of {} bytes on {}", requestId, length, output); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous write start of {} bytes on {}", requestId, length, output); output.write(buffer, offset, length); state = WriteState.PENDING; if (output.isReady()) { - _log.debug("{} asynchronous write of {} bytes completed on {}", requestId, length, output); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous write of {} bytes completed on {}", requestId, length, output); complete(); } else { - _log.debug("{} asynchronous write of {} bytes pending on {}", requestId, length, output); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous write of {} bytes pending on {}", requestId, length, output); } } else if (state == WriteState.PENDING) { // The write blocked but is now complete. - _log.debug("{} asynchronous write of {} bytes completing on {}", requestId, length, output); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous write of {} bytes completing on {}", requestId, length, output); complete(); } else diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java index 68771345216..ff4ae867dbb 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java @@ -26,12 +26,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; - import javax.servlet.ServletException; import javax.servlet.UnavailableException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; +import org.eclipse.jetty.util.URIUtil; + public class BalancerServlet extends ProxyServlet { private static final String BALANCER_MEMBER_PREFIX = "balancerMember."; @@ -86,7 +87,7 @@ public class BalancerServlet extends ProxyServlet } } - private void initStickySessions() throws ServletException + private void initStickySessions() { _stickySessions = Boolean.parseBoolean(getServletConfig().getInitParameter("stickySessions")); } @@ -131,7 +132,8 @@ public class BalancerServlet extends ProxyServlet protected URI rewriteURI(HttpServletRequest request) { BalancerMember balancerMember = selectBalancerMember(request); - _log.debug("Selected {}", balancerMember); + if (_log.isDebugEnabled()) + _log.debug("Selected {}", balancerMember); String path = request.getRequestURI(); String query = request.getQueryString(); if (query != null) @@ -219,17 +221,17 @@ public class BalancerServlet extends ProxyServlet URI locationURI = URI.create(headerValue).normalize(); if (locationURI.isAbsolute() && isBackendLocation(locationURI)) { - String newURI = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort(); + StringBuilder newURI = URIUtil.newURIBuilder(request.getScheme(), request.getServerName(), request.getServerPort()); String component = locationURI.getRawPath(); if (component != null) - newURI += component; + newURI.append(component); component = locationURI.getRawQuery(); if (component != null) - newURI += "?" + component; + newURI.append('?').append(component); component = locationURI.getRawFragment(); if (component != null) - newURI += "#" + component; - return URI.create(newURI).normalize().toString(); + newURI.append('#').append(component); + return URI.create(newURI.toString()).normalize().toString(); } } return headerValue; 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 5a550145976..b43ce7338c3 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 @@ -186,7 +186,8 @@ public class ConnectHandler extends HandlerWrapper if (HttpMethod.CONNECT.is(request.getMethod())) { String serverAddress = request.getRequestURI(); - LOG.debug("CONNECT request for {}", serverAddress); + if (LOG.isDebugEnabled()) + LOG.debug("CONNECT request for {}", serverAddress); try { handleConnect(baseRequest, request, response, serverAddress); @@ -222,7 +223,8 @@ public class ConnectHandler extends HandlerWrapper boolean proceed = handleAuthentication(request, response, serverAddress); if (!proceed) { - LOG.debug("Missing proxy authentication"); + if (LOG.isDebugEnabled()) + LOG.debug("Missing proxy authentication"); sendConnectResponse(request, response, HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED); return; } @@ -238,7 +240,8 @@ public class ConnectHandler extends HandlerWrapper if (!validateDestination(host, port)) { - LOG.debug("Destination {}:{} forbidden", host, port); + if (LOG.isDebugEnabled()) + LOG.debug("Destination {}:{} forbidden", host, port); sendConnectResponse(request, response, HttpServletResponse.SC_FORBIDDEN); return; } @@ -252,7 +255,8 @@ public class ConnectHandler extends HandlerWrapper AsyncContext asyncContext = request.startAsync(); asyncContext.setTimeout(0); - LOG.debug("Connecting to {}", address); + if (LOG.isDebugEnabled()) + LOG.debug("Connecting to {}", address); ConnectContext connectContext = new ConnectContext(request, response, asyncContext, HttpConnection.getCurrentConnection()); selector.connect(channel, connectContext); } @@ -286,7 +290,8 @@ public class ConnectHandler extends HandlerWrapper upstreamConnection.setConnection(downstreamConnection); downstreamConnection.setConnection(upstreamConnection); - LOG.debug("Connection setup completed: {}<->{}", downstreamConnection, upstreamConnection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection setup completed: {}<->{}", downstreamConnection, upstreamConnection); HttpServletResponse response = connectContext.getResponse(); sendConnectResponse(request, response, HttpServletResponse.SC_OK); @@ -297,7 +302,8 @@ public class ConnectHandler extends HandlerWrapper protected void onConnectFailure(HttpServletRequest request, HttpServletResponse response, AsyncContext asyncContext, Throwable failure) { - LOG.debug("CONNECT failed", failure); + if (LOG.isDebugEnabled()) + LOG.debug("CONNECT failed", failure); sendConnectResponse(request, response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR); if (asyncContext != null) asyncContext.complete(); @@ -311,7 +317,8 @@ public class ConnectHandler extends HandlerWrapper if (statusCode != HttpServletResponse.SC_OK) response.setHeader(HttpHeader.CONNECTION.asString(), HttpHeaderValue.CLOSE.asString()); response.getOutputStream().close(); - LOG.debug("CONNECT response sent {} {}", request.getProtocol(), response.getStatus()); + if (LOG.isDebugEnabled()) + LOG.debug("CONNECT response sent {} {}", request.getProtocol(), response.getStatus()); } catch (IOException x) { @@ -353,7 +360,8 @@ public class ConnectHandler extends HandlerWrapper // so that Jetty understands that it has to upgrade the connection request.setAttribute(HttpConnection.UPGRADE_CONNECTION_ATTRIBUTE, connection); response.setStatus(HttpServletResponse.SC_SWITCHING_PROTOCOLS); - LOG.debug("Upgraded connection to {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Upgraded connection to {}", connection); } /** @@ -379,7 +387,8 @@ public class ConnectHandler extends HandlerWrapper */ protected void write(EndPoint endPoint, ByteBuffer buffer, Callback callback) { - LOG.debug("{} writing {} bytes", this, buffer.remaining()); + if (LOG.isDebugEnabled()) + LOG.debug("{} writing {} bytes", this, buffer.remaining()); endPoint.write(callback, buffer); } @@ -407,7 +416,8 @@ public class ConnectHandler extends HandlerWrapper { if (!whiteList.contains(hostPort)) { - LOG.debug("Host {}:{} not whitelisted", host, port); + if (LOG.isDebugEnabled()) + LOG.debug("Host {}:{} not whitelisted", host, port); return false; } } @@ -415,7 +425,8 @@ public class ConnectHandler extends HandlerWrapper { if (blackList.contains(hostPort)) { - LOG.debug("Host {}:{} blacklisted", host, port); + if (LOG.isDebugEnabled()) + LOG.debug("Host {}:{} blacklisted", host, port); return false; } } @@ -445,7 +456,8 @@ public class ConnectHandler extends HandlerWrapper @Override public Connection newConnection(SocketChannel channel, EndPoint endpoint, Object attachment) throws IOException { - ConnectHandler.LOG.debug("Connected to {}", channel.getRemoteAddress()); + if (ConnectHandler.LOG.isDebugEnabled()) + ConnectHandler.LOG.debug("Connected to {}", channel.getRemoteAddress()); ConnectContext connectContext = (ConnectContext)attachment; UpstreamConnection connection = newUpstreamConnection(endpoint, connectContext); connection.setInputBufferSize(getBufferSize()); @@ -565,14 +577,16 @@ public class ConnectHandler extends HandlerWrapper @Override public void succeeded() { - LOG.debug("{} wrote initial {} bytes to server", DownstreamConnection.this, remaining); + if (LOG.isDebugEnabled()) + LOG.debug("{} wrote initial {} bytes to server", DownstreamConnection.this, remaining); fillInterested(); } @Override public void failed(Throwable x) { - LOG.debug(this + " failed to write initial " + remaining + " bytes to server", x); + if (LOG.isDebugEnabled()) + LOG.debug(this + " failed to write initial " + remaining + " bytes to server", x); close(); getConnection().close(); } 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 697de4fa4ce..3a620f43a17 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 @@ -28,13 +28,13 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.ForkInvoker; +import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.log.Logger; public abstract class ProxyConnection extends AbstractConnection { protected static final Logger LOG = ConnectHandler.LOG; - private final ForkInvoker invoker = new ProxyForkInvoker(); + private final IteratingCallback pipe = new ProxyIteratingCallback(); private final ByteBufferPool bufferPool; private final ConcurrentMap context; private Connection connection; @@ -69,50 +69,7 @@ public abstract class ProxyConnection extends AbstractConnection @Override public void onFillable() { - final ByteBuffer buffer = getByteBufferPool().acquire(getInputBufferSize(), true); - try - { - final int filled = read(getEndPoint(), buffer); - LOG.debug("{} filled {} bytes", this, filled); - if (filled > 0) - { - write(getConnection().getEndPoint(), buffer, new Callback() - { - @Override - public void succeeded() - { - LOG.debug("{} wrote {} bytes", this, filled); - bufferPool.release(buffer); - invoker.invoke(null); - } - - @Override - public void failed(Throwable x) - { - LOG.debug(this + " failed to write " + filled + " bytes", x); - bufferPool.release(buffer); - connection.close(); - } - }); - } - else if (filled == 0) - { - bufferPool.release(buffer); - fillInterested(); - } - else - { - bufferPool.release(buffer); - connection.getEndPoint().shutdownOutput(); - } - } - catch (IOException x) - { - LOG.debug(this + " could not fill", x); - bufferPool.release(buffer); - close(); - connection.close(); - } + pipe.iterate(); } protected abstract int read(EndPoint endPoint, ByteBuffer buffer) throws IOException; @@ -128,29 +85,74 @@ public abstract class ProxyConnection extends AbstractConnection getEndPoint().getRemoteAddress().getPort()); } - private class ProxyForkInvoker extends ForkInvoker implements Runnable + private class ProxyIteratingCallback extends IteratingCallback { - private ProxyForkInvoker() + private ByteBuffer buffer; + private int filled; + + @Override + protected Action process() throws Exception { - super(4); + buffer = bufferPool.acquire(getInputBufferSize(), true); + try + { + int filled = this.filled = read(getEndPoint(), buffer); + if (LOG.isDebugEnabled()) + LOG.debug("{} filled {} bytes", ProxyConnection.this, filled); + if (filled > 0) + { + write(connection.getEndPoint(), buffer, this); + return Action.SCHEDULED; + } + else if (filled == 0) + { + bufferPool.release(buffer); + fillInterested(); + return Action.IDLE; + } + else + { + bufferPool.release(buffer); + connection.getEndPoint().shutdownOutput(); + return Action.SUCCEEDED; + } + } + catch (IOException x) + { + if (LOG.isDebugEnabled()) + LOG.debug(ProxyConnection.this + " could not fill", x); + disconnect(); + return Action.SUCCEEDED; + } } @Override - public void fork(Void arg) + public void succeeded() { - getExecutor().execute(this); - } - - @Override - public void run() - { - onFillable(); + if (LOG.isDebugEnabled()) + LOG.debug("{} wrote {} bytes", ProxyConnection.this, filled); + bufferPool.release(buffer); + super.succeeded(); } @Override - public void call(Void arg) + protected void onCompleteSuccess() { - onFillable(); + } + + @Override + protected void onCompleteFailure(Throwable x) + { + if (LOG.isDebugEnabled()) + LOG.debug(ProxyConnection.this + " failed to write " + filled + " bytes", x); + disconnect(); + } + + private void disconnect() + { + bufferPool.release(buffer); + ProxyConnection.this.close(); + connection.close(); } } } diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java index 7dbe2a9bb48..ed00af25641 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java @@ -201,7 +201,8 @@ public class ProxyServlet extends HttpServlet } catch (Exception x) { - _log.debug(x); + if (_log.isDebugEnabled()) + _log.debug(x); } } @@ -362,7 +363,8 @@ public class ProxyServlet extends HttpServlet { if (!_whiteList.contains(hostPort)) { - _log.debug("Host {}:{} not whitelisted", host, port); + if (_log.isDebugEnabled()) + _log.debug("Host {}:{} not whitelisted", host, port); return false; } } @@ -370,7 +372,8 @@ public class ProxyServlet extends HttpServlet { if (_blackList.contains(hostPort)) { - _log.debug("Host {}:{} blacklisted", host, port); + if (_log.isDebugEnabled()) + _log.debug("Host {}:{} blacklisted", host, port); return false; } } @@ -389,7 +392,8 @@ public class ProxyServlet extends HttpServlet StringBuffer uri = request.getRequestURL(); if (request.getQueryString() != null) uri.append("?").append(request.getQueryString()); - _log.debug("{} rewriting: {} -> {}", requestId, uri, rewrittenURI); + if (_log.isDebugEnabled()) + _log.debug("{} rewriting: {} -> {}", requestId, uri, rewrittenURI); } if (rewrittenURI == null) @@ -493,7 +497,8 @@ public class ProxyServlet extends HttpServlet protected void onClientRequestFailure(Request proxyRequest, HttpServletRequest request, Throwable failure) { - _log.debug(getRequestId(request) + " client request failure", failure); + if (_log.isDebugEnabled()) + _log.debug(getRequestId(request) + " client request failure", failure); proxyRequest.abort(failure); } @@ -517,10 +522,6 @@ public class ProxyServlet extends HttpServlet protected void onResponseHeaders(HttpServletRequest request, HttpServletResponse response, Response proxyResponse) { - // Clear the response headers in case it comes with predefined ones. - for (String name : response.getHeaderNames()) - response.setHeader(name, null); - for (HttpField field : proxyResponse.getHeaders()) { String headerName = field.getName(); @@ -540,7 +541,8 @@ public class ProxyServlet extends HttpServlet { try { - _log.debug("{} proxying content to downstream: {} bytes", getRequestId(request), length); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to downstream: {} bytes", getRequestId(request), length); response.getOutputStream().write(buffer, offset, length); callback.succeeded(); } @@ -552,16 +554,34 @@ public class ProxyServlet extends HttpServlet protected void onResponseSuccess(HttpServletRequest request, HttpServletResponse response, Response proxyResponse) { - _log.debug("{} proxying successful", getRequestId(request)); + if (_log.isDebugEnabled()) + _log.debug("{} proxying successful", getRequestId(request)); AsyncContext asyncContext = request.getAsyncContext(); asyncContext.complete(); } protected void onResponseFailure(HttpServletRequest request, HttpServletResponse response, Response proxyResponse, Throwable failure) { - _log.debug(getRequestId(request) + " proxying failed", failure); - if (!response.isCommitted()) + if (_log.isDebugEnabled()) + _log.debug(getRequestId(request) + " proxying failed", failure); + if (response.isCommitted()) { + try + { + // Use Jetty specific behavior to close connection. + response.sendError(-1); + AsyncContext asyncContext = request.getAsyncContext(); + asyncContext.complete(); + } + catch (IOException x) + { + if (_log.isDebugEnabled()) + _log.debug(getRequestId(request) + " could not close the connection", failure); + } + } + else + { + response.resetBuffer(); if (failure instanceof TimeoutException) response.setStatus(HttpServletResponse.SC_GATEWAY_TIMEOUT); else @@ -674,7 +694,8 @@ public class ProxyServlet extends HttpServlet String contextPath = config.getServletContext().getContextPath(); _prefix = _prefix == null ? contextPath : (contextPath + _prefix); - proxyServlet._log.debug(config.getServletName() + " @ " + _prefix + " to " + _proxyTo); + if (proxyServlet._log.isDebugEnabled()) + proxyServlet._log.debug(config.getServletName() + " @ " + _prefix + " to " + _proxyTo); } protected URI rewriteURI(HttpServletRequest request) @@ -794,7 +815,8 @@ public class ProxyServlet extends HttpServlet onResponseSuccess(request, response, result.getResponse()); else onResponseFailure(request, response, result.getResponse(), result.getFailure()); - _log.debug("{} proxying complete", getRequestId(request)); + if (_log.isDebugEnabled()) + _log.debug("{} proxying complete", getRequestId(request)); } } @@ -819,7 +841,8 @@ public class ProxyServlet extends HttpServlet @Override protected ByteBuffer onRead(byte[] buffer, int offset, int length) { - _log.debug("{} proxying content to upstream: {} bytes", getRequestId(request), length); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to upstream: {} bytes", getRequestId(request), length); return onRequestContent(proxyRequest, request, buffer, offset, length); } diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java index 5884a14f829..9641c88163c 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java @@ -19,8 +19,10 @@ package org.eclipse.jetty.proxy; import java.io.ByteArrayOutputStream; +import java.io.EOFException; import java.io.IOException; import java.io.InputStream; +import java.io.InterruptedIOException; import java.io.OutputStream; import java.io.PrintWriter; import java.net.ConnectException; @@ -30,6 +32,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.Arrays; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,7 +45,14 @@ import java.util.zip.GZIPOutputStream; import javax.servlet.AsyncContext; import javax.servlet.AsyncEvent; import javax.servlet.AsyncListener; +import javax.servlet.DispatcherType; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -55,11 +65,16 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Result; +import org.eclipse.jetty.client.http.HttpDestinationOverHTTP; import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.client.util.BytesContentProvider; +import org.eclipse.jetty.client.util.InputStreamResponseListener; import org.eclipse.jetty.http.HttpMethod; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; @@ -95,6 +110,7 @@ public class ProxyServletTest private HttpClient client; private Server proxy; private ServerConnector proxyConnector; + private ServletContextHandler proxyContext; private ProxyServlet proxyServlet; private Server server; private ServerConnector serverConnector; @@ -112,13 +128,20 @@ public class ProxyServletTest private void prepareProxy(Map initParams) throws Exception { proxy = new Server(); - proxyConnector = new ServerConnector(proxy); + + HttpConfiguration configuration = new HttpConfiguration(); + configuration.setSendDateHeader(false); + configuration.setSendServerVersion(false); + String value = initParams.get("outputBufferSize"); + if (value != null) + configuration.setOutputBufferSize(Integer.valueOf(value)); + proxyConnector = new ServerConnector(proxy, new HttpConnectionFactory(configuration)); proxy.addConnector(proxyConnector); - ServletContextHandler proxyCtx = new ServletContextHandler(proxy, "/", true, false); + proxyContext = new ServletContextHandler(proxy, "/", true, false); ServletHolder proxyServletHolder = new ServletHolder(proxyServlet); proxyServletHolder.setInitParameters(initParams); - proxyCtx.addServlet(proxyServletHolder, "/*"); + proxyContext.addServlet(proxyServletHolder, "/*"); proxy.start(); @@ -899,5 +922,184 @@ public class ProxyServletTest Assert.assertTrue(response3.getHeaders().containsKey(PROXIED_HEADER)); } + @Test + public void testProxyRequestFailureInTheMiddleOfProxyingSmallContent() throws Exception + { + final long proxyTimeout = 1000; + Map proxyParams = new HashMap<>(); + proxyParams.put("timeout", String.valueOf(proxyTimeout)); + prepareProxy(proxyParams); + + final CountDownLatch chunk1Latch = new CountDownLatch(1); + final int chunk1 = 'q'; + final int chunk2 = 'w'; + prepareServer(new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + ServletOutputStream output = response.getOutputStream(); + output.write(chunk1); + response.flushBuffer(); + + // Wait for the client to receive this chunk. + await(chunk1Latch, 5000); + + // Send second chunk, must not be received by proxy. + output.write(chunk2); + } + + private boolean await(CountDownLatch latch, long ms) throws IOException + { + try + { + return latch.await(ms, TimeUnit.MILLISECONDS); + } + catch (InterruptedException x) + { + throw new InterruptedIOException(); + } + } + }); + + HttpClient client = prepareClient(); + InputStreamResponseListener listener = new InputStreamResponseListener(); + int port = serverConnector.getLocalPort(); + client.newRequest("localhost", port).send(listener); + + // Make the proxy request fail; given the small content, the + // proxy-to-client response is not committed yet so it will be reset. + TimeUnit.MILLISECONDS.sleep(2 * proxyTimeout); + + Response response = listener.get(5, TimeUnit.SECONDS); + Assert.assertEquals(504, response.getStatus()); + + // Make sure there is no content, as the proxy-to-client response has been reset. + InputStream input = listener.getInputStream(); + Assert.assertEquals(-1, input.read()); + + chunk1Latch.countDown(); + + // Result succeeds because a 504 is a valid HTTP response. + Result result = listener.await(5, TimeUnit.SECONDS); + Assert.assertTrue(result.isSucceeded()); + + // Make sure the proxy does not receive chunk2. + Assert.assertEquals(-1, input.read()); + + HttpDestinationOverHTTP destination = (HttpDestinationOverHTTP)client.getDestination("http", "localhost", port); + Assert.assertEquals(0, destination.getConnectionPool().getIdleConnections().size()); + } + + @Test + public void testProxyRequestFailureInTheMiddleOfProxyingBigContent() throws Exception + { + final long proxyTimeout = 1000; + int outputBufferSize = 1024; + Map proxyParams = new HashMap<>(); + proxyParams.put("timeout", String.valueOf(proxyTimeout)); + proxyParams.put("outputBufferSize", String.valueOf(outputBufferSize)); + prepareProxy(proxyParams); + + final CountDownLatch chunk1Latch = new CountDownLatch(1); + final byte[] chunk1 = new byte[outputBufferSize]; + new Random().nextBytes(chunk1); + final int chunk2 = 'w'; + prepareServer(new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + ServletOutputStream output = response.getOutputStream(); + output.write(chunk1); + response.flushBuffer(); + + // Wait for the client to receive this chunk. + await(chunk1Latch, 5000); + + // Send second chunk, must not be received by proxy. + output.write(chunk2); + } + + private boolean await(CountDownLatch latch, long ms) throws IOException + { + try + { + return latch.await(ms, TimeUnit.MILLISECONDS); + } + catch (InterruptedException x) + { + throw new InterruptedIOException(); + } + } + }); + + HttpClient client = prepareClient(); + InputStreamResponseListener listener = new InputStreamResponseListener(); + int port = serverConnector.getLocalPort(); + client.newRequest("localhost", port).send(listener); + + Response response = listener.get(5, TimeUnit.SECONDS); + Assert.assertEquals(200, response.getStatus()); + + InputStream input = listener.getInputStream(); + for (int i = 0; i < chunk1.length; ++i) + Assert.assertEquals(chunk1[i] & 0xFF, input.read()); + + TimeUnit.MILLISECONDS.sleep(2 * proxyTimeout); + + chunk1Latch.countDown(); + + try + { + // Make sure the proxy does not receive chunk2. + input.read(); + Assert.fail(); + } + catch (EOFException x) + { + // Expected + } + + HttpDestinationOverHTTP destination = (HttpDestinationOverHTTP)client.getDestination("http", "localhost", port); + Assert.assertEquals(0, destination.getConnectionPool().getIdleConnections().size()); + } + + @Test + public void testResponseHeadersAreNotRemoved() throws Exception + { + prepareProxy(); + proxyContext.stop(); + final String headerName = "X-Test"; + final String headerValue = "test-value"; + proxyContext.addFilter(new FilterHolder(new Filter() + { + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException + { + ((HttpServletResponse)response).addHeader(headerName, headerValue); + chain.doFilter(request, response); + } + + @Override + public void destroy() + { + } + }), "/*", EnumSet.of(DispatcherType.REQUEST)); + proxyContext.start(); + prepareServer(new EmptyHttpServlet()); + + HttpClient client = prepareClient(); + ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort()).send(); + + Assert.assertEquals(200, response.getStatus()); + Assert.assertEquals(headerValue, response.getHeaders().get(headerName)); + } + // TODO: test proxy authentication } 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 313c5c03c86..85f95dcb6ab 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 @@ -72,7 +72,23 @@ public class QuickStartConfiguration extends WebInfConfiguration LOG.debug("webapp={}",webApp); - //look for effective-web.xml in WEB-INF of webapp + //look for quickstart-web.xml in WEB-INF of webapp + Resource quickStartWebXml = getQuickStartWebXml(context); + LOG.debug("quickStartWebXml={}",quickStartWebXml); + + context.getMetaData().setWebXml(quickStartWebXml); + } + + + /** + * Get the quickstart-web.xml file as a Resource. + * + * @param context + * @return + * @throws Exception + */ + public Resource getQuickStartWebXml (WebAppContext context) throws Exception + { Resource webInf = context.getWebInf(); if (webInf == null || !webInf.exists()) throw new IllegalStateException("No WEB-INF"); @@ -81,11 +97,10 @@ public class QuickStartConfiguration extends WebInfConfiguration Resource quickStartWebXml = webInf.addPath("quickstart-web.xml"); if (!quickStartWebXml.exists()) throw new IllegalStateException ("No WEB-INF/quickstart-web.xml"); - LOG.debug("quickStartWebXml={}",quickStartWebXml); - - context.getMetaData().setWebXml(quickStartWebXml); + return quickStartWebXml; } - + + /** * @see org.eclipse.jetty.webapp.AbstractConfiguration#configure(org.eclipse.jetty.webapp.WebAppContext) diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java new file mode 100644 index 00000000000..5a56625fb00 --- /dev/null +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java @@ -0,0 +1,659 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + + +package org.eclipse.jetty.quickstart; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Collection; +import java.util.Collections; +import java.util.EventListener; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.servlet.DispatcherType; +import javax.servlet.MultipartConfigElement; +import javax.servlet.ServletContext; +import javax.servlet.SessionCookieConfig; +import javax.servlet.SessionTrackingMode; +import javax.servlet.descriptor.JspPropertyGroupDescriptor; +import javax.servlet.descriptor.TaglibDescriptor; + +import org.eclipse.jetty.annotations.AnnotationConfiguration; +import org.eclipse.jetty.http.MimeTypes; +import org.eclipse.jetty.plus.annotation.LifeCycleCallback; +import org.eclipse.jetty.plus.annotation.LifeCycleCallbackCollection; +import org.eclipse.jetty.security.ConstraintAware; +import org.eclipse.jetty.security.ConstraintMapping; +import org.eclipse.jetty.security.SecurityHandler; +import org.eclipse.jetty.security.authentication.FormAuthenticator; +import org.eclipse.jetty.servlet.ErrorPageErrorHandler; +import org.eclipse.jetty.servlet.FilterHolder; +import org.eclipse.jetty.servlet.FilterMapping; +import org.eclipse.jetty.servlet.Holder; +import org.eclipse.jetty.servlet.ServletHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.servlet.ServletMapping; +import org.eclipse.jetty.servlet.ServletContextHandler.JspConfig; +import org.eclipse.jetty.util.QuotedStringTokenizer; +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.MetaData; +import org.eclipse.jetty.webapp.MetaData.OriginInfo; +import org.eclipse.jetty.webapp.MetaInfConfiguration; +import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.xml.XmlAppendable; + + + +/** + * QuickStartDescriptorGenerator + * + * Generate an effective web.xml from a WebAppContext, including all components + * from web.xml, web-fragment.xmls annotations etc. + */ +public class QuickStartDescriptorGenerator +{ + private static final Logger LOG = Log.getLogger(QuickStartDescriptorGenerator.class); + + public static final String DEFAULT_QUICKSTART_DESCRIPTOR_NAME = "quickstart-web.xml"; + + protected WebAppContext _webApp; + protected String _extraXML; + + + + /** + * @param w the source WebAppContext + * @param extraXML any extra xml snippet to append + */ + public QuickStartDescriptorGenerator (WebAppContext w, String extraXML) + { + _webApp = w; + _extraXML = extraXML; + } + + + /** + * Perform the generation of the xml file + * @throws IOException + * @throws FileNotFoundException + * @throws Exception + */ + public void generateQuickStartWebXml (OutputStream stream) throws FileNotFoundException, IOException + { + if (_webApp == null) + throw new IllegalStateException("No webapp for quickstart generation"); + if (stream == null) + throw new IllegalStateException("No output for quickstart generation"); + + _webApp.getMetaData().getOrigins(); + + if (_webApp.getBaseResource()==null) + throw new IllegalArgumentException("No base resource for "+this); + + LOG.info("Quickstart generating"); + + XmlAppendable out = new XmlAppendable(stream,"UTF-8"); + + MetaData md = _webApp.getMetaData(); + + Map webappAttr = new HashMap<>(); + webappAttr.put("xmlns","http://xmlns.jcp.org/xml/ns/javaee"); + webappAttr.put("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance"); + webappAttr.put("xsi:schemaLocation","http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"); + webappAttr.put("metadata-complete","true"); + webappAttr.put("version","3.1"); + + out.openTag("web-app",webappAttr); + if (_webApp.getDisplayName() != null) + out.tag("display-name",_webApp.getDisplayName()); + + // Set some special context parameters + + // The location of the war file on disk + String resourceBase = _webApp.getBaseResource().getFile().getCanonicalFile().getAbsoluteFile().toURI().toString(); + + // The library order + addContextParamFromAttribute(out,ServletContext.ORDERED_LIBS); + //the servlet container initializers + addContextParamFromAttribute(out,AnnotationConfiguration.CONTAINER_INITIALIZERS); + //the tlds discovered + addContextParamFromAttribute(out,MetaInfConfiguration.METAINF_TLDS,resourceBase); + //the META-INF/resources discovered + addContextParamFromAttribute(out,MetaInfConfiguration.METAINF_RESOURCES,resourceBase); + + + // init params + for (String p : _webApp.getInitParams().keySet()) + out.openTag("context-param",origin(md,"context-param." + p)) + .tag("param-name",p) + .tag("param-value",_webApp.getInitParameter(p)) + .closeTag(); + + if (_webApp.getEventListeners() != null) + for (EventListener e : _webApp.getEventListeners()) + out.openTag("listener",origin(md,e.getClass().getCanonicalName() + ".listener")) + .tag("listener-class",e.getClass().getCanonicalName()) + .closeTag(); + + ServletHandler servlets = _webApp.getServletHandler(); + + if (servlets.getFilters() != null) + { + for (FilterHolder holder : servlets.getFilters()) + outholder(out,md,"filter",holder); + } + + if (servlets.getFilterMappings() != null) + { + for (FilterMapping mapping : servlets.getFilterMappings()) + { + out.openTag("filter-mapping"); + out.tag("filter-name",mapping.getFilterName()); + if (mapping.getPathSpecs() != null) + for (String s : mapping.getPathSpecs()) + out.tag("url-pattern",s); + if (mapping.getServletNames() != null) + for (String n : mapping.getServletNames()) + out.tag("servlet-name",n); + + if (!mapping.isDefaultDispatches()) + { + if (mapping.appliesTo(DispatcherType.REQUEST)) + out.tag("dispatcher","REQUEST"); + if (mapping.appliesTo(DispatcherType.ASYNC)) + out.tag("dispatcher","ASYNC"); + if (mapping.appliesTo(DispatcherType.ERROR)) + out.tag("dispatcher","ERROR"); + if (mapping.appliesTo(DispatcherType.FORWARD)) + out.tag("dispatcher","FORWARD"); + if (mapping.appliesTo(DispatcherType.INCLUDE)) + out.tag("dispatcher","INCLUDE"); + } + out.closeTag(); + } + } + + if (servlets.getServlets() != null) + { + for (ServletHolder holder : servlets.getServlets()) + outholder(out,md,"servlet",holder); + } + + if (servlets.getServletMappings() != null) + { + for (ServletMapping mapping : servlets.getServletMappings()) + { + out.openTag("servlet-mapping",origin(md,mapping.getServletName() + ".servlet.mappings")); + out.tag("servlet-name",mapping.getServletName()); + if (mapping.getPathSpecs() != null) + for (String s : mapping.getPathSpecs()) + out.tag("url-pattern",s); + out.closeTag(); + } + } + + // Security elements + SecurityHandler security =_webApp. getSecurityHandler(); + + if (security!=null && (security.getRealmName()!=null || security.getAuthMethod()!=null)) + { + out.openTag("login-config"); + if (security.getAuthMethod()!=null) + out.tag("auth-method",origin(md,"auth-method"),security.getAuthMethod()); + if (security.getRealmName()!=null) + out.tag("realm-name",origin(md,"realm-name"),security.getRealmName()); + + + if (Constraint.__FORM_AUTH.equalsIgnoreCase(security.getAuthMethod())) + { + out.openTag("form-login-config"); + out.tag("form-login-page",origin(md,"form-login-page"),security.getInitParameter(FormAuthenticator.__FORM_LOGIN_PAGE)); + out.tag("form-error-page",origin(md,"form-error-page"),security.getInitParameter(FormAuthenticator.__FORM_ERROR_PAGE)); + out.closeTag(); + } + + out.closeTag(); + } + + if (security instanceof ConstraintAware) + { + ConstraintAware ca = (ConstraintAware)security; + for (String r:ca.getRoles()) + out.openTag("security-role") + .tag("role-name",r) + .closeTag(); + + for (ConstraintMapping m : ca.getConstraintMappings()) + { + out.openTag("security-constraint"); + + if (m.getConstraint().getAuthenticate()) + { + out.openTag("auth-constraint"); + if (m.getConstraint().getRoles()!=null) + for (String r : m.getConstraint().getRoles()) + out.tag("role-name",r); + + out.closeTag(); + } + + switch (m.getConstraint().getDataConstraint()) + { + case Constraint.DC_NONE: + out.openTag("user-data-constraint").tag("transport-guarantee","NONE").closeTag(); + break; + + case Constraint.DC_INTEGRAL: + out.openTag("user-data-constraint").tag("transport-guarantee","INTEGRAL").closeTag(); + break; + + case Constraint.DC_CONFIDENTIAL: + out.openTag("user-data-constraint").tag("transport-guarantee","CONFIDENTIAL").closeTag(); + break; + + default: + break; + + } + + out.openTag("web-resource-collection"); + { + if (m.getConstraint().getName()!=null) + out.tag("web-resource-name",m.getConstraint().getName()); + if (m.getPathSpec()!=null) + out.tag("url-pattern",origin(md,"constraint.url."+m.getPathSpec()),m.getPathSpec()); + if (m.getMethod()!=null) + out.tag("http-method",m.getMethod()); + + if (m.getMethodOmissions()!=null) + for (String o:m.getMethodOmissions()) + out.tag("http-method-omission",o); + + out.closeTag(); + } + + out.closeTag(); + + } + } + + if (_webApp.getWelcomeFiles() != null) + { + out.openTag("welcome-file-list"); + for (String welcomeFile:_webApp.getWelcomeFiles()) + { + out.tag("welcome-file", welcomeFile); + } + out.closeTag(); + } + + Map localeEncodings = _webApp.getLocaleEncodings(); + if (localeEncodings != null && !localeEncodings.isEmpty()) + { + out.openTag("locale-encoding-mapping-list"); + for (Map.Entry entry:localeEncodings.entrySet()) + { + out.openTag("locale-encoding-mapping", origin(md,"locale-encoding."+entry.getKey())); + out.tag("locale", entry.getKey()); + out.tag("encoding", entry.getValue()); + out.closeTag(); + } + out.closeTag(); + } + + //session-config + if (_webApp.getSessionHandler().getSessionManager() != null) + { + out.openTag("session-config"); + int maxInactiveSec = _webApp.getSessionHandler().getSessionManager().getMaxInactiveInterval(); + out.tag("session-timeout", (maxInactiveSec==0?"0":Integer.toString(maxInactiveSec/60))); + + Set modes =_webApp. getSessionHandler().getSessionManager().getEffectiveSessionTrackingModes(); + if (modes != null) + { + for (SessionTrackingMode mode:modes) + out.tag("tracking-mode", mode.toString()); + } + + //cookie-config + SessionCookieConfig cookieConfig = _webApp.getSessionHandler().getSessionManager().getSessionCookieConfig(); + if (cookieConfig != null) + { + out.openTag("cookie-config"); + if (cookieConfig.getName() != null) + out.tag("name", origin(md,"cookie-config.name"), cookieConfig.getName()); + + if (cookieConfig.getDomain() != null) + out.tag("domain", origin(md, "cookie-config.domain"), cookieConfig.getDomain()); + + if (cookieConfig.getPath() != null) + out.tag("path", origin(md, "cookie-config.path"), cookieConfig.getPath()); + + if (cookieConfig.getComment() != null) + out.tag("comment", origin(md, "cookie-config.comment"), cookieConfig.getComment()); + + out.tag("http-only", origin(md, "cookie-config.http-only"), Boolean.toString(cookieConfig.isHttpOnly())); + out.tag("secure", origin(md, "cookie-config.secure"), Boolean.toString(cookieConfig.isSecure())); + out.tag("max-age", origin(md, "cookie-config.max-age"), Integer.toString(cookieConfig.getMaxAge())); + out.closeTag(); + } + out.closeTag(); + } + + //error-pages + Map errorPages = ((ErrorPageErrorHandler)_webApp.getErrorHandler()).getErrorPages(); + if (errorPages != null) + { + for (Map.Entry entry:errorPages.entrySet()) + { + out.openTag("error-page", origin(md, "error."+entry.getKey())); + //a global or default error page has no code or exception + if (!ErrorPageErrorHandler.GLOBAL_ERROR_PAGE.equals(entry.getKey())) + { + if (entry.getKey().matches("\\d{3}")) + out.tag("error-code", entry.getKey()); + else + out.tag("exception-type", entry.getKey()); + } + out.tag("location", entry.getValue()); + out.closeTag(); + } + } + + //mime-types + MimeTypes mimeTypes = _webApp.getMimeTypes(); + if (mimeTypes != null) + { + for (Map.Entry entry:mimeTypes.getMimeMap().entrySet()) + { + out.openTag("mime-mapping"); + out.tag("extension", origin(md, "extension."+entry.getKey()), entry.getKey()); + out.tag("mime-type", entry.getValue()); + out.closeTag(); + } + } + + //jsp-config + JspConfig jspConfig = (JspConfig)_webApp.getServletContext().getJspConfigDescriptor(); + if (jspConfig != null) + { + out.openTag("jsp-config"); + Collection tlds = jspConfig.getTaglibs(); + if (tlds != null && !tlds.isEmpty()) + { + for (TaglibDescriptor tld:tlds) + { + out.openTag("taglib"); + out.tag("taglib-uri", tld.getTaglibURI()); + out.tag("taglib-location", tld.getTaglibLocation()); + out.closeTag(); + } + } + + Collection jspPropertyGroups = jspConfig.getJspPropertyGroups(); + if (jspPropertyGroups != null && !jspPropertyGroups.isEmpty()) + { + for (JspPropertyGroupDescriptor jspPropertyGroup:jspPropertyGroups) + { + out.openTag("jsp-property-group"); + Collection strings = jspPropertyGroup.getUrlPatterns(); + if (strings != null && !strings.isEmpty()) + { + for (String urlPattern:strings) + out.tag("url-pattern", urlPattern); + } + + if (jspPropertyGroup.getElIgnored() != null) + out.tag("el-ignored", jspPropertyGroup.getElIgnored()); + + if (jspPropertyGroup.getPageEncoding() != null) + out.tag("page-encoding", jspPropertyGroup.getPageEncoding()); + + if (jspPropertyGroup.getScriptingInvalid() != null) + out.tag("scripting-invalid", jspPropertyGroup.getScriptingInvalid()); + + if (jspPropertyGroup.getIsXml() != null) + out.tag("is-xml", jspPropertyGroup.getIsXml()); + + if (jspPropertyGroup.getDeferredSyntaxAllowedAsLiteral() != null) + out.tag("deferred-syntax-allowed-as-literal", jspPropertyGroup.getDeferredSyntaxAllowedAsLiteral()); + + if (jspPropertyGroup.getTrimDirectiveWhitespaces() != null) + out.tag("trim-directive-whitespaces", jspPropertyGroup.getTrimDirectiveWhitespaces()); + + if (jspPropertyGroup.getDefaultContentType() != null) + out.tag("default-content-type", jspPropertyGroup.getDefaultContentType()); + + if (jspPropertyGroup.getBuffer() != null) + out.tag("buffer", jspPropertyGroup.getBuffer()); + + if (jspPropertyGroup.getErrorOnUndeclaredNamespace() != null) + out.tag("error-on-undeclared-namespace", jspPropertyGroup.getErrorOnUndeclaredNamespace()); + + strings = jspPropertyGroup.getIncludePreludes(); + if (strings != null && !strings.isEmpty()) + { + for (String prelude:strings) + out.tag("include-prelude", prelude); + } + + strings = jspPropertyGroup.getIncludeCodas(); + if (strings != null && !strings.isEmpty()) + { + for (String coda:strings) + out.tag("include-coda", coda); + } + + out.closeTag(); + } + } + + out.closeTag(); + } + + //lifecycle: post-construct, pre-destroy + LifeCycleCallbackCollection lifecycles = ((LifeCycleCallbackCollection)_webApp.getAttribute(LifeCycleCallbackCollection.LIFECYCLE_CALLBACK_COLLECTION)); + if (lifecycles != null) + { + Collection tmp = lifecycles.getPostConstructCallbacks(); + + for (LifeCycleCallback c:tmp) + { + out.openTag("post-construct"); + out.tag("lifecycle-callback-class", c.getTargetClassName()); + out.tag("lifecycle-callback-method", c.getMethodName()); + out.closeTag(); + } + + tmp = lifecycles.getPreDestroyCallbacks(); + for (LifeCycleCallback c:tmp) + { + out.openTag("pre-destroy"); + out.tag("lifecycle-callback-class", c.getTargetClassName()); + out.tag("lifecycle-callback-method", c.getMethodName()); + out.closeTag(); + } + } + + out.literal(_extraXML); + + out.closeTag(); + } + + /** + * Turn attribute into context-param to store. + * + * @param out + * @param attribute + * @throws IOException + */ + private void addContextParamFromAttribute(XmlAppendable out, String attribute) throws IOException + { + addContextParamFromAttribute(out,attribute,null); + } + + /** + * Turn context attribute into context-param to store. + * + * @param out + * @param attribute + * @param resourceBase + * @throws IOException + */ + private void addContextParamFromAttribute(XmlAppendable out, String attribute, String resourceBase) throws IOException + { + Object o = _webApp.getAttribute(attribute); + if (o == null) + return; + + Collection c = (o instanceof Collection)? (Collection)o:Collections.singletonList(o); + StringBuilder v=new StringBuilder(); + for (Object i:c) + { + if (i!=null) + { + if (v.length()>0) + v.append(",\n "); + else + v.append("\n "); + if (resourceBase==null) + QuotedStringTokenizer.quote(v,i.toString()); + else + QuotedStringTokenizer.quote(v,i.toString().replace(resourceBase,"${WAR}/")); + } + } + out.openTag("context-param") + .tag("param-name",attribute) + .tagCDATA("param-value",v.toString()) + .closeTag(); + } + + /** + * Generate xml for a Holder (Filter/Servlet) + * + * @param out + * @param md + * @param tag + * @param holder + * @throws IOException + */ + private void outholder(XmlAppendable out, MetaData md, String tag, Holder holder) throws IOException + { + out.openTag(tag,Collections.singletonMap("source",holder.getSource().toString())); + String n = holder.getName(); + out.tag(tag + "-name",n); + + String ot = n + "." + tag + "."; + + if (holder instanceof FilterHolder) + out.tag(tag + "-class",origin(md,ot + tag + "-class"),holder.getClassName()); + else if (holder instanceof ServletHolder) + { + ServletHolder s = (ServletHolder)holder; + if (s.getForcedPath() != null && s.getClassName() == null) + out.tag("jsp-file",s.getForcedPath()); + else + out.tag(tag + "-class",origin(md,ot + tag + "-class"),s.getClassName()); + + } + + for (String p : holder.getInitParameters().keySet()) + { + if ("scratchdir".equalsIgnoreCase(p)) //don't preconfigure the temp dir for jsp output + continue; + out.openTag("init-param",origin(md,ot + "init-param." + p)) + .tag("param-name",p) + .tag("param-value",holder.getInitParameter(p)) + .closeTag(); + } + + if (holder instanceof ServletHolder) + { + ServletHolder s = (ServletHolder)holder; + if (s.getInitOrder() >= 0) + out.tag("load-on-startup",Integer.toString(s.getInitOrder())); + + if (s.getRunAsRole() != null) + out.openTag("run-as",origin(md,ot + "run-as")) + .tag("role-name",s.getRunAsRole()) + .closeTag(); + + Map roles = s.getRoleRefMap(); + if (roles!=null) + { + for (Map.Entry e : roles.entrySet()) + { + out.openTag("security-role-ref",origin(md,ot+"role-name."+e.getKey())) + .tag("role-name",e.getKey()) + .tag("role-link",e.getValue()) + .closeTag(); + } + } + + if (!s.isEnabled()) + out.tag("enabled",origin(md,ot + "enabled"),"false"); + + //multipart-config + MultipartConfigElement multipartConfig = ((ServletHolder.Registration)s.getRegistration()).getMultipartConfig(); + if (multipartConfig != null) + { + out.openTag("multipart-config", origin(md, s.getName()+".servlet.multipart-config")); + if (multipartConfig.getLocation() != null) + out.tag("location", multipartConfig.getLocation()); + out.tag("max-file-size", Long.toString(multipartConfig.getMaxFileSize())); + out.tag("max-request-size", Long.toString(multipartConfig.getMaxRequestSize())); + out.tag("file-size-threshold", Long.toString(multipartConfig.getFileSizeThreshold())); + out.closeTag(); + } + } + + out.tag("async-supported",origin(md,ot + "async-supported"),holder.isAsyncSupported()?"true":"false"); + out.closeTag(); + } + + + + /** + * Find the origin (web.xml, fragment, annotation etc) of a web artifact from MetaData. + * + * @param md + * @param name + * @return + */ + public Map origin(MetaData md, String name) + { + if (!LOG.isDebugEnabled()) + return Collections.emptyMap(); + if (name == null) + return Collections.emptyMap(); + OriginInfo origin = md.getOriginInfo(name); + if (LOG.isDebugEnabled()) LOG.debug("origin of "+name+" is "+origin); + if (origin == null) + return Collections.emptyMap(); + return Collections.singletonMap("origin",origin.toString()); + } + +} diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartWebApp.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartWebApp.java index bcbcab80808..0372e52cb99 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartWebApp.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartWebApp.java @@ -18,51 +18,13 @@ package org.eclipse.jetty.quickstart; -import java.io.File; import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EventListener; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import javax.servlet.DispatcherType; -import javax.servlet.MultipartConfigElement; -import javax.servlet.ServletContext; -import javax.servlet.SessionCookieConfig; -import javax.servlet.SessionTrackingMode; -import javax.servlet.descriptor.JspPropertyGroupDescriptor; -import javax.servlet.descriptor.TaglibDescriptor; - -import org.eclipse.jetty.annotations.AnnotationConfiguration; -import org.eclipse.jetty.http.MimeTypes; -import org.eclipse.jetty.plus.annotation.LifeCycleCallback; -import org.eclipse.jetty.plus.annotation.LifeCycleCallbackCollection; -import org.eclipse.jetty.security.ConstraintAware; -import org.eclipse.jetty.security.ConstraintMapping; -import org.eclipse.jetty.security.SecurityHandler; -import org.eclipse.jetty.security.authentication.FormAuthenticator; -import org.eclipse.jetty.servlet.ErrorPageErrorHandler; -import org.eclipse.jetty.servlet.FilterHolder; -import org.eclipse.jetty.servlet.FilterMapping; -import org.eclipse.jetty.servlet.Holder; -import org.eclipse.jetty.servlet.ServletHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.servlet.ServletMapping; -import org.eclipse.jetty.util.QuotedStringTokenizer; 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.util.security.Constraint; -import org.eclipse.jetty.webapp.MetaData; -import org.eclipse.jetty.webapp.MetaData.OriginInfo; -import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.xml.XmlAppendable; /** * QuickStartWar @@ -72,6 +34,8 @@ public class QuickStartWebApp extends WebAppContext { private static final Logger LOG = Log.getLogger(QuickStartWebApp.class); + + public static final String[] __configurationClasses = new String[] { org.eclipse.jetty.quickstart.QuickStartConfiguration.class.getCanonicalName(), @@ -190,8 +154,7 @@ public class QuickStartWebApp extends WebAppContext { LOG.info("Quickstart preconfigure: {}(war={},dir={})",this,war,dir); - _preconfigProcessor = new PreconfigureDescriptorProcessor(); - + _preconfigProcessor = new PreconfigureDescriptorProcessor(); getMetaData().addDescriptorProcessor(_preconfigProcessor); setPreconfigure(true); _startWebapp=true; @@ -203,518 +166,17 @@ public class QuickStartWebApp extends WebAppContext } - public void generateQuickstartWebXml(String extraXML) throws IOException + public void generateQuickstartWebXml(String extraXML) throws Exception { - getMetaData().getOrigins(); - // dumpStdErr(); - - if (getBaseResource()==null) - throw new IllegalArgumentException("No base resource for "+this); - - File webxml = new File(getWebInf().getFile(),"quickstart-web.xml"); - - LOG.info("Quickstart generate {}",webxml); - - XmlAppendable out = new XmlAppendable(new FileOutputStream(webxml),"UTF-8"); - MetaData md = getMetaData(); - - Map webappAttr = new HashMap<>(); - webappAttr.put("xmlns","http://xmlns.jcp.org/xml/ns/javaee"); - webappAttr.put("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance"); - webappAttr.put("xsi:schemaLocation","http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"); - webappAttr.put("metadata-complete","true"); - webappAttr.put("version","3.1"); - - out.open("web-app",webappAttr); - - if (getDisplayName() != null) - out.tag("display-name",getDisplayName()); - - // Set some special context parameters - - // The location of the war file on disk - String resourceBase=getBaseResource().getFile().getCanonicalFile().getAbsoluteFile().toURI().toString(); - - // The library order - addContextParamFromAttribute(out,ServletContext.ORDERED_LIBS); - //the servlet container initializers - addContextParamFromAttribute(out,AnnotationConfiguration.CONTAINER_INITIALIZERS); - //the tlds discovered - addContextParamFromAttribute(out,MetaInfConfiguration.METAINF_TLDS,resourceBase); - //the META-INF/resources discovered - addContextParamFromAttribute(out,MetaInfConfiguration.METAINF_RESOURCES,resourceBase); - - - // init params - for (String p : getInitParams().keySet()) - out.open("context-param",origin(md,"context-param." + p)) - .tag("param-name",p) - .tag("param-value",getInitParameter(p)) - .close(); - - if (getEventListeners() != null) - for (EventListener e : getEventListeners()) - out.open("listener",origin(md,e.getClass().getCanonicalName() + ".listener")) - .tag("listener-class",e.getClass().getCanonicalName()) - .close(); - - ServletHandler servlets = getServletHandler(); - - if (servlets.getFilters() != null) + Resource descriptor = getWebInf().addPath(QuickStartDescriptorGenerator.DEFAULT_QUICKSTART_DESCRIPTOR_NAME); + if (!descriptor.exists()) + descriptor.getFile().createNewFile(); + QuickStartDescriptorGenerator generator = new QuickStartDescriptorGenerator(this, extraXML); + try (FileOutputStream fos = new FileOutputStream(descriptor.getFile())) { - for (FilterHolder holder : servlets.getFilters()) - outholder(out,md,"filter",holder); + generator.generateQuickStartWebXml(fos); } - - if (servlets.getFilterMappings() != null) - { - for (FilterMapping mapping : servlets.getFilterMappings()) - { - out.open("filter-mapping"); - out.tag("filter-name",mapping.getFilterName()); - if (mapping.getPathSpecs() != null) - for (String s : mapping.getPathSpecs()) - out.tag("url-pattern",s); - if (mapping.getServletNames() != null) - for (String n : mapping.getServletNames()) - out.tag("servlet-name",n); - - if (!mapping.isDefaultDispatches()) - { - if (mapping.appliesTo(DispatcherType.REQUEST)) - out.tag("dispatcher","REQUEST"); - if (mapping.appliesTo(DispatcherType.ASYNC)) - out.tag("dispatcher","ASYNC"); - if (mapping.appliesTo(DispatcherType.ERROR)) - out.tag("dispatcher","ERROR"); - if (mapping.appliesTo(DispatcherType.FORWARD)) - out.tag("dispatcher","FORWARD"); - if (mapping.appliesTo(DispatcherType.INCLUDE)) - out.tag("dispatcher","INCLUDE"); - } - out.close(); - } - } - - if (servlets.getServlets() != null) - { - for (ServletHolder holder : servlets.getServlets()) - outholder(out,md,"servlet",holder); - } - - if (servlets.getServletMappings() != null) - { - for (ServletMapping mapping : servlets.getServletMappings()) - { - out.open("servlet-mapping",origin(md,mapping.getServletName() + ".servlet.mappings")); - out.tag("servlet-name",mapping.getServletName()); - if (mapping.getPathSpecs() != null) - for (String s : mapping.getPathSpecs()) - out.tag("url-pattern",s); - out.close(); - } - } - - // Security elements - SecurityHandler security = getSecurityHandler(); - - if (security!=null && (security.getRealmName()!=null || security.getAuthMethod()!=null)) - { - out.open("login-config"); - if (security.getAuthMethod()!=null) - out.tag("auth-method",origin(md,"auth-method"),security.getAuthMethod()); - if (security.getRealmName()!=null) - out.tag("realm-name",origin(md,"realm-name"),security.getRealmName()); - - - if (Constraint.__FORM_AUTH.equalsIgnoreCase(security.getAuthMethod())) - { - out.open("form-login-config"); - out.tag("form-login-page",origin(md,"form-login-page"),security.getInitParameter(FormAuthenticator.__FORM_LOGIN_PAGE)); - out.tag("form-error-page",origin(md,"form-error-page"),security.getInitParameter(FormAuthenticator.__FORM_ERROR_PAGE)); - out.close(); - } - - out.close(); - } - - if (security instanceof ConstraintAware) - { - ConstraintAware ca = (ConstraintAware)security; - for (String r:ca.getRoles()) - out.open("security-role") - .tag("role-name",r) - .close(); - - for (ConstraintMapping m : ca.getConstraintMappings()) - { - out.open("security-constraint"); - - if (m.getConstraint().getAuthenticate()) - { - out.open("auth-constraint"); - if (m.getConstraint().getRoles()!=null) - for (String r : m.getConstraint().getRoles()) - out.tag("role-name",r); - - out.close(); - } - - switch (m.getConstraint().getDataConstraint()) - { - case Constraint.DC_NONE: - out.open("user-data-constraint").tag("transport-guarantee","NONE").close(); - break; - - case Constraint.DC_INTEGRAL: - out.open("user-data-constraint").tag("transport-guarantee","INTEGRAL").close(); - break; - - case Constraint.DC_CONFIDENTIAL: - out.open("user-data-constraint").tag("transport-guarantee","CONFIDENTIAL").close(); - break; - - default: - break; - - } - - out.open("web-resource-collection"); - { - if (m.getConstraint().getName()!=null) - out.tag("web-resource-name",m.getConstraint().getName()); - if (m.getPathSpec()!=null) - out.tag("url-pattern",origin(md,"constraint.url."+m.getPathSpec()),m.getPathSpec()); - if (m.getMethod()!=null) - out.tag("http-method",m.getMethod()); - - if (m.getMethodOmissions()!=null) - for (String o:m.getMethodOmissions()) - out.tag("http-method-omission",o); - - out.close(); - } - - out.close(); - - } - } - - if (getWelcomeFiles() != null) - { - out.open("welcome-file-list"); - for (String welcomeFile:getWelcomeFiles()) - { - out.tag("welcome-file", welcomeFile); - } - out.close(); - } - - Map localeEncodings = getLocaleEncodings(); - if (localeEncodings != null && !localeEncodings.isEmpty()) - { - out.open("locale-encoding-mapping-list"); - for (Map.Entry entry:localeEncodings.entrySet()) - { - out.open("locale-encoding-mapping", origin(md,"locale-encoding."+entry.getKey())); - out.tag("locale", entry.getKey()); - out.tag("encoding", entry.getValue()); - out.close(); - } - out.close(); - } - - //session-config - if (getSessionHandler().getSessionManager() != null) - { - out.open("session-config"); - int maxInactiveSec = getSessionHandler().getSessionManager().getMaxInactiveInterval(); - out.tag("session-timeout", (maxInactiveSec==0?"0":Integer.toString(maxInactiveSec/60))); - - Set modes = getSessionHandler().getSessionManager().getEffectiveSessionTrackingModes(); - if (modes != null) - { - for (SessionTrackingMode mode:modes) - out.tag("tracking-mode", mode.toString()); - } - - //cookie-config - SessionCookieConfig cookieConfig = getSessionHandler().getSessionManager().getSessionCookieConfig(); - if (cookieConfig != null) - { - out.open("cookie-config"); - if (cookieConfig.getName() != null) - out.tag("name", origin(md,"cookie-config.name"), cookieConfig.getName()); - - if (cookieConfig.getDomain() != null) - out.tag("domain", origin(md, "cookie-config.domain"), cookieConfig.getDomain()); - - if (cookieConfig.getPath() != null) - out.tag("path", origin(md, "cookie-config.path"), cookieConfig.getPath()); - - if (cookieConfig.getComment() != null) - out.tag("comment", origin(md, "cookie-config.comment"), cookieConfig.getComment()); - - out.tag("http-only", origin(md, "cookie-config.http-only"), Boolean.toString(cookieConfig.isHttpOnly())); - out.tag("secure", origin(md, "cookie-config.secure"), Boolean.toString(cookieConfig.isSecure())); - out.tag("max-age", origin(md, "cookie-config.max-age"), Integer.toString(cookieConfig.getMaxAge())); - out.close(); - } - out.close(); - } - - //error-pages - Map errorPages = ((ErrorPageErrorHandler)getErrorHandler()).getErrorPages(); - if (errorPages != null) - { - for (Map.Entry entry:errorPages.entrySet()) - { - out.open("error-page", origin(md, "error."+entry.getKey())); - //a global or default error page has no code or exception - if (!ErrorPageErrorHandler.GLOBAL_ERROR_PAGE.equals(entry.getKey())) - { - if (entry.getKey().matches("\\d{3}")) - out.tag("error-code", entry.getKey()); - else - out.tag("exception-type", entry.getKey()); - } - out.tag("location", entry.getValue()); - out.close(); - } - } - - //mime-types - MimeTypes mimeTypes = getMimeTypes(); - if (mimeTypes != null) - { - for (Map.Entry entry:mimeTypes.getMimeMap().entrySet()) - { - out.open("mime-mapping"); - out.tag("extension", origin(md, "extension."+entry.getKey()), entry.getKey()); - out.tag("mime-type", entry.getValue()); - out.close(); - } - } - - //jsp-config - JspConfig jspConfig = (JspConfig)getServletContext().getJspConfigDescriptor(); - if (jspConfig != null) - { - out.open("jsp-config"); - Collection tlds = jspConfig.getTaglibs(); - if (tlds != null && !tlds.isEmpty()) - { - for (TaglibDescriptor tld:tlds) - { - out.open("taglib"); - out.tag("taglib-uri", tld.getTaglibURI()); - out.tag("taglib-location", tld.getTaglibLocation()); - out.close(); - } - } - - Collection jspPropertyGroups = jspConfig.getJspPropertyGroups(); - if (jspPropertyGroups != null && !jspPropertyGroups.isEmpty()) - { - for (JspPropertyGroupDescriptor jspPropertyGroup:jspPropertyGroups) - { - out.open("jsp-property-group"); - Collection strings = jspPropertyGroup.getUrlPatterns(); - if (strings != null && !strings.isEmpty()) - { - for (String urlPattern:strings) - out.tag("url-pattern", urlPattern); - } - - if (jspPropertyGroup.getElIgnored() != null) - out.tag("el-ignored", jspPropertyGroup.getElIgnored()); - - if (jspPropertyGroup.getPageEncoding() != null) - out.tag("page-encoding", jspPropertyGroup.getPageEncoding()); - - if (jspPropertyGroup.getScriptingInvalid() != null) - out.tag("scripting-invalid", jspPropertyGroup.getScriptingInvalid()); - - if (jspPropertyGroup.getIsXml() != null) - out.tag("is-xml", jspPropertyGroup.getIsXml()); - - if (jspPropertyGroup.getDeferredSyntaxAllowedAsLiteral() != null) - out.tag("deferred-syntax-allowed-as-literal", jspPropertyGroup.getDeferredSyntaxAllowedAsLiteral()); - - if (jspPropertyGroup.getTrimDirectiveWhitespaces() != null) - out.tag("trim-directive-whitespaces", jspPropertyGroup.getTrimDirectiveWhitespaces()); - - if (jspPropertyGroup.getDefaultContentType() != null) - out.tag("default-content-type", jspPropertyGroup.getDefaultContentType()); - - if (jspPropertyGroup.getBuffer() != null) - out.tag("buffer", jspPropertyGroup.getBuffer()); - - if (jspPropertyGroup.getErrorOnUndeclaredNamespace() != null) - out.tag("error-on-undeclared-namespace", jspPropertyGroup.getErrorOnUndeclaredNamespace()); - - strings = jspPropertyGroup.getIncludePreludes(); - if (strings != null && !strings.isEmpty()) - { - for (String prelude:strings) - out.tag("include-prelude", prelude); - } - - strings = jspPropertyGroup.getIncludeCodas(); - if (strings != null && !strings.isEmpty()) - { - for (String coda:strings) - out.tag("include-coda", coda); - } - - out.close(); - } - } - - out.close(); - } - - //lifecycle: post-construct, pre-destroy - LifeCycleCallbackCollection lifecycles = ((LifeCycleCallbackCollection)getAttribute(LifeCycleCallbackCollection.LIFECYCLE_CALLBACK_COLLECTION)); - if (lifecycles != null) - { - Collection tmp = lifecycles.getPostConstructCallbacks(); - - for (LifeCycleCallback c:tmp) - { - out.open("post-construct"); - out.tag("lifecycle-callback-class", c.getTargetClassName()); - out.tag("lifecycle-callback-method", c.getMethodName()); - out.close(); - } - - tmp = lifecycles.getPreDestroyCallbacks(); - for (LifeCycleCallback c:tmp) - { - out.open("pre-destroy"); - out.tag("lifecycle-callback-class", c.getTargetClassName()); - out.tag("lifecycle-callback-method", c.getMethodName()); - out.close(); - } - } - - out.literal(extraXML); - - out.close(); } - private void addContextParamFromAttribute(XmlAppendable out, String attribute) throws IOException - { - addContextParamFromAttribute(out,attribute,null); - } - - private void addContextParamFromAttribute(XmlAppendable out, String attribute, String resourceBase) throws IOException - { - Object o=getAttribute(attribute); - if (o==null) - return; - - Collection c = (o instanceof Collection)? (Collection)o:Collections.singletonList(o); - StringBuilder v=new StringBuilder(); - for (Object i:c) - { - if (i!=null) - { - if (v.length()>0) - v.append(",\n "); - else - v.append("\n "); - if (resourceBase==null) - QuotedStringTokenizer.quote(v,i.toString()); - else - QuotedStringTokenizer.quote(v,i.toString().replace(resourceBase,"${WAR}/")); - } - } - out.open("context-param") - .tag("param-name",attribute) - .tagCDATA("param-value",v.toString()) - .close(); - } - - private static void outholder(XmlAppendable out, MetaData md, String tag, Holder holder) throws IOException - { - out.open(tag,Collections.singletonMap("source",holder.getSource().toString())); - String n = holder.getName(); - out.tag(tag + "-name",n); - - String ot = n + "." + tag + "."; - - out.tag(tag + "-class",origin(md,ot + tag + "-class"),holder.getClassName()); - - for (String p : holder.getInitParameters().keySet()) - { - if ("scratchdir".equalsIgnoreCase(p)) //don't preconfigure the temp dir for jsp output - continue; - out.open("init-param",origin(md,ot + "init-param." + p)) - .tag("param-name",p) - .tag("param-value",holder.getInitParameter(p)) - .close(); - } - - if (holder instanceof ServletHolder) - { - ServletHolder s = (ServletHolder)holder; - if (s.getForcedPath() != null) - out.tag("jsp-file",s.getForcedPath()); - - if (s.getInitOrder() != 0) - out.tag("load-on-startup",Integer.toString(s.getInitOrder())); - - if (s.getRunAsRole() != null) - out.open("run-as",origin(md,ot + "run-as")) - .tag("role-name",s.getRunAsRole()) - .close(); - - Map roles = s.getRoleRefMap(); - if (roles!=null) - { - for (Map.Entry e : roles.entrySet()) - { - out.open("security-role-ref",origin(md,ot+"role-name."+e.getKey())) - .tag("role-name",e.getKey()) - .tag("role-link",e.getValue()) - .close(); - } - } - - if (!s.isEnabled()) - out.tag("enabled",origin(md,ot + "enabled"),"false"); - - //multipart-config - MultipartConfigElement multipartConfig = ((ServletHolder.Registration)s.getRegistration()).getMultipartConfig(); - if (multipartConfig != null) - { - out.open("multipart-config", origin(md, s.getName()+".servlet.multipart-config")); - if (multipartConfig.getLocation() != null) - out.tag("location", multipartConfig.getLocation()); - out.tag("max-file-size", Long.toString(multipartConfig.getMaxFileSize())); - out.tag("max-request-size", Long.toString(multipartConfig.getMaxRequestSize())); - out.tag("file-size-threshold", Long.toString(multipartConfig.getFileSizeThreshold())); - out.close(); - } - } - - out.tag("async-supported",origin(md,ot + "async-supported"),holder.isAsyncSupported()?"true":"false"); - out.close(); - } - - public static Map origin(MetaData md, String name) - { - if (!LOG.isDebugEnabled()) - return Collections.emptyMap(); - if (name == null) - return Collections.emptyMap(); - OriginInfo origin = md.getOriginInfo(name); - // System.err.println("origin of "+name+" is "+origin); - if (origin == null) - return Collections.emptyMap(); - return Collections.singletonMap("origin",origin.toString()); - - } - + } 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 eea013eee3b..f20e9142c79 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 @@ -27,7 +27,6 @@ import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.util.ArrayUtil; 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; diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java index 47fa517d9b0..e8d6cda940e 100644 --- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java +++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java @@ -45,7 +45,7 @@ public class ValidUrlRuleTest extends AbstractRuleTestCase _rule.matchAndApply(_request.getRequestURI(), _request, _response); - assertEquals(0,_response.getStatus()); + assertEquals(200,_response.getStatus()); } @Test diff --git a/jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/GatewayServer.java b/jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/GatewayServer.java index 83068d10d73..713b4fe0eee 100644 --- a/jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/GatewayServer.java +++ b/jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/GatewayServer.java @@ -102,7 +102,7 @@ public class GatewayServer extends Server public GatewayServer() { - this("",DFT_EXT_PATH,DFT_CONNECT_PATH,new StandardTargetIdRetriever()); + this("",DFT_EXT_PATH,DFT_CONNECT_PATH,new StandardTargetIdRetriever()); } public GatewayServer(String contextPath, String externalServletPath,String gatewayServletPath, TargetIdRetriever targetIdRetriever) @@ -145,7 +145,7 @@ public class GatewayServer extends Server public Gateway getGateway() { - return gateway; + return gateway; } public ServletHolder getExternalServlet() 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 201618d89d1..7b7f2a395e0 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 @@ -46,6 +46,7 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.UserIdentity; 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.security.Constraint; @@ -510,21 +511,6 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr mappings.put(ALL_METHODS,roleInfo); } } - else - { - //combine with any entry that covers all methods - if (httpMethod == null) - { - for (Map.Entry entry : mappings.entrySet()) - { - if (entry.getKey() != null) - { - RoleInfo specific = entry.getValue(); - specific.combine(roleInfo); - } - } - } - } } /* ------------------------------------------------------------ */ @@ -627,7 +613,7 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr @Override protected RoleInfo prepareConstraintInfo(String pathInContext, Request request) { - Map mappings = (Map)_constraintMap.match(pathInContext); + Map mappings = _constraintMap.match(pathInContext); if (mappings != null) { @@ -700,11 +686,8 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr { String scheme = httpConfig.getSecureScheme(); int port = httpConfig.getSecurePort(); - String url = ("https".equalsIgnoreCase(scheme) && port==443) - ? "https://"+request.getServerName()+request.getRequestURI() - : scheme + "://" + request.getServerName() + ":" + port + request.getRequestURI(); - if (request.getQueryString() != null) - url += "?" + request.getQueryString(); + + String url = URIUtil.newURI(scheme, request.getServerName(), port,request.getRequestURI(),request.getQueryString()); response.setContentLength(0); response.sendRedirect(url); } diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java b/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java index e2de9f7db22..a67eb96d6fc 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse; /** * @version $Rev: 4466 $ $Date: 2009-02-10 23:42:54 +0100 (Tue, 10 Feb 2009) $ + * @deprecated */ public interface CrossContextPsuedoSession { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java b/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java index 8499a609d3a..2f94908acb3 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; /** * @version $Rev: 4660 $ $Date: 2009-02-25 17:29:53 +0100 (Wed, 25 Feb 2009) $ + * @deprecated */ public class HashCrossContextPsuedoSession implements CrossContextPsuedoSession { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java index 99094c17a9e..21eba251640 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java @@ -22,7 +22,6 @@ import java.security.Principal; import javax.security.auth.Subject; -import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.UserIdentity; /* ------------------------------------------------------------ */ 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 a6e108e9a70..9460736f470 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 @@ -43,7 +43,6 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler.Context; import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.server.session.AbstractSession; -import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; 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 df0f7d92f3a..fe4c64b8bbb 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 @@ -331,28 +331,28 @@ public class DeferredAuthentication implements Authentication.Deferred } @Override - public Collection getHeaderNames() - { - return Collections.emptyList(); - } - - @Override - public String getHeader(String arg0) - { - return null; - } - - @Override - public Collection getHeaders(String arg0) - { + public Collection getHeaderNames() + { return Collections.emptyList(); - } + } - @Override - public int getStatus() - { - return 0; - } + @Override + public String getHeader(String arg0) + { + return null; + } + + @Override + public Collection getHeaders(String arg0) + { + return Collections.emptyList(); + } + + @Override + public int getStatus() + { + return 0; + } }; 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 13537e6cb75..be5db7ef7bf 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 @@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpHeader; -import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.security.ServerAuthException; import org.eclipse.jetty.security.UserAuthentication; import org.eclipse.jetty.server.Authentication; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java index 8469c0a800d..e0248b2e595 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java @@ -50,7 +50,7 @@ public class SpnegoAuthenticator extends LoginAuthenticator */ public SpnegoAuthenticator( String authMethod ) { - _authMethod = authMethod; + _authMethod = authMethod; } @Override @@ -77,10 +77,10 @@ public class SpnegoAuthenticator extends LoginAuthenticator { try { - if (DeferredAuthentication.isDeferred(res)) - { + if (DeferredAuthentication.isDeferred(res)) + { return Authentication.UNAUTHENTICATED; - } + } LOG.debug("SpengoAuthenticator: sending challenge"); res.setHeader(HttpHeader.WWW_AUTHENTICATE.asString(), HttpHeader.NEGOTIATE.asString()); diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java new file mode 100644 index 00000000000..6267cf9ad65 --- /dev/null +++ b/jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java @@ -0,0 +1,174 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.security; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.LocalConnector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.server.handler.ResourceHandler; +import org.eclipse.jetty.server.session.SessionHandler; +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; +import org.eclipse.jetty.util.security.Constraint; +import org.eclipse.jetty.util.security.Password; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; + +/** + * Some requests for static data that is served by ResourceHandler, but some is secured. + *

    + * This is mainly here to test security bypass techniques using aliased names that should be caught. + */ +@RunWith(Parameterized.class) +public class AliasedConstraintTest +{ + private static final String TEST_REALM = "TestRealm"; + private static Server server; + private static LocalConnector connector; + private static ConstraintSecurityHandler security; + + @BeforeClass + public static void startServer() throws Exception + { + server = new Server(); + connector = new LocalConnector(server); + server.setConnectors(new Connector[] { connector }); + + ContextHandler context = new ContextHandler(); + SessionHandler session = new SessionHandler(); + + HashLoginService loginService = new HashLoginService(TEST_REALM); + loginService.putUser("user0",new Password("password"),new String[] {}); + loginService.putUser("user",new Password("password"),new String[] { "user" }); + loginService.putUser("user2",new Password("password"),new String[] { "user" }); + loginService.putUser("admin",new Password("password"),new String[] { "user", "administrator" }); + loginService.putUser("user3",new Password("password"),new String[] { "foo" }); + + context.setContextPath("/ctx"); + context.setResourceBase(MavenTestingUtils.getTestResourceDir("docroot").getAbsolutePath()); + server.setHandler(context); + context.setHandler(session); + // context.addAliasCheck(new AllowSymLinkAliasChecker()); + + server.addBean(loginService); + + security = new ConstraintSecurityHandler(); + session.setHandler(security); + ResourceHandler handler = new ResourceHandler(); + security.setHandler(handler); + + List constraints = new ArrayList<>(); + + Constraint constraint0 = new Constraint(); + constraint0.setAuthenticate(true); + constraint0.setName("forbid"); + ConstraintMapping mapping0 = new ConstraintMapping(); + mapping0.setPathSpec("/forbid/*"); + mapping0.setConstraint(constraint0); + constraints.add(mapping0); + + Set knownRoles = new HashSet<>(); + knownRoles.add("user"); + knownRoles.add("administrator"); + + security.setConstraintMappings(constraints,knownRoles); + server.start(); + } + + @AfterClass + public static void stopServer() throws Exception + { + server.stop(); + } + + @Parameters(name = "{0}: {1}") + public static Collection data() + { + List data = new ArrayList<>(); + + final String OPENCONTENT = "this is open content"; + + data.add(new Object[] { "/ctx/all/index.txt", HttpStatus.OK_200, OPENCONTENT }); + data.add(new Object[] { "/ctx/ALL/index.txt", HttpStatus.NOT_FOUND_404, null }); + data.add(new Object[] { "/ctx/ALL/Fred/../index.txt", HttpStatus.NOT_FOUND_404, null }); + data.add(new Object[] { "/ctx/../bar/../ctx/all/index.txt", HttpStatus.OK_200, OPENCONTENT }); + data.add(new Object[] { "/ctx/forbid/index.txt", HttpStatus.FORBIDDEN_403, null }); + data.add(new Object[] { "/ctx/all/../forbid/index.txt", HttpStatus.FORBIDDEN_403, null }); + data.add(new Object[] { "/ctx/FoRbId/index.txt", HttpStatus.NOT_FOUND_404, null }); + + return data; + } + + @Parameter(value = 0) + public String uri; + + @Parameter(value = 1) + public int expectedStatusCode; + + @Parameter(value = 2) + public String expectedContent; + + @Test + public void testAccess() throws Exception + { + StringBuilder request = new StringBuilder(); + request.append("GET ").append(uri).append(" HTTP/1.1\r\n"); + request.append("Host: localhost\r\n"); + request.append("Connection: close\r\n"); + request.append("\r\n"); + + String response = connector.getResponses(request.toString()); + + switch (expectedStatusCode) + { + case 200: + assertThat(response,startsWith("HTTP/1.1 200 OK")); + break; + case 403: + assertThat(response,startsWith("HTTP/1.1 403 Forbidden")); + break; + case 404: + assertThat(response,startsWith("HTTP/1.1 404 Not Found")); + break; + default: + fail("Write a handler for response status code: " + expectedStatusCode); + break; + } + + if (expectedContent != null) + { + assertThat(response,containsString("this is open content")); + } + } +} diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java index 8897caa7124..93b32c71230 100644 --- a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java +++ b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java @@ -441,7 +441,7 @@ public class ConstraintTest Constraint constraint6 = new Constraint(); constraint6.setAuthenticate(true); - constraint6.setName("omit POST and GET"); + constraint6.setName("omit HEAD and GET"); constraint6.setRoles(new String[]{"user"}); ConstraintMapping mapping6 = new ConstraintMapping(); mapping6.setPathSpec("/omit/*"); diff --git a/jetty-security/src/test/resources/docroot/all/index.txt b/jetty-security/src/test/resources/docroot/all/index.txt new file mode 100644 index 00000000000..290f7027036 --- /dev/null +++ b/jetty-security/src/test/resources/docroot/all/index.txt @@ -0,0 +1 @@ +this is open content. \ No newline at end of file diff --git a/jetty-security/src/test/resources/docroot/forbid/index.txt b/jetty-security/src/test/resources/docroot/forbid/index.txt new file mode 100644 index 00000000000..aed1cf32e17 --- /dev/null +++ b/jetty-security/src/test/resources/docroot/forbid/index.txt @@ -0,0 +1 @@ +this is forbidden content. \ No newline at end of file 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 7d3402fbfa7..3106eec2575 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 @@ -19,8 +19,6 @@ package org.eclipse.jetty.server; import java.io.IOException; -import java.net.Socket; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -37,9 +35,7 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.io.ArrayByteBufferPool; import org.eclipse.jetty.io.ByteBufferPool; -import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.io.ssl.SslConnection; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; @@ -47,7 +43,6 @@ 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.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; @@ -145,7 +140,7 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co private final Scheduler _scheduler; private final ByteBufferPool _byteBufferPool; private final Thread[] _acceptors; - private final Set _endpoints = Collections.newSetFromMap(new ConcurrentHashMap()); + private final Set _endpoints = Collections.newSetFromMap(new ConcurrentHashMap()); private final Set _immutableEndPoints = Collections.unmodifiableSet(_endpoints); private volatile CountDownLatch _stopping; private long _idleTimeout = 30000; @@ -191,9 +186,9 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co int cores = Runtime.getRuntime().availableProcessors(); if (acceptors < 0) - acceptors = 1 + cores / 16; - if (acceptors > 2 * cores) - LOG.warn("Acceptors should be <= 2*availableProcessors: " + this); + acceptors=Math.max(1, Math.min(4,cores/8)); + if (acceptors > cores) + LOG.warn("Acceptors should be <= availableProcessors: " + this); _acceptors = new Thread[acceptors]; } @@ -261,7 +256,11 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co _stopping=new CountDownLatch(_acceptors.length); for (int i = 0; i < _acceptors.length; i++) - getExecutor().execute(new Acceptor(i)); + { + Acceptor a = new Acceptor(i); + addBean(a); + getExecutor().execute(a); + } LOG.info("Started {}", this); } @@ -299,6 +298,9 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co _stopping=null; super.doStop(); + + for (Acceptor a : getBeans(Acceptor.class)) + removeBean(a); LOG.info("Stopped {}", this); } @@ -440,6 +442,7 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co private class Acceptor implements Runnable { private final int _acceptor; + private String _name; private Acceptor(int id) { @@ -450,8 +453,9 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co public void run() { Thread current = Thread.currentThread(); - String name = current.getName(); - current.setName(name + "-acceptor-" + _acceptor + "-" + AbstractConnector.this); + String name=current.getName(); + _name=String.format("%s-acceptor-%d@%x-%s",name,_acceptor,hashCode(),AbstractConnector.this.toString()); + current.setName(_name); synchronized (AbstractConnector.this) { @@ -488,6 +492,16 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co stopping.countDown(); } } + + @Override + public String toString() + { + String name=_name; + if (name==null) + return String.format("acceptor-%d@%x", _acceptor, hashCode()); + return name; + } + } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java index dcaecbe50fb..2a16bdd5501 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java @@ -25,7 +25,6 @@ import javax.servlet.http.Cookie; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.PathMap; -import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.util.DateCache; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.component.AbstractLifeCycle; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Connector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Connector.java index ce4544c9005..0ea12cc734d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Connector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Connector.java @@ -24,7 +24,6 @@ import java.util.concurrent.Executor; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.EndPoint; -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.component.Graceful; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java index 891e8ee1cf2..ff8f14763dc 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java @@ -20,8 +20,6 @@ package org.eclipse.jetty.server; import java.net.InetSocketAddress; -import javax.servlet.ServletRequest; - import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpScheme; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java index cfe7b9a200b..6b7f11fb1b0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java @@ -24,8 +24,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HostHeaderCustomizer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HostHeaderCustomizer.java index b39b25dcf40..7911351ef00 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HostHeaderCustomizer.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HostHeaderCustomizer.java @@ -20,8 +20,6 @@ package org.eclipse.jetty.server; import java.util.Objects; -import javax.servlet.http.HttpServletRequest; - /** * Customizes requests that lack the {@code Host} header (for example, HTTP 1.0 requests). *

    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 07b09ab7241..9248d9f874b 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 @@ -23,9 +23,9 @@ import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; import java.nio.charset.StandardCharsets; +import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; - import javax.servlet.DispatcherType; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; @@ -247,7 +247,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H */ public boolean handle() { - LOG.debug("{} handle enter", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} handle enter", this); final HttpChannellast = setCurrentHttpChannel(this); @@ -270,7 +271,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H boolean error=false; try { - LOG.debug("{} action {}",this,action); + if (LOG.isDebugEnabled()) + LOG.debug("{} action {}",this,action); switch(action) { @@ -279,8 +281,12 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H _response.getHttpOutput().reopen(); _request.setDispatcherType(DispatcherType.REQUEST); - for (HttpConfiguration.Customizer customizer : _configuration.getCustomizers()) - customizer.customize(getConnector(),_configuration,_request); + List customizers = _configuration.getCustomizers(); + if (!customizers.isEmpty()) + { + for (HttpConfiguration.Customizer customizer : customizers) + customizer.customize(getConnector(), _configuration, _request); + } getServer().handle(this); break; @@ -391,10 +397,14 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H _state.completed(); if (!_response.isCommitted() && !_request.isHandled()) + { _response.sendError(404); + } else + { // Complete generating the response _response.closeOutput(); + } } catch(EofException|ClosedChannelException e) { @@ -411,7 +421,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H } } - LOG.debug("{} handle exit, result {}", this, action); + if (LOG.isDebugEnabled()) + LOG.debug("{} handle exit, result {}", this, action); return action!=Action.WAIT; } @@ -666,7 +677,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H @Override public boolean messageComplete() { - LOG.debug("{} messageComplete", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} messageComplete", this); _request.getHttpInput().messageComplete(); return true; } @@ -787,10 +799,11 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H /** * If a write or similar to this channel fails this method should be called. The standard implementation - * of {@link #failed()} is a noop. But the different implementations of HttpChannel might want to take actions. + * is to call {@link HttpTransport#abort()} */ - public void failed() + public void abort() { + _transport.abort(); } private class CommitCallback implements Callback diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java index 352af25c750..f9c5054714f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java @@ -54,6 +54,23 @@ public class HttpConfiguration private boolean _sendXPoweredBy = false; //send X-Powered-By: header private boolean _sendDateHeader = true; //send Date: header + + /* ------------------------------------------------------------ */ + /** + *

    An interface that allows a request object to be customized + * for a particular HTTP connector configuration. Unlike Filters, customizer are + * applied before the request is submitted for processing and can be specific to the + * connector on which the request was received. + * + *

    Typically Customizers perform tasks such as:

      + *
    • process header fields that may be injected by a proxy or load balancer. + *
    • setup attributes that may come from the connection/connector such as SSL Session IDs + *
    • Allow a request to be marked as secure or authenticated if those have been offloaded + * and communicated by header, cookie or other out-of-band mechanism + *
    • Set request attributes/fields that are determined by the connector on which the + * request was received + *
    + */ public interface Customizer { public void customize(Connector connector, HttpConfiguration channelConfig, Request request); @@ -103,7 +120,8 @@ public class HttpConfiguration { return _customizers; } - + + /* ------------------------------------------------------------ */ public T getCustomizer(Class type) { for (Customizer c : _customizers) 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 16cbbf93d6b..cec4058cf65 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 @@ -20,6 +20,7 @@ package org.eclipse.jetty.server; import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.channels.WritePendingException; import java.util.concurrent.RejectedExecutionException; import org.eclipse.jetty.http.HttpGenerator; @@ -61,6 +62,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http private final HttpParser _parser; private volatile ByteBuffer _requestBuffer = null; private volatile ByteBuffer _chunk = null; + private final SendCallback _sendCallback = new SendCallback(); /* ------------------------------------------------------------ */ @@ -103,7 +105,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http HttpInput input = newHttpInput(); _channel = newHttpChannel(input); _parser = newHttpParser(); - LOG.debug("New HTTP Connection {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("New HTTP Connection {}", this); } protected HttpGenerator newHttpGenerator() @@ -191,7 +194,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http @Override public void onFillable() { - LOG.debug("{} onFillable {}", this, _channel.getState()); + if (LOG.isDebugEnabled()) + LOG.debug("{} onFillable {}", this, _channel.getState()); final HttpConnection last=setCurrentConnection(this); int filled=Integer.MAX_VALUE; @@ -328,7 +332,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http Connection connection = (Connection)_channel.getRequest().getAttribute(UPGRADE_CONNECTION_ATTRIBUTE); if (connection != null) { - LOG.debug("Upgrade from {} to {}", this, connection); + if (LOG.isDebugEnabled()) + LOG.debug("Upgrade from {} to {}", this, connection); onClose(); getEndPoint().setConnection(connection); connection.onOpen(); @@ -418,34 +423,37 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http fillInterested(); } + @Override + public void onClose() + { + _sendCallback.close(); + super.onClose(); + } + @Override public void run() { onFillable(); } - @Override public void send(ResponseInfo info, ByteBuffer content, boolean lastContent, Callback callback) { - if (info==null) - new ContentCallback(content,lastContent,callback).iterate(); - else - { - // If we are still expecting a 100 continues - if (_channel.isExpecting100Continue()) - // then we can't be persistent - _generator.setPersistent(false); - new CommitCallback(info,content,lastContent,callback).iterate(); - } + // If we are still expecting a 100 continues when we commit + if (info!=null && _channel.isExpecting100Continue()) + // then we can't be persistent + _generator.setPersistent(false); + + _sendCallback.reset(info,content,lastContent,callback); + _sendCallback.iterate(); } @Override public void send(ByteBuffer content, boolean lastContent, Callback callback) { - new ContentCallback(content,lastContent,callback).iterate(); + _sendCallback.reset(null,content,lastContent,callback); + _sendCallback.iterate(); } - protected class HttpChannelOverHttp extends HttpChannel { @@ -529,11 +537,11 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } @Override - public void failed() + public void abort() { - getEndPoint().shutdownOutput(); + super.abort(); + _generator.setPersistent(false); } - @Override public boolean messageComplete() @@ -543,25 +551,47 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } } - private class CommitCallback extends IteratingCallback + private class SendCallback extends IteratingCallback { - final ByteBuffer _content; - final boolean _lastContent; - final ResponseInfo _info; - final Callback _callback; - ByteBuffer _header; + private ResponseInfo _info; + private ByteBuffer _content; + private boolean _lastContent; + private Callback _callback; + private ByteBuffer _header; + private boolean _shutdownOut; - CommitCallback(ResponseInfo info, ByteBuffer content, boolean last, Callback callback) + private SendCallback() { - _info=info; - _content=content; - _lastContent=last; - _callback=callback; + super(true); + } + + private void reset(ResponseInfo info, ByteBuffer content, boolean last, Callback callback) + { + if (reset()) + { + _info = info; + _content = content; + _lastContent = last; + _callback = callback; + _header = null; + _shutdownOut = false; + } + else if (isClosed()) + { + callback.failed(new EofException()); + } + else + { + callback.failed(new WritePendingException()); + } } @Override public Action process() throws Exception { + if (_callback==null) + throw new IllegalStateException(); + ByteBuffer chunk = _chunk; while (true) { @@ -579,25 +609,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http { case NEED_HEADER: { - // Look for optimisation to avoid allocating a _header buffer - /* - Cannot use this optimisation unless we work out how not to overwrite data in user passed arrays. - if (_lastContent && _content!=null && !_content.isReadOnly() && _content.hasArray() && BufferUtil.space(_content)>_config.getResponseHeaderSize() ) - { - // use spare space in content buffer for header buffer - int p=_content.position(); - int l=_content.limit(); - _content.position(l); - _content.limit(l+_config.getResponseHeaderSize()); - _header=_content.slice(); - _header.limit(0); - _content.position(p); - _content.limit(l); - } - else - */ - _header = _bufferPool.acquire(_config.getResponseHeaderSize(), HEADER_BUFFER_DIRECT); - + _header = _bufferPool.acquire(_config.getResponseHeaderSize(), HEADER_BUFFER_DIRECT); continue; } case NEED_CHUNK: @@ -644,17 +656,12 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } case SHUTDOWN_OUT: { - getEndPoint().shutdownOutput(); + _shutdownOut=true; continue; } case DONE: { - if (_header!=null) - { - // don't release header in spare content buffer - if (!_lastContent || _content==null || !_content.hasArray() || !_header.hasArray() || _content.array()!=_header.array()) - _bufferPool.release(_header); - } + releaseHeader(); return Action.SUCCEEDED; } case CONTINUE: @@ -669,115 +676,39 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } } - @Override - protected void completed() + private void releaseHeader() { + ByteBuffer h=_header; + _header=null; + if (h!=null) + _bufferPool.release(h); + } + + @Override + protected void onCompleteSuccess() + { + releaseHeader(); _callback.succeeded(); + if (_shutdownOut) + getEndPoint().shutdownOutput(); } @Override - public void failed(final Throwable x) + public void onCompleteFailure(final Throwable x) { - super.failed(x); + releaseHeader(); failedCallback(_callback,x); + if (_shutdownOut) + getEndPoint().shutdownOutput(); + } + + @Override + public String toString() + { + return String.format("%s[i=%s,cb=%s]",super.toString(),_info,_callback); } } - private class ContentCallback extends IteratingCallback - { - final ByteBuffer _content; - final boolean _lastContent; - final Callback _callback; - - ContentCallback(ByteBuffer content, boolean last, Callback callback) - { - _content=content; - _lastContent=last; - _callback=callback; - } - - @Override - public Action process() throws Exception - { - ByteBuffer chunk = _chunk; - while (true) - { - HttpGenerator.Result result = _generator.generateResponse(null, null, chunk, _content, _lastContent); - if (LOG.isDebugEnabled()) - LOG.debug("{} generate: {} ({},{})@{}", - this, - result, - BufferUtil.toSummaryString(_content), - _lastContent, - _generator.getState()); - - switch (result) - { - case NEED_HEADER: - throw new IllegalStateException(); - case NEED_CHUNK: - { - chunk = _chunk = _bufferPool.acquire(HttpGenerator.CHUNK_SIZE, CHUNK_BUFFER_DIRECT); - continue; - } - case FLUSH: - { - // Don't write the chunk or the content if this is a HEAD response - if (_channel.getRequest().isHead()) - { - BufferUtil.clear(chunk); - BufferUtil.clear(_content); - continue; - } - else if (BufferUtil.hasContent(chunk)) - { - if (BufferUtil.hasContent(_content)) - getEndPoint().write(this, chunk, _content); - else - getEndPoint().write(this, chunk); - } - else if (BufferUtil.hasContent(_content)) - { - getEndPoint().write(this, _content); - } - else - continue; - return Action.SCHEDULED; - } - case SHUTDOWN_OUT: - { - getEndPoint().shutdownOutput(); - continue; - } - case DONE: - { - return Action.SUCCEEDED; - } - case CONTINUE: - { - break; - } - default: - { - throw new IllegalStateException("generateResponse="+result); - } - } - } - } - - @Override - protected void completed() - { - _callback.succeeded(); - } - - @Override - public void failed(final Throwable x) - { - super.failed(x); - failedCallback(_callback,x); - } - } @Override public void abort() 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 833ecdede7f..dc3e6dcbca9 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 @@ -146,7 +146,8 @@ public abstract class HttpInput extends ServletInputStream implements Runnabl { if (_eofState != null) { - LOG.debug("{} eof {}", this, _eofState); + if (LOG.isDebugEnabled()) + LOG.debug("{} eof {}", this, _eofState); _contentState = _eofState; } } @@ -237,7 +238,8 @@ public abstract class HttpInput extends ServletInputStream implements Runnabl { if (!isEOF()) { - LOG.debug("{} early EOF", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} early EOF", this); _eofState = EARLY_EOF; if (_listener == null) return; @@ -256,7 +258,8 @@ public abstract class HttpInput extends ServletInputStream implements Runnabl { if (!isEOF()) { - LOG.debug("{} EOF", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} EOF", this); _eofState = EOF; if (_listener == null) return; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java index 35524500492..d22444db0cb 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java @@ -61,7 +61,8 @@ public class HttpInputOverHTTP extends HttpInput implements Callback try (Blocker blocker=_readBlocker.acquire()) { _httpConnection.fillInterested(blocker); - LOG.debug("{} block readable on {}",this,blocker); + if (LOG.isDebugEnabled()) + LOG.debug("{} block readable on {}",this,blocker); blocker.block(); } 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 7c0fd899a41..12a23d5fb35 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 @@ -24,10 +24,7 @@ import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritePendingException; import java.util.concurrent.atomic.AtomicReference; -import javax.servlet.RequestDispatcher; import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; import javax.servlet.WriteListener; import org.eclipse.jetty.http.HttpContent; @@ -160,7 +157,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable catch(IOException e) { LOG.debug(e); - _channel.failed(); + _channel.abort(); } releaseBuffer(); return; @@ -195,7 +192,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable catch(IOException e) { LOG.debug(e); - _channel.failed(); + _channel.abort(); } releaseBuffer(); return; @@ -755,7 +752,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable { Throwable th=_onError; _onError=null; - LOG.debug("onError",th); + if (LOG.isDebugEnabled()) + LOG.debug("onError",th); _writeListener.onError(th); close(); @@ -763,7 +761,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable } } - continue loop; + continue; } switch(_state.get()) @@ -798,7 +796,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable private abstract class AsyncICB extends IteratingCallback { @Override - protected void completed() + protected void onCompleteSuccess() { while(true) { @@ -827,9 +825,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable } @Override - public void failed(Throwable e) + public void onCompleteFailure(Throwable e) { - super.failed(e); _onError=e; _channel.getState().onWritePossible(); } @@ -949,9 +946,9 @@ public class HttpOutput extends ServletOutputStream implements Runnable } @Override - protected void completed() + protected void onCompleteSuccess() { - super.completed(); + super.onCompleteSuccess(); if (_complete) closed(); } @@ -1014,9 +1011,9 @@ public class HttpOutput extends ServletOutputStream implements Runnable } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { - super.failed(x); + super.onCompleteFailure(x); _channel.getByteBufferPool().release(_buffer); try { @@ -1078,9 +1075,9 @@ public class HttpOutput extends ServletOutputStream implements Runnable } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { - super.failed(x); + super.onCompleteFailure(x); _channel.getByteBufferPool().release(_buffer); try { @@ -1092,5 +1089,4 @@ public class HttpOutput extends ServletOutputStream implements Runnable } } } - } 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 cb81d3c95e0..95e894afc20 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 @@ -81,7 +81,7 @@ public class InclusiveByteRange * @param size Size of the resource. * @return LazyList of satisfiable ranges */ - public static List satisfiableRanges(Enumeration headers, long size) + public static List satisfiableRanges(Enumeration headers, long size) { Object satRanges=null; @@ -89,7 +89,7 @@ public class InclusiveByteRange headers: while (headers.hasMoreElements()) { - String header = (String) headers.nextElement(); + String header = headers.nextElement(); StringTokenizer tok = new StringTokenizer(header,"=,",false); String t=null; try 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 5796226362e..26ff80fb5bf 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 @@ -133,12 +133,15 @@ public class LocalConnector extends AbstractConnector */ public ByteBuffer getResponses(ByteBuffer requestsBuffer,long idleFor,TimeUnit units) throws Exception { - LOG.debug("requests {}", BufferUtil.toUTF8String(requestsBuffer)); + if (LOG.isDebugEnabled()) + LOG.debug("requests {}", BufferUtil.toUTF8String(requestsBuffer)); LocalEndPoint endp = executeRequest(requestsBuffer); endp.waitUntilClosedOrIdleFor(idleFor,units); ByteBuffer responses = endp.takeOutput(); - endp.getConnection().close(); - LOG.debug("responses {}", BufferUtil.toUTF8String(responses)); + if (endp.isOutputShutdown()) + endp.close(); + if (LOG.isDebugEnabled()) + LOG.debug("responses {}", BufferUtil.toUTF8String(responses)); return responses; } @@ -155,6 +158,8 @@ public class LocalConnector extends AbstractConnector private LocalEndPoint executeRequest(ByteBuffer rawRequest) { + if (!isStarted()) + throw new IllegalStateException("!STARTED"); LocalEndPoint endp = new LocalEndPoint(); endp.setInput(rawRequest); _connects.add(endp); @@ -164,7 +169,8 @@ public class LocalConnector extends AbstractConnector @Override protected void accept(int acceptorID) throws IOException, InterruptedException { - LOG.debug("accepting {}", acceptorID); + if (LOG.isDebugEnabled()) + LOG.debug("accepting {}", acceptorID); LocalEndPoint endPoint = _connects.take(); endPoint.onOpen(); onEndPointOpened(endPoint); @@ -249,7 +255,8 @@ public class LocalConnector extends AbstractConnector { if (size==getOutput().remaining()) { - LOG.debug("idle for {} {}",idleFor,units); + if (LOG.isDebugEnabled()) + LOG.debug("idle for {} {}",idleFor,units); return; } size=getOutput().remaining(); 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 3d010699e2a..6d9dd210216 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 @@ -26,8 +26,6 @@ import javax.net.ssl.SSLEngineResult; import org.eclipse.jetty.io.AbstractConnection; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.server.ConnectionFactory; -import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; @@ -95,7 +93,8 @@ public abstract class NegotiatingServerConnection extends AbstractConnection if (engine.getHandshakeStatus() == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) { // Here the SSL handshake is finished, but the protocol has not been negotiated. - LOG.debug("{} could not negotiate protocol, SSLEngine: {}", this, engine); + if (LOG.isDebugEnabled()) + LOG.debug("{} could not negotiate protocol, SSLEngine: {}", this, engine); close(); } else @@ -110,7 +109,8 @@ public abstract class NegotiatingServerConnection extends AbstractConnection ConnectionFactory connectionFactory = connector.getConnectionFactory(protocol); if (connectionFactory == null) { - LOG.debug("{} application selected protocol '{}', but no correspondent {} has been configured", + if (LOG.isDebugEnabled()) + LOG.debug("{} application selected protocol '{}', but no correspondent {} has been configured", this, protocol, ConnectionFactory.class.getName()); close(); } @@ -119,7 +119,8 @@ public abstract class NegotiatingServerConnection extends AbstractConnection EndPoint endPoint = getEndPoint(); Connection oldConnection = endPoint.getConnection(); Connection newConnection = connectionFactory.newConnection(connector, endPoint); - LOG.debug("{} switching from {} to {}", this, oldConnection, newConnection); + if (LOG.isDebugEnabled()) + LOG.debug("{} switching from {} to {}", this, oldConnection, newConnection); oldConnection.onClose(); endPoint.setConnection(newConnection); getEndPoint().getConnection().onOpen(); @@ -129,7 +130,8 @@ public abstract class NegotiatingServerConnection extends AbstractConnection else if (filled < 0) { // Something went bad, we need to close. - LOG.debug("{} closing on client close", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} closing on client close", this); close(); } else diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java index 881fbfa0842..c856d983d4d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java @@ -55,7 +55,8 @@ public abstract class QueuedHttpInput extends HttpInput { boolean wasEmpty = _inputQ.isEmpty(); _inputQ.add(item); - LOG.debug("{} queued {}", this, item); + if (LOG.isDebugEnabled()) + LOG.debug("{} queued {}", this, item); if (wasEmpty) { if (!onAsyncRead()) @@ -90,7 +91,8 @@ public abstract class QueuedHttpInput extends HttpInput { _inputQ.pollUnsafe(); onContentConsumed(item); - LOG.debug("{} consumed {}", this, item); + if (LOG.isDebugEnabled()) + LOG.debug("{} consumed {}", this, item); item = _inputQ.peekUnsafe(); } return item; @@ -105,7 +107,8 @@ public abstract class QueuedHttpInput extends HttpInput { try { - LOG.debug("{} waiting for content", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} waiting for content", this); lock().wait(); } catch (InterruptedException e) 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 77c80abc293..330bb40cd9d 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 @@ -1247,7 +1247,7 @@ public class Request implements HttpServletRequest _port=0; return _serverName; } - _serverName = hostPort.substring(1,len-1); + _serverName = hostPort.substring(0,len); } else if (len==hostPort.length()) _serverName=hostPort; @@ -1865,9 +1865,6 @@ public class Request implements HttpServletRequest public void setHandled(boolean h) { _handled = h; - Response r=getResponse(); - if (_handled && r.getStatus()==0) - r.setStatus(200); } /* ------------------------------------------------------------ */ diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java index e39c4a60fb3..dc686260cd7 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java @@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.http.DateGenerator; import org.eclipse.jetty.http.HttpContent; -import org.eclipse.jetty.http.HttpContent.ResourceAsHttpContent; import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; 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 0408c8825ca..79f4e4989c1 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 @@ -112,7 +112,7 @@ public class Response implements HttpServletResponse private final HttpFields _fields = new HttpFields(); private final AtomicInteger _include = new AtomicInteger(); private HttpOutput _out; - private int _status = HttpStatus.NOT_SET_000; + private int _status = HttpStatus.OK_200; private String _reason; private Locale _locale; private MimeTypes.Type _mimeType; @@ -137,7 +137,7 @@ public class Response implements HttpServletResponse protected void recycle() { - _status = HttpStatus.NOT_SET_000; + _status = HttpStatus.OK_200; _reason = null; _locale = null; _mimeType = null; @@ -541,10 +541,7 @@ public class Response implements HttpServletResponse @Override public void sendError(int sc) throws IOException { - if (sc == 102) - sendProcessing(); - else - sendError(sc, null); + sendError(sc, null); } @Override @@ -553,6 +550,17 @@ public class Response implements HttpServletResponse if (isIncluding()) return; + switch(code) + { + case -1: + _channel.abort(); + return; + case 102: + sendProcessing(); + return; + default: + } + if (isCommitted()) LOG.warn("Committed before "+code+" "+message); @@ -1290,8 +1298,6 @@ public class Response implements HttpServletResponse protected ResponseInfo newResponseInfo() { - if (_status == HttpStatus.NOT_SET_000) - _status = HttpStatus.OK_200; return new ResponseInfo(_channel.getRequest().getHttpVersion(), _fields, getLongContentLength(), getStatus(), getReason(), _channel.getRequest().isHead()); } 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 b017461310e..dd26b04b146 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 @@ -20,8 +20,10 @@ package org.eclipse.jetty.server; import java.security.cert.X509Certificate; +import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLSession; +import javax.servlet.ServletRequest; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.io.ssl.SslConnection; @@ -31,6 +33,12 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; + +/* ------------------------------------------------------------ */ +/** Customizer that extracts the attribute from an {@link SSLContext} + * and sets them on the request with {@link ServletRequest#setAttribute(String, Object)} + * according to Servlet Specification Requirements. + */ public class SecureRequestCustomizer implements HttpConfiguration.Customizer { private static final Logger LOG = Log.getLogger(SecureRequestCustomizer.class); @@ -40,7 +48,6 @@ public class SecureRequestCustomizer implements HttpConfiguration.Customizer */ public static final String CACHED_INFO_ATTR = CachedInfo.class.getName(); - @Override public void customize(Connector connector, HttpConfiguration channelConfig, Request request) { @@ -53,14 +60,11 @@ public class SecureRequestCustomizer implements HttpConfiguration.Customizer SSLEngine sslEngine=sslConnection.getSSLEngine(); customize(sslEngine,request); } - } /* ------------------------------------------------------------ */ /* - * Allow the Listener a chance to customise the request. before the server - * does its stuff.
    - * This allows the required attributes to be set for SSL requests.
    + * Customise the request attributes to be set for SSL requests.
    * The requirements of the Servlet specs are: *
      *
    • an attribute named "javax.servlet.request.ssl_session_id" of type 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 b1437d6d98d..ce4bdd9097c 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 @@ -18,6 +18,7 @@ package org.eclipse.jetty.server; +import java.awt.geom.PathIterator; import java.io.IOException; import java.lang.management.ManagementFactory; import java.net.InetAddress; @@ -32,6 +33,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; + import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -46,11 +48,13 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.HandlerWrapper; +import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.util.Attributes; import org.eclipse.jetty.util.AttributesMap; import org.eclipse.jetty.util.Jetty; import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.URIUtil; +import org.eclipse.jetty.util.UrlEncoded; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.Name; @@ -143,6 +147,25 @@ public class Server extends HandlerWrapper implements Attributes } /* ------------------------------------------------------------ */ + /** + * Set a graceful stop time. + * The {@link StatisticsHandler} must be configured so that open connections can + * be tracked for a graceful shutdown. + * @see org.eclipse.jetty.util.component.ContainerLifeCycle#setStopTimeout(long) + */ + @Override + public void setStopTimeout(long stopTimeout) + { + super.setStopTimeout(stopTimeout); + } + + /* ------------------------------------------------------------ */ + /** Set stop server at shutdown behaviour. + * @param stop If true, this server instance will be explicitly stopped when the + * JVM is shutdown. Otherwise the JVM is stopped with the server running. + * @see Runtime#addShutdownHook(Thread) + * @see ShutdownThread + */ public void setStopAtShutdown(boolean stop) { //if we now want to stop @@ -384,7 +407,8 @@ public class Server extends HandlerWrapper implements Attributes if (stopTimeout>0) { long stop_by=System.currentTimeMillis()+stopTimeout; - LOG.debug("Graceful shutdown {} by ",this,new Date(stop_by)); + if (LOG.isDebugEnabled()) + LOG.debug("Graceful shutdown {} by ",this,new Date(stop_by)); // Wait for shutdowns for (Future future: futures) @@ -396,7 +420,7 @@ public class Server extends HandlerWrapper implements Attributes } catch (Exception e) { - mex.add(e.getCause()); + mex.add(e); } } } @@ -473,7 +497,6 @@ public class Server extends HandlerWrapper implements Attributes response.sendError(HttpStatus.BAD_REQUEST_400); request.setHandled(true); response.setStatus(200); - response.getHttpFields().put(HttpHeader.ALLOW,"GET,POST,HEAD,OPTIONS"); response.setContentLength(0); response.closeOutput(); } @@ -491,15 +514,15 @@ public class Server extends HandlerWrapper implements Attributes final Request baseRequest=connection.getRequest(); final String path=event.getPath(); - + if (path!=null) { // this is a dispatch with a path ServletContext context=event.getServletContext(); - HttpURI uri = new HttpURI(context==null?path:URIUtil.addPaths(context.getContextPath(),path)); + HttpURI uri = new HttpURI(URIUtil.addPaths(context==null?null:context.getContextPath(), path)); baseRequest.setUri(uri); baseRequest.setRequestURI(null); - baseRequest.setPathInfo(baseRequest.getRequestURI()); + baseRequest.setPathInfo(uri.getDecodedPath()); if (uri.getQuery()!=null) baseRequest.mergeQueryParameters(uri.getQuery(), true); //we have to assume dispatch path and query are UTF8 } @@ -605,6 +628,7 @@ public class Server extends HandlerWrapper implements Attributes /** * @return The URI of the first {@link NetworkConnector} and first {@link ContextHandler}, or null */ + @SuppressWarnings("resource") public URI getURI() { NetworkConnector connector=null; @@ -651,6 +675,7 @@ public class Server extends HandlerWrapper implements Attributes return this.getClass().getName()+"@"+Integer.toHexString(hashCode()); } + /* ------------------------------------------------------------ */ @Override public void dump(Appendable out,String indent) throws IOException { 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 a7d5fe0f2d8..f4da30c004e 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 @@ -20,12 +20,10 @@ package org.eclipse.jetty.server; import java.io.IOException; import java.net.InetSocketAddress; -import java.net.ServerSocket; import java.net.Socket; import java.net.SocketException; import java.nio.channels.Channel; import java.nio.channels.SelectionKey; -import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.util.concurrent.Executor; @@ -37,7 +35,6 @@ import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.SelectChannelEndPoint; import org.eclipse.jetty.io.SelectorManager; import org.eclipse.jetty.io.SelectorManager.ManagedSelector; -import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.Name; @@ -208,7 +205,8 @@ public class ServerConnector extends AbstractNetworkConnector @Name("factories") ConnectionFactory... factories) { super(server,executor,scheduler,bufferPool,acceptors,factories); - _manager = new ServerConnectorManager(getExecutor(), getScheduler(), selectors > 0 ? selectors : Runtime.getRuntime().availableProcessors()); + _manager = new ServerConnectorManager(getExecutor(), getScheduler(), + selectors>0?selectors:Math.max(1,Math.min(4,Runtime.getRuntime().availableProcessors()/2))); addBean(_manager, true); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java index 11f249e139d..8ac5a482073 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java @@ -48,126 +48,151 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements super(request); } + @Override public String getAuthType() { return null; } + @Override public Cookie[] getCookies() { return null; } + @Override public long getDateHeader(String name) { return 0; } + @Override public String getHeader(String name) { return null; } - public Enumeration getHeaders(String name) + @Override + public Enumeration getHeaders(String name) { return null; } - public Enumeration getHeaderNames() + @Override + public Enumeration getHeaderNames() { return null; } + @Override public int getIntHeader(String name) { return 0; } + @Override public String getMethod() { return null; } + @Override public String getPathInfo() { return null; } + @Override public String getPathTranslated() { return null; } + @Override public String getContextPath() { return null; } + @Override public String getQueryString() { return null; } + @Override public String getRemoteUser() { return null; } + @Override public boolean isUserInRole(String role) { return false; } + @Override public Principal getUserPrincipal() { return null; } + @Override public String getRequestedSessionId() { return null; } + @Override public String getRequestURI() { return null; } + @Override public StringBuffer getRequestURL() { return null; } + @Override public String getServletPath() { return null; } + @Override public HttpSession getSession(boolean create) { return null; } + @Override public HttpSession getSession() { return null; } + @Override public boolean isRequestedSessionIdValid() { return false; } + @Override public boolean isRequestedSessionIdFromCookie() { return false; } + @Override public boolean isRequestedSessionIdFromURL() { return false; } + @Override public boolean isRequestedSessionIdFromUrl() { return false; @@ -176,6 +201,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#authenticate(javax.servlet.http.HttpServletResponse) */ + @Override public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { return false; @@ -184,6 +210,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#getPart(java.lang.String) */ + @Override public Part getPart(String name) throws IOException, ServletException { return null; @@ -192,6 +219,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#getParts() */ + @Override public Collection getParts() throws IOException, ServletException { return null; @@ -200,6 +228,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#login(java.lang.String, java.lang.String) */ + @Override public void login(String username, String password) throws ServletException { @@ -208,6 +237,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#logout() */ + @Override public void logout() throws ServletException { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java index 267391b56da..d6ca22d61ee 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java @@ -23,7 +23,6 @@ import java.util.Set; import javax.servlet.SessionCookieConfig; import javax.servlet.SessionTrackingMode; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java index abc6d61ef87..38b866574da 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java @@ -54,20 +54,18 @@ public class ShutdownMonitor } /** - * ShutdownMonitorThread + * ShutdownMonitorRunnable * * Thread for listening to STOP.PORT for command to stop Jetty. * If ShowndownMonitor.exitVm is true, then Sytem.exit will also be * called after the stop. * */ - public class ShutdownMonitorThread extends Thread + private class ShutdownMonitorRunnable implements Runnable { - - public ShutdownMonitorThread () + public ShutdownMonitorRunnable() { - setDaemon(true); - setName("ShutdownMonitor"); + startListenSocket(); } @Override @@ -102,7 +100,7 @@ public class ShutdownMonitor // Graceful Shutdown debug("Issuing graceful shutdown.."); ShutdownThread.getInstance().run(); - + //Stop accepting any more close(serverSocket); serverSocket = null; @@ -148,28 +146,7 @@ public class ShutdownMonitor } } - public void start() - { - if (isAlive()) - { - // TODO why are we reentrant here? - if (DEBUG) - System.err.printf("ShutdownMonitorThread already started"); - return; // cannot start it again - } - - startListenSocket(); - - if (serverSocket == null) - { - return; - } - if (DEBUG) - System.err.println("Starting ShutdownMonitorThread"); - super.start(); - } - - private void startListenSocket() + public void startListenSocket() { if (port < 0) { @@ -217,9 +194,7 @@ public class ShutdownMonitor private String key; private boolean exitVm; private ServerSocket serverSocket; - private ShutdownMonitorThread thread; - - + private Thread thread; /** * Create a ShutdownMonitor using configuration from the System properties. @@ -372,18 +347,20 @@ public class ShutdownMonitor protected void start() throws Exception { - ShutdownMonitorThread t = null; + Thread t = null; + synchronized (this) { if (thread != null && thread.isAlive()) { - // TODO why are we reentrant here? if (DEBUG) System.err.printf("ShutdownMonitorThread already started"); return; // cannot start it again } - thread = new ShutdownMonitorThread(); + thread = new Thread(new ShutdownMonitorRunnable()); + thread.setDaemon(true); + thread.setName("ShutdownMonitor"); t = thread; } 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 3d92512ca2b..d1c76088252 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 @@ -54,7 +54,8 @@ public abstract class AbstractHandler extends ContainerLifeCycle implements Hand @Override protected void doStart() throws Exception { - LOG.debug("starting {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("starting {}",this); if (_server==null) LOG.warn("No Server set for {}",this); super.doStart(); @@ -67,7 +68,8 @@ public abstract class AbstractHandler extends ContainerLifeCycle implements Hand @Override protected void doStop() throws Exception { - LOG.debug("stopping {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("stopping {}",this); super.doStop(); } 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 0d54e536fb3..16a09aca5f1 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 @@ -58,6 +58,7 @@ public abstract class AbstractHandlerContainer extends AbstractHandler implement } /* ------------------------------------------------------------ */ + @SuppressWarnings("unchecked") @Override public T getChildHandlerByClass(Class byclass) { @@ -103,6 +104,7 @@ public abstract class AbstractHandlerContainer extends AbstractHandler implement { for (Handler h:branches) { + @SuppressWarnings("unchecked") T container = (T)h; Handler[] candidates = container.getChildHandlersByClass(handler.getClass()); if (candidates!=null) 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 c3d8b5932d1..427c5b05929 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 @@ -56,7 +56,8 @@ public class AllowSymLinkAliasChecker implements AliasCheck URI real = file.toPath().toRealPath().toUri(); if (real.equals(resource.getAlias())) { - LOG.debug("Allow symlink {} --> {}",resource,real); + if (LOG.isDebugEnabled()) + LOG.debug("Allow symlink {} --> {}",resource,real); return true; } } @@ -79,7 +80,8 @@ public class AllowSymLinkAliasChecker implements AliasCheck } if (resource.getAlias().equals(d.toURI())) { - LOG.debug("Allow symlink {} --> {}",resource,d); + if (LOG.isDebugEnabled()) + LOG.debug("Allow symlink {} --> {}",resource,d); return true; } } 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 397cde1fd13..ed6efd1b654 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 @@ -36,7 +36,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -67,7 +66,6 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.server.ClassLoaderDump; -import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Dispatcher; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HandlerContainer; @@ -108,7 +106,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu { public final static int SERVLET_MAJOR_VERSION=3; public final static int SERVLET_MINOR_VERSION=0; - public static final Class[] SERVLET_LISTENER_TYPES = new Class[] {ServletContextListener.class, + public static final Class[] SERVLET_LISTENER_TYPES = new Class[] {ServletContextListener.class, ServletContextAttributeListener.class, ServletRequestListener.class, ServletRequestAttributeListener.class}; @@ -510,8 +508,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu /* * @see javax.servlet.ServletContext#getInitParameterNames() */ - @SuppressWarnings("rawtypes") - public Enumeration getInitParameterNames() + public Enumeration getInitParameterNames() { return Collections.enumeration(_initParams.keySet()); } @@ -796,14 +793,16 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu /* ------------------------------------------------------------ */ protected void callContextInitialized (ServletContextListener l, ServletContextEvent e) { - LOG.debug("contextInitialized: {}->{}",e,l); + if (LOG.isDebugEnabled()) + LOG.debug("contextInitialized: {}->{}",e,l); l.contextInitialized(e); } /* ------------------------------------------------------------ */ protected void callContextDestroyed (ServletContextListener l, ServletContextEvent e) { - LOG.debug("contextDestroyed: {}->{}",e,l); + if (LOG.isDebugEnabled()) + LOG.debug("contextDestroyed: {}->{}",e,l); l.contextDestroyed(e); } @@ -871,27 +870,8 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu _scontext.clearAttributes(); } - /* ------------------------------------------------------------ */ - /* - * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - public boolean checkContext(final String target, final Request baseRequest, final HttpServletResponse response) throws IOException + public boolean checkVirtualHost(final Request baseRequest) { - DispatcherType dispatch = baseRequest.getDispatcherType(); - - switch (_availability) - { - case SHUTDOWN: - case UNAVAILABLE: - baseRequest.setHandled(true); - response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); - return false; - default: - if ((DispatcherType.REQUEST.equals(dispatch) && baseRequest.isHandled())) - return false; - } - - // Check the vhosts if (_vhosts != null && _vhosts.length > 0) { String vhost = normalizeHostname(baseRequest.getServerName()); @@ -927,27 +907,61 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu if (!match || connectorName && !connectorMatch) return false; } - + return true; + } + + public boolean checkContextPath(String uri) + { // Are we not the root context? if (_contextPath.length() > 1) { // reject requests that are not for us - if (!target.startsWith(_contextPath)) + if (!uri.startsWith(_contextPath)) return false; - if (target.length() > _contextPath.length() && target.charAt(_contextPath.length()) != '/') + if (uri.length() > _contextPath.length() && uri.charAt(_contextPath.length()) != '/') return false; + } + return true; + } + + /* ------------------------------------------------------------ */ + /* + * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + public boolean checkContext(final String target, final Request baseRequest, final HttpServletResponse response) throws IOException + { + DispatcherType dispatch = baseRequest.getDispatcherType(); - // redirect null path infos - if (!_allowNullPathInfo && _contextPath.length() == target.length()) - { - // context request must end with / + // Check the vhosts + if (!checkVirtualHost(baseRequest)) + return false; + + if (!checkContextPath(target)) + return false; + + // Are we not the root context? + // redirect null path infos + if (!_allowNullPathInfo && _contextPath.length() == target.length() && _contextPath.length()>1) + { + // context request must end with / + baseRequest.setHandled(true); + if (baseRequest.getQueryString() != null) + response.sendRedirect(URIUtil.addPaths(baseRequest.getRequestURI(),URIUtil.SLASH) + "?" + baseRequest.getQueryString()); + else + response.sendRedirect(URIUtil.addPaths(baseRequest.getRequestURI(),URIUtil.SLASH)); + return false; + } + + switch (_availability) + { + case SHUTDOWN: + case UNAVAILABLE: baseRequest.setHandled(true); - if (baseRequest.getQueryString() != null) - response.sendRedirect(URIUtil.addPaths(baseRequest.getRequestURI(),URIUtil.SLASH) + "?" + baseRequest.getQueryString()); - else - response.sendRedirect(URIUtil.addPaths(baseRequest.getRequestURI(),URIUtil.SLASH)); + response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); return false; - } + default: + if ((DispatcherType.REQUEST.equals(dispatch) && baseRequest.isHandled())) + return false; } return true; @@ -1127,7 +1141,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu if (!_requestAttributeListeners.isEmpty()) { - ListIterator iter = _requestAttributeListeners.listIterator(_requestAttributeListeners.size()); for (int i=_requestAttributeListeners.size();i-->0;) baseRequest.removeEventListener(_requestAttributeListeners.get(i)); } @@ -1646,10 +1659,15 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu } /* ------------------------------------------------------------ */ + /** + * @param path + * @param resource + * @return True if the alias is OK + */ public boolean checkAlias(String path, Resource resource) { // Is the resource aliased? - if (resource.getAlias() != null) + if (resource.getAlias() != null) { if (LOG.isDebugEnabled()) LOG.debug("Aliased resource: " + resource + "~=" + resource.getAlias()); @@ -1878,7 +1896,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu matched_path = context_path; } - if (matched_path.equals(context_path)) + if (matched_path != null && matched_path.equals(context_path)) contexts.add(ch); } } @@ -2056,7 +2074,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu /* * @see javax.servlet.ServletContext#getInitParameterNames() */ - @SuppressWarnings("unchecked") @Override public Enumeration getInitParameterNames() { @@ -2193,6 +2210,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu try { + @SuppressWarnings("unchecked") Class clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className); addListener(clazz); } @@ -2287,9 +2305,9 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu //classloader, or a parent of it try { - Class reflect = Loader.loadClass(getClass(), "sun.reflect.Reflection"); + Class reflect = Loader.loadClass(getClass(), "sun.reflect.Reflection"); Method getCallerClass = reflect.getMethod("getCallerClass", Integer.TYPE); - Class caller = (Class)getCallerClass.invoke(null, 2); + Class caller = (Class)getCallerClass.invoke(null, 2); boolean ok = false; ClassLoader callerLoader = caller.getClassLoader(); 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 4ade3649030..2d77d1c2afe 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 @@ -19,6 +19,15 @@ package org.eclipse.jetty.server.handler; import java.io.IOException; +import java.lang.reflect.Array; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -52,7 +61,8 @@ public class ContextHandlerCollection extends HandlerCollection { private static final Logger LOG = Log.getLogger(ContextHandlerCollection.class); - private volatile Trie _contexts; + private final ConcurrentMap _contextBranches = new ConcurrentHashMap<>(); + private volatile Trie> _pathBranches; private Class _contextClass = ContextHandler.class; /* ------------------------------------------------------------ */ @@ -69,71 +79,70 @@ public class ContextHandlerCollection extends HandlerCollection @ManagedOperation("update the mapping of context path to context") public void mapContexts() { - int capacity=512; + _contextBranches.clear(); + + if (getHandlers()==null) + { + _pathBranches=new ArrayTernaryTrie<>(false,16); + return; + } + + // Create map of contextPath to handler Branch + Map map = new HashMap<>(); + for (Handler handler:getHandlers()) + { + Branch branch=new Branch(handler); + for (String contextPath : branch.getContextPaths()) + { + Branch[] branches=map.get(contextPath); + map.put(contextPath, ArrayUtil.addToArray(branches, branch, Branch.class)); + } + + for (ContextHandler context : branch.getContextHandlers()) + _contextBranches.putIfAbsent(context, branch.getHandler()); + } + + // Sort the branches so those with virtual hosts are considered before those without + for (Map.Entry entry: map.entrySet()) + { + Branch[] branches=entry.getValue(); + Branch[] sorted=new Branch[branches.length]; + int i=0; + for (Branch branch:branches) + if (branch.hasVirtualHost()) + sorted[i++]=branch; + for (Branch branch:branches) + if (!branch.hasVirtualHost()) + sorted[i++]=branch; + entry.setValue(sorted); + } // Loop until we have a big enough trie to hold all the context paths - Trie trie; + int capacity=512; + Trie> trie; loop: while(true) { trie=new ArrayTernaryTrie<>(false,capacity); - - Handler[] branches = getHandlers(); - - // loop over each group of contexts - for (int b=0;branches!=null && b entry: map.entrySet()) { - Handler[] handlers=null; - - if (branches[b] instanceof ContextHandler) + if (!trie.put(entry.getKey().substring(1),entry)) { - handlers = new Handler[]{ branches[b] }; - } - else if (branches[b] instanceof HandlerContainer) - { - handlers = ((HandlerContainer)branches[b]).getChildHandlersByClass(ContextHandler.class); - } - else - continue; - - // for each context handler in a group - for (int i=0;handlers!=null && i0) - sorted[i++]=handler; - for (ContextHandler handler:contexts) - if (handler.getVirtualHosts()==null || handler.getVirtualHosts().length==0) - sorted[i++]=handler; - trie.put(ctx,sorted); + for (String ctx : trie.keySet()) + LOG.debug("{}->{}",ctx,Arrays.asList(trie.get(ctx).getValue())); } - - //for (String ctx : trie.keySet()) - // System.err.printf("'%s'->%s%n",ctx,Arrays.asList(trie.get(ctx))); - _contexts=trie; + _pathBranches=trie; } - /* ------------------------------------------------------------ */ /* * @see org.eclipse.jetty.server.server.handler.HandlerCollection#setHandlers(org.eclipse.jetty.server.server.Handler[]) @@ -164,60 +173,66 @@ public class ContextHandlerCollection extends HandlerCollection { Handler[] handlers = getHandlers(); if (handlers==null || handlers.length==0) - return; + return; - HttpChannelState async = baseRequest.getHttpChannelState(); - if (async.isAsync()) - { - ContextHandler context=async.getContextHandler(); - if (context!=null) - { - context.handle(target,baseRequest,request, response); - return; - } - } + HttpChannelState async = baseRequest.getHttpChannelState(); + if (async.isAsync()) + { + ContextHandler context=async.getContextHandler(); + if (context!=null) + { + Handler branch = _contextBranches.get(context); + + if (branch==null) + context.handle(target,baseRequest,request, response); + else + branch.handle(target, baseRequest, request, response); + return; + } + } + + // data structure which maps a request to a context; first-best match wins + // { context path => [ context ] } + // } + if (target.startsWith("/")) + { + int limit = target.length()-1; - // data structure which maps a request to a context; first-best match wins - // { context path => [ context ] } - // } - if (target.startsWith("/")) - { - int limit = target.length()-1; - - while (limit>=0) - { - // Get best match - ContextHandler[] contexts = _contexts.getBest(target,1,limit); - if (contexts==null) - break; - - int l=contexts[0].getContextPath().length(); - if (l==1 || target.length()==l || target.charAt(l)=='/') - { - for (ContextHandler handler : contexts) - { - handler.handle(target,baseRequest, request, response); - if (baseRequest.isHandled()) - return; - } - } - - limit=l-2; - } - } - else - { + while (limit>=0) + { + // Get best match + Map.Entry branches = _pathBranches.getBest(target,1,limit); + + + if (branches==null) + break; + + int l=branches.getKey().length(); + if (l==1 || target.length()==l || target.charAt(l)=='/') + { + for (Branch branch : branches.getValue()) + { + branch.getHandler().handle(target,baseRequest, request, response); + if (baseRequest.isHandled()) + return; + } + } + + limit=l-2; + } + } + else + { // This may not work in all circumstances... but then I think it should never be called - for (int i=0;i getContextPaths() + { + Set set = new HashSet(); + for (ContextHandler context:_contexts) + set.add(context.getContextPath()); + return set; + } + + boolean hasVirtualHost() + { + for (ContextHandler context:_contexts) + if (context.getVirtualHosts()!=null && context.getVirtualHosts().length>0) + return true; + return false; + } + + ContextHandler[] getContextHandlers() + { + return _contexts; + } + + Handler getHandler() + { + return _handler; + } + + @Override + public String toString() + { + return String.format("{%s,%s}",_handler,Arrays.asList(_contexts)); + } + } + } 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 f71720af41f..cf92003c0eb 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 @@ -117,62 +117,63 @@ public class DefaultHandler extends AbstractHandler response.setStatus(HttpServletResponse.SC_NOT_FOUND); response.setContentType(MimeTypes.Type.TEXT_HTML.toString()); - ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(1500); - - writer.write("\n\nError 404 - Not Found"); - writer.write("\n\n

      Error 404 - Not Found.

      \n"); - writer.write("No context on this server matched or handled this request.
      "); - writer.write("Contexts known to this server are:
      "); + writer.write(" "); + writer.write("Powered by Jetty:// Java Web Server
      \n"); + + writer.write("\n\n\n"); + writer.flush(); + response.setContentLength(writer.size()); + try (OutputStream out=response.getOutputStream()) + { + writer.writeTo(out); + } + } } /* ------------------------------------------------------------ */ diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java index c118c7ec1da..b79b75dc23c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java @@ -19,6 +19,7 @@ package org.eclipse.jetty.server.handler; import java.io.IOException; +import java.util.Arrays; import java.util.List; import javax.servlet.ServletException; @@ -185,4 +186,12 @@ public class HandlerCollection extends AbstractHandlerContainer child.destroy(); super.destroy(); } + + /* ------------------------------------------------------------ */ + @Override + public String toString() + { + Handler[] handlers=getHandlers(); + return super.toString()+(handlers==null?"[]":Arrays.asList(getHandlers()).toString()); + } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java index dcbf6ff5d54..88226c951e0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java @@ -30,7 +30,6 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.component.LifeCycle; /* ------------------------------------------------------------ */ /** A HandlerWrapper acts as a {@link Handler} but delegates the {@link Handler#handle handle} method and 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 10d1e051301..37fda012e98 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 @@ -240,18 +240,18 @@ public class ResourceHandler extends HandlerWrapper */ public Resource getStylesheet() { - if(_stylesheet != null) - { - return _stylesheet; - } - else - { - if(_defaultStylesheet == null) - { - _defaultStylesheet = Resource.newResource(this.getClass().getResource("/jetty-dir.css")); - } - return _defaultStylesheet; - } + if(_stylesheet != null) + { + return _stylesheet; + } + else + { + if(_defaultStylesheet == null) + { + _defaultStylesheet = Resource.newResource(this.getClass().getResource("/jetty-dir.css")); + } + return _defaultStylesheet; + } } /* ------------------------------------------------------------ */ @@ -269,12 +269,12 @@ public class ResourceHandler extends HandlerWrapper _stylesheet = null; } } - catch(Exception e) - { - LOG.warn(e.toString()); - LOG.debug(e); - throw new IllegalArgumentException(stylesheet); - } + catch(Exception e) + { + LOG.warn(e.toString()); + LOG.debug(e); + throw new IllegalArgumentException(stylesheet); + } } /* ------------------------------------------------------------ */ @@ -308,15 +308,16 @@ public class ResourceHandler extends HandlerWrapper { if (_context==null) return null; - base=_context.getBaseResource(); - if (base==null) - return null; + return _context.getResource(path); } try { path=URIUtil.canonicalPath(path); - return base.addPath(path); + Resource r = base.addPath(path); + if (r!=null && r.getAlias()!=null && !_context.checkAlias(path, r)) + return null; + return r; } catch(Exception e) { 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 e946fb670e7..9c948ae0e7d 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 @@ -133,6 +133,7 @@ public class ShutdownHandler extends HandlerWrapper } } + @SuppressWarnings("resource") private String getServerUrl() { NetworkConnector connector=null; @@ -224,7 +225,8 @@ public class ShutdownHandler extends HandlerWrapper private boolean hasCorrectSecurityToken(HttpServletRequest request) { String tok = request.getParameter("token"); - LOG.debug("Token: {}", tok); + if (LOG.isDebugEnabled()) + LOG.debug("Token: {}", tok); return _shutdownToken.equals(tok); } 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 98bb413429b..2e4ec6b7456 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 @@ -193,35 +193,35 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful } } - private void updateResponse(Request request) + protected void updateResponse(Request request) { Response response = request.getResponse(); - switch (response.getStatus() / 100) + if (request.isHandled()) { - case 0: - if (request.isHandled()) + switch (response.getStatus() / 100) + { + case 1: + _responses1xx.incrementAndGet(); + break; + case 2: _responses2xx.incrementAndGet(); - else + break; + case 3: + _responses3xx.incrementAndGet(); + break; + case 4: _responses4xx.incrementAndGet(); - break; - case 1: - _responses1xx.incrementAndGet(); - break; - case 2: - _responses2xx.incrementAndGet(); - break; - case 3: - _responses3xx.incrementAndGet(); - break; - case 4: - _responses4xx.incrementAndGet(); - break; - case 5: - _responses5xx.incrementAndGet(); - break; - default: - break; + break; + case 5: + _responses5xx.incrementAndGet(); + break; + default: + break; + } } + else + // will fall through to not found handler + _responses4xx.incrementAndGet(); _responsesTotalBytes.addAndGet(response.getContentCount()); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java index 809d9d98923..3bed6cda0c9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java @@ -19,13 +19,10 @@ package org.eclipse.jetty.server.session; import java.util.ArrayList; -import java.util.Collections; import java.util.Enumeration; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; - import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSessionActivationListener; @@ -335,7 +332,8 @@ public abstract class AbstractSession implements AbstractSessionManager.SessionI { try { - LOG.debug("invalidate {}",_clusterId); + if (LOG.isDebugEnabled()) + LOG.debug("invalidate {}",_clusterId); if (isValid()) clearAttributes(); } @@ -399,7 +397,6 @@ public abstract class AbstractSession implements AbstractSessionManager.SessionI } /* ------------------------------------------------------------ */ - @SuppressWarnings({ "unchecked" }) @Override public Enumeration getAttributeNames() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java index 9414408338b..7b8a94cb5e0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java @@ -167,7 +167,8 @@ public abstract class AbstractSessionIdManager extends AbstractLifeCycle impleme // random chance to reseed if (_reseed>0 && (r0%_reseed)== 1L) { - LOG.debug("Reseeding {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Reseeding {}",this); if (_random instanceof SecureRandom) { SecureRandom secure = (SecureRandom)_random; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java index 1f966c5957d..aa039081e60 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java @@ -227,10 +227,10 @@ public abstract class AbstractSessionManager extends ContainerLifeCycle implemen _context=ContextHandler.getCurrentContext(); _loader=Thread.currentThread().getContextClassLoader(); - if (_sessionIdManager==null) + final Server server=getSessionHandler().getServer(); + synchronized (server) { - final Server server=getSessionHandler().getServer(); - synchronized (server) + if (_sessionIdManager==null) { _sessionIdManager=server.getSessionIdManager(); if (_sessionIdManager==null) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java index a17bc06f768..382b633b5cd 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java @@ -32,8 +32,6 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.eclipse.jetty.server.SessionIdManager; - /* ------------------------------------------------------------ */ /** * HashSessionIdManager. An in-memory implementation of the session ID manager. diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java index 1effd32f94b..53ccd6398e1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.server.session; import java.io.DataInputStream; -import java.io.EOFException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -34,10 +33,8 @@ import java.util.concurrent.TimeUnit; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import org.eclipse.jetty.server.SessionIdManager; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.ClassLoadingObjectInputStream; -import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; @@ -308,9 +305,9 @@ public class HashSessionManager extends AbstractSessionManager _scavengePeriodMs=period; - if (_timer!=null && (period!=old_period || _task==null)) + synchronized (this) { - synchronized (this) + if (_timer!=null && (period!=old_period || _task==null)) { if (_task!=null) { @@ -569,18 +566,22 @@ public class HashSessionManager extends AbstractSessionManager { File file = new File(_storeDir,idInCuster); - FileInputStream in = null; Exception error = null; - try + if (!file.exists()) { - if (file.exists()) + if (LOG.isDebugEnabled()) { - in = new FileInputStream(file); - HashedSession session = restoreSession(in, null); - addSession(session, false); - session.didActivate(); - return session; + LOG.debug("Not loading: {}",file); } + return null; + } + + try (FileInputStream in = new FileInputStream(file)) + { + HashedSession session = restoreSession(in,null); + addSession(session,false); + session.didActivate(); + return session; } catch (Exception e) { @@ -588,8 +589,6 @@ public class HashSessionManager extends AbstractSessionManager } finally { - if (in != null) IO.close(in); - if (error != null) { if (isDeleteUnrestorableSessions() && file.exists() && file.getParentFile().equals(_storeDir) ) @@ -603,7 +602,10 @@ public class HashSessionManager extends AbstractSessionManager } } else - file.delete(); //delete successfully restored file + { + // delete successfully restored file + file.delete(); + } } return null; } @@ -641,8 +643,10 @@ public class HashSessionManager extends AbstractSessionManager if (session == null) session = (HashedSession)newSession(created, accessed, clusterId); + session.setRequests(requests); + // Attributes int size = di.readInt(); restoreSessionAttributes(di, size, session); @@ -652,7 +656,7 @@ public class HashSessionManager extends AbstractSessionManager int maxIdle = di.readInt(); session.setMaxInactiveInterval(maxIdle); } - catch (EOFException e) + catch (IOException e) { LOG.debug("No maxInactiveInterval persisted for session "+clusterId); LOG.ignore(e); @@ -661,12 +665,14 @@ public class HashSessionManager extends AbstractSessionManager return session; } - + + @SuppressWarnings("resource") private void restoreSessionAttributes (InputStream is, int size, HashedSession session) throws Exception { if (size>0) { + // input stream should not be closed here ClassLoadingObjectInputStream ois = new ClassLoadingObjectInputStream(is); for (int i=0; i= (_saveIntervalSec * 1000L)) { - LOG.debug("getSession("+idInCluster+"): stale session. Reloading session data from db."); + if (LOG.isDebugEnabled()) + LOG.debug("getSession("+idInCluster+"): stale session. Reloading session data from db."); session = loadSession(idInCluster, canonicalize(_context.getContextPath()), getVirtualHost(_context)); } else { - LOG.debug("getSession("+idInCluster+"): session in session map"); + if (LOG.isDebugEnabled()) + LOG.debug("getSession("+idInCluster+"): session in session map"); session = memSession; } } @@ -562,7 +561,8 @@ public class JDBCSessionManager extends AbstractSessionManager } else { - LOG.debug("getSession ({}): Session has expired", idInCluster); + if (LOG.isDebugEnabled()) + LOG.debug("getSession ({}): Session has expired", idInCluster); //ensure that the session id for the expired session is deleted so that a new session with the //same id cannot be created (because the idInUse() test would succeed) _jdbcSessionIdMgr.removeSession(idInCluster); @@ -574,7 +574,8 @@ public class JDBCSessionManager extends AbstractSessionManager { //the session loaded from the db and the one in memory are the same, so keep using the one in memory session = memSession; - LOG.debug("getSession({}): Session not stale {}", idInCluster,session); + if (LOG.isDebugEnabled()) + LOG.debug("getSession({}): Session not stale {}", idInCluster,session); } } else 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 e6aedc5b8c9..fc86f3de5fb 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 @@ -49,10 +49,12 @@ public class SessionHandler extends ScopedHandler final static Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); public final static EnumSet DEFAULT_TRACKING = EnumSet.of(SessionTrackingMode.COOKIE,SessionTrackingMode.URL); - - public static final Class[] SESSION_LISTENER_TYPES = new Class[] {HttpSessionAttributeListener.class, - HttpSessionIdListener.class, - HttpSessionListener.class}; + + @SuppressWarnings("unchecked") + public static final Class[] SESSION_LISTENER_TYPES = + new Class[] {HttpSessionAttributeListener.class, + HttpSessionIdListener.class, + HttpSessionListener.class}; @@ -262,7 +264,8 @@ public class SessionHandler extends ScopedHandler requested_session_id = cookies[i].getValue(); requested_session_id_from_cookie = true; - LOG.debug("Got Session ID {} from cookie",requested_session_id); + if (LOG.isDebugEnabled()) + LOG.debug("Got Session ID {} from cookie",requested_session_id); if (requested_session_id != null) { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/CheckReverseProxyHeadersTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/CheckReverseProxyHeadersTest.java index 506ff9e2ea2..cb60e0627d3 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/CheckReverseProxyHeadersTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/CheckReverseProxyHeadersTest.java @@ -66,7 +66,7 @@ public class CheckReverseProxyHeadersTest @Override public void validate(HttpServletRequest request) { - assertEquals("::1", request.getServerName()); + assertEquals("[::1]", request.getServerName()); assertEquals(80, request.getServerPort()); assertEquals("10.20.30.40", request.getRemoteAddr()); assertEquals("10.20.30.40", request.getRemoteHost()); @@ -84,7 +84,7 @@ public class CheckReverseProxyHeadersTest @Override public void validate(HttpServletRequest request) { - assertEquals("::1", request.getServerName()); + assertEquals("[::1]", request.getServerName()); assertEquals(8888, request.getServerPort()); assertEquals("10.20.30.40", request.getRemoteAddr()); assertEquals("10.20.30.40", request.getRemoteHost()); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java index 2794cfb1f9a..6943f768ce9 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java @@ -30,6 +30,8 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.StdErrLog; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Before; @@ -79,6 +81,35 @@ public class GracefulStopTest Assert.assertThat(out,Matchers.containsString("200 OK")); } } + + @Test + public void testGracefulTimout() throws Exception + { + server.setStopTimeout(100); + new Thread() + { + @Override + public void run() + { + try + { + TimeUnit.SECONDS.sleep(1); + server.stop(); + } + catch (Exception e) + { + //e.printStackTrace(); + } + } + }.start(); + + try(Socket socket = new Socket("localhost",server.getBean(NetworkConnector.class).getLocalPort());) + { + socket.getOutputStream().write("GET / HTTP/1.0\r\n\r\n".getBytes(StandardCharsets.ISO_8859_1)); + String out = IO.toString(socket.getInputStream()); + Assert.assertEquals("",out); + } + } private static class TestHandler extends AbstractHandler { 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 bd1904655cb..d582e578cec 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 @@ -72,7 +72,9 @@ public class HttpConnectionTest connector.setIdleTimeout(500); server.addConnector(connector); server.setHandler(new DumpHandler()); - server.addBean(new ErrorHandler()); + ErrorHandler eh=new ErrorHandler(); + eh.setServer(server); + server.addBean(eh); server.start(); } @@ -721,7 +723,6 @@ public class HttpConnectionTest "12345\015\012"+ "0;\015\012\015\012"); offset = checkContains(response,offset,"HTTP/1.1 200"); - offset = checkContains(response,offset,"Allow: GET,POST,HEAD"); offset=0; response=connector.getResponses("GET * HTTP/1.1\n"+ diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java index e2b4f213d3c..58497def1be 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java @@ -136,11 +136,11 @@ public class HttpURITest /*33*/ {"/?abc=test",null, null, null,null,"/", null,"abc=test",null}, /*34*/ {"/#fragment",null, null, null,null,"/", null,null,"fragment"}, /*35*/ {"http://192.0.0.1:8080/","http","//192.0.0.1:8080","192.0.0.1","8080","/",null,null,null}, - /*36*/ {"http://[2001:db8::1]:8080/","http","//[2001:db8::1]:8080","2001:db8::1","8080","/",null,null,null}, - /*37*/ {"http://user@[2001:db8::1]:8080/","http","//user@[2001:db8::1]:8080","2001:db8::1","8080","/",null,null,null}, - /*38*/ {"http://[2001:db8::1]/","http","//[2001:db8::1]","2001:db8::1",null,"/",null,null,null}, + /*36*/ {"http://[2001:db8::1]:8080/","http","//[2001:db8::1]:8080","[2001:db8::1]","8080","/",null,null,null}, + /*37*/ {"http://user@[2001:db8::1]:8080/","http","//user@[2001:db8::1]:8080","[2001:db8::1]","8080","/",null,null,null}, + /*38*/ {"http://[2001:db8::1]/","http","//[2001:db8::1]","[2001:db8::1]",null,"/",null,null,null}, /*39*/ {"//[2001:db8::1]:8080/",null,null,null,null,"//[2001:db8::1]:8080/",null,null,null}, - /*40*/ {"http://user@[2001:db8::1]:8080/","http","//user@[2001:db8::1]:8080","2001:db8::1","8080","/",null,null,null}, + /*40*/ {"http://user@[2001:db8::1]:8080/","http","//user@[2001:db8::1]:8080","[2001:db8::1]","8080","/",null,null,null}, /*41*/ {"*",null,null,null,null,"*",null, null,null} }; @@ -353,7 +353,7 @@ public class HttpURITest { /* 0*/ {" localhost:8080 ","localhost","8080"}, /* 1*/ {" 127.0.0.1:8080 ","127.0.0.1","8080"}, - /* 2*/ {" [127::0::0::1]:8080 ","127::0::0::1","8080"}, + /* 2*/ {" [127::0::0::1]:8080 ","[127::0::0::1]","8080"}, /* 3*/ {" error ",null,null}, /* 4*/ {" http://localhost:8080/ ",null,null}, }; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java index 1eeddc76914..4e696bf6bc4 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java @@ -124,6 +124,40 @@ public class LocalConnectorTest assertThat(response,containsString("HTTP/1.1 200 OK")); assertThat(response,containsString("pathInfo=/R2")); } + + @Test + public void testManyGETs() throws Exception + { + String response=_connector.getResponses( + "GET /R1 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R2 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R3 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R4 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R5 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R6 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "Connection: close\r\n"+ + "\r\n"); + + String r=response; + + for (int i=1;i<=6;i++) + { + assertThat(r,containsString("HTTP/1.1 200 OK")); + assertThat(r,containsString("pathInfo=/R"+i)); + r=r.substring(r.indexOf("")+8); + } + } @Test public void testGETandGET() throws Exception diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java index ca9d7999cb9..21589a44428 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java @@ -41,7 +41,6 @@ import org.eclipse.jetty.io.NetworkTrafficListener; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.util.BufferUtil; import org.junit.After; -import org.junit.Ignore; import org.junit.Test; public class NetworkTrafficListenerTest diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java b/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java index 1643bab762c..bfb52afab07 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java @@ -495,7 +495,6 @@ public class PartialRFC2616Test "Host: localhost\n"+ "\n"); offset=checkContains(response,offset, "HTTP/1.1 200","200")+1; - offset=checkContains(response,offset, "Allow: GET,POST,HEAD,OPTIONS","Allow")+1; offset=0; response=connector.getResponses("GET * HTTP/1.1\n"+ 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 17e1ec9af97..ef8025c70e4 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 @@ -18,6 +18,8 @@ package org.eclipse.jetty.server; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -483,7 +485,7 @@ public class RequestTest assertThat(response,Matchers.containsString("200 OK")); assertEquals("http://[::1]/",results.get(i++)); assertEquals("0.0.0.0",results.get(i++)); - assertEquals("::1",results.get(i++)); + assertEquals("[::1]",results.get(i++)); assertEquals("80",results.get(i++)); @@ -497,7 +499,7 @@ public class RequestTest assertThat(response,Matchers.containsString("200 OK")); assertEquals("http://[::1]:8888/",results.get(i++)); assertEquals("0.0.0.0",results.get(i++)); - assertEquals("::1",results.get(i++)); + assertEquals("[::1]",results.get(i++)); assertEquals("8888",results.get(i++)); @@ -513,7 +515,7 @@ public class RequestTest assertThat(response,Matchers.containsString("200 OK")); assertEquals("https://[::1]/",results.get(i++)); assertEquals("remote",results.get(i++)); - assertEquals("::1",results.get(i++)); + assertEquals("[::1]",results.get(i++)); assertEquals("443",results.get(i++)); @@ -529,7 +531,7 @@ public class RequestTest assertThat(response,Matchers.containsString("200 OK")); assertEquals("https://[::1]:8888/",results.get(i++)); assertEquals("remote",results.get(i++)); - assertEquals("::1",results.get(i++)); + assertEquals("[::1]",results.get(i++)); assertEquals("8888",results.get(i++)); } @@ -960,7 +962,6 @@ public class RequestTest assertEquals("other", cookies.get(1).getName()); assertEquals("quoted=;value", cookies.get(1).getValue()); - cookies.clear(); response=_connector.getResponses( "GET /other HTTP/1.1\n"+ @@ -975,7 +976,8 @@ public class RequestTest "Connection: close\n"+ "\n" ); - assertTrue(response.startsWith("HTTP/1.1 200 OK")); + assertThat(response,startsWith("HTTP/1.1 200 OK")); + assertThat(response.substring(15),containsString("HTTP/1.1 200 OK")); assertEquals(4,cookies.size()); assertEquals("name", cookies.get(0).getName()); assertEquals("value", cookies.get(0).getValue()); @@ -999,7 +1001,8 @@ public class RequestTest "Connection: close\n"+ "\n" ); - assertTrue(response.startsWith("HTTP/1.1 200 OK")); + assertThat(response,startsWith("HTTP/1.1 200 OK")); + assertThat(response.substring(15),containsString("HTTP/1.1 200 OK")); assertEquals(4,cookies.size()); assertEquals("name", cookies.get(0).getName()); assertEquals("value", cookies.get(0).getValue()); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java new file mode 100644 index 00000000000..03ee046aa8a --- /dev/null +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java @@ -0,0 +1,197 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.server; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.lang.reflect.Field; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.Socket; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.io.ChannelEndPoint; +import org.eclipse.jetty.io.EndPoint; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerList; +import org.eclipse.jetty.util.IO; +import org.junit.Test; + +public class ServerConnectorTest +{ + public static class ReuseInfoHandler extends AbstractHandler + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + response.setContentType("text/plain"); + + EndPoint endPoint = baseRequest.getHttpChannel().getEndPoint(); + assertThat("Endpoint",endPoint,instanceOf(ChannelEndPoint.class)); + ChannelEndPoint channelEndPoint = (ChannelEndPoint)endPoint; + Socket socket = channelEndPoint.getSocket(); + ServerConnector connector = (ServerConnector)baseRequest.getHttpChannel().getConnector(); + + PrintWriter out = response.getWriter(); + out.printf("connector.getReuseAddress() = %b%n",connector.getReuseAddress()); + + try + { + Field fld = connector.getClass().getDeclaredField("_reuseAddress"); + assertThat("Field[_reuseAddress]",fld,notNullValue()); + fld.setAccessible(true); + Object val = fld.get(connector); + out.printf("connector._reuseAddress() = %b%n",val); + } + catch (Throwable t) + { + t.printStackTrace(out); + } + + out.printf("socket.getReuseAddress() = %b%n",socket.getReuseAddress()); + + baseRequest.setHandled(true); + } + } + + private URI toServerURI(ServerConnector connector) throws URISyntaxException + { + String host = connector.getHost(); + if (host == null) + { + host = "localhost"; + } + int port = connector.getLocalPort(); + return new URI(String.format("http://%s:%d/",host,port)); + } + + private String getResponse(URI uri) throws MalformedURLException, IOException + { + HttpURLConnection http = (HttpURLConnection)uri.toURL().openConnection(); + assertThat("Valid Response Code",http.getResponseCode(),anyOf(is(200),is(404))); + + try (InputStream in = http.getInputStream()) + { + return IO.toString(in,StandardCharsets.UTF_8); + } + } + + @Test + public void testReuseAddress_Default() throws Exception + { + Server server = new Server(); + ServerConnector connector = new ServerConnector(server); + connector.setPort(0); + server.addConnector(connector); + + HandlerList handlers = new HandlerList(); + handlers.addHandler(new ReuseInfoHandler()); + handlers.addHandler(new DefaultHandler()); + + server.setHandler(handlers); + + try + { + server.start(); + + URI uri = toServerURI(connector); + String response = getResponse(uri); + assertThat("Response",response,containsString("connector.getReuseAddress() = true")); + assertThat("Response",response,containsString("connector._reuseAddress() = true")); + assertThat("Response",response,containsString("socket.getReuseAddress() = true")); + } + finally + { + server.stop(); + } + } + + @Test + public void testReuseAddress_True() throws Exception + { + Server server = new Server(); + ServerConnector connector = new ServerConnector(server); + connector.setPort(0); + connector.setReuseAddress(true); + server.addConnector(connector); + + HandlerList handlers = new HandlerList(); + handlers.addHandler(new ReuseInfoHandler()); + handlers.addHandler(new DefaultHandler()); + + server.setHandler(handlers); + + try + { + server.start(); + + URI uri = toServerURI(connector); + String response = getResponse(uri); + assertThat("Response",response,containsString("connector.getReuseAddress() = true")); + assertThat("Response",response,containsString("connector._reuseAddress() = true")); + assertThat("Response",response,containsString("socket.getReuseAddress() = true")); + } + finally + { + server.stop(); + } + } + + @Test + public void testReuseAddress_False() throws Exception + { + Server server = new Server(); + ServerConnector connector = new ServerConnector(server); + connector.setPort(0); + connector.setReuseAddress(false); + server.addConnector(connector); + + HandlerList handlers = new HandlerList(); + handlers.addHandler(new ReuseInfoHandler()); + handlers.addHandler(new DefaultHandler()); + + server.setHandler(handlers); + + try + { + server.start(); + + URI uri = toServerURI(connector); + String response = getResponse(uri); + assertThat("Response",response,containsString("connector.getReuseAddress() = false")); + assertThat("Response",response,containsString("connector._reuseAddress() = false")); + assertThat("Response",response,containsString("socket.getReuseAddress() = false")); + } + finally + { + server.stop(); + } + } +} diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java index bd02b034d8a..0b02ee1b8ab 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java @@ -26,43 +26,36 @@ import java.io.LineNumberReader; import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; +import java.util.concurrent.TimeUnit; import org.junit.Test; /** * ShutdownMonitorTest - * - * - * */ public class ShutdownMonitorTest { - - @Test - public void testShutdown () - throws Exception + public void testShutdown() throws Exception { - - //test port and key assignment + // test port and key assignment ShutdownMonitor.getInstance().setPort(0); ShutdownMonitor.getInstance().setExitVm(false); ShutdownMonitor.getInstance().start(); String key = ShutdownMonitor.getInstance().getKey(); int port = ShutdownMonitor.getInstance().getPort(); - - //try starting a 2nd time (should be ignored) - ShutdownMonitor.getInstance().start(); - - + + // try starting a 2nd time (should be ignored) + ShutdownMonitor.getInstance().start(); + stop(port,key,true); assertTrue(!ShutdownMonitor.getInstance().isAlive()); - - //should be able to change port and key because it is stopped + + // should be able to change port and key because it is stopped ShutdownMonitor.getInstance().setPort(0); - ShutdownMonitor.getInstance().setKey("foo"); + ShutdownMonitor.getInstance().setKey("foo"); ShutdownMonitor.getInstance().start(); - + key = ShutdownMonitor.getInstance().getKey(); port = ShutdownMonitor.getInstance().getPort(); assertTrue(ShutdownMonitor.getInstance().isAlive()); @@ -71,41 +64,34 @@ public class ShutdownMonitorTest assertTrue(!ShutdownMonitor.getInstance().isAlive()); } - - public void stop (int port, String key, boolean check) - throws Exception + public void stop(int port, String key, boolean check) throws Exception { - Socket s = null; - - try + System.out.printf("Attempting stop to localhost:%d (%b)%n",port,check); + try (Socket s = new Socket(InetAddress.getByName("127.0.0.1"),port)) { - //send stop command - s = new Socket(InetAddress.getByName("127.0.0.1"),port); - - OutputStream out = s.getOutputStream(); - out.write((key + "\r\nstop\r\n").getBytes()); - out.flush(); - - if (check) + // send stop command + try (OutputStream out = s.getOutputStream()) { - //wait a little - Thread.currentThread().sleep(600); + out.write((key + "\r\nstop\r\n").getBytes()); + out.flush(); - //check for stop confirmation - LineNumberReader lin = new LineNumberReader(new InputStreamReader(s.getInputStream())); - String response; - if ((response = lin.readLine()) != null) + if (check) { - assertEquals("Stopped", response); + // wait a little + TimeUnit.MILLISECONDS.sleep(600); + + // check for stop confirmation + LineNumberReader lin = new LineNumberReader(new InputStreamReader(s.getInputStream())); + String response; + if ((response = lin.readLine()) != null) + { + assertEquals("Stopped",response); + } + else + throw new IllegalStateException("No stop confirmation"); } - else - throw new IllegalStateException("No stop confirmation"); } } - finally - { - if (s != null) s.close(); - } } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java index 5e2adf2a2f1..3c13fea0ae1 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java @@ -18,17 +18,24 @@ package org.eclipse.jetty.server.handler; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.IOException; +import javax.servlet.AsyncContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; @@ -84,9 +91,9 @@ public class ContextHandlerCollectionTest c.addHandler(contextC); HandlerList list = new HandlerList(); - list.addHandler(contextD); list.addHandler(contextE); list.addHandler(contextF); + list.addHandler(contextD); c.addHandler(list); server.setHandler(c); @@ -132,18 +139,22 @@ public class ContextHandlerCollectionTest handlerE.reset(); handlerF.reset(); - // System.err.printf("test %d %s@%s --> %s | %s%n",i,uri,host,connector.getName(),handler); + String t = String.format("test %d %s@%s --> %s | %s%n",i,uri,host,connector.getName(),handler); String response = connector.getResponses("GET "+uri+" HTTP/1.0\nHost: "+host+"\n\n"); if (handler==null) { - Assert.assertThat(response,Matchers.containsString(" 302 ")); + Assert.assertThat(t,response,Matchers.containsString(" 302 ")); } - else if (!handler.isHandled()) + else { - System.err.printf("FAILED %d %s@%s --> %s | %s%n",i,uri,host,connector.getName(),handler); - System.err.println(response); - Assert.fail(); + assertThat(t,response,endsWith(handler.toString())); + if (!handler.isHandled()) + { + System.err.printf("FAILED %s",t); + System.err.println(response); + Assert.fail(); + } } } @@ -260,8 +271,148 @@ public class ContextHandlerCollectionTest assertEquals(wrapperB,AbstractHandlerContainer.findContainerOf(contextB,HandlerWrapper.class,handlerB)); } + + @Test + public void testWrappedContext() throws Exception + { + Server server = new Server(); + LocalConnector connector = new LocalConnector(server); + server.setConnectors(new Connector[] { connector }); + + ContextHandler root = new ContextHandler("/"); + root.setHandler(new IsHandledHandler("root")); + + ContextHandler left = new ContextHandler("/left"); + left.setHandler(new IsHandledHandler("left")); + + HandlerList centre = new HandlerList(); + ContextHandler centreLeft = new ContextHandler("/leftcentre"); + centreLeft.setHandler(new IsHandledHandler("left of centre")); + ContextHandler centreRight = new ContextHandler("/rightcentre"); + centreRight.setHandler(new IsHandledHandler("right of centre")); + centre.setHandlers(new Handler[]{centreLeft,new WrappedHandler(centreRight)}); + + ContextHandler right = new ContextHandler("/right"); + right.setHandler(new IsHandledHandler("right")); + + ContextHandlerCollection contexts = new ContextHandlerCollection(); + contexts.setHandlers(new Handler[]{root,left,centre,new WrappedHandler(right)}); + + server.setHandler(contexts); + server.start(); + + String response=connector.getResponses("GET / HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("root")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /foobar/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("root")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /left/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("left")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /leftcentre/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("left of centre")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /rightcentre/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("right of centre")); + assertThat(response, containsString("Wrapped: TRUE")); + + response=connector.getResponses("GET /right/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("right")); + assertThat(response, containsString("Wrapped: TRUE")); + } + @Test + public void testAsyncWrappedContext() throws Exception + { + Server server = new Server(); + LocalConnector connector = new LocalConnector(server); + server.setConnectors(new Connector[] { connector }); + + ContextHandler root = new ContextHandler("/"); + root.setHandler(new AsyncHandler("root")); + + ContextHandler left = new ContextHandler("/left"); + left.setHandler(new AsyncHandler("left")); + + HandlerList centre = new HandlerList(); + ContextHandler centreLeft = new ContextHandler("/leftcentre"); + centreLeft.setHandler(new AsyncHandler("left of centre")); + ContextHandler centreRight = new ContextHandler("/rightcentre"); + centreRight.setHandler(new AsyncHandler("right of centre")); + centre.setHandlers(new Handler[]{centreLeft,new WrappedHandler(centreRight)}); + + ContextHandler right = new ContextHandler("/right"); + right.setHandler(new AsyncHandler("right")); + + ContextHandlerCollection contexts = new ContextHandlerCollection(); + contexts.setHandlers(new Handler[]{root,left,centre,new WrappedHandler(right)}); + + server.setHandler(contexts); + server.start(); + + String response=connector.getResponses("GET / HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("root")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /foobar/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("root")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /left/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("left")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /leftcentre/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("left of centre")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /rightcentre/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("right of centre")); + assertThat(response, containsString("Wrapped: ASYNC")); + + response=connector.getResponses("GET /right/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("right")); + assertThat(response, containsString("Wrapped: ASYNC")); + } + + + private static final class WrappedHandler extends HandlerWrapper + { + WrappedHandler(Handler handler) + { + setHandler(handler); + } + + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + if (response.containsHeader("Wrapped")) + response.setHeader("Wrapped", "ASYNC"); + else + response.setHeader("Wrapped", "TRUE"); + super.handle(target, baseRequest, request, response); + } + } + + private static final class IsHandledHandler extends AbstractHandler { private boolean handled; @@ -298,5 +449,41 @@ public class ContextHandlerCollectionTest } + + private static final class AsyncHandler extends AbstractHandler + { + private final String name; + + public AsyncHandler(String string) + { + name=string; + } + + @Override + public void handle(String s, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + + String n = (String)baseRequest.getAttribute("async"); + if (n==null) + { + AsyncContext async=baseRequest.startAsync(); + async.setTimeout(1000); + baseRequest.setAttribute("async", name); + async.dispatch(); + } + else + { + response.getWriter().print(n); + } + } + + @Override + public String toString() + { + return name; + } + } + } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/session/HashSessionManagerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/session/HashSessionManagerTest.java index ebd686d53d4..a562c095910 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/session/HashSessionManagerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/session/HashSessionManagerTest.java @@ -22,6 +22,7 @@ import java.io.File; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; +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; @@ -33,24 +34,6 @@ import org.junit.Test; public class HashSessionManagerTest { - @After - public void enableStacks() - { - enableStacks(true); - } - - @Before - public void quietStacks() - { - enableStacks(false); - } - - protected void enableStacks(boolean enabled) - { - StdErrLog log = (StdErrLog)Log.getLogger("org.eclipse.jetty.server.session"); - log.setHideStacks(!enabled); - } - @Test public void testDangerousSessionIdRemoval() throws Exception { @@ -78,7 +61,8 @@ public class HashSessionManagerTest manager.setDeleteUnrestorableSessions(true); manager.setLazyLoad(true); File testDir = MavenTestingUtils.getTargetTestingDir("hashes"); - testDir.mkdirs(); + FS.ensureEmpty(testDir); + manager.setStoreDirectory(testDir); Assert.assertTrue(new File(testDir, "validFile.session").createNewFile()); @@ -88,7 +72,6 @@ public class HashSessionManagerTest manager.getSession("validFile.session"); Assert.assertTrue("File shouldn't exist!", !new File(testDir,"validFile.session").exists()); - } @Test @@ -116,7 +99,6 @@ public class HashSessionManagerTest server.start(); manager.start(); - HashedSession session = (HashedSession)manager.newHttpSession(new Request(null, null)); String sessionId = session.getId(); @@ -124,7 +106,7 @@ public class HashSessionManagerTest session.setAttribute("two", new Integer(2)); //stop will persist sessions - manager.setMaxInactiveInterval(30); //change max inactive interval for *new* sessions + manager.setMaxInactiveInterval(30); // change max inactive interval for *new* sessions manager.stop(); Assert.assertTrue("File should exist!", new File(testDir, session.getId()).exists()); 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 6cc241a9b0b..6c5addb60d6 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 @@ -63,9 +63,9 @@ public class SelectChannelServerSslTest extends HttpServerTestBase @Override public void testFullMethod() throws Exception { - // Don't run on Windows (buggy JVM) - Assume.assumeTrue(!OS.IS_WINDOWS); - + // Don't run on Windows (buggy JVM) + Assume.assumeTrue(!OS.IS_WINDOWS); + try { super.testFullMethod(); @@ -79,8 +79,8 @@ public class SelectChannelServerSslTest extends HttpServerTestBase @Override public void testFullURI() throws Exception { - // Don't run on Windows (buggy JVM) - Assume.assumeTrue(!OS.IS_WINDOWS); + // Don't run on Windows (buggy JVM) + Assume.assumeTrue(!OS.IS_WINDOWS); try { super.testFullURI(); 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 c3787395d38..cf22ca3b4c2 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 @@ -25,8 +25,10 @@ import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import java.util.StringTokenizer; import javax.servlet.AsyncContext; import javax.servlet.RequestDispatcher; @@ -125,6 +127,9 @@ import org.eclipse.jetty.util.resource.ResourceFactory; * * cacheControl If set, all static content will have this value set as the cache-control * header. + * + * otherGzipFileExtensions + * Other file extensions that signify that a file is gzip compressed. Eg ".svgz" * * * @@ -164,6 +169,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory private String _relativeResourceBase; private ServletHandler _servletHandler; private ServletHolder _defaultHolder; + private List _gzipEquivalentFileExtensions; /* ------------------------------------------------------------ */ @Override @@ -249,18 +255,19 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory throw new UnavailableException("resourceCache specified with resource bases"); _cache=(ResourceCache)_servletContext.getAttribute(resourceCache); - LOG.debug("Cache {}={}",resourceCache,_cache); + if (LOG.isDebugEnabled()) + LOG.debug("Cache {}={}",resourceCache,_cache); } _etags = getInitBoolean("etags",_etags); try { - if (_cache==null && max_cached_files>0) + if (_cache==null && (max_cached_files!=-2 || max_cache_size!=-2 || max_cached_file_size!=-2)) { _cache= new ResourceCache(null,this,_mimeTypes,_useFileMappedBuffer,_etags); - if (max_cache_size>0) + if (max_cache_size>=0) _cache.setMaxCacheSize(max_cache_size); if (max_cached_file_size>=-1) _cache.setMaxCachedFileSize(max_cached_file_size); @@ -273,15 +280,33 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory LOG.warn(Log.EXCEPTION,e); throw new UnavailableException(e.toString()); } - - _servletHandler= _contextHandler.getChildHandlerByClass(ServletHandler.class); - for (ServletHolder h :_servletHandler.getServlets()) - if (h.getServletInstance()==this) - _defaultHolder=h; - - if (LOG.isDebugEnabled()) - LOG.debug("resource base = "+_resourceBase); + _gzipEquivalentFileExtensions = new ArrayList(); + String otherGzipExtensions = getInitParameter("otherGzipFileExtensions"); + if (otherGzipExtensions != null) + { + //comma separated list + StringTokenizer tok = new StringTokenizer(otherGzipExtensions,",",false); + while (tok.hasMoreTokens()) + { + String s = tok.nextToken().trim(); + _gzipEquivalentFileExtensions.add((s.charAt(0)=='.'?s:"."+s)); + } + } + else + { + //.svgz files are gzipped svg files and must be served with Content-Encoding:gzip + _gzipEquivalentFileExtensions.add(".svgz"); + } + + _servletHandler= _contextHandler.getChildHandlerByClass(ServletHandler.class); + for (ServletHolder h :_servletHandler.getServlets()) + if (h.getServletInstance()==this) + _defaultHolder=h; + + + if (LOG.isDebugEnabled()) + LOG.debug("resource base = "+_resourceBase); } /** @@ -496,7 +521,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory if (included.booleanValue() || passConditionalHeaders(request,response, resource,content)) { - if (gzip) + if (gzip || isGzippedContent(pathInContext)) { response.setHeader(HttpHeader.CONTENT_ENCODING.asString(),"gzip"); String mt=_servletContext.getMimeType(pathInContext); @@ -534,7 +559,8 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory // else look for a welcome file else if (null!=(welcome=getWelcomeFile(pathInContext))) { - LOG.debug("welcome={}",welcome); + if (LOG.isDebugEnabled()) + LOG.debug("welcome={}",welcome); if (_redirectWelcome) { // Redirect to the index @@ -585,6 +611,20 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory } + /** + * @param resource + * @return + */ + protected boolean isGzippedContent(String path) + { + if (path == null) return false; + + for (String suffix:_gzipEquivalentFileExtensions) + if (path.endsWith(suffix)) + return true; + return false; + } + /* ------------------------------------------------------------ */ private boolean hasDefinedRange(Enumeration reqRanges) { @@ -1018,7 +1058,15 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory /* ------------------------------------------------------------ */ protected void writeHeaders(HttpServletResponse response,HttpContent content,long count) - { + { + if (content == null) + { + // No content, then no headers to process + // This is possible during bypass write because of wrapping + // See .sendData() for more details. + return; + } + if (content.getContentType()!=null && response.getContentType()==null) response.setContentType(content.getContentType().toString()); 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 d9635fae0e3..728dfdfdda9 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 @@ -133,7 +133,8 @@ public class FilterHolder extends Holder } _config=new Config(); - LOG.debug("Filter.init {}",_filter); + if (LOG.isDebugEnabled()) + LOG.debug("Filter.init {}",_filter); _filter.init(_config); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java index 1d5a9a42054..d8265842f94 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java @@ -24,7 +24,6 @@ import java.util.EnumSet; import javax.servlet.DispatcherType; import org.eclipse.jetty.http.PathMap; -import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; @@ -67,19 +66,19 @@ public class FilterMapping implements Dumpable */ public static int dispatch(DispatcherType type) { - switch(type) - { - case REQUEST: - return REQUEST; - case ASYNC: - return ASYNC; - case FORWARD: - return FORWARD; - case INCLUDE: - return INCLUDE; - case ERROR: - return ERROR; - } + switch(type) + { + case REQUEST: + return REQUEST; + case ASYNC: + return ASYNC; + case FORWARD: + return FORWARD; + case INCLUDE: + return INCLUDE; + case ERROR: + return ERROR; + } throw new IllegalArgumentException(type.toString()); } @@ -124,8 +123,8 @@ public class FilterMapping implements Dumpable */ boolean appliesTo(int type) { - if (_dispatches==0) - return type==REQUEST || type==ASYNC && _holder.isAsyncSupported(); + if (_dispatches==0) + return type==REQUEST || type==ASYNC && _holder.isAsyncSupported(); return (_dispatches&type)!=0; } 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 2f690b17b59..9ee03cc88d3 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 @@ -89,7 +89,7 @@ public class Holder extends BaseHolder } /* ------------------------------------------------------------ */ - public Enumeration getInitParameterNames() + public Enumeration getInitParameterNames() { if (_initParams==null) return Collections.enumeration(Collections.EMPTY_LIST); @@ -227,7 +227,7 @@ public class Holder extends BaseHolder } /* -------------------------------------------------------- */ - public Enumeration getInitParameterNames() + public Enumeration getInitParameterNames() { return Holder.this.getInitParameterNames(); } 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 4613144bafd..b7f0e748f74 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 @@ -72,8 +72,8 @@ public class Invoker extends HttpServlet private ContextHandler _contextHandler; private ServletHandler _servletHandler; - private Map.Entry _invokerEntry; - private Map _parameters; + private Map.Entry _invokerEntry; + private Map _parameters; private boolean _nonContextServlets; private boolean _verbose; @@ -87,10 +87,10 @@ public class Invoker extends HttpServlet while (handler!=null && !(handler instanceof ServletHandler) && (handler instanceof HandlerWrapper)) handler=((HandlerWrapper)handler).getHandler(); _servletHandler = (ServletHandler)handler; - Enumeration e = getInitParameterNames(); + Enumeration e = getInitParameterNames(); while(e.hasMoreElements()) { - String param=(String)e.nextElement(); + String param=e.nextElement(); String value=getInitParameter(param); String lvalue=value.toLowerCase(Locale.ENGLISH); if ("nonContextServlets".equals(param)) @@ -104,7 +104,7 @@ public class Invoker extends HttpServlet else { if (_parameters==null) - _parameters=new HashMap(); + _parameters=new HashMap(); _parameters.put(param,value); } } @@ -112,7 +112,7 @@ public class Invoker extends HttpServlet /* ------------------------------------------------------------ */ protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException + throws ServletException, IOException { // Get the requested path and info boolean included=false; @@ -151,7 +151,7 @@ public class Invoker extends HttpServlet ServletMapping mapping = new ServletMapping(); mapping.setServletName(servlet); mapping.setPathSpec(URIUtil.addPaths(servlet_path,servlet)+"/*"); - _servletHandler.setServletMappings((ServletMapping[])ArrayUtil.addToArray(_servletHandler.getServletMappings(), mapping, ServletMapping.class)); + _servletHandler.setServletMappings(ArrayUtil.addToArray(_servletHandler.getServletMappings(), mapping, ServletMapping.class)); } else { @@ -171,7 +171,7 @@ public class Invoker extends HttpServlet // Check for existing mapping (avoid threaded race). String path=URIUtil.addPaths(servlet_path,servlet); - Map.Entry entry = _servletHandler.getHolderEntry(path); + Map.Entry entry = _servletHandler.getHolderEntry(path); if (entry!=null && !entry.equals(_invokerEntry)) { 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 d01ddd2a269..7e2e22e6fc1 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 @@ -35,8 +35,6 @@ import javax.servlet.Filter; import javax.servlet.FilterRegistration; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.ServletException; @@ -290,9 +288,9 @@ public class ServletContextHandler extends ContextHandler decorator.decorate(holder.getListener()); } } - } - } - + } + } + super.startContext(); // OK to Initialize servlet handler now that all relevant object trees have been started 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 81243e01e78..e650a709fc2 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 @@ -116,8 +116,6 @@ public class ServletHandler extends ScopedHandler private ServletHolder[] _servlets=new ServletHolder[0]; private ServletMapping[] _servletMappings; - private Map _servletPathMappings = new HashMap(); - private final Map _filterNameMap= new HashMap<>(); private List _filterPathMappings; private MultiMap _filterNameMappings; @@ -127,9 +125,12 @@ public class ServletHandler extends ScopedHandler private ListenerHolder[] _listeners=new ListenerHolder[0]; - protected final ConcurrentMap _chainCache[] = new ConcurrentMap[FilterMapping.ALL]; - protected final Queue[] _chainLRU = new Queue[FilterMapping.ALL]; - + @SuppressWarnings("unchecked") + protected final ConcurrentMap _chainCache[] = new ConcurrentMap[FilterMapping.ALL]; + + @SuppressWarnings("unchecked") + protected final Queue[] _chainLRU = new Queue[FilterMapping.ALL]; + /* ------------------------------------------------------------ */ @@ -160,7 +161,8 @@ public class ServletHandler extends ScopedHandler if (getServletMapping("/")==null && _ensureDefaultServlet) { - LOG.debug("Adding Default404Servlet to {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Adding Default404Servlet to {}",this); addServletWithMapping(Default404Servlet.class,"/"); updateMappings(); getServletMapping("/").setDefault(true); @@ -339,7 +341,6 @@ public class ServletHandler extends ScopedHandler _filterPathMappings=null; _filterNameMappings=null; _servletPathMap=null; - _servletPathMappings=null; } /* ------------------------------------------------------------ */ @@ -414,10 +415,26 @@ public class ServletHandler extends ScopedHandler */ public ServletMapping getServletMapping(String pathSpec) { - if (pathSpec == null || _servletPathMappings == null) + if (pathSpec == null || _servletMappings == null) return null; - return _servletPathMappings.get(pathSpec); + ServletMapping mapping = null; + for (int i=0; i<_servletMappings.length && mapping == null; i++) + { + ServletMapping m = _servletMappings[i]; + if (m.getPathSpecs() != null) + { + for (String p:m.getPathSpecs()) + { + if (pathSpec.equals(p)) + { + mapping = m; + break; + } + } + } + } + return mapping; } /* ------------------------------------------------------------ */ @@ -543,7 +560,9 @@ public class ServletHandler extends ScopedHandler } } - LOG.debug("chain={}",chain); + if (LOG.isDebugEnabled()) + LOG.debug("chain={}",chain); + Throwable th=null; try { @@ -729,26 +748,26 @@ public class ServletHandler extends ScopedHandler if (filters.size() > 0) chain= new CachedChain(filters, servletHolder); - final Map cache=(Map)_chainCache[dispatch]; - final Queue lru=(Queue)_chainLRU[dispatch]; + final Map cache=_chainCache[dispatch]; + final Queue lru=_chainLRU[dispatch]; - // Do we have too many cached chains? - while (_maxFilterChainsCacheSize>0 && cache.size()>=_maxFilterChainsCacheSize) - { - // The LRU list is not atomic with the cache map, so be prepared to invalidate if - // a key is not found to delete. - // Delete by LRU (where U==created) - String k=lru.poll(); - if (k==null) - { - cache.clear(); - break; - } - cache.remove(k); - } + // Do we have too many cached chains? + while (_maxFilterChainsCacheSize>0 && cache.size()>=_maxFilterChainsCacheSize) + { + // The LRU list is not atomic with the cache map, so be prepared to invalidate if + // a key is not found to delete. + // Delete by LRU (where U==created) + String k=lru.poll(); + if (k==null) + { + cache.clear(); + break; + } + cache.remove(k); + } - cache.put(key,chain); - lru.add(key); + cache.put(key,chain); + lru.add(key); } else if (filters.size() > 0) chain = new Chain(baseRequest,filters, servletHolder); @@ -846,18 +865,6 @@ public class ServletHandler extends ScopedHandler { try { - /* if (servlet.getClassName() == null && servlet.getForcedPath() != null) - { - ServletHolder forced_holder = _servletPathMap.match(servlet.getForcedPath()); - if (forced_holder == null || forced_holder.getClassName() == null) - { - mx.add(new IllegalStateException("No forced path servlet for " + servlet.getForcedPath())); - continue; - } - System.err.println("ServletHandler setting forced path classname to "+forced_holder.getClassName()+ " for "+servlet.getForcedPath()); - servlet.setClassName(forced_holder.getClassName()); - }*/ - servlet.start(); servlet.initialize(); } @@ -1452,9 +1459,7 @@ public class ServletHandler extends ScopedHandler //for each path, look at the mappings where it is referenced //if a mapping is for a servlet that is not enabled, skip it Set mappings = sms.get(pathSpec); - - - + ServletMapping finalMapping = null; for (ServletMapping mapping : mappings) { @@ -1492,7 +1497,6 @@ public class ServletHandler extends ScopedHandler } _servletPathMap=pm; - _servletPathMappings=servletPathMappings; } // flush filter chain cache @@ -1528,7 +1532,8 @@ public class ServletHandler extends ScopedHandler /* ------------------------------------------------------------ */ protected void notFound(Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - LOG.debug("Not Found {}",request.getRequestURI()); + if (LOG.isDebugEnabled()) + LOG.debug("Not Found {}",request.getRequestURI()); if (getHandler()!=null) nextHandle(URIUtil.addPaths(request.getServletPath(),request.getPathInfo()),baseRequest,request,response); } @@ -1550,7 +1555,7 @@ public class ServletHandler extends ScopedHandler { updateBeans(_filterMappings,filterMappings); _filterMappings = filterMappings; - updateMappings(); + if (isStarted()) updateMappings(); invalidateChainsCache(); } @@ -1575,7 +1580,7 @@ public class ServletHandler extends ScopedHandler { updateBeans(_servletMappings,servletMappings); _servletMappings = servletMappings; - updateMappings(); + if (isStarted()) updateMappings(); invalidateChainsCache(); } @@ -1630,27 +1635,23 @@ public class ServletHandler extends ScopedHandler // pass to next filter if (_filterHolder!=null) { - LOG.debug("call filter {}", _filterHolder); + if (LOG.isDebugEnabled()) + LOG.debug("call filter {}", _filterHolder); Filter filter= _filterHolder.getFilter(); - if (_filterHolder.isAsyncSupported()) - filter.doFilter(request, response, _next); - else + + //if the request already does not support async, then the setting for the filter + //is irrelevant. However if the request supports async but this filter does not + //temporarily turn it off for the execution of the filter + boolean requestAsyncSupported = baseRequest.isAsyncSupported(); + try { - final boolean suspendable=baseRequest.isAsyncSupported(); - if (suspendable) - { - try - { - baseRequest.setAsyncSupported(false); - filter.doFilter(request, response, _next); - } - finally - { - baseRequest.setAsyncSupported(true); - } - } - else - filter.doFilter(request, response, _next); + if (!_filterHolder.isAsyncSupported() && requestAsyncSupported) + baseRequest.setAsyncSupported(false); + filter.doFilter(request, response, _next); + } + finally + { + baseRequest.setAsyncSupported(requestAsyncSupported); } return; } @@ -1711,23 +1712,20 @@ public class ServletHandler extends ScopedHandler LOG.debug("call filter " + holder); Filter filter= holder.getFilter(); - if (holder.isAsyncSupported() || !_baseRequest.isAsyncSupported()) + //if the request already does not support async, then the setting for the filter + //is irrelevant. However if the request supports async but this filter does not + //temporarily turn it off for the execution of the filter + boolean requestAsyncSupported = _baseRequest.isAsyncSupported(); + try { + if (!holder.isAsyncSupported() && requestAsyncSupported) + _baseRequest.setAsyncSupported(false); filter.doFilter(request, response, this); } - else + finally { - try - { - _baseRequest.setAsyncSupported(false); - filter.doFilter(request, response, this); - } - finally - { - _baseRequest.setAsyncSupported(true); - } + _baseRequest.setAsyncSupported(requestAsyncSupported); } - return; } @@ -1737,7 +1735,8 @@ public class ServletHandler extends ScopedHandler notFound((request instanceof Request)?((Request)request):HttpChannel.getCurrentHttpChannel().getRequest(), srequest, (HttpServletResponse)response); else { - LOG.debug("call servlet {}", _servletHolder); + if (LOG.isDebugEnabled()) + LOG.debug("call servlet {}", _servletHolder); _servletHolder.handle(_baseRequest,request, response); } } 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 1df08b33dc6..ee57e2ab7db 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 @@ -18,6 +18,7 @@ package org.eclipse.jetty.servlet; +import java.io.File; import java.io.IOException; import java.lang.reflect.Method; import java.util.ArrayList; @@ -289,11 +290,13 @@ public class ServletHolder extends Holder implements UserIdentity.Scope { // Look for a precompiled JSP Servlet String precompiled=getClassNameForJsp(_forcedPath); - LOG.debug("Checking for precompiled servlet {} for jsp {}", precompiled, _forcedPath); + if (LOG.isDebugEnabled()) + LOG.debug("Checking for precompiled servlet {} for jsp {}", precompiled, _forcedPath); ServletHolder jsp=getServletHandler().getServlet(precompiled); if (jsp!=null) { - LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); + if (LOG.isDebugEnabled()) + LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); // set the className for this servlet to the precompiled one setClassName(jsp.getClassName()); } @@ -305,7 +308,8 @@ public class ServletHolder extends Holder implements UserIdentity.Scope jsp=getServletHandler().getServlet("jsp"); if (jsp!=null) { - LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); + if (LOG.isDebugEnabled()) + LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); setClassName(jsp.getClassName()); //copy jsp init params that don't exist for this servlet for (Map.Entry entry:jsp.getInitParameters().entrySet()) @@ -565,7 +569,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope /* ------------------------------------------------------------ */ private void initServlet() - throws ServletException + throws ServletException { Object old_run_as = null; try @@ -591,7 +595,8 @@ public class ServletHolder extends Holder implements UserIdentity.Scope initMultiPart(); - LOG.debug("Filter.init {}",_servlet); + if (LOG.isDebugEnabled()) + LOG.debug("Servlet.init {}",_servlet); _servlet.init(_config); } catch (UnavailableException e) @@ -642,10 +647,23 @@ public class ServletHolder extends Holder implements UserIdentity.Scope if ("?".equals(getInitParameter("classpath"))) { String classpath = ch.getClassPath(); - LOG.debug("classpath=" + classpath); + if (LOG.isDebugEnabled()) + LOG.debug("classpath=" + classpath); if (classpath != null) setInitParameter("classpath", classpath); } + + /* ensure scratch dir */ + File scratch = null; + if (getInitParameter("scratchdir") == null) + { + File tmp = (File)getServletHandler().getServletContext().getAttribute(ServletContext.TEMPDIR); + scratch = new File(tmp, "jsp"); + setInitParameter("scratchdir", scratch.getAbsolutePath()); + } + + scratch = new File (getInitParameter("scratchdir")); + if (!scratch.exists()) scratch.mkdir(); } /* ------------------------------------------------------------ */ @@ -777,7 +795,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope if (_servlet == null) return false; - Class c = _servlet.getClass(); + Class c = _servlet.getClass(); boolean result = false; while (c != null && !result) @@ -809,7 +827,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope jsp = jsp.substring(i); try { - Class jspUtil = Loader.loadClass(Holder.class, "org.apache.jasper.compiler.JspUtil"); + Class jspUtil = Loader.loadClass(Holder.class, "org.apache.jasper.compiler.JspUtil"); Method makeJavaIdentifier = jspUtil.getMethod("makeJavaIdentifier", String.class); return (String)makeJavaIdentifier.invoke(null, jsp); } @@ -835,7 +853,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope return ""; try { - Class jspUtil = Loader.loadClass(Holder.class, "org.apache.jasper.compiler.JspUtil"); + Class jspUtil = Loader.loadClass(Holder.class, "org.apache.jasper.compiler.JspUtil"); Method makeJavaPackage = jspUtil.getMethod("makeJavaPackage", String.class); return (String)makeJavaPackage.invoke(null, jsp.substring(0,i)); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java index 2317195a183..5be08c2047c 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java @@ -23,6 +23,7 @@ import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Enumeration; import java.util.Map; +import java.util.concurrent.TimeUnit; import javax.servlet.DispatcherType; import javax.servlet.Filter; @@ -97,7 +98,7 @@ public class ServletTester extends ContainerLifeCycle return _context.getAttribute(name); } - public Enumeration getAttributeNames() + public Enumeration getAttributeNames() { return _context.getAttributeNames(); } @@ -122,7 +123,7 @@ public class ServletTester extends ContainerLifeCycle return _context.setInitParameter(name,value); } - public Enumeration getInitParameterNames() + public Enumeration getInitParameterNames() { return _context.getInitParameterNames(); } @@ -191,11 +192,21 @@ public class ServletTester extends ContainerLifeCycle { return _connector.getResponses(request); } - + + public String getResponses(String request, long idleFor,TimeUnit units) throws Exception + { + return _connector.getResponses(request, idleFor, units); + } + public ByteBuffer getResponses(ByteBuffer request) throws Exception { return _connector.getResponses(request); } + + public ByteBuffer getResponses(ByteBuffer requestsBuffer,long idleFor,TimeUnit units) throws Exception + { + return _connector.getResponses(requestsBuffer, idleFor, units); + } /* ------------------------------------------------------------ */ /** Create a port based connector. 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 81b75288744..df582ff8dcd 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 @@ -52,7 +52,7 @@ public class ELContextCleaner implements ServletContextListener try { //Check that the BeanELResolver class is on the classpath - Class beanELResolver = Loader.loadClass(this.getClass(), "javax.el.BeanELResolver"); + Class beanELResolver = Loader.loadClass(this.getClass(), "javax.el.BeanELResolver"); //Get a reference via reflection to the properties field which is holding class references Field field = getField(beanELResolver); @@ -60,22 +60,15 @@ public class ELContextCleaner implements ServletContextListener //Get rid of references purgeEntries(field); - LOG.debug("javax.el.BeanELResolver purged"); + if (LOG.isDebugEnabled()) + LOG.debug("javax.el.BeanELResolver purged"); } catch (ClassNotFoundException e) { //BeanELResolver not on classpath, ignore } - catch (SecurityException e) - { - LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e); - } - catch (IllegalArgumentException e) - { - LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e); - } - catch (IllegalAccessException e) + catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e); } @@ -87,7 +80,7 @@ public class ELContextCleaner implements ServletContextListener } - protected Field getField (Class beanELResolver) + protected Field getField (Class beanELResolver) throws SecurityException, NoSuchFieldException { if (beanELResolver == null) @@ -105,22 +98,27 @@ public class ELContextCleaner implements ServletContextListener if (!properties.isAccessible()) properties.setAccessible(true); - ConcurrentHashMap map = (ConcurrentHashMap) properties.get(null); + ConcurrentHashMap, Object> map = (ConcurrentHashMap, Object>) properties.get(null); if (map == null) return; - Iterator itor = map.keySet().iterator(); + Iterator> itor = map.keySet().iterator(); while (itor.hasNext()) { - Class clazz = itor.next(); - LOG.debug("Clazz: "+clazz+" loaded by "+clazz.getClassLoader()); + Class clazz = itor.next(); + if (LOG.isDebugEnabled()) + LOG.debug("Clazz: "+clazz+" loaded by "+clazz.getClassLoader()); if (Thread.currentThread().getContextClassLoader().equals(clazz.getClassLoader())) { itor.remove(); - LOG.debug("removed"); + if (LOG.isDebugEnabled()) + LOG.debug("removed"); } else - LOG.debug("not removed: "+"contextclassloader="+Thread.currentThread().getContextClassLoader()+"clazz's classloader="+clazz.getClassLoader()); + { + if (LOG.isDebugEnabled()) + LOG.debug("not removed: "+"contextclassloader="+Thread.currentThread().getContextClassLoader()+"clazz's classloader="+clazz.getClassLoader()); + } } } } diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java index ce220866e06..ac91ca79f52 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java @@ -45,67 +45,67 @@ import org.junit.Test; */ public class AsyncContextDispatchWithQueryStrings { - private Server _server = new Server(); - private ServletContextHandler _contextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); - private LocalConnector _connector = new LocalConnector(_server); + private Server _server = new Server(); + private ServletContextHandler _contextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); + private LocalConnector _connector = new LocalConnector(_server); - @Before - public void setUp() throws Exception { - _connector.setIdleTimeout(30000); - _server.setConnectors(new Connector[] { _connector }); + @Before + public void setUp() throws Exception { + _connector.setIdleTimeout(30000); + _server.setConnectors(new Connector[] { _connector }); - _contextHandler.setContextPath("/"); - _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/initialCall"); - _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/firstDispatchWithNewQueryString"); - _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/secondDispatchNewValueForExistingQueryString"); + _contextHandler.setContextPath("/"); + _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/initialCall"); + _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/firstDispatchWithNewQueryString"); + _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/secondDispatchNewValueForExistingQueryString"); - HandlerList handlers = new HandlerList(); - handlers.setHandlers(new Handler[] { _contextHandler, new DefaultHandler() }); + HandlerList handlers = new HandlerList(); + handlers.setHandlers(new Handler[] { _contextHandler, new DefaultHandler() }); - _server.setHandler(handlers); - _server.start(); - } + _server.setHandler(handlers); + _server.start(); + } - @Test - public void testMultipleDispatchesWithNewQueryStrings() throws Exception { - String request = "GET /initialCall?initialParam=right HTTP/1.1\r\n" + "Host: localhost\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" - + "Connection: close\r\n" + "\r\n"; - String responseString = _connector.getResponses(request); - assertTrue("Not the expected response. Check STDOUT for details.", responseString.startsWith("HTTP/1.1 200")); - } + @Test + public void testMultipleDispatchesWithNewQueryStrings() throws Exception { + String request = "GET /initialCall?initialParam=right HTTP/1.1\r\n" + "Host: localhost\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" + + "Connection: close\r\n" + "\r\n"; + String responseString = _connector.getResponses(request); + assertTrue("Not the expected response. Check STDOUT for details.", responseString.startsWith("HTTP/1.1 200")); + } - @After - public void tearDown() throws Exception { - _server.stop(); - _server.join(); - } + @After + public void tearDown() throws Exception { + _server.stop(); + _server.join(); + } - private class TestServlet extends HttpServlet { - private static final long serialVersionUID = 1L; + private class TestServlet extends HttpServlet { + private static final long serialVersionUID = 1L; - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String path = request.getRequestURI(); - String queryString = request.getQueryString(); - if ("/initialCall".equals(path)) - { - AsyncContext async = request.startAsync(); - async.dispatch("/firstDispatchWithNewQueryString?newQueryString=initialValue"); - assertEquals("initialParam=right", queryString); - } - else if ("/firstDispatchWithNewQueryString".equals(path)) - { + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String path = request.getRequestURI(); + String queryString = request.getQueryString(); + if ("/initialCall".equals(path)) + { + AsyncContext async = request.startAsync(); + async.dispatch("/firstDispatchWithNewQueryString?newQueryString=initialValue"); + assertEquals("initialParam=right", queryString); + } + else if ("/firstDispatchWithNewQueryString".equals(path)) + { AsyncContext async = request.startAsync(); async.dispatch("/secondDispatchNewValueForExistingQueryString?newQueryString=newValue"); assertEquals("newQueryString=initialValue&initialParam=right", queryString); - } - else - { - response.setContentType("text/html"); - response.setStatus(HttpServletResponse.SC_OK); - response.getWriter().println("

      woohhooooo

      "); - assertEquals("newQueryString=newValue&initialParam=right", queryString); - } - } - } + } + else + { + response.setContentType("text/html"); + response.setStatus(HttpServletResponse.SC_OK); + response.getWriter().println("

      woohhooooo

      "); + assertEquals("newQueryString=newValue&initialParam=right", queryString); + } + } + } } diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java index b37f94c2557..194a39898cc 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java @@ -19,8 +19,6 @@ package org.eclipse.jetty.servlet; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; import java.io.BufferedReader; @@ -46,7 +44,6 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.toolchain.test.http.SimpleHttpParser; import org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse; -import org.hamcrest.Matchers; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java index a1bb491f191..5a50e834b2b 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java @@ -51,6 +51,7 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.hamcrest.Matchers; import org.junit.After; @@ -97,6 +98,7 @@ public class AsyncServletTest _servletHandler.addServletWithMapping(holder,"/path/*"); _servletHandler.addServletWithMapping(holder,"/path1/*"); _servletHandler.addServletWithMapping(holder,"/path2/*"); + _servletHandler.addServletWithMapping(holder,"/p th3/*"); _servletHandler.addServletWithMapping(new ServletHolder(new FwdServlet()),"/fwd/*"); _server.start(); _port=_connector.getLocalPort(); @@ -116,7 +118,7 @@ public class AsyncServletTest String response=process(null,null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n",response); assertContains("NORMAL",response); assertNotContains("history: onTimeout",response); @@ -129,7 +131,7 @@ public class AsyncServletTest String response=process("sleep=200",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n",response); assertContains("SLEPT",response); assertNotContains("history: onTimeout",response); @@ -143,11 +145,11 @@ public class AsyncServletTest String response=process("suspend=200",null); assertEquals("HTTP/1.1 500 Async Timeout",response.substring(0,26)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); @@ -160,12 +162,12 @@ public class AsyncServletTest String response=process("suspend=200&timeout=dispatch",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ "history: dispatch\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); @@ -178,7 +180,7 @@ public class AsyncServletTest String response=process("suspend=200&timeout=complete",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ @@ -194,11 +196,11 @@ public class AsyncServletTest String response=process("suspend=200&resume=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertNotContains("history: onTimeout",response); @@ -210,11 +212,11 @@ public class AsyncServletTest String response=process("suspend=200&resume=0",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("history: onComplete",response); @@ -226,7 +228,7 @@ public class AsyncServletTest String response=process("suspend=200&complete=50",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: complete\r\n"+ @@ -242,7 +244,7 @@ public class AsyncServletTest String response=process("suspend=200&complete=0",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: complete\r\n"+ @@ -258,15 +260,15 @@ public class AsyncServletTest String response=process("suspend=1000&resume=10&suspend2=1000&resume2=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); @@ -278,11 +280,11 @@ public class AsyncServletTest String response=process("suspend=1000&resume=10&suspend2=1000&complete2=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: complete\r\n"+ @@ -297,15 +299,15 @@ public class AsyncServletTest String response=process("suspend=1000&resume=10&suspend2=10",null); assertEquals("HTTP/1.1 500 Async Timeout",response.substring(0,26)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("ERROR: /ctx/path/info",response); @@ -317,15 +319,15 @@ public class AsyncServletTest String response=process("suspend=10&suspend2=1000&resume2=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); @@ -337,11 +339,11 @@ public class AsyncServletTest String response=process("suspend=10&suspend2=1000&complete2=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: complete\r\n"+ @@ -355,15 +357,15 @@ public class AsyncServletTest _expectedCode="500 "; String response=process("suspend=10&suspend2=10",null); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("ERROR: /ctx/path/info",response); @@ -375,30 +377,48 @@ public class AsyncServletTest String response=process("wrap=true&suspend=200&resume=20",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: wrapped REQ RSP\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); } + + @Test + public void testStartDispatchEncodedPath() throws Exception + { + String response=process("suspend=200&resume=20&path=/p%20th3",null); + assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); + assertContains( + "history: REQUEST /ctx/path/info\r\n"+ + "history: initial\r\n"+ + "history: suspend\r\n"+ + "history: resume\r\n"+ + "history: ASYNC /ctx/p%20th3\r\n"+ + "history: !initial\r\n"+ + "history: onComplete\r\n",response); + assertContains("DISPATCHED",response); + } + + @Test public void testFwdStartDispatch() throws Exception { String response=process("fwd","suspend=200&resume=20",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: FWD REQUEST /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD REQUEST /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: FWD ASYNC /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD ASYNC /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); @@ -410,12 +430,12 @@ public class AsyncServletTest String response=process("fwd","suspend=200&resume=20&path=/path2",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: FWD REQUEST /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD REQUEST /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path2\r\n"+ + "history: ASYNC /ctx/path2\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); @@ -427,12 +447,12 @@ public class AsyncServletTest String response=process("fwd","wrap=true&suspend=200&resume=20",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: FWD REQUEST /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD REQUEST /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path1\r\n"+ + "history: ASYNC /ctx/path1\r\n"+ "history: wrapped REQ RSP\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); @@ -445,12 +465,12 @@ public class AsyncServletTest String response=process("fwd","wrap=true&suspend=200&resume=20&path=/path2",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: FWD REQUEST /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD REQUEST /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path2\r\n"+ + "history: ASYNC /ctx/path2\r\n"+ "history: wrapped REQ RSP\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); @@ -485,12 +505,12 @@ public class AsyncServletTest String response = IO.toString(socket.getInputStream()); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: async-read=10\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); } @@ -548,7 +568,7 @@ public class AsyncServletTest @Override public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { - response.addHeader("history","FWD "+request.getDispatcherType()+" "+request.getServletPath()); + response.addHeader("history","FWD "+request.getDispatcherType()+" "+request.getRequestURI()); if (request instanceof ServletRequestWrapper || response instanceof ServletResponseWrapper) response.addHeader("history","wrapped"+((request instanceof ServletRequestWrapper)?" REQ":"")+((response instanceof ServletResponseWrapper)?" RSP":"")); request.getServletContext().getRequestDispatcher("/path1").forward(request,response); @@ -564,7 +584,7 @@ public class AsyncServletTest public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { // System.err.println(request.getDispatcherType()+" "+request.getRequestURI()); - response.addHeader("history",request.getDispatcherType()+" "+request.getServletPath()); + response.addHeader("history",request.getDispatcherType()+" "+request.getRequestURI()); if (request instanceof ServletRequestWrapper || response instanceof ServletResponseWrapper) response.addHeader("history","wrapped"+((request instanceof ServletRequestWrapper)?" REQ":"")+((response instanceof ServletResponseWrapper)?" RSP":"")); @@ -687,7 +707,13 @@ public class AsyncServletTest { ((HttpServletResponse)async.getResponse()).addHeader("history","resume"); if (path!=null) - async.dispatch(path); + { + int q=path.indexOf('?'); + String uriInContext=(q>=0) + ?URIUtil.encodePath(path.substring(0,q))+path.substring(q) + :URIUtil.encodePath(path); + async.dispatch(uriInContext); + } else async.dispatch(); } 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 7ebbe2bec34..cde72a5e95d 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 @@ -40,7 +40,6 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.SecurityHandler; -import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; @@ -51,7 +50,6 @@ import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.server.handler.ResourceHandler; import org.eclipse.jetty.server.session.SessionHandler; -import org.eclipse.jetty.util.component.LifeCycle.Listener; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Assert; diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java index f8d1aaa1c8e..cb035d7ac21 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java @@ -335,6 +335,7 @@ public class ServletHandlerTest //add a non-programmatic one to begin with handler.addFilterWithMapping(fh1, "/*", EnumSet.allOf(DispatcherType.class)); + handler.updateMappings(); FilterMapping[] mappings = handler.getFilterMappings(); assertNotNull(mappings); assertTrue(fh1 == mappings[0].getFilterHolder()); @@ -343,6 +344,7 @@ public class ServletHandlerTest fh4.setServletHandler(handler); handler.addFilter(fh4); fh4.getRegistration().addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), false, "/*"); + handler.updateMappings(); mappings = handler.getFilterMappings(); assertNotNull(mappings); assertEquals(2, mappings.length); @@ -353,6 +355,7 @@ public class ServletHandlerTest fh3.setServletHandler(handler); handler.addFilter(fh3); fh3.getRegistration().addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, "/*"); + handler.updateMappings(); mappings = handler.getFilterMappings(); assertNotNull(mappings); assertEquals(3, mappings.length); @@ -364,6 +367,7 @@ public class ServletHandlerTest fh5.setServletHandler(handler); handler.addFilter(fh5); fh5.getRegistration().addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), false, "/*"); + handler.updateMappings(); mappings = handler.getFilterMappings(); assertNotNull(mappings); assertEquals(4, mappings.length); @@ -376,6 +380,7 @@ public class ServletHandlerTest FilterHolder f = new FilterHolder(Source.EMBEDDED); f.setName("non-programmatic"); handler.addFilterWithMapping(f, "/*", EnumSet.allOf(DispatcherType.class)); + handler.updateMappings(); mappings = handler.getFilterMappings(); assertNotNull(mappings); assertEquals(5, mappings.length); @@ -391,6 +396,7 @@ public class ServletHandlerTest pf.setName("programmaticA"); handler.addFilter(pf); pf.getRegistration().addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, "/*"); + handler.updateMappings(); mappings = handler.getFilterMappings(); assertNotNull(mappings); assertEquals(6, mappings.length); @@ -407,6 +413,7 @@ public class ServletHandlerTest pf2.setName("programmaticB"); handler.addFilter(pf2); pf2.getRegistration().addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), false, "/*"); + handler.updateMappings(); mappings = handler.getFilterMappings(); assertNotNull(mappings); diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java index c9523ae2e89..7b62a57bd77 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java @@ -209,14 +209,16 @@ public class AsyncGzipFilter extends UserAgentFilter implements GzipFactory { for (String type:MimeTypes.getKnownMimeTypes()) { + if (type.equals("image/svg+xml")) //always compressable (unless .svgz file) + continue; if (type.startsWith("image/")|| type.startsWith("audio/")|| type.startsWith("video/")) _mimeTypes.add(type); - _mimeTypes.add("application/compress"); - _mimeTypes.add("application/zip"); - _mimeTypes.add("application/gzip"); } + _mimeTypes.add("application/compress"); + _mimeTypes.add("application/zip"); + _mimeTypes.add("application/gzip"); } else { @@ -315,21 +317,32 @@ public class AsyncGzipFilter extends UserAgentFilter implements GzipFactory super.doFilter(request,response,chain); return; } - + // Exclude non compressible mime-types known from URI extension. - no Vary because no matter what client, this URI is always excluded - if (_mimeTypes.size()>0) + if (_mimeTypes.size()>0 && _excludeMimeTypes) { String mimeType = _context.getMimeType(request.getRequestURI()); - - if (mimeType!=null && _mimeTypes.contains(mimeType)==_excludeMimeTypes) + + if (mimeType!=null) { - LOG.debug("{} excluded by path suffix {}",this,request); - // handle normally without setting vary header - super.doFilter(request,response,chain); - return; + mimeType = MimeTypes.getContentTypeWithoutCharset(mimeType); + if (_mimeTypes.contains(mimeType)) + { + LOG.debug("{} excluded by path suffix {}",this,request); + // handle normally without setting vary header + super.doFilter(request,response,chain); + return; + } } } + //If the Content-Encoding is already set, then we won't compress + if (response.getHeader("Content-Encoding") != null) + { + super.doFilter(request,response,chain); + return; + } + if (_checkGzExists && request.getServletContext()!=null) { String path=request.getServletContext().getRealPath(URIUtil.addPaths(request.getServletPath(),request.getPathInfo())); 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 ba56bc7d90c..cbb9370c92c 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 @@ -51,14 +51,23 @@ import org.eclipse.jetty.util.log.Logger; * * The following init parameters are used to configure this servlet: *
      - *
      cgibinResourceBase
      Path to the cgi bin directory if set or it will default to the resource base of the context.
      - *
      resourceBase
      An alias for cgibinResourceBase.
      - *
      cgibinResourceBaseIsRelative
      If true then cgibinResourceBase is relative to the webapp (eg "WEB-INF/cgi")
      - *
      commandPrefix
      may be used to set a prefix to all commands passed to exec. This can be used on systems that need assistance to execute a + *
      cgibinResourceBase
      + *
      Path to the cgi bin directory if set or it will default to the resource base of the context.
      + *
      resourceBase
      + *
      An alias for cgibinResourceBase.
      + *
      cgibinResourceBaseIsRelative
      + *
      If true then cgibinResourceBase is relative to the webapp (eg "WEB-INF/cgi")
      + *
      commandPrefix
      + *
      may be used to set a prefix to all commands passed to exec. This can be used on systems that need assistance to execute a * particular file type. For example on windows this can be set to "perl" so that perl scripts are executed.
      - *
      Path
      passed to the exec environment as PATH.
      - *
      ENV_*
      used to set an arbitrary environment variable with the name stripped of the leading ENV_ and using the init parameter value
      - *
      useFullPath
      If true, the full URI path within the context is used for the exec command, otherwise a search is done for a partial URL that matches an exec Command
      + *
      Path
      + *
      passed to the exec environment as PATH.
      + *
      ENV_*
      + *
      used to set an arbitrary environment variable with the name stripped of the leading ENV_ and using the init parameter value
      + *
      useFullPath
      + *
      If true, the full URI path within the context is used for the exec command, otherwise a search is done for a partial URL that matches an exec Command
      + *
      ignoreExitState
      + *
      If true then do not act on a non-zero exec exit status")
      *
      * */ @@ -196,13 +205,9 @@ public class CGI extends HttpServlet String info = ""; // Search docroot for a matching execCmd - while (path.endsWith("/") && path.length() >= 0) + while ((path.endsWith("/") || !execCmd.exists()) && path.length() >= 0) { - if(!execCmd.exists()) - break; - int index = path.lastIndexOf('/'); - path = path.substring(0,index); info = pathInContext.substring(index,pathInContext.length()); execCmd = new File(_docRoot,path); @@ -571,4 +576,4 @@ public class CGI extends HttpServlet return envMap.toString(); } } -} +} \ No newline at end of file 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 8f7ff914f84..174930af86a 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 @@ -31,7 +31,9 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; - +import javax.servlet.AsyncContext; +import javax.servlet.AsyncEvent; +import javax.servlet.AsyncListener; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -47,9 +49,6 @@ import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; import javax.servlet.http.HttpSessionEvent; -import org.eclipse.jetty.continuation.Continuation; -import org.eclipse.jetty.continuation.ContinuationListener; -import org.eclipse.jetty.continuation.ContinuationSupport; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; @@ -169,7 +168,10 @@ public class DoSFilter implements Filter private static final int USER_IP = 1; private static final int USER_UNKNOWN = 0; - private ServletContext _context; + private final String _suspended = "DoSFilter@" + Integer.toHexString(hashCode()) + ".SUSPENDED"; + private final String _resumed = "DoSFilter@" + Integer.toHexString(hashCode()) + ".RESUMED"; + private final ConcurrentHashMap _rateTrackers = new ConcurrentHashMap<>(); + private final List _whitelist = new CopyOnWriteArrayList<>(); private volatile long _delayMs; private volatile long _throttleMs; private volatile long _maxWaitMs; @@ -182,34 +184,18 @@ public class DoSFilter implements Filter private Semaphore _passes; private volatile int _throttledRequests; private volatile int _maxRequestsPerSec; - private Queue[] _queue; - private ContinuationListener[] _listeners; - private final ConcurrentHashMap _rateTrackers = new ConcurrentHashMap<>(); - private final List _whitelist = new CopyOnWriteArrayList<>(); + private Queue[] _queues; + private AsyncListener[] _listeners; private Scheduler _scheduler; public void init(FilterConfig filterConfig) throws ServletException { - _context = filterConfig.getServletContext(); - - _queue = new Queue[getMaxPriority() + 1]; - _listeners = new ContinuationListener[getMaxPriority() + 1]; - for (int p = 0; p < _queue.length; p++) + _queues = new Queue[getMaxPriority() + 1]; + _listeners = new AsyncListener[_queues.length]; + for (int p = 0; p < _queues.length; p++) { - _queue[p] = new ConcurrentLinkedQueue<>(); - - final int priority = p; - _listeners[p] = new ContinuationListener() - { - public void onComplete(Continuation continuation) - { - } - - public void onTimeout(Continuation continuation) - { - _queue[priority].remove(continuation); - } - }; + _queues[p] = new ConcurrentLinkedQueue<>(); + _listeners[p] = new DoSAsyncListener(p); } _rateTrackers.clear(); @@ -276,8 +262,9 @@ public class DoSFilter implements Filter _scheduler = startScheduler(); - if (_context != null && Boolean.parseBoolean(filterConfig.getInitParameter(MANAGED_ATTR_INIT_PARAM))) - _context.setAttribute(filterConfig.getFilterName(), this); + ServletContext context = filterConfig.getServletContext(); + if (context != null && Boolean.parseBoolean(filterConfig.getInitParameter(MANAGED_ATTR_INIT_PARAM))) + context.setAttribute(filterConfig.getFilterName(), this); } protected Scheduler startScheduler() throws ServletException @@ -307,37 +294,40 @@ public class DoSFilter implements Filter return; } - // Look for the rate tracker for this request + // Look for the rate tracker for this request. RateTracker tracker = (RateTracker)request.getAttribute(__TRACKER); - if (tracker == null) { // This is the first time we have seen this request. + if (LOG.isDebugEnabled()) + LOG.debug("Filtering {}", request); - // get a rate tracker associated with this request, and record one hit + // Get a rate tracker associated with this request, and record one hit. tracker = getRateTracker(request); // Calculate the rate and check it is over the allowed limit final boolean overRateLimit = tracker.isRateExceeded(System.currentTimeMillis()); - // pass it through if we are not currently over the rate limit + // Pass it through if we are not currently over the rate limit. if (!overRateLimit) { + if (LOG.isDebugEnabled()) + LOG.debug("Allowing {}", request); doFilterChain(filterChain, request, response); return; } // We are over the limit. - // So either reject it, delay it or throttle it + // So either reject it, delay it or throttle it. long delayMs = getDelayMs(); boolean insertHeaders = isInsertHeaders(); switch ((int)delayMs) { case -1: { - // Reject this request - LOG.warn("DOS ALERT: Request rejected ip=" + request.getRemoteAddr() + ",session=" + request.getRequestedSessionId() + ",user=" + request.getUserPrincipal()); + // Reject this request. + LOG.warn("DOS ALERT: Request rejected ip={}, session={}, user={}", request.getRemoteAddr(), request.getRequestedSessionId(), request.getUserPrincipal()); if (insertHeaders) response.addHeader("DoSFilter", "unavailable"); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); @@ -345,39 +335,41 @@ public class DoSFilter implements Filter } case 0: { - // fall through to throttle code - LOG.warn("DOS ALERT: Request throttled ip=" + request.getRemoteAddr() + ",session=" + request.getRequestedSessionId() + ",user=" + request.getUserPrincipal()); + // Fall through to throttle the request. + LOG.warn("DOS ALERT: Request throttled ip={}, session={}, user={}", request.getRemoteAddr(), request.getRequestedSessionId(), request.getUserPrincipal()); request.setAttribute(__TRACKER, tracker); break; } default: { - // insert a delay before throttling the request - LOG.warn("DOS ALERT: Request delayed="+delayMs+"ms ip=" + request.getRemoteAddr() + ",session=" + request.getRequestedSessionId() + ",user=" + request.getUserPrincipal()); + // Insert a delay before throttling the request, + // using the suspend+timeout mechanism of AsyncContext. + LOG.warn("DOS ALERT: Request delayed={}ms, ip={}, session={}, user={}", delayMs, request.getRemoteAddr(), request.getRequestedSessionId(), request.getUserPrincipal()); if (insertHeaders) response.addHeader("DoSFilter", "delayed"); - Continuation continuation = ContinuationSupport.getContinuation(request); request.setAttribute(__TRACKER, tracker); + AsyncContext asyncContext = request.startAsync(); if (delayMs > 0) - continuation.setTimeout(delayMs); - continuation.suspend(); + asyncContext.setTimeout(delayMs); + asyncContext.addListener(new DoSTimeoutAsyncListener()); return; } } } - // Throttle the request + if (LOG.isDebugEnabled()) + LOG.debug("Throttling {}", request); + + // Throttle the request. boolean accepted = false; try { - // check if we can afford to accept another request at this time + // Check if we can afford to accept another request at this time. accepted = _passes.tryAcquire(getMaxWaitMs(), TimeUnit.MILLISECONDS); - if (!accepted) { - // we were not accepted, so either we suspend to wait,or if we were woken up we insist or we fail - final Continuation continuation = ContinuationSupport.getContinuation(request); - + // We were not accepted, so either we suspend to wait, + // or if we were woken up we insist or we fail. Boolean throttled = (Boolean)request.getAttribute(__THROTTLED); long throttleMs = getThrottleMs(); if (throttled != Boolean.TRUE && throttleMs > 0) @@ -386,30 +378,39 @@ public class DoSFilter implements Filter request.setAttribute(__THROTTLED, Boolean.TRUE); if (isInsertHeaders()) response.addHeader("DoSFilter", "throttled"); + AsyncContext asyncContext = request.startAsync(); + request.setAttribute(_suspended, Boolean.TRUE); if (throttleMs > 0) - continuation.setTimeout(throttleMs); - continuation.suspend(); - - continuation.addContinuationListener(_listeners[priority]); - _queue[priority].add(continuation); + asyncContext.setTimeout(throttleMs); + asyncContext.addListener(_listeners[priority]); + _queues[priority].add(asyncContext); + if (LOG.isDebugEnabled()) + LOG.debug("Throttled {}, {}ms", request, throttleMs); return; } - // else were we resumed? - else if (request.getAttribute("javax.servlet.resumed") == Boolean.TRUE) + + Boolean resumed = (Boolean)request.getAttribute(_resumed); + if (resumed == Boolean.TRUE) { - // we were resumed and somebody stole our pass, so we wait for the next one. + // We were resumed, we wait for the next pass. _passes.acquire(); accepted = true; } } - // if we were accepted (either immediately or after throttle) + // If we were accepted (either immediately or after throttle)... if (accepted) - // call the chain + { + // ...call the chain. + if (LOG.isDebugEnabled()) + LOG.debug("Allowing {}", request); doFilterChain(filterChain, request, response); + } else { - // fail the request + // ...otherwise fail the request. + if (LOG.isDebugEnabled()) + LOG.debug("Rejecting {}", request); if (isInsertHeaders()) response.addHeader("DoSFilter", "unavailable"); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); @@ -417,21 +418,28 @@ public class DoSFilter implements Filter } catch (InterruptedException e) { - _context.log("DoS", e); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); } finally { if (accepted) { - // wake up the next highest priority request. - for (int p = _queue.length; p-- > 0; ) + // Wake up the next highest priority request. + for (int p = _queues.length - 1; p >= 0; --p) { - Continuation continuation = _queue[p].poll(); - if (continuation != null && continuation.isSuspended()) + AsyncContext asyncContext = _queues[p].poll(); + if (asyncContext != null) { - continuation.resume(); - break; + ServletRequest candidate = asyncContext.getRequest(); + Boolean suspended = (Boolean)candidate.getAttribute(_suspended); + if (suspended == Boolean.TRUE) + { + if (LOG.isDebugEnabled()) + LOG.debug("Resuming {}", request); + candidate.setAttribute(_resumed, Boolean.TRUE); + asyncContext.dispatch(); + break; + } } } _passes.release(); @@ -450,7 +458,6 @@ public class DoSFilter implements Filter closeConnection(request, response, thread); } }; - Scheduler.Task task = _scheduler.schedule(requestTimeout, getMaxRequestMs(), TimeUnit.MILLISECONDS); try { @@ -1057,10 +1064,10 @@ public class DoSFilter implements Filter { private static final long serialVersionUID = 3534663738034577872L; - transient protected final String _id; - transient protected final int _type; - transient protected final long[] _timestamps; - transient protected int _next; + protected transient final String _id; + protected transient final int _type; + protected transient final long[] _timestamps; + protected transient int _next; public RateTracker(String id, int type, int maxRequestsPerSecond) { @@ -1116,7 +1123,8 @@ public class DoSFilter implements Filter //and ensure that we take ourselves out of the session so we are not saved _rateTrackers.remove(_id); se.getSession().removeAttribute(__TRACKER); - if (LOG.isDebugEnabled()) LOG.debug("Value removed: {}", getId()); + if (LOG.isDebugEnabled()) + LOG.debug("Value removed: {}", getId()); } public void sessionDidActivate(HttpSessionEvent se) @@ -1172,4 +1180,45 @@ public class DoSFilter implements Filter return "Fixed" + super.toString(); } } + + private class DoSTimeoutAsyncListener implements AsyncListener + { + @Override + public void onStartAsync(AsyncEvent event) throws IOException + { + } + + @Override + public void onComplete(AsyncEvent event) throws IOException + { + } + + @Override + public void onTimeout(AsyncEvent event) throws IOException + { + event.getAsyncContext().dispatch(); + } + + @Override + public void onError(AsyncEvent event) throws IOException + { + } + } + + private class DoSAsyncListener extends DoSTimeoutAsyncListener + { + private final int priority; + + public DoSAsyncListener(int priority) + { + this.priority = priority; + } + + @Override + public void onTimeout(AsyncEvent event) throws IOException + { + _queues[priority].remove(event.getAsyncContext()); + super.onTimeout(event); + } + } } diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java index e376349e703..0343034d333 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java @@ -208,14 +208,16 @@ public class GzipFilter extends UserAgentFilter { for (String type:MimeTypes.getKnownMimeTypes()) { + if (type.equals("image/svg+xml")) //always compressable (unless .svgz file) + continue; if (type.startsWith("image/")|| type.startsWith("audio/")|| type.startsWith("video/")) _mimeTypes.add(type); - _mimeTypes.add("application/compress"); - _mimeTypes.add("application/zip"); - _mimeTypes.add("application/gzip"); } + _mimeTypes.add("application/compress"); + _mimeTypes.add("application/zip"); + _mimeTypes.add("application/gzip"); } else { @@ -298,19 +300,30 @@ public class GzipFilter extends UserAgentFilter super.doFilter(request,response,chain); return; } - + // Exclude non compressible mime-types known from URI extension. - no Vary because no matter what client, this URI is always excluded - if (_mimeTypes.size()>0) + if (_mimeTypes.size()>0 && _excludeMimeTypes) { String mimeType = _context.getMimeType(request.getRequestURI()); - - if (mimeType!=null && _mimeTypes.contains(mimeType)==_excludeMimeTypes) + + if (mimeType!=null) { - // handle normally without setting vary header - super.doFilter(request,response,chain); - return; + mimeType = MimeTypes.getContentTypeWithoutCharset(mimeType); + if (_mimeTypes.contains(mimeType)) + { + // handle normally without setting vary header + super.doFilter(request,response,chain); + return; + } } } + + //If the Content-Encoding is already set, then we won't compress + if (response.getHeader("Content-Encoding") != null) + { + super.doFilter(request,response,chain); + return; + } if (_checkGzExists && request.getServletContext()!=null) { 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 9479fd8bd01..d1df22b978f 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 @@ -23,7 +23,9 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; - +import javax.servlet.AsyncContext; +import javax.servlet.AsyncEvent; +import javax.servlet.AsyncListener; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -35,28 +37,27 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.eclipse.jetty.continuation.Continuation; -import org.eclipse.jetty.continuation.ContinuationListener; -import org.eclipse.jetty.continuation.ContinuationSupport; 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; /** * Quality of Service Filter. - * + *

      * This filter limits the number of active requests to the number set by the "maxRequests" init parameter (default 10). * If more requests are received, they are suspended and placed on priority queues. Priorities are determined by * the {@link #getPriority(ServletRequest)} method and are a value between 0 and the value given by the "maxPriority" * init parameter (default 10), with higher values having higher priority. - *

      + *

      * This filter is ideal to prevent wasting threads waiting for slow/limited * resources such as a JDBC connection pool. It avoids the situation where all of a * containers thread pool may be consumed blocking on such a slow resource. * By limiting the number of active threads, a smaller thread pool may be used as * the threads are not wasted waiting. Thus more memory may be available for use by * the active threads. - *

      + *

      * Furthermore, this filter uses a priority when resuming waiting requests. So that if * a container is under load, and there are many requests waiting for resources, * the {@link #getPriority(ServletRequest)} method is used, so that more important @@ -64,175 +65,168 @@ import org.eclipse.jetty.util.annotation.ManagedObject; * maxRequest limit slightly smaller than the containers thread pool and a high priority * allocated to admin users. Thus regardless of load, admin users would always be * able to access the web application. - *

      + *

      * The maxRequest limit is policed by a {@link Semaphore} and the filter will wait a short while attempting to acquire * the semaphore. This wait is controlled by the "waitMs" init parameter and allows the expense of a suspend to be * avoided if the semaphore is shortly available. If the semaphore cannot be obtained, the request will be suspended * for the default suspend period of the container or the valued set as the "suspendMs" init parameter. - *

      + *

      * If the "managedAttr" init parameter is set to true, then this servlet is set as a {@link ServletContext} attribute with the * filter name as the attribute name. This allows context external mechanism (eg JMX via {@link ContextHandler#MANAGED_ATTRIBUTES}) to * manage the configuration of the filter. - *

      - * - * */ @ManagedObject("Quality of Service Filter") public class QoSFilter implements Filter { - final static int __DEFAULT_MAX_PRIORITY=10; - final static int __DEFAULT_PASSES=10; - final static int __DEFAULT_WAIT_MS=50; - final static long __DEFAULT_TIMEOUT_MS = -1; + private static final Logger LOG = Log.getLogger(QoSFilter.class); - final static String MANAGED_ATTR_INIT_PARAM="managedAttr"; - final static String MAX_REQUESTS_INIT_PARAM="maxRequests"; - final static String MAX_PRIORITY_INIT_PARAM="maxPriority"; - final static String MAX_WAIT_INIT_PARAM="waitMs"; - final static String SUSPEND_INIT_PARAM="suspendMs"; + static final int __DEFAULT_MAX_PRIORITY = 10; + static final int __DEFAULT_PASSES = 10; + static final int __DEFAULT_WAIT_MS = 50; + static final long __DEFAULT_TIMEOUT_MS = -1; - ServletContext _context; - - protected long _waitMs; - protected long _suspendMs; - protected int _maxRequests; + static final String MANAGED_ATTR_INIT_PARAM = "managedAttr"; + static final String MAX_REQUESTS_INIT_PARAM = "maxRequests"; + static final String MAX_PRIORITY_INIT_PARAM = "maxPriority"; + static final String MAX_WAIT_INIT_PARAM = "waitMs"; + static final String SUSPEND_INIT_PARAM = "suspendMs"; + private final String _suspended = "QoSFilter@" + Integer.toHexString(hashCode()) + ".SUSPENDED"; + private final String _resumed = "QoSFilter@" + Integer.toHexString(hashCode()) + ".RESUMED"; + private long _waitMs; + private long _suspendMs; + private int _maxRequests; private Semaphore _passes; - private Queue[] _queue; - private ContinuationListener[] _listener; - private String _suspended="QoSFilter@"+this.hashCode(); + private Queue[] _queues; + private AsyncListener[] _listeners; - /* ------------------------------------------------------------ */ - /** - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) - */ public void init(FilterConfig filterConfig) { - _context=filterConfig.getServletContext(); - - int max_priority=__DEFAULT_MAX_PRIORITY; - if (filterConfig.getInitParameter(MAX_PRIORITY_INIT_PARAM)!=null) - max_priority=Integer.parseInt(filterConfig.getInitParameter(MAX_PRIORITY_INIT_PARAM)); - _queue=new Queue[max_priority+1]; - _listener = new ContinuationListener[max_priority + 1]; - for (int p=0;p<_queue.length;p++) + int max_priority = __DEFAULT_MAX_PRIORITY; + if (filterConfig.getInitParameter(MAX_PRIORITY_INIT_PARAM) != null) + max_priority = Integer.parseInt(filterConfig.getInitParameter(MAX_PRIORITY_INIT_PARAM)); + _queues = new Queue[max_priority + 1]; + _listeners = new AsyncListener[_queues.length]; + for (int p = 0; p < _queues.length; ++p) { - _queue[p]=new ConcurrentLinkedQueue(); - - final int priority=p; - _listener[p] = new ContinuationListener() - { - public void onComplete(Continuation continuation) - {} - - public void onTimeout(Continuation continuation) - { - _queue[priority].remove(continuation); - } - }; + _queues[p] = new ConcurrentLinkedQueue<>(); + _listeners[p] = new QoSAsyncListener(p); } - int maxRequests=__DEFAULT_PASSES; - if (filterConfig.getInitParameter(MAX_REQUESTS_INIT_PARAM)!=null) - maxRequests=Integer.parseInt(filterConfig.getInitParameter(MAX_REQUESTS_INIT_PARAM)); - _passes=new Semaphore(maxRequests,true); + int maxRequests = __DEFAULT_PASSES; + if (filterConfig.getInitParameter(MAX_REQUESTS_INIT_PARAM) != null) + maxRequests = Integer.parseInt(filterConfig.getInitParameter(MAX_REQUESTS_INIT_PARAM)); + _passes = new Semaphore(maxRequests, true); _maxRequests = maxRequests; long wait = __DEFAULT_WAIT_MS; - if (filterConfig.getInitParameter(MAX_WAIT_INIT_PARAM)!=null) - wait=Integer.parseInt(filterConfig.getInitParameter(MAX_WAIT_INIT_PARAM)); - _waitMs=wait; + if (filterConfig.getInitParameter(MAX_WAIT_INIT_PARAM) != null) + wait = Integer.parseInt(filterConfig.getInitParameter(MAX_WAIT_INIT_PARAM)); + _waitMs = wait; long suspend = __DEFAULT_TIMEOUT_MS; - if (filterConfig.getInitParameter(SUSPEND_INIT_PARAM)!=null) - suspend=Integer.parseInt(filterConfig.getInitParameter(SUSPEND_INIT_PARAM)); - _suspendMs=suspend; + if (filterConfig.getInitParameter(SUSPEND_INIT_PARAM) != null) + suspend = Integer.parseInt(filterConfig.getInitParameter(SUSPEND_INIT_PARAM)); + _suspendMs = suspend; - if (_context!=null && Boolean.parseBoolean(filterConfig.getInitParameter(MANAGED_ATTR_INIT_PARAM))) - _context.setAttribute(filterConfig.getFilterName(),this); + ServletContext context = filterConfig.getServletContext(); + if (context != null && Boolean.parseBoolean(filterConfig.getInitParameter(MANAGED_ATTR_INIT_PARAM))) + context.setAttribute(filterConfig.getFilterName(), this); } - /* ------------------------------------------------------------ */ - /** - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) - */ - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - boolean accepted=false; + boolean accepted = false; try { - if (request.getAttribute(_suspended)==null) + Boolean suspended = (Boolean)request.getAttribute(_suspended); + if (suspended == null) { - accepted=_passes.tryAcquire(_waitMs,TimeUnit.MILLISECONDS); + accepted = _passes.tryAcquire(getWaitMs(), TimeUnit.MILLISECONDS); if (accepted) { - request.setAttribute(_suspended,Boolean.FALSE); + request.setAttribute(_suspended, Boolean.FALSE); + if (LOG.isDebugEnabled()) + LOG.debug("Accepted {}", request); } else { - request.setAttribute(_suspended,Boolean.TRUE); + request.setAttribute(_suspended, Boolean.TRUE); int priority = getPriority(request); - Continuation continuation = ContinuationSupport.getContinuation(request); - if (_suspendMs>0) - continuation.setTimeout(_suspendMs); - continuation.suspend(); - continuation.addContinuationListener(_listener[priority]); - _queue[priority].add(continuation); + AsyncContext asyncContext = request.startAsync(); + long suspendMs = getSuspendMs(); + if (suspendMs > 0) + asyncContext.setTimeout(suspendMs); + asyncContext.addListener(_listeners[priority]); + _queues[priority].add(asyncContext); + if (LOG.isDebugEnabled()) + LOG.debug("Suspended {}", request); return; } } else { - Boolean suspended=(Boolean)request.getAttribute(_suspended); - - if (suspended.booleanValue()) + if (suspended) { - request.setAttribute(_suspended,Boolean.FALSE); - if (request.getAttribute("javax.servlet.resumed")==Boolean.TRUE) + request.setAttribute(_suspended, Boolean.FALSE); + Boolean resumed = (Boolean)request.getAttribute(_resumed); + if (resumed == Boolean.TRUE) { _passes.acquire(); - accepted=true; + accepted = true; + if (LOG.isDebugEnabled()) + LOG.debug("Resumed {}", request); } else { // Timeout! try 1 more time. - accepted = _passes.tryAcquire(_waitMs,TimeUnit.MILLISECONDS); + accepted = _passes.tryAcquire(getWaitMs(), TimeUnit.MILLISECONDS); + if (LOG.isDebugEnabled()) + LOG.debug("Timeout {}", request); } } else { - // pass through resume of previously accepted request + // Pass through resume of previously accepted request. _passes.acquire(); accepted = true; + if (LOG.isDebugEnabled()) + LOG.debug("Passthrough {}", request); } } if (accepted) { - chain.doFilter(request,response); + chain.doFilter(request, response); } else { + if (LOG.isDebugEnabled()) + LOG.debug("Rejected {}", request); ((HttpServletResponse)response).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); } } - catch(InterruptedException e) + catch (InterruptedException e) { - _context.log("QoS",e); ((HttpServletResponse)response).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); } finally { if (accepted) { - for (int p=_queue.length;p-->0;) + for (int p = _queues.length - 1; p >= 0; --p) { - Continuation continutaion=_queue[p].poll(); - if (continutaion!=null && continutaion.isSuspended()) + AsyncContext asyncContext = _queues[p].poll(); + if (asyncContext != null) { - continutaion.resume(); - break; + ServletRequest candidate = asyncContext.getRequest(); + Boolean suspended = (Boolean)candidate.getAttribute(_suspended); + if (suspended == Boolean.TRUE) + { + candidate.setAttribute(_resumed, Boolean.TRUE); + asyncContext.dispatch(); + break; + } } } _passes.release(); @@ -241,40 +235,40 @@ public class QoSFilter implements Filter } /** - * Get the request Priority. - *

      The default implementation assigns the following priorities:

        - *
      • 2 - for a authenticated request - *
      • 1 - for a request with valid /non new session + * Computes the request priority. + *

        + * The default implementation assigns the following priorities: + *

          + *
        • 2 - for an authenticated request + *
        • 1 - for a request with valid / non new session *
        • 0 - for all other requests. *
        - * This method may be specialised to provide application specific priorities. + * This method may be overridden to provide application specific priorities. * - * @param request - * @return the request priority + * @param request the incoming request + * @return the computed request priority */ protected int getPriority(ServletRequest request) { HttpServletRequest baseRequest = (HttpServletRequest)request; - if (baseRequest.getUserPrincipal() != null ) + if (baseRequest.getUserPrincipal() != null) + { return 2; + } else { HttpSession session = baseRequest.getSession(false); - if (session!=null && !session.isNew()) + if (session != null && !session.isNew()) return 1; else return 0; } } + public void destroy() + { + } - /* ------------------------------------------------------------ */ - /** - * @see javax.servlet.Filter#destroy() - */ - public void destroy(){} - - /* ------------------------------------------------------------ */ /** * Get the (short) amount of time (in milliseconds) that the filter would wait * for the semaphore to become available before suspending a request. @@ -287,7 +281,6 @@ public class QoSFilter implements Filter return _waitMs; } - /* ------------------------------------------------------------ */ /** * Set the (short) amount of time (in milliseconds) that the filter would wait * for the semaphore to become available before suspending a request. @@ -299,7 +292,6 @@ public class QoSFilter implements Filter _waitMs = value; } - /* ------------------------------------------------------------ */ /** * Get the amount of time (in milliseconds) that the filter would suspend * a request for while waiting for the semaphore to become available. @@ -312,7 +304,6 @@ public class QoSFilter implements Filter return _suspendMs; } - /* ------------------------------------------------------------ */ /** * Set the amount of time (in milliseconds) that the filter would suspend * a request for while waiting for the semaphore to become available. @@ -324,7 +315,6 @@ public class QoSFilter implements Filter _suspendMs = value; } - /* ------------------------------------------------------------ */ /** * Get the maximum number of requests allowed to be processed * at the same time. @@ -337,7 +327,6 @@ public class QoSFilter implements Filter return _maxRequests; } - /* ------------------------------------------------------------ */ /** * Set the maximum number of requests allowed to be processed * at the same time. @@ -346,8 +335,42 @@ public class QoSFilter implements Filter */ public void setMaxRequests(int value) { - _passes = new Semaphore((value-_maxRequests+_passes.availablePermits()), true); + _passes = new Semaphore((value - getMaxRequests() + _passes.availablePermits()), true); _maxRequests = value; } + private class QoSAsyncListener implements AsyncListener + { + private final int priority; + + public QoSAsyncListener(int priority) + { + this.priority = priority; + } + + @Override + public void onStartAsync(AsyncEvent event) throws IOException + { + } + + @Override + public void onComplete(AsyncEvent event) throws IOException + { + } + + @Override + public void onTimeout(AsyncEvent event) throws IOException + { + // Remove before it's redispatched, so it won't be + // redispatched again at the end of the filtering. + AsyncContext asyncContext = event.getAsyncContext(); + _queues[priority].remove(asyncContext); + asyncContext.dispatch(); + } + + @Override + public void onError(AsyncEvent event) throws IOException + { + } + } } diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java index e628ed1b5cb..a17818e8d37 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java @@ -49,15 +49,15 @@ public class WelcomeFilter implements Filter public void init(FilterConfig filterConfig) { welcome=filterConfig.getInitParameter("welcome"); - if (welcome==null) - welcome="index.html"; + if (welcome==null) + welcome="index.html"; } /* ------------------------------------------------------------ */ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException + throws IOException, ServletException { String path=((HttpServletRequest)request).getServletPath(); if (welcome!=null && path.endsWith("/")) diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java index 44d34d1f055..365dd164bf5 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java @@ -262,6 +262,7 @@ public class GzipHandler extends HandlerWrapper _mimeTypes.add("application/gzip"); } } + super.doStart(); } /* ------------------------------------------------------------ */ diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java index 3151ab8e5a9..636eab2b53c 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java @@ -151,6 +151,16 @@ public class GzipHttpOutput extends HttpOutput } } + // Has the Content-Encoding header already been set? + String ce=getHttpChannel().getResponse().getHeader("Content-Encoding"); + if (ce != null) + { + LOG.debug("{} exclude by content-encoding {}",this,ce); + noCompression(); + super.write(content,complete,callback); + return; + } + // Are we the thread that commits? if (_state.compareAndSet(GZState.MIGHT_COMPRESS,GZState.COMMITTING)) { @@ -188,6 +198,7 @@ public class GzipHttpOutput extends HttpOutput gzip(content,complete,callback); } + // TODO else ? } public void noCompression() diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java index cb97090d5be..e0804d6781d 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java @@ -57,6 +57,6 @@ public class CloseableDoSFilterTest extends AbstractDoSFilterTest public void testUnresponsiveClient() throws Exception { // TODO work out why this intermittently fails - LOG.warn("Ignored Closeable testUnresponsiveClient"); + LOG.warn("Ignored Closeable testUnresponsiveClient"); } } diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/DoSFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/DoSFilterTest.java index 69353f6a9ef..66f787e9d58 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/DoSFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/DoSFilterTest.java @@ -18,12 +18,8 @@ package org.eclipse.jetty.servlets; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.List; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -34,6 +30,9 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class DoSFilterTest extends AbstractDoSFilterTest { private static final Logger LOG = Log.getLogger(DoSFilterTest.class); @@ -62,7 +61,7 @@ public class DoSFilterTest extends AbstractDoSFilterTest } @Test - public void isRateExceededTest() throws InterruptedException + public void testRateIsRateExceeded() throws InterruptedException { DoSFilter doSFilter = new DoSFilter(); diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultNoRecompressTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultNoRecompressTest.java index f6b16d24cd0..4aa434e68f7 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultNoRecompressTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultNoRecompressTest.java @@ -25,7 +25,6 @@ import java.util.List; import javax.servlet.Filter; -import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlets.gzip.GzipTester; import org.eclipse.jetty.servlets.gzip.TestStaticMimeTypeServlet; diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java index 81aa29ec97a..ce743ad6a9b 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java @@ -20,7 +20,6 @@ package org.eclipse.jetty.servlets; import java.io.IOException; import java.util.Arrays; -import java.util.Collection; import java.util.List; import javax.servlet.Filter; @@ -273,6 +272,24 @@ public class GzipFilterDefaultTest } } + @Test + public void testGzippedIfSVG() throws Exception + { + GzipTester tester = new GzipTester(testingdir, compressionType); + tester.setGzipFilterClass(testFilter); + tester.copyTestServerFile("test.svg"); + FilterHolder holder = tester.setContentServlet(org.eclipse.jetty.servlet.DefaultServlet.class); + try + { + tester.start(); + HttpTester.Response http = tester.assertIsResponseGzipCompressed("GET","test.svg",System.currentTimeMillis()-4000); + Assert.assertEquals("Accept-Encoding",http.get("Vary")); + } + finally + { + tester.stop(); + } + } @Test public void testNotGzipedIfNotModified() throws Exception @@ -371,6 +388,60 @@ public class GzipFilterDefaultTest } } + + @Test + public void testIsNotGzipCompressedByExcludedContentType() throws Exception + { + GzipTester tester = new GzipTester(testingdir, compressionType); + tester.setGzipFilterClass(testFilter); + + int filesize = tester.getOutputBufferSize() * 4; + tester.prepareServerFile("test_quotes.txt", filesize); + + + FilterHolder holder = tester.setContentServlet(org.eclipse.jetty.servlet.DefaultServlet.class); + holder.setInitParameter("excludedMimeTypes","text/plain"); + + try + { + tester.start(); + HttpTester.Response http = tester.assertIsResponseNotGzipCompressed("GET","test_quotes.txt", filesize, HttpStatus.OK_200); + Assert.assertNull(http.get("Vary")); + } + finally + { + tester.stop(); + } + } + + + @Test + public void testIsNotGzipCompressedByExcludedContentTypeWithCharset() throws Exception + { + GzipTester tester = new GzipTester(testingdir, compressionType); + tester.setGzipFilterClass(testFilter); + + int filesize = tester.getOutputBufferSize() * 4; + tester.prepareServerFile("test_quotes.txt", filesize); + tester.addMimeType("txt","text/plain;charset=UTF-8"); + + FilterHolder holder = tester.setContentServlet(org.eclipse.jetty.servlet.DefaultServlet.class); + holder.setInitParameter("excludedMimeTypes","text/plain"); + + try + { + tester.start(); + HttpTester.Response http = tester.assertIsResponseNotGzipCompressed("GET","test_quotes.txt", filesize, HttpStatus.OK_200); + Assert.assertNull(http.get("Vary")); + } + finally + { + tester.stop(); + } + } + + + @Test public void testGzipCompressedByContentTypeWithEncoding() throws Exception { @@ -553,4 +624,24 @@ public class GzipFilterDefaultTest tester.stop(); } } + + + @Test + public void testIsNotGzipCompressedSVGZ() throws Exception + { + GzipTester tester = new GzipTester(testingdir,compressionType); + tester.setGzipFilterClass(testFilter); + + FilterHolder holder = tester.setContentServlet(DefaultServlet.class); + tester.copyTestServerFile("test.svgz"); + try + { + tester.start(); + tester.assertIsResponseNotGzipFiltered("test.svgz", "test.svgz.sha1", "image/svg+xml", "gzip"); + } + finally + { + tester.stop(); + } + } } 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 a7516228b41..1ab5204c345 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 @@ -18,16 +18,12 @@ package org.eclipse.jetty.servlets; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.net.URL; import java.util.EnumSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.servlet.DispatcherType; -import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServlet; @@ -64,14 +60,14 @@ public class QoSFilterTest _tester = new ServletTester(); _tester.setContextPath("/context"); _tester.addServlet(TestServlet.class, "/test"); - TestServlet.__maxSleepers=0; - TestServlet.__sleepers=0; + TestServlet.__maxSleepers = 0; + TestServlet.__sleepers = 0; _connectors = new LocalConnector[NUM_CONNECTIONS]; - for(int i = 0; i < _connectors.length; ++i) + for (int i = 0; i < _connectors.length; ++i) _connectors[i] = _tester.createLocalConnector(); - _doneRequests = new CountDownLatch(NUM_CONNECTIONS*NUM_LOOPS); + _doneRequests = new CountDownLatch(NUM_CONNECTIONS * NUM_LOOPS); _tester.start(); } @@ -85,17 +81,17 @@ public class QoSFilterTest @Test public void testNoFilter() throws Exception { - for(int i = 0; i < NUM_CONNECTIONS; ++i ) + for (int i = 0; i < NUM_CONNECTIONS; ++i) { new Thread(new Worker(i)).start(); } - _doneRequests.await(10,TimeUnit.SECONDS); + _doneRequests.await(10, TimeUnit.SECONDS); - if (TestServlet.__maxSleepers<=MAX_QOS) + if (TestServlet.__maxSleepers <= MAX_QOS) LOG.warn("TEST WAS NOT PARALLEL ENOUGH!"); else - Assert.assertThat(TestServlet.__maxSleepers,Matchers.lessThanOrEqualTo(NUM_CONNECTIONS)); + Assert.assertThat(TestServlet.__maxSleepers, Matchers.lessThanOrEqualTo(NUM_CONNECTIONS)); } @Test @@ -103,19 +99,19 @@ public class QoSFilterTest { FilterHolder holder = new FilterHolder(QoSFilter2.class); holder.setAsyncSupported(true); - holder.setInitParameter(QoSFilter.MAX_REQUESTS_INIT_PARAM, ""+MAX_QOS); - _tester.getContext().getServletHandler().addFilterWithMapping(holder,"/*",EnumSet.of(DispatcherType.REQUEST,DispatcherType.ASYNC)); + holder.setInitParameter(QoSFilter.MAX_REQUESTS_INIT_PARAM, "" + MAX_QOS); + _tester.getContext().getServletHandler().addFilterWithMapping(holder, "/*", EnumSet.of(DispatcherType.REQUEST, DispatcherType.ASYNC)); - for(int i = 0; i < NUM_CONNECTIONS; ++i ) + for (int i = 0; i < NUM_CONNECTIONS; ++i) { new Thread(new Worker(i)).start(); } - _doneRequests.await(10,TimeUnit.SECONDS); - if (TestServlet.__maxSleepers __maxSleepers) + if (__sleepers > __maxSleepers) __maxSleepers = __sleepers; } Thread.sleep(50); - synchronized(TestServlet.class) + synchronized (TestServlet.class) { - // System.err.println(_count++); __sleepers--; - if(__sleepers > __maxSleepers) - __maxSleepers = __sleepers; } response.setContentType("text/plain"); @@ -234,7 +229,6 @@ public class QoSFilterTest } catch (InterruptedException e) { - e.printStackTrace(); response.sendError(500); } } @@ -246,7 +240,7 @@ public class QoSFilterTest public int getPriority(ServletRequest request) { String p = request.getParameter("priority"); - if (p!=null) + if (p != null) return Integer.parseInt(p); return 0; } diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java index f6bfbb8c1cb..66bf12a58b8 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java @@ -282,6 +282,27 @@ public class GzipTester * @param expectedContentType */ public void assertIsResponseNotGzipFiltered(String requestedFilename, String testResourceSha1Sum, String expectedContentType) throws Exception + { + assertIsResponseNotGzipFiltered(requestedFilename, testResourceSha1Sum, expectedContentType,null); + } + + /** + * Makes sure that the response contains an unfiltered file contents. + *

        + * This is used to test exclusions and passthroughs in the GzipFilter. + *

        + * An example is to test that it is possible to configure GzipFilter to not recompress content that shouldn't be + * compressed by the GzipFilter. + * + * @param requestedFilename + * the filename used to on the GET request,. + * @param testResourceSha1Sum + * the sha1sum file that contains the SHA1SUM checksum that will be used to verify that the response + * contents are what is intended. + * @param expectedContentType + * @param expectedContentEncoding can be non-null in some circumstances, eg when dealing with pre-gzipped .svgz files + */ + public void assertIsResponseNotGzipFiltered(String requestedFilename, String testResourceSha1Sum, String expectedContentType, String expectedContentEncoding) throws Exception { //System.err.printf("[GzipTester] requesting /context/%s%n",requestedFilename); HttpTester.Request request = HttpTester.newRequest(); @@ -304,7 +325,10 @@ public class GzipTester String prefix = requestedFilename + " / Response"; Assert.assertThat(prefix + ".status",response.getStatus(),is(HttpServletResponse.SC_OK)); Assert.assertThat(prefix + ".header[Content-Length]",response.get("Content-Length"),notNullValue()); - Assert.assertThat(prefix + ".header[Content-Encoding] (should not be recompressed by GzipFilter)",response.get("Content-Encoding"),nullValue()); + Assert.assertThat(prefix + ".header[Content-Encoding] (should not be recompressed by GzipFilter)",response.get("Content-Encoding"), + expectedContentEncoding == null? nullValue() : notNullValue()); + if (expectedContentEncoding != null) + Assert.assertThat(prefix + ".header[Content-Encoding]",response.get("Content-Encoding"),is(expectedContentEncoding)); Assert.assertThat(prefix + ".header[Content-Type] (should have a Content-Type associated with it)",response.get("Content-Type"),notNullValue()); Assert.assertThat(prefix + ".header[Content-Type]",response.get("Content-Type"),is(expectedContentType)); @@ -339,7 +363,7 @@ public class GzipTester { String name = names.nextElement(); String value = message.get(name); - //System.out.printf(" [%s] = %s%n",name,value); + //System.out.printf(" [%s] = %s%n",name,value); } } @@ -371,7 +395,6 @@ public class GzipTester String uri = "/context/"+filename; HttpTester.Response response = executeRequest(method,uri); assertResponseHeaders(expectedFilesize,status,response); - // Assert that the contents are what we expect. if (filename != null) { @@ -612,6 +635,11 @@ public class GzipTester { this.userAgent = ua; } + + public void addMimeType (String extension, String mimetype) + { + this.tester.getContext().getMimeTypes().addMimeMapping(extension, mimetype); + } public void start() throws Exception { diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletBufferTypeLengthWrite.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletBufferTypeLengthWrite.java index 032bdca31c0..16a66ddce11 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletBufferTypeLengthWrite.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletBufferTypeLengthWrite.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.HttpOutput; -import org.eclipse.jetty.servlets.GzipFilter; /** * A sample servlet to serve static content, using a order of construction that has caused problems for diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletLengthStreamTypeWrite.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletLengthStreamTypeWrite.java index 8c45a7b3462..52a1b648a38 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletLengthStreamTypeWrite.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletLengthStreamTypeWrite.java @@ -25,8 +25,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.servlets.GzipFilter; - /** * A sample servlet to serve static content, using a order of construction that has caused problems for * {@link GzipFilter} in the past. diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletLengthTypeStreamWrite.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletLengthTypeStreamWrite.java index 08caf7b3e46..5ccb44aa42f 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletLengthTypeStreamWrite.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletLengthTypeStreamWrite.java @@ -25,8 +25,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.servlets.GzipFilter; - /** * A sample servlet to serve static content, using a order of construction that has caused problems for * {@link GzipFilter} in the past. diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamLengthTypeWrite.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamLengthTypeWrite.java index fe2b0f060c2..f945d1817c1 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamLengthTypeWrite.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamLengthTypeWrite.java @@ -25,8 +25,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.servlets.GzipFilter; - /** * A sample servlet to serve static content, using a order of construction that has caused problems for * {@link GzipFilter} in the past. diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamLengthTypeWriteWithFlush.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamLengthTypeWriteWithFlush.java index f77356ab62e..91d63231f5d 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamLengthTypeWriteWithFlush.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamLengthTypeWriteWithFlush.java @@ -25,8 +25,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.servlets.GzipFilter; - /** * A sample servlet to serve static content, using a order of construction that has caused problems for * {@link GzipFilter} in the past. diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamTypeLengthWrite.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamTypeLengthWrite.java index b2c4fa3ad5e..7fdcc8355b8 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamTypeLengthWrite.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletStreamTypeLengthWrite.java @@ -25,8 +25,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.servlets.GzipFilter; - /** * A sample servlet to serve static content, using a order of construction that has caused problems for * {@link GzipFilter} in the past. diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletTypeLengthStreamWrite.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletTypeLengthStreamWrite.java index a6be524dbd7..b266e9e430b 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletTypeLengthStreamWrite.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletTypeLengthStreamWrite.java @@ -25,8 +25,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.servlets.GzipFilter; - /** * A sample servlet to serve static content, using a order of construction that has caused problems for * {@link GzipFilter} in the past. diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletTypeStreamLengthWrite.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletTypeStreamLengthWrite.java index 86a82db5167..40a33fab3ab 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletTypeStreamLengthWrite.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestServletTypeStreamLengthWrite.java @@ -25,8 +25,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.servlets.GzipFilter; - /** * A sample servlet to serve static content, using a order of construction that has caused problems for * {@link GzipFilter} in the past. diff --git a/jetty-servlets/src/test/resources/jetty-logging.properties b/jetty-servlets/src/test/resources/jetty-logging.properties index f97be99cc87..a280c758842 100644 --- a/jetty-servlets/src/test/resources/jetty-logging.properties +++ b/jetty-servlets/src/test/resources/jetty-logging.properties @@ -2,3 +2,5 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog #org.eclipse.jetty.LEVEL=DEBUG #org.eclipse.jetty.servlets.LEVEL=DEBUG #org.eclipse.jetty.servlets.GzipFilter.LEVEL=DEBUG +#org.eclipse.jetty.servlets.QoSFilter.LEVEL=DEBUG +#org.eclipse.jetty.servlets.DoSFilter.LEVEL=DEBUG diff --git a/jetty-servlets/src/test/resources/test.svg b/jetty-servlets/src/test/resources/test.svg new file mode 100644 index 00000000000..08fbae33514 --- /dev/null +++ b/jetty-servlets/src/test/resources/test.svg @@ -0,0 +1,2101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jetty-servlets/src/test/resources/test.svg.sha1 b/jetty-servlets/src/test/resources/test.svg.sha1 new file mode 100644 index 00000000000..3b170f0b098 --- /dev/null +++ b/jetty-servlets/src/test/resources/test.svg.sha1 @@ -0,0 +1 @@ +1ccb7a0b85585d0e9bdc3863ad093d4e53a9ea68 test.svg diff --git a/jetty-servlets/src/test/resources/test.svgz b/jetty-servlets/src/test/resources/test.svgz new file mode 100644 index 00000000000..c4d595ffd0a Binary files /dev/null and b/jetty-servlets/src/test/resources/test.svgz differ diff --git a/jetty-servlets/src/test/resources/test.svgz.sha1 b/jetty-servlets/src/test/resources/test.svgz.sha1 new file mode 100644 index 00000000000..e8ec3aa6650 --- /dev/null +++ b/jetty-servlets/src/test/resources/test.svgz.sha1 @@ -0,0 +1 @@ +62df7c3ac6ee6e4462b6abf9ef15b4e916ecf68f test.svgz diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java index f7d984b0574..52bc964278f 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java @@ -139,11 +139,13 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id EndPoint endPoint = getEndPoint(); // We need to gently close first, to allow // SSL close alerts to be sent by Jetty - LOG.debug("Shutting down output {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Shutting down output {}", endPoint); endPoint.shutdownOutput(); if (!onlyOutput) { - LOG.debug("Closing {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Closing {}", endPoint); endPoint.close(); } } @@ -158,7 +160,8 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id protected boolean onReadTimeout() { boolean idle = this.idle; - LOG.debug("Idle timeout on {}, idle={}", this, idle); + if (LOG.isDebugEnabled()) + LOG.debug("Idle timeout on {}, idle={}", this, idle); if (idle) goAway(session); return false; diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java index 6fb5a78cc1b..9347fc5f432 100644 --- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java +++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java @@ -218,7 +218,7 @@ public class Flusher } @Override - protected void completed() + protected void onCompleteSuccess() { // will never be called as process always returns SCHEDULED or IDLE throw new IllegalStateException(); @@ -242,7 +242,7 @@ public class Flusher } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { List failed = new ArrayList<>(); synchronized (lock) @@ -261,7 +261,6 @@ public class Flusher // Notify outside the synchronized block. for (StandardSession.FrameBytes frame : failed) frame.failed(x); - super.failed(x); } } } diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java index 469f3a87f78..8e86eb5ae9b 100644 --- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java +++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java @@ -339,11 +339,13 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable notifyIdle(idleListener, false); try { - LOG.debug("Processing {}", frame); + if (LOG.isDebugEnabled()) + LOG.debug("Processing {}", frame); if (goAwaySent.get()) { - LOG.debug("Skipped processing of {}", frame); + if (LOG.isDebugEnabled()) + LOG.debug("Skipped processing of {}", frame); return; } @@ -417,11 +419,13 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable notifyIdle(idleListener, false); try { - LOG.debug("Processing {}, {} data bytes", frame, data.remaining()); + if (LOG.isDebugEnabled()) + LOG.debug("Processing {}, {} data bytes", frame, data.remaining()); if (goAwaySent.get()) { - LOG.debug("Skipped processing of {}", frame); + if (LOG.isDebugEnabled()) + LOG.debug("Skipped processing of {}", frame); return; } @@ -430,7 +434,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable if (stream == null) { RstInfo rstInfo = new RstInfo(streamId, StreamStatus.INVALID_STREAM); - LOG.debug("Unknown stream {}", rstInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Unknown stream {}", rstInfo); rst(rstInfo, Callback.Adapter.INSTANCE); } else @@ -569,13 +574,15 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable throw duplicateIdException; } RstInfo rstInfo = new RstInfo(streamId, StreamStatus.PROTOCOL_ERROR); - LOG.debug("Duplicate stream, {}", rstInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Duplicate stream, {}", rstInfo); rst(rstInfo, Callback.Adapter.INSTANCE); // We don't care (too much) if the reset fails. return null; } else { - LOG.debug("Created {}", stream); + if (LOG.isDebugEnabled()) + LOG.debug("Created {}", stream); notifyStreamCreated(stream); return stream; } @@ -617,7 +624,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable if (streamIds.get() % 2 == stream.getId() % 2) localStreamCount.decrementAndGet(); - LOG.debug("Removed {}", stream); + if (LOG.isDebugEnabled()) + LOG.debug("Removed {}", stream); notifyStreamClosed(stream); } } @@ -652,7 +660,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable if (stream == null) { RstInfo rstInfo = new RstInfo(streamId, StreamStatus.INVALID_STREAM); - LOG.debug("Unknown stream {}", rstInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Unknown stream {}", rstInfo); rst(rstInfo, Callback.Adapter.INSTANCE); } else @@ -689,14 +698,16 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { int windowSize = windowSizeSetting.value(); setWindowSize(windowSize); - LOG.debug("Updated session window size to {}", windowSize); + if (LOG.isDebugEnabled()) + LOG.debug("Updated session window size to {}", windowSize); } Settings.Setting maxConcurrentStreamsSetting = frame.getSettings().get(Settings.ID.MAX_CONCURRENT_STREAMS); if (maxConcurrentStreamsSetting != null) { int maxConcurrentStreamsValue = maxConcurrentStreamsSetting.value(); maxConcurrentLocalStreams = maxConcurrentStreamsValue; - LOG.debug("Updated session maxConcurrentLocalStreams to {}", maxConcurrentStreamsValue); + if (LOG.isDebugEnabled()) + LOG.debug("Updated session maxConcurrentLocalStreams to {}", maxConcurrentStreamsValue); } SettingsInfo settingsInfo = new SettingsInfo(frame.getSettings(), frame.isClearPersisted()); notifyOnSettings(listener, settingsInfo); @@ -735,7 +746,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable if (stream == null) { RstInfo rstInfo = new RstInfo(streamId, StreamStatus.INVALID_STREAM); - LOG.debug("Unknown stream, {}", rstInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Unknown stream, {}", rstInfo); rst(rstInfo, Callback.Adapter.INSTANCE); } else @@ -777,7 +789,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", x, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", x, listener); listener.onFailure(this, x); } } @@ -798,7 +811,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener == null) return null; - LOG.debug("Invoking callback with {} on listener {}", pushInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", pushInfo, listener); return listener.onPush(stream, pushInfo); } catch (Exception x) @@ -819,7 +833,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener == null) return null; - LOG.debug("Invoking callback with {} on listener {}", synInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", synInfo, listener); return listener.onSyn(stream, synInfo); } catch (Exception x) @@ -840,7 +855,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", rstInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", rstInfo, listener); listener.onRst(this, rstInfo); } } @@ -861,7 +877,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", settingsInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", settingsInfo, listener); listener.onSettings(this, settingsInfo); } } @@ -882,7 +899,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", pingResultInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", pingResultInfo, listener); listener.onPing(this, pingResultInfo); } } @@ -903,7 +921,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", goAwayResultInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", goAwayResultInfo, listener); listener.onGoAway(this, goAwayResultInfo); } } @@ -936,7 +955,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable synchronized (this) { ByteBuffer buffer = generator.control(frame); - LOG.debug("Queuing {} on {}", frame, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {} on {}", frame, stream); frameBytes = new ControlFrameBytes(stream, callback, frame, buffer); if (timeout > 0) frameBytes.task = scheduler.schedule(frameBytes, timeout, unit); @@ -966,7 +986,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable @Override public void data(IStream stream, DataInfo dataInfo, long timeout, TimeUnit unit, Callback callback) { - LOG.debug("Queuing {} on {}", dataInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {} on {}", dataInfo, stream); DataFrameBytes frameBytes = new DataFrameBytes(stream, callback, dataInfo); if (timeout > 0) frameBytes.task = scheduler.schedule(frameBytes, timeout, unit); diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java index 778fe0b95d5..25389d39681 100644 --- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java +++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java @@ -141,7 +141,8 @@ public class StandardStream extends IdleTimeout implements IStream public void updateWindowSize(int delta) { int size = windowSize.addAndGet(delta); - LOG.debug("Updated window size {} -> {} for {}", size - delta, size, this); + if (LOG.isDebugEnabled()) + LOG.debug("Updated window size {} -> {} for {}", size - delta, size, this); } @Override @@ -183,7 +184,8 @@ public class StandardStream extends IdleTimeout implements IStream @Override public void updateCloseState(boolean close, boolean local) { - LOG.debug("{} close={} local={}", this, close, local); + if (LOG.isDebugEnabled()) + LOG.debug("{} close={} local={}", this, close, local); if (close) { switch (closeState) @@ -265,13 +267,15 @@ public class StandardStream extends IdleTimeout implements IStream // ignore data frame if this stream is remotelyClosed already if (isRemotelyClosed()) { - LOG.debug("Stream is remotely closed, ignoring {}", dataInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Stream is remotely closed, ignoring {}", dataInfo); return; } if (!canReceive()) { - LOG.debug("Protocol error receiving {}, resetting", dataInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Protocol error receiving {}, resetting", dataInfo); session.rst(new RstInfo(getId(), StreamStatus.PROTOCOL_ERROR), Callback.Adapter.INSTANCE); return; } @@ -301,7 +305,8 @@ public class StandardStream extends IdleTimeout implements IStream { if (listener != null) { - LOG.debug("Invoking reply callback with {} on listener {}", replyInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking reply callback with {} on listener {}", replyInfo, listener); listener.onReply(this, replyInfo); } } @@ -323,7 +328,8 @@ public class StandardStream extends IdleTimeout implements IStream { if (listener != null) { - LOG.debug("Invoking headers callback with {} on listener {}", headersInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking headers callback with {} on listener {}", headersInfo, listener); listener.onHeaders(this, headersInfo); } } @@ -345,9 +351,11 @@ public class StandardStream extends IdleTimeout implements IStream { if (listener != null) { - LOG.debug("Invoking data callback with {} on listener {}", dataInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking data callback with {} on listener {}", dataInfo, listener); listener.onData(this, dataInfo); - LOG.debug("Invoked data callback with {} on listener {}", dataInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoked data callback with {} on listener {}", dataInfo, listener); } } catch (Exception x) diff --git a/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java b/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java index 37105897357..295a49bf6a2 100644 --- a/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java +++ b/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java @@ -576,7 +576,8 @@ public class StandardSessionTest StandardSession.FrameBytes frameBytes = (StandardSession.FrameBytes)callback; int streamId = frameBytes.getStream().getId(); - LOG.debug("last: {}, current: {}", lastStreamId, streamId); + if (LOG.isDebugEnabled()) + LOG.debug("last: {}, current: {}", lastStreamId, streamId); if (lastStreamId < streamId) lastStreamId = streamId; else diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml index 907da39c54f..626d1a6fab4 100644 --- a/jetty-spdy/spdy-example-webapp/pom.xml +++ b/jetty-spdy/spdy-example-webapp/pom.xml @@ -24,6 +24,13 @@ ${basedir}/src/main/config/example-jetty-spdy.xml / + + run + run-war + deploy + start + stop + @@ -53,6 +60,13 @@ ${basedir}/src/main/config/example-jetty-spdy-proxy.xml / + + run + run-war + deploy + start + stop + diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod new file mode 100644 index 00000000000..639c70e3ffd --- /dev/null +++ b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar + +[exec] +-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod new file mode 100644 index 00000000000..639c70e3ffd --- /dev/null +++ b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar + +[exec] +-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java index cffdba25e9a..e94ab73d389 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java @@ -94,7 +94,8 @@ public class HTTPSPDYServerConnectionFactory extends SPDYServerConnectionFactory // can arrive on the same connection, so we need to create an // HttpChannel for each SYN in order to run concurrently. - LOG.debug("Received {} on {}", synInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Received {} on {}", synInfo, stream); Fields headers = synInfo.getHeaders(); // According to SPDY/3 spec section 3.2.1 user-agents MUST support gzip compression. Firefox omits the @@ -136,7 +137,8 @@ public class HTTPSPDYServerConnectionFactory extends SPDYServerConnectionFactory @Override public void onHeaders(Stream stream, HeadersInfo headersInfo) { - LOG.debug("Received {} on {}", headersInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Received {} on {}", headersInfo, stream); HttpChannelOverSPDY channel = (HttpChannelOverSPDY)stream.getAttribute(CHANNEL_ATTRIBUTE); channel.requestHeaders(headersInfo.getHeaders(), headersInfo.isClose()); } @@ -150,7 +152,8 @@ public class HTTPSPDYServerConnectionFactory extends SPDYServerConnectionFactory @Override public void onData(Stream stream, final DataInfo dataInfo) { - LOG.debug("Received {} on {}", dataInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Received {} on {}", dataInfo, stream); HttpChannelOverSPDY channel = (HttpChannelOverSPDY)stream.getAttribute(CHANNEL_ATTRIBUTE); channel.requestContent(dataInfo, dataInfo.isClose()); } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java index d032aa1c9e3..3a19386a3d9 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java @@ -67,7 +67,8 @@ public class HttpChannelOverSPDY extends HttpChannel redispatch=true; else { - LOG.debug("Dispatch {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Dispatch {}", this); dispatched=true; execute(this); } @@ -83,12 +84,14 @@ public class HttpChannelOverSPDY extends HttpChannel { try { - LOG.debug("Executing {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Executing {}",this); super.run(); } finally { - LOG.debug("Completing {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Completing {}", this); synchronized (this) { dispatched = redispatch; @@ -130,7 +133,8 @@ public class HttpChannelOverSPDY extends HttpChannel if (!headersComplete && headerComplete()) dispatch=true; - LOG.debug("HTTP > {} bytes of content", dataInfo.length()); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP > {} bytes of content", dataInfo.length()); // We need to copy the dataInfo since we do not know when its bytes // will be consumed. When the copy is consumed, we consume also the @@ -145,7 +149,8 @@ public class HttpChannelOverSPDY extends HttpChannel dataInfo.consume(delta); } }; - LOG.debug("Queuing last={} content {}", endRequest, copyDataInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing last={} content {}", endRequest, copyDataInfo); if (content(copyDataInfo)) dispatch=true; @@ -184,7 +189,8 @@ public class HttpChannelOverSPDY extends HttpChannel // that we have to deal with ByteBuffer uri = BufferUtil.toBuffer(uriHeader.getValue()); - LOG.debug("HTTP > {} {} {}", httpMethod, uriHeader.getValue(), httpVersion); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP > {} {} {}", httpMethod, uriHeader.getValue(), httpVersion); startRequest(httpMethod, httpMethod.asString(), uri, httpVersion); Fields.Field schemeHeader = headers.get(HTTPSPDYHeader.SCHEME.name(version)); @@ -223,7 +229,8 @@ public class HttpChannelOverSPDY extends HttpChannel { // Spec says headers must be single valued String value = header.getValue(); - LOG.debug("HTTP > {}: {}", name, value); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP > {}: {}", name, value); parsedHeader(new HttpField(name,value)); break; } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java index 63ff7a40ffc..520ad181cdd 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java @@ -130,7 +130,8 @@ public class HttpTransportOverSPDY implements HttpTransport StreamException exception = new StreamException(stream.getId(), StreamStatus.PROTOCOL_ERROR, "Stream already committed!"); callback.failed(exception); - LOG.debug("Committed response twice.", exception); + if (LOG.isDebugEnabled()) + LOG.debug("Committed response twice.", exception); return; } sendReply(info, !hasContent ? callback : new Callback.Adapter() @@ -147,7 +148,8 @@ public class HttpTransportOverSPDY implements HttpTransport if (hasContent) { // send the data and let it call the callback - LOG.debug("Send content: {} on stream: {} lastContent={}", BufferUtil.toDetailString(content), stream, + if (LOG.isDebugEnabled()) + LOG.debug("Send content: {} on stream: {} lastContent={}", BufferUtil.toDetailString(content), stream, lastContent); stream.data(new ByteBufferDataInfo(endPoint.getIdleTimeout(), TimeUnit.MILLISECONDS, content, lastContent ), callback); @@ -156,7 +158,8 @@ public class HttpTransportOverSPDY implements HttpTransport else if (lastContent && info == null) { // send empty data to close and let the send call the callback - LOG.debug("No content and lastContent=true. Sending empty ByteBuffer to close stream: {}", stream); + if (LOG.isDebugEnabled()) + LOG.debug("No content and lastContent=true. Sending empty ByteBuffer to close stream: {}", stream); stream.data(new ByteBufferDataInfo(endPoint.getIdleTimeout(), TimeUnit.MILLISECONDS, BufferUtil.EMPTY_BUFFER, lastContent), callback); } @@ -180,7 +183,8 @@ public class HttpTransportOverSPDY implements HttpTransport if (reason != null) httpStatus.append(" ").append(reason); headers.put(HTTPSPDYHeader.STATUS.name(version), httpStatus.toString()); - LOG.debug("HTTP < {} {}", httpVersion, httpStatus); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP < {} {}", httpVersion, httpStatus); // TODO merge the two Field classes into one HttpFields fields = info.getHttpFields(); @@ -192,7 +196,8 @@ public class HttpTransportOverSPDY implements HttpTransport String name = field.getName(); String value = field.getValue(); headers.add(name, value); - LOG.debug("HTTP < {}: {}", name, value); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP < {}: {}", name, value); } } @@ -202,14 +207,16 @@ public class HttpTransportOverSPDY implements HttpTransport headers.add(HttpHeader.X_POWERED_BY.asString(), HttpConfiguration.SERVER_VERSION); ReplyInfo reply = new ReplyInfo(headers, close); - LOG.debug("Sending reply: {} on stream: {}", reply, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Sending reply: {} on stream: {}", reply, stream); reply(stream, reply, callback); } @Override public void completed() { - LOG.debug("Completed {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Completed {}", this); } private void reply(Stream stream, ReplyInfo replyInfo, Callback callback) @@ -249,7 +256,8 @@ public class HttpTransportOverSPDY implements HttpTransport public void completed() { Stream stream = getStream(); - LOG.debug("Resource pushed for {} on {}", + if (LOG.isDebugEnabled()) + LOG.debug("Resource pushed for {} on {}", getRequestHeaders().get(HTTPSPDYHeader.URI.name(version)), stream); coordinator.complete(); } @@ -268,7 +276,8 @@ public class HttpTransportOverSPDY implements HttpTransport private void coordinate() { - LOG.debug("Pushing resources: {}", resources); + if (LOG.isDebugEnabled()) + LOG.debug("Pushing resources: {}", resources); // Must send all push frames to the client at once before we // return from this method and send the main resource data for (String pushResource : resources) @@ -277,13 +286,15 @@ public class HttpTransportOverSPDY implements HttpTransport private void sendNextResourceData() { - LOG.debug("{} sendNextResourceData active: {}", hashCode(), active.get()); + if (LOG.isDebugEnabled()) + LOG.debug("{} sendNextResourceData active: {}", hashCode(), active.get()); if (active.compareAndSet(false, true)) { PushResource resource = queue.poll(); if (resource != null) { - LOG.debug("Opening new push channel for: {}", resource); + if (LOG.isDebugEnabled()) + LOG.debug("Opening new push channel for: {}", resource); HttpChannelOverSPDY pushChannel = newHttpChannelOverSPDY(resource.getPushStream(), resource.getPushRequestHeaders()); pushChannel.requestStart(resource.getPushRequestHeaders(), true); return; @@ -322,7 +333,8 @@ public class HttpTransportOverSPDY implements HttpTransport @Override public void succeeded(Stream pushStream) { - LOG.debug("Headers pushed for {} on {}", pushHeaders.get(HTTPSPDYHeader.URI.name(version)), pushStream); + if (LOG.isDebugEnabled()) + LOG.debug("Headers pushed for {} on {}", pushHeaders.get(HTTPSPDYHeader.URI.name(version)), pushStream); queue.offer(new PushResource(pushStream, pushRequestHeaders)); sendNextResourceData(); } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java index 9e60819ac9b..3a4652f8c1b 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java @@ -167,7 +167,8 @@ public class ReferrerPushStrategy implements PushStrategy String origin = scheme + "://" + host; String url = requestHeaders.get(HTTPSPDYHeader.URI.name(version)).getValue(); String absoluteURL = origin + url; - LOG.debug("Applying push strategy for {}", absoluteURL); + if (LOG.isDebugEnabled()) + LOG.debug("Applying push strategy for {}", absoluteURL); if (isMainResource(url, responseHeaders)) { MainResource mainResource = getOrCreateMainResource(absoluteURL); @@ -190,7 +191,8 @@ public class ReferrerPushStrategy implements PushStrategy result = getPushResources(absoluteURL); } } - LOG.debug("Pushing {} resources for {}: {}", result.size(), absoluteURL, result); + if (LOG.isDebugEnabled()) + LOG.debug("Pushing {} resources for {}: {}", result.size(), absoluteURL, result); } return result; } @@ -208,7 +210,8 @@ public class ReferrerPushStrategy implements PushStrategy MainResource mainResource = mainResources.get(absoluteURL); if (mainResource == null) { - LOG.debug("Creating new main resource for {}", absoluteURL); + if (LOG.isDebugEnabled()) + LOG.debug("Creating new main resource for {}", absoluteURL); MainResource value = new MainResource(absoluteURL); mainResource = mainResources.putIfAbsent(absoluteURL, value); if (mainResource == null) @@ -283,7 +286,8 @@ public class ReferrerPushStrategy implements PushStrategy long delay = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - firstResourceAdded.get()); if (!referrer.startsWith(origin) && !isPushOriginAllowed(origin)) { - LOG.debug("Skipped store of push metadata {} for {}: Origin: {} doesn't match or origin not allowed", + if (LOG.isDebugEnabled()) + LOG.debug("Skipped store of push metadata {} for {}: Origin: {} doesn't match or origin not allowed", url, name, origin); return false; } @@ -293,18 +297,21 @@ public class ReferrerPushStrategy implements PushStrategy // although in rare cases few more resources will be stored if (resources.size() >= maxAssociatedResources) { - LOG.debug("Skipped store of push metadata {} for {}: max associated resources ({}) reached", + if (LOG.isDebugEnabled()) + LOG.debug("Skipped store of push metadata {} for {}: max associated resources ({}) reached", url, name, maxAssociatedResources); return false; } if (delay > referrerPushPeriod) { - LOG.debug("Delay: {}ms longer than referrerPushPeriod ({}ms). Not adding resource: {} for: {}", delay, - referrerPushPeriod, url, name); + if (LOG.isDebugEnabled()) + LOG.debug("Delay: {}ms longer than referrerPushPeriod ({}ms). Not adding resource: {} for: {}", + delay, referrerPushPeriod, url, name); return false; } - LOG.debug("Adding: {} to: {} with delay: {}ms.", url, this, delay); + if (LOG.isDebugEnabled()) + LOG.debug("Adding: {} to: {} with delay: {}ms.", url, this, delay); resources.add(url); return true; } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java index cd656bb31d8..8d500a366ed 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java @@ -88,7 +88,8 @@ public class HTTPProxyEngine extends ProxyEngine String host = proxyServerInfo.getHost(); int port = proxyServerInfo.getAddress().getPort(); - LOG.debug("Sending HTTP request to: {}", host + ":" + port); + if (LOG.isDebugEnabled()) + LOG.debug("Sending HTTP request to: {}", host + ":" + port); final Request request = httpClient.newRequest(host, port) .path(path) .method(HttpMethod.fromString(method)); @@ -119,7 +120,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void onData(Stream clientStream, final DataInfo clientDataInfo) { - LOG.debug("received clientDataInfo: {} for stream: {}", clientDataInfo, clientStream); + if (LOG.isDebugEnabled()) + LOG.debug("received clientDataInfo: {} for stream: {}", clientDataInfo, clientStream); DeferredContentProvider contentProvider = (DeferredContentProvider)request.getContent(); contentProvider.offer(clientDataInfo.asByteBuffer(true)); @@ -139,7 +141,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void onHeaders(final Response response) { - LOG.debug("onHeaders called with response: {}. Sending replyInfo to client.", response); + if (LOG.isDebugEnabled()) + LOG.debug("onHeaders called with response: {}. Sending replyInfo to client.", response); Fields responseHeaders = createResponseHeaders(clientStream, response); removeHopHeaders(responseHeaders); ReplyInfo replyInfo = new ReplyInfo(responseHeaders, false); @@ -163,7 +166,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void onContent(final Response response, ByteBuffer content) { - LOG.debug("onContent called with response: {} and content: {}. Sending response content to client.", + if (LOG.isDebugEnabled()) + LOG.debug("onContent called with response: {} and content: {}. Sending response content to client.", response, content); final ByteBuffer contentCopy = httpClient.getByteBufferPool().acquire(content.remaining(), true); BufferUtil.flipPutFlip(content, contentCopy); @@ -194,7 +198,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void onSuccess(Response response) { - LOG.debug("onSuccess called. Closing client stream."); + if (LOG.isDebugEnabled()) + LOG.debug("onSuccess called. Closing client stream."); clientStream.data(new ByteBufferDataInfo(BufferUtil.EMPTY_BUFFER, true), LOGGING_CALLBACK); } @@ -264,7 +269,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void succeeded() { - LOG.debug("succeeded"); + if (LOG.isDebugEnabled()) + LOG.debug("succeeded"); } } } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java index 18b8c5db285..3c41023ee1d 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java @@ -57,7 +57,8 @@ public class ProxyEngineSelector extends ServerSessionFrameListener.Adapter @Override public final StreamFrameListener onSyn(final Stream clientStream, SynInfo clientSynInfo) { - LOG.debug("C -> P {} on {}", clientSynInfo, clientStream); + if (LOG.isDebugEnabled()) + LOG.debug("C -> P {} on {}", clientSynInfo, clientStream); final Session clientSession = clientStream.getSession(); short clientVersion = clientSession.getVersion(); @@ -66,7 +67,8 @@ public class ProxyEngineSelector extends ServerSessionFrameListener.Adapter Fields.Field hostHeader = headers.get(HTTPSPDYHeader.HOST.name(clientVersion)); if (hostHeader == null) { - LOG.debug("No host header found: " + headers); + if (LOG.isDebugEnabled()) + LOG.debug("No host header found: " + headers); rst(clientStream); return null; } @@ -79,7 +81,8 @@ public class ProxyEngineSelector extends ServerSessionFrameListener.Adapter ProxyServerInfo proxyServerInfo = getProxyServerInfo(host); if (proxyServerInfo == null) { - LOG.debug("No matching ProxyServerInfo found for: " + host); + if (LOG.isDebugEnabled()) + LOG.debug("No matching ProxyServerInfo found for: " + host); rst(clientStream); return null; } @@ -88,11 +91,13 @@ public class ProxyEngineSelector extends ServerSessionFrameListener.Adapter ProxyEngine proxyEngine = proxyEngines.get(protocol); if (proxyEngine == null) { - LOG.debug("No matching ProxyEngine found for: " + protocol); + if (LOG.isDebugEnabled()) + LOG.debug("No matching ProxyEngine found for: " + protocol); rst(clientStream); return null; } - LOG.debug("Forwarding request: {} -> {}", clientSynInfo, proxyServerInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Forwarding request: {} -> {}", clientSynInfo, proxyServerInfo); return proxyEngine.proxy(clientStream, clientSynInfo, proxyServerInfo); } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java index 5316575bb5c..8042d584226 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java @@ -154,7 +154,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void onData(Stream clientStream, final DataInfo clientDataInfo) { - LOG.debug("C -> P {} on {}", clientDataInfo, clientStream); + if (LOG.isDebugEnabled()) + LOG.debug("C -> P {} on {}", clientDataInfo, clientStream); ByteBufferDataInfo serverDataInfo = new ByteBufferDataInfo(clientDataInfo.asByteBuffer(false), clientDataInfo.isClose()) { @@ -185,7 +186,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener { SPDYClient client = factory.newSPDYClient(version); session = client.connect(address, sessionListener); - LOG.debug("Proxy session connected to {}", address); + if (LOG.isDebugEnabled()) + LOG.debug("Proxy session connected to {}", address); Session existing = serverSessions.putIfAbsent(host, session); if (existing != null) { @@ -237,7 +239,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public StreamFrameListener onPush(Stream stream, PushInfo pushInfo) { - LOG.debug("S -> P pushed {} on {}. Opening new PushStream P -> C now.", pushInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P pushed {} on {}. Opening new PushStream P -> C now.", pushInfo, stream); PushStreamPromise newPushStreamPromise = new PushStreamPromise(stream, pushInfo); this.pushStreamPromise.push(newPushStreamPromise); return new ProxyPushStreamFrameListener(newPushStreamPromise); @@ -259,7 +262,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void onData(Stream serverStream, final DataInfo serverDataInfo) { - LOG.debug("S -> P pushed {} on {}", serverDataInfo, serverStream); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P pushed {} on {}", serverDataInfo, serverStream); ByteBufferDataInfo clientDataInfo = new ByteBufferDataInfo(serverDataInfo.asByteBuffer(false), serverDataInfo.isClose()) { @@ -293,7 +297,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public StreamFrameListener onPush(Stream senderStream, PushInfo pushInfo) { - LOG.debug("S -> P {} on {}"); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P {} on {}"); PushInfo newPushInfo = convertPushInfo(pushInfo, senderStream, receiverStream); PushStreamPromise pushStreamPromise = new PushStreamPromise(senderStream, newPushInfo); receiverStream.push(newPushInfo, pushStreamPromise); @@ -303,7 +308,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void onReply(final Stream stream, ReplyInfo replyInfo) { - LOG.debug("S -> P {} on {}", replyInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P {} on {}", replyInfo, stream); final ReplyInfo clientReplyInfo = new ReplyInfo(convertHeaders(stream, receiverStream, replyInfo.getHeaders()), replyInfo.isClose()); reply(stream, clientReplyInfo); @@ -316,7 +322,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void succeeded() { - LOG.debug("P -> C {} from {} to {}", clientReplyInfo, stream, receiverStream); + if (LOG.isDebugEnabled()) + LOG.debug("P -> C {} from {} to {}", clientReplyInfo, stream, receiverStream); } @Override @@ -338,7 +345,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void onData(final Stream stream, final DataInfo dataInfo) { - LOG.debug("S -> P {} on {}", dataInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P {} on {}", dataInfo, stream); data(stream, dataInfo); } @@ -359,7 +367,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void succeeded() { - LOG.debug("P -> C {} from {} to {}", clientDataInfo, stream, receiverStream); + if (LOG.isDebugEnabled()) + LOG.debug("P -> C {} from {} to {}", clientDataInfo, stream, receiverStream); } @Override @@ -396,7 +405,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void succeeded(Stream stream) { - LOG.debug("P -> S {} from {} to {}", info, senderStream, stream); + if (LOG.isDebugEnabled()) + LOG.debug("P -> S {} from {} to {}", info, senderStream, stream); stream.setAttribute(CLIENT_STREAM_ATTRIBUTE, senderStream); @@ -409,18 +419,21 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener { if (dataInfoCallback.flushing) { - LOG.debug("SYN completed, flushing {}, queue size {}", dataInfoCallback.dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("SYN completed, flushing {}, queue size {}", dataInfoCallback.dataInfo, queue.size()); dataInfoCallback = null; } else { dataInfoCallback.flushing = true; - LOG.debug("SYN completed, queue size {}", queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("SYN completed, queue size {}", queue.size()); } } else { - LOG.debug("SYN completed, queue empty"); + if (LOG.isDebugEnabled()) + LOG.debug("SYN completed, queue empty"); } } if (dataInfoCallback != null) @@ -448,18 +461,21 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener dataInfoCallbackToFlush = queue.peek(); if (dataInfoCallbackToFlush.flushing) { - LOG.debug("Queued {}, flushing {}, queue size {}", dataInfo, dataInfoCallbackToFlush.dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("Queued {}, flushing {}, queue size {}", dataInfo, dataInfoCallbackToFlush.dataInfo, queue.size()); receiverStream = null; } else { dataInfoCallbackToFlush.flushing = true; - LOG.debug("Queued {}, queue size {}", dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("Queued {}, queue size {}", dataInfo, queue.size()); } } else { - LOG.debug("Queued {}, SYN incomplete, queue size {}", dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("Queued {}, SYN incomplete, queue size {}", dataInfo, queue.size()); } } if (receiverStream != null) @@ -468,7 +484,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener private void flush(Stream receiverStream, DataInfoCallback dataInfoCallback) { - LOG.debug("P -> S {} on {}", dataInfoCallback.dataInfo, receiverStream); + if (LOG.isDebugEnabled()) + LOG.debug("P -> S {} on {}", dataInfoCallback.dataInfo, receiverStream); receiverStream.data(dataInfoCallback.dataInfo, dataInfoCallback); //TODO: timeout??? } @@ -498,11 +515,13 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener { assert !dataInfoCallback.flushing; dataInfoCallback.flushing = true; - LOG.debug("Completed {}, queue size {}", dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("Completed {}, queue size {}", dataInfo, queue.size()); } else { - LOG.debug("Completed {}, queue empty", dataInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Completed {}, queue empty", dataInfo); } } if (dataInfoCallback != null) @@ -550,7 +569,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener { super.succeeded(receiverStream); - LOG.debug("P -> C PushStreamPromise.succeeded() called with pushStreamPromise: {}", pushStreamPromise); + if (LOG.isDebugEnabled()) + LOG.debug("P -> C PushStreamPromise.succeeded() called with pushStreamPromise: {}", pushStreamPromise); PushStreamPromise promise = pushStreamPromise; if (promise != null) diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java index b0bbf73a705..43c028a0980 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java @@ -18,16 +18,6 @@ package org.eclipse.jetty.spdy.server.http; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -40,15 +30,15 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; - +import javax.servlet.AsyncContext; +import javax.servlet.AsyncEvent; +import javax.servlet.AsyncListener; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.continuation.Continuation; -import org.eclipse.jetty.continuation.ContinuationSupport; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.Request; @@ -63,15 +53,23 @@ import org.eclipse.jetty.spdy.api.StringDataInfo; import org.eclipse.jetty.spdy.api.SynInfo; import org.eclipse.jetty.spdy.http.HTTPSPDYHeader; import org.eclipse.jetty.util.Fields; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.StdErrLog; import org.junit.Assert; import org.junit.Test; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.core.IsInstanceOf.instanceOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest { - private static final Logger LOG = Log.getLogger(ServerHTTPSPDYTest.class); + public static final String SUSPENDED_ATTRIBUTE = ServerHTTPSPDYTest.class.getName() + ".SUSPENDED"; public ServerHTTPSPDYTest(short version) { @@ -1160,10 +1158,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - - final Continuation continuation = ContinuationSupport.getContinuation(request); - continuation.suspend(); - + final AsyncContext asyncContext = request.startAsync(); new Thread() { @Override @@ -1172,7 +1167,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest try { readRequestData(request, data.length); - continuation.complete(); + asyncContext.complete(); latch.countDown(); } catch (IOException x) @@ -1213,17 +1208,17 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - final Continuation continuation = ContinuationSupport.getContinuation(request); - if (continuation.isInitial()) - { - continuation.setTimeout(1000); - continuation.suspend(); - } - else + if (request.getAttribute(SUSPENDED_ATTRIBUTE) == Boolean.TRUE) { dispatchedAgainAfterExpire.countDown(); } - + else + { + AsyncContext asyncContext = request.startAsync(); + asyncContext.setTimeout(1000); + asyncContext.addListener(new AsyncListenerAdapter()); + request.setAttribute(SUSPENDED_ATTRIBUTE, Boolean.TRUE); + } } }, 30000), null); @@ -1257,18 +1252,18 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - final Continuation continuation = ContinuationSupport.getContinuation(request); - if (continuation.isInitial()) - { - readRequestData(request, data.length); - continuation.setTimeout(1000); - continuation.suspend(); - } - else + if (request.getAttribute(SUSPENDED_ATTRIBUTE) == Boolean.TRUE) { dispatchedAgainAfterExpire.countDown(); } - + else + { + readRequestData(request, data.length); + AsyncContext asyncContext = request.startAsync(); + asyncContext.setTimeout(1000); + asyncContext.addListener(new AsyncListenerAdapter()); + request.setAttribute(SUSPENDED_ATTRIBUTE, Boolean.TRUE); + } } }, 30000), null); @@ -1312,10 +1307,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - - final Continuation continuation = ContinuationSupport.getContinuation(request); - continuation.suspend(); - + final AsyncContext asyncContext = request.startAsync(); new Thread() { @Override @@ -1328,7 +1320,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest int read = 0; while (read < 2 * data.length) read += input.read(buffer); - continuation.complete(); + asyncContext.complete(); latch.countDown(); } catch (IOException x) @@ -1371,17 +1363,20 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - - final Continuation continuation = ContinuationSupport.getContinuation(request); - - if (continuation.isInitial()) + if (request.getAttribute(SUSPENDED_ATTRIBUTE) == Boolean.TRUE) { + OutputStream output = httpResponse.getOutputStream(); + output.write(data); + } + else + { + final AsyncContext asyncContext = request.startAsync(); + request.setAttribute(SUSPENDED_ATTRIBUTE, Boolean.TRUE); InputStream input = request.getInputStream(); byte[] buffer = new byte[256]; int read = 0; while (read < data.length) read += input.read(buffer); - continuation.suspend(); new Thread() { @Override @@ -1390,7 +1385,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest try { TimeUnit.SECONDS.sleep(1); - continuation.resume(); + asyncContext.dispatch(); latch.countDown(); } catch (InterruptedException x) @@ -1400,11 +1395,6 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest } }.start(); } - else - { - OutputStream output = httpResponse.getOutputStream(); - output.write(data); - } } }, 30000), null); @@ -1532,7 +1522,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest }, idleTimeout), null); Fields headers = SPDYTestUtils.createHeaders("localhost", connector.getPort(), version, "GET", "/"); - Stream stream = session.syn(new SynInfo(5, TimeUnit.SECONDS, headers, true, (byte)0), + session.syn(new SynInfo(5, TimeUnit.SECONDS, headers, true, (byte)0), new StreamFrameListener.Adapter() { @Override @@ -1609,4 +1599,27 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest }); } + private class AsyncListenerAdapter implements AsyncListener + { + @Override + public void onStartAsync(AsyncEvent event) throws IOException + { + } + + @Override + public void onComplete(AsyncEvent event) throws IOException + { + } + + @Override + public void onTimeout(AsyncEvent event) throws IOException + { + event.getAsyncContext().dispatch(); + } + + @Override + public void onError(AsyncEvent event) throws IOException + { + } + } } diff --git a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NPNServerConnection.java b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NPNServerConnection.java index 1a9e291e0a6..58de4d3e2c7 100644 --- a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NPNServerConnection.java +++ b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NPNServerConnection.java @@ -53,7 +53,8 @@ public class NPNServerConnection extends NegotiatingServerConnection implements @Override public void protocolSelected(String protocol) { - LOG.debug("{} protocol selected {}", this, protocol); + if (LOG.isDebugEnabled()) + LOG.debug("{} protocol selected {}", this, protocol); setProtocol(protocol != null ? protocol : getDefaultProtocol()); NextProtoNego.remove(getSSLEngine()); } diff --git a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SPDYClientFactoryTest.java b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SPDYClientFactoryTest.java index bba6166b181..844737026b0 100644 --- a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SPDYClientFactoryTest.java +++ b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SPDYClientFactoryTest.java @@ -61,10 +61,15 @@ public class SPDYClientFactoryTest extends AbstractTest session.goAway(new GoAwayInfo(5, TimeUnit.SECONDS)); - // Sleep a while to allow the factory to remove the session - // since it is done asynchronously by the selector thread - TimeUnit.SECONDS.sleep(1); + for (int i=0;i<10;i++) + { + // Sleep a while to allow the factory to remove the session + // since it is done asynchronously by the selector thread + TimeUnit.SECONDS.sleep(1); + if (clientFactory.getSessions().isEmpty()) + return; + } - Assert.assertTrue(clientFactory.getSessions().isEmpty()); + Assert.fail(clientFactory.getSessions().toString()); } } diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 407b78bd5d6..637f50523dd 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -9,7 +9,7 @@ Example :: Jetty Spring - 3.1.3.RELEASE + 3.2.8.RELEASE target/dependencies diff --git a/jetty-spring/src/main/config/modules/spring.mod b/jetty-spring/src/main/config/modules/spring.mod new file mode 100644 index 00000000000..444afb2f93a --- /dev/null +++ b/jetty-spring/src/main/config/modules/spring.mod @@ -0,0 +1,16 @@ +# +# Spring +# +[name] +spring + +[depend] +server + +[lib] +lib/spring/*.jar + +[ini-template] +## See http://www.eclipse.org/jetty/documentation/current/frameworks.html#framework-jetty-spring +## for information on how to complete spring configuration + diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java index 8859cff7d2e..965333b9d65 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java @@ -136,6 +136,7 @@ public class Main } private BaseHome baseHome; + private StartArgs startupArgs; public Main() throws IOException { @@ -389,10 +390,10 @@ public class Main } boolean transitive = module.isEnabled() && (module.getSources().size() == 0); - boolean has_ini_lines = module.getInitialise().size() > 0; + boolean hasDefinedDefaults = module.getDefaultConfig().size() > 0; // If it is not enabled or is transitive with ini template lines or toplevel and doesn't exist - if (!module.isEnabled() || (transitive && has_ini_lines) || (topLevel && !FS.exists(startd_ini) && !appendStartIni)) + if (!module.isEnabled() || (transitive && hasDefinedDefaults) || (topLevel && !FS.exists(startd_ini) && !appendStartIni)) { // File BufferedWriter BufferedWriter writer = null; @@ -430,7 +431,7 @@ public class Main out.println("--module=" + name); args.parse("--module=" + name,source); modules.enable(name,Collections.singletonList(source)); - for (String line : module.getInitialise()) + for (String line : module.getDefaultConfig()) { out.println(line); args.parse(line,source); @@ -490,10 +491,9 @@ public class Main // Process dependencies module.expandProperties(args.getProperties()); - modules.registerParentsIfMissing(baseHome,args,module); + modules.registerParentsIfMissing(module); modules.buildGraph(); - // process new ini modules if (topLevel) { @@ -573,9 +573,9 @@ public class Main // ------------------------------------------------------------ // 3) Module Registration - Modules modules = new Modules(); + Modules modules = new Modules(baseHome,args); StartLog.debug("Registering all modules"); - modules.registerAll(baseHome, args); + modules.registerAll(); // ------------------------------------------------------------ // 4) Active Module Resolution @@ -584,7 +584,7 @@ public class Main List msources = args.getSources(enabledModule); modules.enable(enabledModule,msources); } - + StartLog.debug("Building Module Graph"); modules.buildGraph(); @@ -600,6 +600,7 @@ public class Main // 6) Resolve Extra XMLs args.resolveExtraXmls(baseHome); + // ------------------------------------------------------------ // 9) Resolve Property Files args.resolvePropertyFiles(baseHome); @@ -658,19 +659,7 @@ public class Main if (args.isStopCommand()) { - int stopPort = Integer.parseInt(args.getProperties().getString("STOP.PORT")); - String stopKey = args.getProperties().getString("STOP.KEY"); - - if (args.getProperties().getString("STOP.WAIT") != null) - { - int stopWait = Integer.parseInt(args.getProperties().getString("STOP.PORT")); - - stop(stopPort,stopKey,stopWait); - } - else - { - stop(stopPort,stopKey); - } + doStop(args); } // Initialize start.ini @@ -760,6 +749,22 @@ public class Main } } + private void doStop(StartArgs args) { + int stopPort = Integer.parseInt(args.getProperties().getString("STOP.PORT")); + String stopKey = args.getProperties().getString("STOP.KEY"); + + if (args.getProperties().getString("STOP.WAIT") != null) + { + int stopWait = Integer.parseInt(args.getProperties().getString("STOP.PORT")); + + stop(stopPort,stopKey,stopWait); + } + else + { + stop(stopPort,stopKey); + } + } + /** * Stop a running jetty instance. */ @@ -867,4 +872,37 @@ public class Main System.exit(EXIT_USAGE); } } + + // ------------------------------------------------------------ + // implement Apache commons daemon (jsvc) lifecycle methods (init, start, stop, destroy) + public void init(String[] args) throws Exception + { + try + { + startupArgs = processCommandLine(args); + } + catch (UsageException e) + { + System.err.println(e.getMessage()); + usageExit(e.getCause(),e.getExitCode()); + } + catch (Throwable e) + { + usageExit(e,UsageException.ERR_UNKNOWN); + } + } + + public void start() throws Exception + { + start(startupArgs); + } + + public void stop() throws Exception + { + doStop(startupArgs); + } + + public void destroy() + { + } } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java index 2df1b05e64b..dc0de1ced59 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java @@ -96,7 +96,7 @@ public class Module /** List of xml configurations for this Module */ private List xmls; /** List of ini template lines */ - private List initialise; + private List defaultConfig; /** List of library options for this Module */ private List libs; /** List of files for this Module */ @@ -213,9 +213,14 @@ public class Module return fileRef; } - public List getInitialise() + public List getDefaultConfig() { - return initialise; + return defaultConfig; + } + + public boolean hasDefaultConfig() + { + return (defaultConfig != null) && (defaultConfig.size() > 0); } public List getLibs() @@ -274,7 +279,7 @@ public class Module parentEdges = new HashSet<>(); childEdges = new HashSet<>(); xmls = new ArrayList<>(); - initialise = new ArrayList<>(); + defaultConfig = new ArrayList<>(); libs = new ArrayList<>(); files = new ArrayList<>(); jvmArgs = new ArrayList<>(); @@ -328,7 +333,7 @@ public class Module { if ("INI-TEMPLATE".equals(sectionType)) { - initialise.add(line); + defaultConfig.add(line); } } else @@ -344,8 +349,9 @@ public class Module case "FILES": files.add(line); break; + case "DEFAULTS": case "INI-TEMPLATE": - initialise.add(line); + defaultConfig.add(line); break; case "LIB": libs.add(line); @@ -396,7 +402,10 @@ public class Module { StringBuilder str = new StringBuilder(); str.append("Module[").append(logicalName); - str.append(",").append(fileRef); + if (!logicalName.equals(fileRef)) + { + str.append(",file=").append(fileRef); + } if (enabled) { str.append(",enabled"); @@ -404,4 +413,5 @@ public class Module str.append(']'); return str.toString(); } + } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java index 7c612a71400..2d207727acd 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java @@ -212,9 +212,9 @@ public class ModuleGraphWriter } } - if (!module.getInitialise().isEmpty()) + if (!module.getDefaultConfig().isEmpty()) { - List inis = module.getInitialise(); + List inis = module.getDefaultConfig(); writeModuleDetailHeader(out,"INI Template",inis.size()); } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java index 61330ac7546..804d63ae325 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java @@ -38,6 +38,9 @@ import java.util.regex.Pattern; */ public class Modules implements Iterable { + private final BaseHome baseHome; + private final StartArgs args; + private Map modules = new HashMap<>(); /* * modules that may appear in the resolved graph but are undefined in the module system @@ -47,6 +50,12 @@ public class Modules implements Iterable private Set missingModules = new HashSet(); private int maxDepth = -1; + + public Modules(BaseHome basehome, StartArgs args) + { + this.baseHome = basehome; + this.args = args; + } private Set asNameSet(Set moduleSet) { @@ -106,8 +115,10 @@ public class Modules implements Iterable /** * Using the provided dependencies, build the module graph */ - public void buildGraph() + public void buildGraph() throws FileNotFoundException, IOException { + normalizeDependencies(); + // Connect edges for (Module module : modules.values()) { @@ -118,9 +129,13 @@ public class Modules implements Iterable if (parent == null) { if (parentName.contains("${")) + { StartLog.debug("module not found [%s]%n",parentName); + } else + { StartLog.warn("module not found [%s]%n",parentName); + } } else { @@ -250,19 +265,36 @@ public class Modules implements Iterable } } - public void enable(String name, List sources) + public void enable(String name, List sources) throws IOException { if (name.contains("*")) { // A regex! Pattern pat = Pattern.compile(name); - for (Map.Entry entry : modules.entrySet()) + List matching = new ArrayList<>(); + do { - if (pat.matcher(entry.getKey()).matches()) + matching.clear(); + + // find matching entries that are not enabled + for (Map.Entry entry : modules.entrySet()) { - enableModule(entry.getValue(),sources); + if (pat.matcher(entry.getKey()).matches()) + { + if (!entry.getValue().isEnabled()) + { + matching.add(entry.getValue()); + } + } + } + + // enable them + for (Module module : matching) + { + enableModule(module,sources); } } + while (!matching.isEmpty()); } else { @@ -276,16 +308,51 @@ public class Modules implements Iterable } } - private void enableModule(Module module, List sources) + private void enableModule(Module module, List sources) throws IOException { + if (module.isEnabled()) + { + // already enabled, skip + return; + } + StartLog.debug("Enabling module: %s (via %s)",module.getName(),Main.join(sources,", ")); module.setEnabled(true); + args.parseModule(module); + module.expandProperties(args.getProperties()); if (sources != null) { module.addSources(sources); } + + // enable any parents that haven't been enabled (yet) + Set parentNames = new HashSet<>(); + parentNames.addAll(module.getParentNames()); + for(String name: parentNames) + { + Module parent = modules.get(name); + if (parent == null) + { + // parent module doesn't exist, yet + Path file = baseHome.getPath("modules/" + name + ".mod"); + if (FS.canReadFile(file)) + { + parent = registerModule(file); + updateParentReferencesTo(parent); + } + else + { + StartLog.debug("Missing module definition: [ Mod: %s | File: %s ]",name,file); + missingModules.add(name); + } + } + if (parent != null) + { + enableModule(parent,sources); + } + } } - + private void findChildren(Module module, Set ret) { ret.add(module); @@ -372,32 +439,35 @@ public class Modules implements Iterable return module; } - public void registerParentsIfMissing(BaseHome basehome, StartArgs args, Module module) throws IOException + public void registerParentsIfMissing(Module module) throws IOException { Set parents = new HashSet<>(module.getParentNames()); for (String name : parents) { if (!modules.containsKey(name)) { - Path file = basehome.getPath("modules/" + name + ".mod"); + Path file = baseHome.getPath("modules/" + name + ".mod"); if (FS.canReadFile(file)) { - Module parent = registerModule(basehome,args,file); + Module parent = registerModule(file); updateParentReferencesTo(parent); - registerParentsIfMissing(basehome, args, parent); + registerParentsIfMissing(parent); } } } } - public void registerAll(BaseHome basehome, StartArgs args) throws IOException + public void registerAll() throws IOException { - for (Path path : basehome.getPaths("modules/*.mod")) + for (Path path : baseHome.getPaths("modules/*.mod")) { - registerModule(basehome,args,path); + registerModule(path); } - - // load missing post-expanded dependent modules + } + + // load missing post-expanded dependent modules + private void normalizeDependencies() throws FileNotFoundException, IOException + { boolean done = false; while (!done) { @@ -419,30 +489,29 @@ public class Modules implements Iterable for (String missingParent : missingParents) { - Path file = basehome.getPath("modules/" + missingParent + ".mod"); + Path file = baseHome.getPath("modules/" + missingParent + ".mod"); if (FS.canReadFile(file)) { - Module module = registerModule(basehome,args,file); + Module module = registerModule(file); updateParentReferencesTo(module); } else { - StartLog.debug("Missing module definition: [ Mod: %s | File: %s]",missingParent,file); + StartLog.debug("Missing module definition: [ Mod: %s | File: %s ]",missingParent,file); missingModules.add(missingParent); } } } } - private Module registerModule(BaseHome basehome, StartArgs args, Path file) throws FileNotFoundException, IOException + private Module registerModule(Path file) throws FileNotFoundException, IOException { if (!FS.canReadFile(file)) { throw new IOException("Cannot read file: " + file); } - StartLog.debug("Registering Module: %s",basehome.toShortForm(file)); - Module module = new Module(basehome,file); - module.expandProperties(args.getProperties()); + StartLog.debug("Registering Module: %s",baseHome.toShortForm(file)); + Module module = new Module(baseHome,file); return register(module); } @@ -485,7 +554,7 @@ public class Modules implements Iterable StartLog.warn("** Unable to continue, required dependency missing. [%s]",missing); StartLog.warn("** As configured, Jetty is unable to start due to a missing enabled module dependency."); StartLog.warn("** This may be due to a transitive dependency akin to spdy on npn, which resolves based on the JDK in use."); - return Collections.emptyList(); + throw new UsageException(UsageException.ERR_BAD_ARG, "Missing referenced dependency: " + missing); } } } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java b/jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java index 05e08f95ed1..c7e2e7883a7 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/PathMatchers.java @@ -96,15 +96,11 @@ public class PathMatchers // If the pattern starts with a root path then its assumed to // be a full system path - for (Path root : fs.getRootDirectories()) + if (isAbsolute(pattern)) { - StartLog.debug("root: " + root); - if (pattern.startsWith(root.toString())) - { - String pat = "glob:" + pattern; - StartLog.debug("Using absolute path pattern: " + pat); - return fs.getPathMatcher(pat); - } + String pat = "glob:" + pattern; + StartLog.debug("Using absolute path pattern: " + pat); + return fs.getPathMatcher(pat); } // Doesn't start with filesystem root, then assume the pattern diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java index 7d35aaaf4c8..3875a4de9f4 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java @@ -61,6 +61,22 @@ public final class Props implements Iterable this(key,value,origin); this.overrides = overrides; } + + @Override + public String toString() + { + StringBuilder builder = new StringBuilder(); + builder.append("Prop [key="); + builder.append(key); + builder.append(", value="); + builder.append(value); + builder.append(", origin="); + builder.append(origin); + builder.append(", overrides="); + builder.append(overrides); + builder.append("]"); + return builder.toString(); + } } public static final String ORIGIN_SYSPROP = ""; diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java index 43df38122a6..4aff293052b 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java @@ -647,11 +647,25 @@ public class StartArgs } public void parse(final String rawarg, String source) + { + parse(rawarg,source,true); + } + + /** + * Parse a single line of argument. + * + * @param rawarg the raw argument to parse + * @param source the origin of this line of argument + * @param replaceProps true if properties in this parse replace previous ones, false to not replace. + */ + private void parse(final String rawarg, String source, boolean replaceProps) { if (rawarg == null) { return; } + + StartLog.debug("parse(\"%s\", \"%s\", %b)",rawarg,source,replaceProps); final String arg = rawarg.trim(); @@ -810,11 +824,11 @@ public class StartArgs { case 2: System.setProperty(assign[0],assign[1]); - setProperty(assign[0],assign[1],source); + setProperty(assign[0],assign[1],source,replaceProps); break; case 1: System.setProperty(assign[0],""); - setProperty(assign[0],"",source); + setProperty(assign[0],"",source,replaceProps); break; default: break; @@ -840,11 +854,14 @@ public class StartArgs String key = arg.substring(0,idx); String value = arg.substring(idx + 1); - if (propertySource.containsKey(key)) + if (replaceProps) { - StartLog.warn("Property %s in %s already set in %s",key,source,propertySource.get(key)); + if (propertySource.containsKey(key)) + { + StartLog.warn("Property %s in %s already set in %s",key,source,propertySource.get(key)); + } + propertySource.put(key,source); } - propertySource.put(key,source); if ("OPTION".equals(key) || "OPTIONS".equals(key)) { @@ -857,7 +874,7 @@ public class StartArgs StartLog.warn(warn.toString()); } - setProperty(key,value,source); + setProperty(key,value,source,replaceProps); return; } @@ -877,15 +894,26 @@ public class StartArgs // only add non-duplicates if (!propertyFileRefs.contains(arg)) { - propertyFileRefs.add(arg); + propertyFileRefs.add(arg); } - return; + return; } // Anything else is unrecognized throw new UsageException(ERR_BAD_ARG,"Unrecognized argument: \"%s\" in %s",arg,source); } + public void parseModule(Module module) + { + if(module.hasDefaultConfig()) + { + for(String line: module.getDefaultConfig()) + { + parse(line,module.getFilesystemRef(),false); + } + } + } + public void resolveExtraXmls(BaseHome baseHome) throws IOException { // Find and Expand XML files @@ -910,7 +938,7 @@ public class StartArgs Path propertyFile = baseHome.getPath(propertyFileRef); if (!FS.exists(propertyFile)) { - propertyFile = baseHome.getPath("etc/" + propertyFileRef); + propertyFile = baseHome.getPath("etc/" + propertyFileRef); } addUniquePropertyFile(propertyFileRef,propertyFile); } @@ -921,7 +949,7 @@ public class StartArgs this.allModules = allModules; } - private void setProperty(String key, String value, String source) + private void setProperty(String key, String value, String source, boolean replaceProp) { // Special / Prevent override from start.ini's if (key.equals("jetty.home")) @@ -938,7 +966,19 @@ public class StartArgs } // Normal - properties.setProperty(key,value,source); + if (replaceProp) + { + // always override + properties.setProperty(key,value,source); + } + else + { + // only set if unset + if (!properties.containsKey(key)) + { + properties.setProperty(key,value,source); + } + } } public void setRun(boolean run) @@ -961,4 +1001,5 @@ public class StartArgs builder.append("]"); return builder.toString(); } + } diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java index 1d2e8ba1d01..4baacb4af09 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java @@ -51,7 +51,7 @@ public class ConfigurationAssert */ public static void assertConfiguration(BaseHome baseHome, StartArgs args, String filename) throws FileNotFoundException, IOException { - File testResourcesDir = MavenTestingUtils.getTestResourcesDir(); + Path testResourcesDir = MavenTestingUtils.getTestResourcesDir().toPath().toAbsolutePath(); File file = MavenTestingUtils.getTestResourceFile(filename); TextFile textFile = new TextFile(file.toPath()); @@ -149,18 +149,23 @@ public class ConfigurationAssert assertContainsUnordered("Files/Dirs",expectedFiles,actualFiles); } - private static String shorten(BaseHome baseHome, Path path, File testResourcesDir) + private static String shorten(BaseHome baseHome, Path path, Path testResourcesDir) { String value = baseHome.toShortForm(path); - if (value.startsWith(testResourcesDir.getAbsolutePath())) + if (value.startsWith("${")) { - int len = testResourcesDir.getAbsolutePath().length(); + return value; + } + + if (path.startsWith(testResourcesDir)) + { + int len = testResourcesDir.toString().length(); value = "${maven-test-resources}" + value.substring(len); } return value; } - - private static void assertContainsUnordered(String msg, Collection expectedSet, Collection actualSet) + + public static void assertContainsUnordered(String msg, Collection expectedSet, Collection actualSet) { // same size? boolean mismatch = expectedSet.size() != actualSet.size(); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java index 2043d6b5ae9..54cb773c509 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java @@ -18,20 +18,27 @@ package org.eclipse.jetty.start; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.junit.Assert; +import org.eclipse.jetty.toolchain.test.TestTracker; import org.junit.Before; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; public class MainTest { + @Rule + public TestTracker ttracker = new TestTracker(); + @Before public void clearSystemProperties() { @@ -70,9 +77,9 @@ public class MainTest System.err.println(args); // Assert.assertEquals("--stop should not build module tree", 0, args.getEnabledModules().size()); - Assert.assertEquals("--stop missing port","10000",args.getProperties().getString("STOP.PORT")); - Assert.assertEquals("--stop missing key","foo",args.getProperties().getString("STOP.KEY")); - Assert.assertEquals("--stop missing wait","300",args.getProperties().getString("STOP.WAIT")); + assertEquals("--stop missing port","10000",args.getProperties().getString("STOP.PORT")); + assertEquals("--stop missing key","foo",args.getProperties().getString("STOP.KEY")); + assertEquals("--stop missing wait","300",args.getProperties().getString("STOP.WAIT")); } @Test @@ -114,9 +121,22 @@ public class MainTest cmdLineArgs.add("-Xmx1024m"); // Arbitrary Libs - File extraJar = MavenTestingUtils.getTestResourceFile("extra-libs/example.jar"); - File extraDir = MavenTestingUtils.getTestResourceDir("extra-resources"); - cmdLineArgs.add(String.format("--lib=%s%s%s",extraJar.getAbsolutePath(),File.pathSeparatorChar,extraDir.getAbsolutePath())); + Path extraJar = MavenTestingUtils.getTestResourceFile("extra-libs/example.jar").toPath().normalize(); + Path extraDir = MavenTestingUtils.getTestResourceDir("extra-resources").toPath().normalize(); + + extraJar = extraJar.toAbsolutePath(); + extraDir = extraDir.toAbsolutePath(); + + assertThat("Extra Jar exists: " + extraJar,Files.exists(extraJar),is(true)); + assertThat("Extra Dir exists: " + extraDir,Files.exists(extraDir),is(true)); + + StringBuilder lib = new StringBuilder(); + lib.append("--lib="); + lib.append(extraJar.toString()); + lib.append(File.pathSeparator); + lib.append(extraDir.toString()); + + cmdLineArgs.add(lib.toString()); // Arbitrary XMLs cmdLineArgs.add("jetty.xml"); @@ -128,11 +148,37 @@ public class MainTest StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()])); BaseHome baseHome = main.getBaseHome(); - Assert.assertThat("jetty.home",baseHome.getHome(),is(homePath.getAbsolutePath())); - Assert.assertThat("jetty.base",baseHome.getBase(),is(homePath.getAbsolutePath())); + assertThat("jetty.home",baseHome.getHome(),is(homePath.getAbsolutePath())); + assertThat("jetty.base",baseHome.getBase(),is(homePath.getAbsolutePath())); ConfigurationAssert.assertConfiguration(baseHome,args,"assert-home-with-jvm.txt"); } + + @Test + public void testWithSpdy() throws Exception + { + List cmdLineArgs = new ArrayList<>(); + + File homePath = MavenTestingUtils.getTestResourceDir("usecases/home").getAbsoluteFile(); + cmdLineArgs.add("jetty.home=" + homePath); + cmdLineArgs.add("user.dir=" + homePath); + cmdLineArgs.add("java.version=1.7.0_60"); + + // Modules + cmdLineArgs.add("--module=server"); + cmdLineArgs.add("--module=deploy"); + cmdLineArgs.add("--module=spdy"); + + Main main = new Main(); + + StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()])); + BaseHome baseHome = main.getBaseHome(); + + assertThat("jetty.home",baseHome.getHome(),is(homePath.getAbsolutePath())); + assertThat("jetty.base",baseHome.getBase(),is(homePath.getAbsolutePath())); + + ConfigurationAssert.assertConfiguration(baseHome,args,"assert-home-with-spdy.txt"); + } @Test public void testJettyHomeWithSpaces() throws Exception @@ -147,8 +193,8 @@ public class MainTest StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()])); BaseHome baseHome = main.getBaseHome(); - Assert.assertThat("jetty.home",baseHome.getHome(),is(homePath.getAbsolutePath())); - Assert.assertThat("jetty.base",baseHome.getBase(),is(homePath.getAbsolutePath())); + assertThat("jetty.home",baseHome.getHome(),is(homePath.getAbsolutePath())); + assertThat("jetty.base",baseHome.getBase(),is(homePath.getAbsolutePath())); ConfigurationAssert.assertConfiguration(baseHome,args,"assert-home-with-spaces.txt"); } diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModuleGraphWriterTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModuleGraphWriterTest.java index 82db04cf9cb..13b43cc25ee 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModuleGraphWriterTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModuleGraphWriterTest.java @@ -60,8 +60,8 @@ public class ModuleGraphWriterTest StartArgs args = new StartArgs(); args.parse(config); - Modules modules = new Modules(); - modules.registerAll(basehome, args); + Modules modules = new Modules(basehome, args); + modules.registerAll(); modules.buildGraph(); Path outputFile = basehome.getBasePath("graph.dot"); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java index fff9e4df2ec..506ad932ce0 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.start; import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.is; import java.io.File; import java.io.IOException; @@ -66,8 +65,8 @@ public class ModulesTest args.parse(config); // Test Modules - Modules modules = new Modules(); - modules.registerAll(basehome,args); + Modules modules = new Modules(basehome,args); + modules.registerAll(); List moduleNames = new ArrayList<>(); for (Module mod : modules) @@ -80,11 +79,42 @@ public class ModulesTest moduleNames.add(mod.getName()); } - String expected[] = { "jmx", "client", "stats", "spdy", "deploy", "debug", "security", "npn", "ext", "websocket", "rewrite", "ipaccess", "xinetd", - "proxy", "webapp", "jndi", "lowresources", "https", "plus", "requestlog", "jsp", "monitor", "xml", "servlet", "jaas", "http", "base", "server", - "annotations", "resources", "loggging" }; - - Assert.assertThat("Module count: " + moduleNames,moduleNames.size(),is(expected.length)); + List expected = new ArrayList<>(); + expected.add("jmx"); + expected.add("client"); + expected.add("stats"); + expected.add("spdy"); + expected.add("deploy"); + expected.add("debug"); + expected.add("security"); + expected.add("ext"); + expected.add("websocket"); + expected.add("rewrite"); + expected.add("ipaccess"); + expected.add("xinetd"); + expected.add("proxy"); + expected.add("webapp"); + expected.add("jndi"); + expected.add("lowresources"); + expected.add("https"); + expected.add("plus"); + expected.add("requestlog"); + expected.add("jsp"); + // (only present if enabled) expected.add("jsp-impl"); + expected.add("monitor"); + expected.add("xml"); + expected.add("ssl"); + expected.add("protonego"); + expected.add("servlet"); + expected.add("jaas"); + expected.add("http"); + expected.add("base"); + expected.add("server"); + expected.add("annotations"); + expected.add("resources"); + expected.add("logging"); + + ConfigurationAssert.assertContainsUnordered("All Modules",expected,moduleNames); } @Test @@ -93,7 +123,7 @@ public class ModulesTest // Test Env File homeDir = MavenTestingUtils.getTestResourceDir("usecases/home"); File baseDir = testdir.getEmptyDir(); - String cmdLine[] = new String[] {"jetty.version=TEST"}; + String cmdLine[] = new String[] {"jetty.version=TEST", "java.version=1.7.0_60"}; // Configuration CommandLineConfigSource cmdLineSource = new CommandLineConfigSource(cmdLine); @@ -109,13 +139,37 @@ public class ModulesTest args.parse(config); // Test Modules - Modules modules = new Modules(); - modules.registerAll(basehome,args); + Modules modules = new Modules(basehome,args); + modules.registerAll(); modules.enable("[sj]{1}.*",TEST_SOURCE); + modules.buildGraph(); - String expected[] = { "jmx", "stats", "spdy", "security", "jndi", "jsp", "servlet", "jaas", "server" }; + List expected = new ArrayList<>(); + expected.add("jmx"); + expected.add("stats"); + expected.add("spdy"); + expected.add("security"); + expected.add("jndi"); + expected.add("jsp"); + expected.add("servlet"); + expected.add("jaas"); + expected.add("server"); + // transitive + expected.add("base"); + expected.add("ssl"); + expected.add("protonego"); + expected.add("protonego-boot"); + expected.add("protonego-impl"); + expected.add("xml"); + expected.add("jsp-impl"); + + List resolved = new ArrayList<>(); + for (Module module : modules.resolveEnabled()) + { + resolved.add(module.getName()); + } - Assert.assertThat("Enabled Module count",modules.resolveEnabled().size(),is(expected.length)); + ConfigurationAssert.assertContainsUnordered("Enabled Modules",expected,resolved); } @Test @@ -140,14 +194,15 @@ public class ModulesTest args.parse(config); // Test Modules - Modules modules = new Modules(); - modules.registerAll(basehome,args); - modules.buildGraph(); + Modules modules = new Modules(basehome, args); + modules.registerAll(); // Enable 2 modules modules.enable("server",TEST_SOURCE); modules.enable("http",TEST_SOURCE); + modules.buildGraph(); + // Collect active module list List active = modules.resolveEnabled(); @@ -211,15 +266,16 @@ public class ModulesTest args.parse(config); // Test Modules - Modules modules = new Modules(); - modules.registerAll(basehome,args); - modules.buildGraph(); - // modules.dump(); + Modules modules = new Modules(basehome,args); + modules.registerAll(); // Enable 2 modules modules.enable("websocket",TEST_SOURCE); modules.enable("http",TEST_SOURCE); + modules.buildGraph(); + // modules.dump(); + // Collect active module list List active = modules.resolveEnabled(); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java new file mode 100644 index 00000000000..9280cdab156 --- /dev/null +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java @@ -0,0 +1,85 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.start; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; +import org.junit.Test; + +/** + * Test bad configuration scenarios. + */ +public class TestBadUseCases +{ + private void assertBadConfig(String homeName, String baseName, String expectedErrorMessage, String... cmdLineArgs) throws Exception + { + File homeDir = MavenTestingUtils.getTestResourceDir("usecases/" + homeName); + File baseDir = MavenTestingUtils.getTestResourceDir("usecases/" + baseName); + + Main main = new Main(); + List cmdLine = new ArrayList<>(); + cmdLine.add("jetty.home=" + homeDir.getAbsolutePath()); + cmdLine.add("jetty.base=" + baseDir.getAbsolutePath()); + // cmdLine.add("--debug"); + for (String arg : cmdLineArgs) + { + cmdLine.add(arg); + } + + try + { + main.processCommandLine(cmdLine); + fail("Expected " + UsageException.class.getName()); + } + catch (UsageException e) + { + assertThat("Usage error",e.getMessage(),containsString(expectedErrorMessage)); + } + } + + @Test + public void testBadJspCommandLine() throws Exception + { + assertBadConfig("home","base.with.jsp.default", + "Missing referenced dependency: jsp-impl/bad-jsp","jsp-impl=bad"); + } + + @Test + public void testBadJspImplName() throws Exception + { + assertBadConfig("home","base.with.jsp.bad", + "Missing referenced dependency: jsp-impl/bogus-jsp"); + } + + @Test + public void testWithSpdyBadNpnVersion() throws Exception + { + assertBadConfig("home","base.enable.spdy.bad.npn.version", + "Missing referenced dependency: protonego-impl/npn-1.7.0_01", + "java.version=1.7.0_01", "protonego=npn"); + } + + +} diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java index aef3da70691..bf77b48141d 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java @@ -73,6 +73,30 @@ public class TestUseCases assertUseCase("home","base.with.include.jetty.dirs","assert-include-jetty-dir-logging.txt"); } + @Test + public void testWithJspDefault() throws Exception + { + assertUseCase("home","base.with.jsp.default","assert-jsp-apache.txt"); + } + + @Test + public void testWithJspApache() throws Exception + { + assertUseCase("home","base.with.jsp.apache","assert-jsp-apache.txt"); + } + + @Test + public void testWithJspGlassfish() throws Exception + { + assertUseCase("home","base.with.jsp.glassfish","assert-jsp-glassfish.txt"); + } + + @Test + public void testWithJspGlassfishCmdLine() throws Exception + { + assertUseCase("home","base.with.jsp.default","assert-jsp-glassfish.txt","jsp-impl=glassfish"); + } + @Test public void testWithMissingNpnVersion() throws Exception { @@ -82,15 +106,9 @@ public class TestUseCases @Test public void testWithSpdy() throws Exception { - assertUseCase("home","base.enable.spdy","assert-enable-spdy.txt","java.version=1.7.0_21"); + assertUseCase("home","base.enable.spdy","assert-enable-spdy.txt","java.version=1.7.0_60"); } - @Test - public void testWithSpdyBadNpnVersion() throws Exception - { - assertUseCase("home","base.enable.spdy.bad.npn.version","assert-enable-spdy-bad-npn-version.txt","java.version=1.7.0_01"); - } - @Test public void testWithDatabase() throws Exception { diff --git a/jetty-start/src/test/resources/assert-home-with-spdy.txt b/jetty-start/src/test/resources/assert-home-with-spdy.txt new file mode 100644 index 00000000000..9069c2bf79c --- /dev/null +++ b/jetty-start/src/test/resources/assert-home-with-spdy.txt @@ -0,0 +1,72 @@ +# The XMLs we expect (order is important) +XML|${jetty.base}/etc/jetty-jmx.xml +XML|${jetty.base}/etc/protonego-alpn.xml +XML|${jetty.base}/etc/jetty.xml +XML|${jetty.base}/etc/jetty-http.xml +XML|${jetty.base}/etc/jetty-ssl.xml +XML|${jetty.base}/etc/jetty-plus.xml +XML|${jetty.base}/etc/jetty-spdy.xml +XML|${jetty.base}/etc/jetty-annotations.xml +XML|${jetty.base}/etc/jetty-deploy.xml +XML|${jetty.base}/etc/jetty-websockets.xml + +# The LIBs we expect (order is irrelevant) +LIB|${jetty.base}/lib/annotations/javax.annotation-api-1.2.jar +LIB|${jetty.base}/lib/annotations/org.objectweb.asm-TEST.jar +LIB|${jetty.base}/lib/jetty-annotations-TEST.jar +LIB|${jetty.base}/lib/jetty-continuation-TEST.jar +LIB|${jetty.base}/lib/jetty-http-TEST.jar +LIB|${jetty.base}/lib/jetty-io-TEST.jar +LIB|${jetty.base}/lib/jetty-deploy-TEST.jar +LIB|${jetty.base}/lib/jetty-jmx-TEST.jar +LIB|${jetty.base}/lib/jetty-jndi-TEST.jar +LIB|${jetty.base}/lib/jetty-plus-TEST.jar +LIB|${jetty.base}/lib/jetty-schemas-3.1.jar +LIB|${jetty.base}/lib/jetty-security-TEST.jar +LIB|${jetty.base}/lib/jetty-server-TEST.jar +LIB|${jetty.base}/lib/jetty-servlet-TEST.jar +LIB|${jetty.base}/lib/jetty-util-TEST.jar +LIB|${jetty.base}/lib/jetty-webapp-TEST.jar +LIB|${jetty.base}/lib/jetty-xml-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-client-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-core-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-http-common-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-http-server-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-server-TEST.jar +LIB|${jetty.base}/lib/jndi/javax.activation-1.1.jar +LIB|${jetty.base}/lib/jndi/javax.transaction-api-1.2.jar +LIB|${jetty.base}/lib/servlet-api-3.1.jar +LIB|${jetty.base}/lib/websocket/javax.websocket-api-1.0.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-client-impl-TEST.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-server-impl-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-api-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-client-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-common-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-server-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar + +# The Properties we expect (order is irrelevant) +PROP|java.version=1.7.0_60 +PROP|jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g +PROP|jetty.keystore=etc/keystore +PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +PROP|jetty.secure.port=8443 +PROP|jetty.truststore=etc/keystore +PROP|jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +PROP|protonego=alpn +PROP|spdy.port=8443 +PROP|spdy.timeout=30000 + +# JVM Args +JVM|-Xms1024m +JVM|-Xmx1024m + +# Downloads +DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar +DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore + +# Files +FILE|lib/ +FILE|lib/alpn/ + + diff --git a/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt index b097f5d12f4..40577a7ed30 100644 --- a/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt +++ b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt @@ -1,10 +1,12 @@ # The XMLs we expect (order is important) XML|${jetty.home}/etc/jetty-jmx.xml +XML|${jetty.home}/etc/protonego-alpn.xml XML|${jetty.home}/etc/jetty.xml XML|${jetty.home}/etc/jetty-http.xml XML|${jetty.home}/etc/jetty-ssl.xml XML|${jetty.home}/etc/jetty-spdy.xml + # The LIBs we expect (order is irrelevant) LIB|${jetty.home}/lib/jetty-continuation-TEST.jar LIB|${jetty.home}/lib/jetty-http-TEST.jar @@ -23,15 +25,25 @@ LIB|${jetty.home}/lib/spdy/spdy-core-TEST.jar # The Properties we expect (order is irrelevant) PROP|jetty.port=9090 +PROP|jetty.secure.port=8443 PROP|jetty.keystore=etc/keystore PROP|jetty.keystore.password=friendly PROP|jetty.keymanager.password=icecream PROP|jetty.truststore=etc/keystore PROP|jetty.truststore.password=sundae -PROP|java.version=1.7.0_21 +PROP|java.version=1.7.0_60 +PROP|protonego=alpn +PROP|spdy.port=8443 +PROP|spdy.timeout=30000 # The Downloads -DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar +DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar +DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore # The Bootlib -BOOTLIB|-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar +BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar + +# The Files +FILE|lib/ +FILE|lib/alpn/ + diff --git a/jetty-start/src/test/resources/usecases/assert-jsp-apache.txt b/jetty-start/src/test/resources/usecases/assert-jsp-apache.txt new file mode 100644 index 00000000000..fe3d51ce8aa --- /dev/null +++ b/jetty-start/src/test/resources/usecases/assert-jsp-apache.txt @@ -0,0 +1,26 @@ +# The XMLs we expect (order is important) +XML|${jetty.home}/etc/jetty.xml +XML|${jetty.home}/etc/jetty-http.xml + +# The LIBs we expect (order is irrelevant) +LIB|${jetty.home}/lib/jetty-continuation-TEST.jar +LIB|${jetty.home}/lib/jetty-http-TEST.jar +LIB|${jetty.home}/lib/jetty-io-TEST.jar +LIB|${jetty.home}/lib/jetty-schemas-3.1.jar +LIB|${jetty.home}/lib/jetty-server-TEST.jar +LIB|${jetty.home}/lib/jetty-servlet-TEST.jar +LIB|${jetty.home}/lib/jetty-util-TEST.jar +LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/servlet-api-3.1.jar +LIB|${jetty.home}/lib/apache-jsp/javax.servlet.jsp.javax.servlet.jsp-api-TEST.jar +LIB|${jetty.home}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar +LIB|${jetty.home}/lib/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-TEST.jar +LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-el-TEST.jar +LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-TEST.jar + +# The Properties we expect (order is irrelevant) +PROP|jetty.port=9090 +PROP|jsp-impl=apache + +# Files / Directories to create +# FILE|lib/ diff --git a/jetty-start/src/test/resources/usecases/assert-jsp-glassfish.txt b/jetty-start/src/test/resources/usecases/assert-jsp-glassfish.txt new file mode 100644 index 00000000000..9c17c56fb27 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/assert-jsp-glassfish.txt @@ -0,0 +1,28 @@ +# The XMLs we expect (order is important) +XML|${jetty.home}/etc/jetty.xml +XML|${jetty.home}/etc/jetty-http.xml + +# The LIBs we expect (order is irrelevant) +LIB|${jetty.home}/lib/jetty-continuation-TEST.jar +LIB|${jetty.home}/lib/jetty-http-TEST.jar +LIB|${jetty.home}/lib/jetty-io-TEST.jar +LIB|${jetty.home}/lib/jetty-schemas-3.1.jar +LIB|${jetty.home}/lib/jetty-server-TEST.jar +LIB|${jetty.home}/lib/jetty-servlet-TEST.jar +LIB|${jetty.home}/lib/jetty-util-TEST.jar +LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/servlet-api-3.1.jar +LIB|${jetty.home}/lib/jsp/javax.el-TEST.jar +LIB|${jetty.home}/lib/jsp/javax.servlet.jsp.jstl-TEST.jar +LIB|${jetty.home}/lib/jsp/javax.servlet.jsp-api-TEST.jar +LIB|${jetty.home}/lib/jsp/javax.servlet.jsp-TEST.jar +LIB|${jetty.home}/lib/jsp/jetty-jsp-jdt-TEST.jar +LIB|${jetty.home}/lib/jsp/org.eclipse.jdt.core-TEST.jar +LIB|${jetty.home}/lib/jsp/org.eclipse.jetty.orbit.javax.servlet.jsp.jstl-TEST.jar + +# The Properties we expect (order is irrelevant) +PROP|jetty.port=9090 +PROP|jsp-impl=glassfish + +# Files / Directories to create +# FILE|lib/ diff --git a/jetty-start/src/test/resources/usecases/base.with.jsp.apache/start.ini b/jetty-start/src/test/resources/usecases/base.with.jsp.apache/start.ini new file mode 100644 index 00000000000..fcdea021bd8 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/base.with.jsp.apache/start.ini @@ -0,0 +1,7 @@ + +--module=server +--module=http +--module=jsp +jsp-impl=apache + +jetty.port=9090 diff --git a/jetty-start/src/test/resources/usecases/base.with.jsp.bad/start.ini b/jetty-start/src/test/resources/usecases/base.with.jsp.bad/start.ini new file mode 100644 index 00000000000..96e495acaff --- /dev/null +++ b/jetty-start/src/test/resources/usecases/base.with.jsp.bad/start.ini @@ -0,0 +1,7 @@ + +--module=server +--module=http +--module=jsp +jsp-impl=bogus + +jetty.port=9090 diff --git a/jetty-start/src/test/resources/usecases/base.with.jsp.default/start.ini b/jetty-start/src/test/resources/usecases/base.with.jsp.default/start.ini new file mode 100644 index 00000000000..bf58fa82d77 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/base.with.jsp.default/start.ini @@ -0,0 +1,6 @@ + +--module=server +--module=http +--module=jsp + +jetty.port=9090 diff --git a/jetty-start/src/test/resources/usecases/base.with.jsp.glassfish/start.ini b/jetty-start/src/test/resources/usecases/base.with.jsp.glassfish/start.ini new file mode 100644 index 00000000000..7107adec968 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/base.with.jsp.glassfish/start.ini @@ -0,0 +1,7 @@ + +--module=server +--module=http +--module=jsp +jsp-impl=glassfish + +jetty.port=9090 diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.el-3.0.0.jar b/jetty-start/src/test/resources/usecases/home/etc/protonego-alpn.xml similarity index 100% rename from jetty-start/src/test/resources/usecases/home/lib/jsp/javax.el-3.0.0.jar rename to jetty-start/src/test/resources/usecases/home/etc/protonego-alpn.xml diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp-2.3.2.jar b/jetty-start/src/test/resources/usecases/home/etc/protonego-npn.xml similarity index 100% rename from jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp-2.3.2.jar rename to jetty-start/src/test/resources/usecases/home/etc/protonego-npn.xml diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp-api-2.3.1.jar b/jetty-start/src/test/resources/usecases/home/lib/apache-jsp/javax.servlet.jsp.javax.servlet.jsp-api-TEST.jar similarity index 100% rename from jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp-api-2.3.1.jar rename to jetty-start/src/test/resources/usecases/home/lib/apache-jsp/javax.servlet.jsp.javax.servlet.jsp-api-TEST.jar diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp.jstl-1.2.0.jar b/jetty-start/src/test/resources/usecases/home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar similarity index 100% rename from jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp.jstl-1.2.0.jar rename to jetty-start/src/test/resources/usecases/home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.jar b/jetty-start/src/test/resources/usecases/home/lib/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-TEST.jar similarity index 100% rename from jetty-start/src/test/resources/usecases/home/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.jar rename to jetty-start/src/test/resources/usecases/home/lib/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-TEST.jar diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/org.eclipse.jdt.core-3.8.2.jar b/jetty-start/src/test/resources/usecases/home/lib/apache-jsp/org.mortbay.jasper.apache-el-TEST.jar similarity index 100% rename from jetty-start/src/test/resources/usecases/home/lib/jsp/org.eclipse.jdt.core-3.8.2.jar rename to jetty-start/src/test/resources/usecases/home/lib/apache-jsp/org.mortbay.jasper.apache-el-TEST.jar diff --git a/jetty-start/src/test/resources/usecases/home/lib/apache-jsp/org.mortbay.jasper.apache-jsp-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/apache-jsp/org.mortbay.jasper.apache-jsp-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.el-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.el-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp-api-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp-api-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp.jstl-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/jsp/javax.servlet.jsp.jstl-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/jetty-jsp-jdt-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/jsp/jetty-jsp-jdt-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/org.eclipse.jdt.core-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/jsp/org.eclipse.jdt.core-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/lib/jsp/org.eclipse.jetty.orbit.javax.servlet.jsp.jstl-TEST.jar b/jetty-start/src/test/resources/usecases/home/lib/jsp/org.eclipse.jetty.orbit.javax.servlet.jsp.jstl-TEST.jar new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/modules/jsp-impl/apache-jsp.mod b/jetty-start/src/test/resources/usecases/home/modules/jsp-impl/apache-jsp.mod new file mode 100644 index 00000000000..aed547c851f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/jsp-impl/apache-jsp.mod @@ -0,0 +1,10 @@ +# +# Apache JSP Module +# + +[name] +jsp-impl + +[lib] +lib/apache-jsp/*.jar + diff --git a/jetty-start/src/test/resources/usecases/home/modules/jsp-impl/glassfish-jsp.mod b/jetty-start/src/test/resources/usecases/home/modules/jsp-impl/glassfish-jsp.mod new file mode 100644 index 00000000000..130d2b371f4 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/jsp-impl/glassfish-jsp.mod @@ -0,0 +1,8 @@ +# +# Glassfish JSP Module +# +[name] +jsp-impl + +[lib] +lib/jsp/*.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/jsp.mod b/jetty-start/src/test/resources/usecases/home/modules/jsp.mod index f85530d3c8a..fa5b9fdfa95 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/jsp.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/jsp.mod @@ -1,10 +1,20 @@ # -# Jetty Servlet Module +# Jetty JSP Module # [depend] servlet +jsp-impl/${jsp-impl}-jsp -[lib] -lib/jsp/*.jar +[ini-template] +# JSP Configuration +# Select JSP implementation, choices are +# glassfish : The reference implementation +# default in jetty <= 9.1 +# apache : The apache version +# default jetty >= 9.2 +jsp-impl=apache + +# To use a non-jdk compiler for JSP compilation when using glassfish uncomment next line +# -Dorg.apache.jasper.compiler.disablejsr199=true diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn.mod b/jetty-start/src/test/resources/usecases/home/modules/npn.mod deleted file mode 100644 index 9c9d4bcd1d3..00000000000 --- a/jetty-start/src/test/resources/usecases/home/modules/npn.mod +++ /dev/null @@ -1,4 +0,0 @@ - -[depend] -npn/npn-${java.version} - diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod new file mode 100644 index 00000000000..65e6cb3c4db --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod new file mode 100644 index 00000000000..65e6cb3c4db --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn.mod new file mode 100644 index 00000000000..0e399f05cb1 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn.mod @@ -0,0 +1,36 @@ +# ALPN is provided via a -Xbootclasspath that modifies the secure connections +# in java to support the ALPN layer needed for SPDY (and eventually HTTP/2) +# +# This modification has a tight dependency on specific recent updates of +# Java 1.7 and Java 1.8 +# (Java versions prior to 1.7u40 are not supported) +# +# The alpn protonego module will use an appropriate alpn-boot jar for your +# specific version of Java. +# +# IMPORTANT: Versions of Java that exist after this module was created are +# not guaranteed to work with existing alpn-boot jars, and might +# need a new alpn-boot to be created / tested / deployed by the +# Jetty project in order to provide support for these future +# Java versions. +# +# All versions of alpn-boot can be found at +# http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/ + +[name] +protonego-impl + +[depend] +protonego-impl/alpn-${java.version} + +[lib] +lib/jetty-alpn-client-${jetty.version}.jar +lib/jetty-alpn-server-${jetty.version}.jar + +[xml] +etc/protonego-alpn.xml + +[files] +lib/ +lib/alpn/ + diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_04.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_04.mod index a6778222464..007570b6757 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_04.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar|lib/npn/npn-boot-1.1.0.v20120525.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_05.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_05.mod index a6778222464..007570b6757 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_05.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar|lib/npn/npn-boot-1.1.0.v20120525.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_06.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_06.mod index bb6b64bf1f1..868a7a77fcb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_06.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar|lib/npn/npn-boot-1.1.1.v20121030.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_07.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_07.mod index bb6b64bf1f1..868a7a77fcb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_07.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar|lib/npn/npn-boot-1.1.1.v20121030.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_09.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_09.mod index c488457f14e..20c1db27bd5 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_09.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_10.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_10.mod index c488457f14e..20c1db27bd5 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_10.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_11.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_11.mod index c488457f14e..20c1db27bd5 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_11.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_13.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_13.mod index 0264d724869..1645a52dba0 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_13.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.4.v20130313/npn-boot-1.1.4.v20130313.jar|lib/npn/npn-boot-1.1.4.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_15.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_15.mod index d2d09ea2d68..73bc09007eb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_15.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_17.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_17.mod index d2d09ea2d68..73bc09007eb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_17.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_21.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_21.mod index d2d09ea2d68..73bc09007eb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_21.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_25.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_25.mod index d2d09ea2d68..73bc09007eb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_25.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_40.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_40.mod index 909bebf5f70..465e6f034b6 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_40.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_45.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_45.mod index 909bebf5f70..465e6f034b6 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_45.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_51.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_51.mod index 909bebf5f70..465e6f034b6 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_51.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod index 6f6b4250803..639c70e3ffd 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod new file mode 100644 index 00000000000..639c70e3ffd --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar + +[exec] +-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn.mod new file mode 100644 index 00000000000..040aad10197 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn.mod @@ -0,0 +1,31 @@ +# NPN is provided via a -Xbootclasspath that modifies the secure connections +# in java to support the NPN layer needed for SPDY. +# +# This modification has a tight dependency on specific updates of Java 1.7. +# (No support for Java 8 exists for npn / npn-boot, use alpn instead) +# +# The npn module will use an appropriate npn-boot jar for your specific +# version of Java. +# +# IMPORTANT: Versions of Java that exist after this module was created are +# not guaranteed to work with existing npn-boot jars, and might +# need a new npn-boot to be created / tested / deployed by the +# Jetty project in order to provide support for these future +# Java versions. +# +# All versions of npn-boot can be found at +# http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/ + + +[name] +protonego-impl + +[depend] +protonego-impl/npn-${java.version} + +[xml] +etc/protonego-npn.xml + +[files] +lib/ +lib/npn/ diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego.mod new file mode 100644 index 00000000000..d7bba9fbeca --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego.mod @@ -0,0 +1,15 @@ +# +# Protocol Negotiatin Selection Module +# + +[depend] +protonego-impl/${protonego} + +[ini-template] +# Protocol Negotiation Implementation Selection +# choices are: +# 'npn' : original implementation for SPDY (now deprecated) +# 'alpn' : replacement for NPN, in use by current SPDY implementations +# and the future HTTP/2 spec +# Note: java 1.8+ are ALPN only. +protonego=alpn diff --git a/jetty-start/src/test/resources/usecases/home/modules/spdy.mod b/jetty-start/src/test/resources/usecases/home/modules/spdy.mod index 92e31a2b231..cf79dfa0f20 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/spdy.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/spdy.mod @@ -1,7 +1,10 @@ +# +# SPDY Support Module +# [depend] -server -npn +ssl +protonego [lib] lib/spdy/*.jar @@ -9,3 +12,15 @@ lib/spdy/*.jar [xml] etc/jetty-ssl.xml etc/jetty-spdy.xml + +[ini-template] +## SPDY Configuration + +# Port for SPDY connections +spdy.port=8443 + +# SPDY idle timeout in milliseconds +spdy.timeout=30000 + +# Initial Window Size for SPDY +#spdy.initialWindowSize=65536 diff --git a/jetty-start/src/test/resources/usecases/home/modules/ssl.mod b/jetty-start/src/test/resources/usecases/home/modules/ssl.mod new file mode 100644 index 00000000000..449f58104fb --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/ssl.mod @@ -0,0 +1,35 @@ +# +# SSL Keystore module +# + +[depend] +server + +[xml] +etc/jetty-ssl.xml + +[files] +http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore + +[ini-template] +## SSL Keystore Configuration +# define the port to use for secure redirection +jetty.secure.port=8443 + +# Setup a demonstration keystore and truststore +jetty.keystore=etc/keystore +jetty.truststore=etc/keystore + +# Set the demonstration passwords. +# Note that OBF passwords are not secure, just protected from casual observation +# See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html +jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g +jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 + +# Set the client auth behavior +# Set to true if client certificate authentication is required +# jetty.ssl.needClientAuth=true +# Set to true if client certificate authentication is desired +# jetty.ssl.wantClientAuth=true + diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java index fdca4ce1350..2cd345ae6de 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java @@ -71,7 +71,7 @@ public class ArrayTernaryTrie extends AbstractTrie * The value (if any) for a Trie row. * A row may be a leaf, a node or both in the Trie tree. */ - private final Object[] _value; + private final V[] _value; /** * The number of rows allocated @@ -96,7 +96,7 @@ public class ArrayTernaryTrie extends AbstractTrie public ArrayTernaryTrie(boolean insensitive, int capacityInNodes) { super(insensitive); - _value=new Object[capacityInNodes]; + _value=(V[])new Object[capacityInNodes]; _tree=new char[capacityInNodes*ROW_SIZE]; _key=new String[capacityInNodes]; } @@ -216,7 +216,7 @@ public class ArrayTernaryTrie extends AbstractTrie } } - return (V)_value[t]; + return _value[t]; } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java index 73ccc424fd0..9d8013cacd8 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java @@ -79,7 +79,7 @@ public class ArrayTrie extends AbstractTrie * The value (if any) for a Trie row. * A row may be a leaf, a node or both in the Trie tree. */ - private final Object[] _value; + private final V[] _value; /** * A big index for each row. @@ -102,7 +102,7 @@ public class ArrayTrie extends AbstractTrie public ArrayTrie(int capacityInNodes) { super(true); - _value=new Object[capacityInNodes]; + _value=(V[])new Object[capacityInNodes]; _rowIndex=new char[capacityInNodes*32]; _key=new String[capacityInNodes]; } @@ -183,7 +183,7 @@ public class ArrayTrie extends AbstractTrie return null; } } - return (V)_value[t]; + return _value[t]; } /* ------------------------------------------------------------ */ @@ -374,7 +374,7 @@ public class ArrayTrie extends AbstractTrie } - private void toString(Appendable out, int t) + private void toString(Appendable out, int t) { if (_value[t]!=null) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/B64Code.java b/jetty-util/src/main/java/org/eclipse/jetty/util/B64Code.java index 7fbbb187d32..0560ffc5361 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/B64Code.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/B64Code.java @@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import java.nio.charset.UnsupportedCharsetException; /** Fast B64 Encoder/Decoder as described in RFC 1421. 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 bd7cb06ecd1..53d24db9669 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 @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.RandomAccessFile; -import java.nio.Buffer; import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; @@ -930,7 +929,7 @@ public class BufferUtil buf.append(buffer.getClass().getSimpleName()); buf.append("@"); if (buffer.hasArray()) - buf.append(Integer.toHexString(((Object)buffer.array()).hashCode())); + buf.append(Integer.toHexString(Arrays.hashCode(buffer.array()))); else buf.append(Integer.toHexString(buf.hashCode())); buf.append("[p="); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java index 5b734db7f4f..58f6df411a4 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java @@ -71,10 +71,10 @@ public class ClassLoadingObjectInputStream extends ObjectInputStream boolean hasNonPublicInterface = false; // define proxy in class loader of non-public interface(s), if any - Class[] classObjs = new Class[interfaces.length]; + Class[] classObjs = new Class[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { - Class cl = Class.forName(interfaces[i], false, loader); + Class cl = Class.forName(interfaces[i], false, loader); if ((cl.getModifiers() & Modifier.PUBLIC) == 0) { if (hasNonPublicInterface) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentArrayQueue.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentArrayQueue.java index fc1326d63a6..c7aa96e3cb7 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentArrayQueue.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentArrayQueue.java @@ -25,8 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; import java.util.Objects; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicIntegerArray; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReferenceArray; @@ -168,6 +166,7 @@ public class ConcurrentArrayQueue extends AbstractQueue return _blocks.compareAndSet(TAIL_OFFSET,current,update); } + @SuppressWarnings("unchecked") @Override public T poll() { @@ -276,7 +275,7 @@ public class ConcurrentArrayQueue extends AbstractQueue } else { - Object element = currentHeadBlock.peek(head); + T element = currentHeadBlock.peek(head); if (element == REMOVED_ELEMENT) { // Already removed, try next index @@ -284,7 +283,7 @@ public class ConcurrentArrayQueue extends AbstractQueue } else { - return (T)element; + return element; } } } @@ -421,8 +420,11 @@ public class ConcurrentArrayQueue extends AbstractQueue advance(); - if (element != REMOVED_ELEMENT) - return (T)element; + if (element != REMOVED_ELEMENT) { + @SuppressWarnings("unchecked") + T e = (T)element; + return e; + } } } @@ -518,9 +520,10 @@ public class ConcurrentArrayQueue extends AbstractQueue elements = new AtomicReferenceArray<>(blockSize); } - public Object peek(int index) + @SuppressWarnings("unchecked") + public E peek(int index) { - return elements.get(index); + return (E)elements.get(index); } public boolean store(int index, E item) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ForkInvoker.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ForkInvoker.java deleted file mode 100644 index c15b313b0d9..00000000000 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ForkInvoker.java +++ /dev/null @@ -1,135 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.util; - -/** - * Utility class that splits calls to {@link #invoke(Object)} into calls to {@link #fork(Object)} or {@link #call(Object)} - * depending on the max number of reentrant calls to {@link #invoke(Object)}. - *

        - * This class prevents {@link StackOverflowError}s in case of methods that end up invoking themselves, - * such is common for {@link Callback#succeeded()}. - *

        - * Typical use case is: - * 

        - * public void reentrantMethod(Object param)
- * {
- *     if (condition || tooManyReenters)
- *         fork(param)
- *     else
- *         call(param)
- * }
- *
        - * Calculating {@code tooManyReenters} usually involves using a {@link ThreadLocal} and algebra on the - * number of reentrant invocations, which is factored out in this class for convenience. - *

        - * The same code using this class becomes: - * 

        - * private final ForkInvoker invoker = ...;
- *
- * public void reentrantMethod(Object param)
- * {
- *     invoker.invoke(param);
- * }
- *
        - * - */ -public abstract class ForkInvoker -{ - private static final ThreadLocal __invocations = new ThreadLocal() - { - @Override - protected Integer initialValue() - { - return 0; - } - }; - private final int _maxInvocations; - - /** - * Creates an instance with the given max number of reentrant calls to {@link #invoke(Object)} - *

        - * If {@code maxInvocations} is zero or negative, it is interpreted - * as if the max number of reentrant calls is infinite. - * - * @param maxInvocations the max number of reentrant calls to {@link #invoke(Object)} - */ - public ForkInvoker(int maxInvocations) - { - _maxInvocations = maxInvocations; - } - - /** - * Invokes either {@link #fork(Object)} or {@link #call(Object)}. - * If {@link #condition()} returns true, {@link #fork(Object)} is invoked. - * Otherwise, if the max number of reentrant calls is positive and the - * actual number of reentrant invocations exceeds it, {@link #fork(Object)} is invoked. - * Otherwise, {@link #call(Object)} is invoked. - * @param arg TODO - * - * @return true if {@link #fork(Object)} has been called, false otherwise - */ - public boolean invoke(T arg) - { - boolean countInvocations = _maxInvocations > 0; - int invocations = __invocations.get(); - if (condition() || countInvocations && invocations > _maxInvocations) - { - fork(arg); - return true; - } - else - { - if (countInvocations) - __invocations.set(invocations + 1); - try - { - call(arg); - return false; - } - finally - { - if (countInvocations) - __invocations.set(invocations); - } - } - } - - /** - * Subclasses should override this method returning true if they want - * {@link #invoke(Object)} to call {@link #fork(Object)}. - * - * @return true if {@link #invoke(Object)} should call {@link #fork(Object)}, false otherwise - */ - protected boolean condition() - { - return false; - } - - /** - * Executes the forked invocation - * @param arg TODO - */ - public abstract void fork(T arg); - - /** - * Executes the direct, non-forked, invocation - * @param arg TODO - */ - public abstract void call(T arg); -} diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/FutureCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/FutureCallback.java index 5bad6b2e111..27403be261d 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/FutureCallback.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/FutureCallback.java @@ -151,7 +151,7 @@ public class FutureCallback implements Future,Callback @Override public String toString() { - return String.format("FutureCallback@%x{%b,%b}",hashCode(),_done,_cause==COMPLETED); + return String.format("FutureCallback@%x{%b,%b}",hashCode(),_done.get(),_cause==COMPLETED); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/FuturePromise.java b/jetty-util/src/main/java/org/eclipse/jetty/util/FuturePromise.java index f781c85004d..edba7662b62 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/FuturePromise.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/FuturePromise.java @@ -153,7 +153,7 @@ public class FuturePromise implements Future,Promise @Override public String toString() { - return String.format("FutureCallback@%x{%b,%b,%s}",hashCode(),_done,_cause==COMPLETED,_result); + return String.format("FutureCallback@%x{%b,%b,%s}",hashCode(),_done.get(),_cause==COMPLETED,_result); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java index 1c74d5eaf65..2791803ba69 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java @@ -50,6 +50,46 @@ import java.util.concurrent.atomic.AtomicReference; */ public abstract class IteratingCallback implements Callback { + /** + * The internal states of this callback + */ + private enum State + { + /** + * This callback is inactive, ready to iterate. + */ + INACTIVE, + /** + * This callback is iterating and {@link #process()} has scheduled an + * asynchronous operation by returning {@link Action#SCHEDULED}, but + * the operation is still undergoing. + */ + ACTIVE, + /** + * This callback is iterating and {@link #process()} has been called + * but not returned yet. + */ + ITERATING, + /** + * While this callback was iterating, another request for iteration + * has been issued, so the iteration must continue even if a previous + * call to {@link #process()} returned {@link Action#IDLE}. + */ + ITERATE_AGAIN, + /** + * The overall job has succeeded. + */ + SUCCEEDED, + /** + * The overall job has failed. + */ + FAILED, + /** + * This callback has been closed and cannot be reset. + */ + CLOSED + } + /** * The indication of the overall progress of the overall job that * implementations of {@link #process()} must return. @@ -71,15 +111,21 @@ public abstract class IteratingCallback implements Callback /** * Indicates that {@link #process()} has completed the overall job. */ - SUCCEEDED, - /** - * Indicates that {@link #process()} has failed the overall job. - */ - FAILED + SUCCEEDED } - private final AtomicReference _state = new AtomicReference<>(State.INACTIVE); - + private final AtomicReference _state; + + protected IteratingCallback() + { + _state = new AtomicReference<>(State.INACTIVE); + } + + protected IteratingCallback(boolean needReset) + { + _state = new AtomicReference<>(needReset ? State.SUCCEEDED : State.INACTIVE); + } + /** * Method called by {@link #iterate()} to process the sub task. *

        @@ -91,7 +137,6 @@ public abstract class IteratingCallback implements Callback *

      • {@link Action#SCHEDULED} when the sub task asynchronous execution * has been started
        • *
      • {@link Action#SUCCEEDED} when the overall job is completed
        • - *
      • {@link Action#FAILED} when the overall job cannot be completed
        • *
      * * @throws Exception if the sub task processing throws @@ -99,9 +144,31 @@ public abstract class IteratingCallback implements Callback protected abstract Action process() throws Exception; /** - * Invoked when the overall task has completed successfully. + * @deprecated Use {@link #onCompleteSuccess()} instead. */ - protected abstract void completed(); + @Deprecated + protected void completed() + { + } + + /** + * Invoked when the overall task has completed successfully. + * + * @see #onCompleteFailure(Throwable) + */ + protected void onCompleteSuccess() + { + completed(); + } + + /** + * Invoked when the overall task has completed with a failure. + * + * @see #onCompleteSuccess() + */ + protected void onCompleteFailure(Throwable x) + { + } /** * This method must be invoked by applications to start the processing @@ -196,14 +263,25 @@ public abstract class IteratingCallback implements Callback case SUCCEEDED: { // The overall job has completed. - if (completeSuccess()) - completed(); - return true; - } - case FAILED: - { - completeFailure(); - return true; + while (true) + { + State current = _state.get(); + switch(current) + { + case SUCCEEDED: + case FAILED: + // Already complete!. + return true; + case CLOSED: + throw new IllegalStateException(); + default: + if (_state.compareAndSet(current, State.SUCCEEDED)) + { + onCompleteSuccess(); + return true; + } + } + } } default: { @@ -251,6 +329,11 @@ public abstract class IteratingCallback implements Callback iterate(); return; } + case CLOSED: + { + // Too late! + return; + } default: { throw new IllegalStateException(toString()); @@ -266,54 +349,73 @@ public abstract class IteratingCallback implements Callback */ @Override public void failed(Throwable x) - { - completeFailure(); - } - - private boolean completeSuccess() { while (true) { State current = _state.get(); - if (current == State.FAILED) + switch (current) { - // Success arrived too late, sorry. - return false; - } - else - { - if (_state.compareAndSet(current, State.SUCCEEDED)) - return true; + case SUCCEEDED: + case FAILED: + case INACTIVE: + case CLOSED: + { + // Already complete!. + return; + } + default: + { + if (_state.compareAndSet(current, State.FAILED)) + { + onCompleteFailure(x); + return; + } + } } } } - private void completeFailure() + public void close() { while (true) { State current = _state.get(); - if (current == State.SUCCEEDED) + switch (current) { - // Failed arrived too late, sorry. - return; - } - else - { - if (_state.compareAndSet(current, State.FAILED)) + case INACTIVE: + case SUCCEEDED: + case FAILED: + { + if (_state.compareAndSet(current, State.CLOSED)) + return; break; + } + default: + { + if (_state.compareAndSet(current, State.CLOSED)) + { + onCompleteFailure(new IllegalStateException("Closed with pending callback " + this)); + return; + } + } } } } - /** + /* + * only for testing * @return whether this callback is idle and {@link #iterate()} needs to be called */ - public boolean isIdle() + boolean isIdle() { return _state.get() == State.INACTIVE; } + public boolean isClosed() + { + return _state.get() == State.CLOSED; + } + /** * @return whether this callback has failed */ @@ -330,45 +432,42 @@ public abstract class IteratingCallback implements Callback return _state.get() == State.SUCCEEDED; } + /** + * Resets this callback. + *

      + * A callback can only be reset to INACTIVE from the + * SUCCEEDED or FAILED states or if it is already INACTIVE. + * + * @return true if the reset was successful + */ + public boolean reset() + { + while (true) + { + switch(_state.get()) + { + case INACTIVE: + return true; + + case SUCCEEDED: + if (_state.compareAndSet(State.SUCCEEDED, State.INACTIVE)) + return true; + break; + + case FAILED: + if (_state.compareAndSet(State.FAILED, State.INACTIVE)) + return true; + break; + + default: + return false; + } + } + } + @Override public String toString() { return String.format("%s[%s]", super.toString(), _state); } - - /** - * The internal states of this callback - */ - private enum State - { - /** - * This callback is inactive, ready to iterate. - */ - INACTIVE, - /** - * This callback is iterating and {@link #process()} has scheduled an - * asynchronous operation by returning {@link Action#SCHEDULED}, but - * the operation is still undergoing. - */ - ACTIVE, - /** - * This callback is iterating and {@link #process()} has been called - * but not returned yet. - */ - ITERATING, - /** - * While this callback was iterating, another request for iteration - * has been issued, so the iteration must continue even if a previous - * call to {@link #process()} returned {@link Action#IDLE}. - */ - ITERATE_AGAIN, - /** - * The overall job has succeeded. - */ - SUCCEEDED, - /** - * The overall job has failed. - */ - FAILED - } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java index e018f43a484..dd05ded9789 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java @@ -48,15 +48,14 @@ public abstract class IteratingNestedCallback extends IteratingCallback } @Override - protected void completed() + protected void onCompleteSuccess() { _callback.succeeded(); } - + @Override - public void failed(Throwable x) + protected void onCompleteFailure(Throwable x) { - super.failed(x); _callback.failed(x); } 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 b0ac94e9b4d..55aab63fa5b 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 @@ -20,7 +20,6 @@ package org.eclipse.jetty.util; import java.lang.ref.PhantomReference; import java.lang.ref.ReferenceQueue; -import java.lang.ref.WeakReference; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -138,7 +137,8 @@ public class LeakDetector extends AbstractLifeCycle implements Runnable { @SuppressWarnings("unchecked") LeakInfo leakInfo = (LeakInfo)queue.remove(); - LOG.debug("Resource GC'ed: {}", leakInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Resource GC'ed: {}", leakInfo); if (resources.remove(leakInfo.id) != null) leaked(leakInfo); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java index 2e71f3c58cc..f5aa27df7ec 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java @@ -43,10 +43,11 @@ public class MultiException extends Exception /* ------------------------------------------------------------ */ public void add(Throwable e) { + if (e==null) + throw new IllegalArgumentException(); + if(nested == null) - { nested = new ArrayList<>(); - } if (e instanceof MultiException) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java index 441d648ea52..026856f46dd 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java @@ -57,7 +57,7 @@ public class MultiPartInputStreamParser protected InputStream _in; protected MultipartConfigElement _config; protected String _contentType; - protected MultiMap _parts; + protected MultiMap _parts; protected File _tmpDir; protected File _contextTmpDir; protected boolean _deleteOnExit; @@ -72,7 +72,7 @@ public class MultiPartInputStreamParser protected OutputStream _out; protected ByteArrayOutputStream2 _bout; protected String _contentType; - protected MultiMap _headers; + protected MultiMap _headers; protected long _size = 0; protected boolean _temporary = true; @@ -161,7 +161,7 @@ public class MultiPartInputStreamParser - protected void setHeaders(MultiMap headers) + protected void setHeaders(MultiMap headers) { _headers = headers; } @@ -359,9 +359,9 @@ public class MultiPartInputStreamParser if (_parts == null) return Collections.emptyList(); - Collection values = _parts.values(); + Collection> values = _parts.values(); List parts = new ArrayList(); - for (Object o: values) + for (List o: values) { List asList = LazyList.getList(o, false); parts.addAll(asList); @@ -406,9 +406,9 @@ public class MultiPartInputStreamParser throws IOException, ServletException { parse(); - Collection values = _parts.values(); + Collection> values = _parts.values(); List parts = new ArrayList(); - for (Object o: values) + for (List o: values) { List asList = LazyList.getList(o, false); parts.addAll(asList); @@ -447,7 +447,7 @@ public class MultiPartInputStreamParser //initialize long total = 0; //keep running total of size of bytes read from input and throw an exception if exceeds MultipartConfigElement._maxRequestSize - _parts = new MultiMap(); + _parts = new MultiMap(); //if its not a multipart request, don't parse it if (_contentType == null || !_contentType.startsWith("multipart/form-data")) @@ -523,7 +523,7 @@ public class MultiPartInputStreamParser String contentType=null; String contentTransferEncoding=null; - MultiMap headers = new MultiMap(); + MultiMap headers = new MultiMap(); while(true) { line=((ReadLineInputStream)_in).readLine(); 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 f29db3daac4..f2068bb43d2 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 @@ -557,12 +557,16 @@ public class Scanner extends AbstractLifeCycle { if ((_filter == null) || ((_filter != null) && _filter.accept(f.getParentFile(), f.getName()))) { - LOG.debug("scan accepted {}",f); + if (LOG.isDebugEnabled()) + LOG.debug("scan accepted {}",f); String name = f.getCanonicalPath(); scanInfoMap.put(name, new TimeNSize(f.lastModified(),f.length())); } else - LOG.debug("scan rejected {}",f); + { + if (LOG.isDebugEnabled()) + LOG.debug("scan rejected {}",f); + } } // If it is a directory, scan if it is a known directory or the depth is OK. 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 3085a68735d..07b08368960 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 @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InterruptedIOException; import java.util.concurrent.CancellationException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; @@ -159,14 +158,11 @@ public class SharedBlockingCallback { if (_state == null) { - // TODO remove when feedback received on 435322 - if (cause==null) - LOG.warn("null failed cause (please report stack trace) ",new Throwable()); _state = cause==null?FAILED:cause; _complete.signalAll(); } else if (_state == IDLE) - throw new IllegalStateException("IDLE"); + throw new IllegalStateException("IDLE",cause); } finally { @@ -249,9 +245,15 @@ public class SharedBlockingCallback } finally { - _state = IDLE; - _idle.signalAll(); - _lock.unlock(); + try + { + _state = IDLE; + _idle.signalAll(); + } + finally + { + _lock.unlock(); + } } } 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 e75abfc064f..b7916f3d2f7 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 @@ -148,7 +148,8 @@ public class SocketAddressResolver long start = System.nanoTime(); InetSocketAddress result = new InetSocketAddress(host, port); long elapsed = System.nanoTime() - start; - LOG.debug("Resolved {} in {} ms", host, TimeUnit.NANOSECONDS.toMillis(elapsed)); + if (LOG.isDebugEnabled()) + LOG.debug("Resolved {} in {} ms", host, TimeUnit.NANOSECONDS.toMillis(elapsed)); if (complete.compareAndSet(false, true)) { if (result.isUnresolved()) 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 b96a520c110..d30ad320f9b 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 @@ -569,8 +569,9 @@ public class TypeUtil // target has no annotations if ( parameterAnnotations == null || parameterAnnotations.length == 0 ) - { - LOG.debug("Target has no parameter annotations"); + { + if (LOG.isDebugEnabled()) + LOG.debug("Target has no parameter annotations"); return constructor.newInstance(arguments); } else @@ -588,19 +589,22 @@ public class TypeUtil if (namedArgMap.containsKey(param.value())) { - LOG.debug("placing named {} in position {}", param.value(), count); + if (LOG.isDebugEnabled()) + LOG.debug("placing named {} in position {}", param.value(), count); swizzled[count] = namedArgMap.get(param.value()); } else { - LOG.debug("placing {} in position {}", arguments[count], count); + if (LOG.isDebugEnabled()) + LOG.debug("placing {} in position {}", arguments[count], count); swizzled[count] = arguments[count]; } ++count; } else { - LOG.debug("passing on annotation {}", annotation); + if (LOG.isDebugEnabled()) + LOG.debug("passing on annotation {}", annotation); } } } 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 f333fc3b5f2..ca2013830c2 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 @@ -663,7 +663,49 @@ public class URIUtil } return false; } + + /* ------------------------------------------------------------ */ + /** + * Create a new URI from the arguments, handling IPv6 host encoding and default ports + * @param scheme + * @param server + * @param port + * @param path + * @param query + * @return A String URI + */ + public static String newURI(String scheme,String server, int port,String path,String query) + { + StringBuilder builder = newURIBuilder(scheme, server, port); + builder.append(path); + if (query!=null && query.length()>0) + builder.append('?').append(query); + return builder.toString(); + } + /* ------------------------------------------------------------ */ + /** + * Create a new URI StringBuilder from the arguments, handling IPv6 host encoding and default ports + * @param scheme + * @param server + * @param port + * @return a StringBuilder containing URI prefix + */ + public static StringBuilder newURIBuilder(String scheme,String server, int port) + { + StringBuilder builder = new StringBuilder(); + appendSchemeHostPort(builder, scheme, server, port); + return builder; + } + + /* ------------------------------------------------------------ */ + /** + * Append scheme, host and port URI prefix, handling IPv6 address encoding and default ports

      + * @param url StringBuilder to append to + * @param scheme + * @param server + * @param port + */ public static void appendSchemeHostPort(StringBuilder url,String scheme,String server, int port) { if (server.indexOf(':')>=0&&server.charAt(0)!='[') @@ -671,10 +713,34 @@ public class URIUtil else url.append(scheme).append("://").append(server); - if (port > 0 && (("http".equalsIgnoreCase(scheme) && port != 80) || ("https".equalsIgnoreCase(scheme) && port != 443))) - url.append(':').append(port); + if (port > 0) + { + switch(scheme) + { + case "http": + if (port!=80) + url.append(':').append(port); + break; + + case "https": + if (port!=443) + url.append(':').append(port); + break; + + default: + url.append(':').append(port); + } + } } + /* ------------------------------------------------------------ */ + /** + * Append scheme, host and port URI prefix, handling IPv6 address encoding and default ports

      + * @param url StringBuffer to append to + * @param scheme + * @param server + * @param port + */ public static void appendSchemeHostPort(StringBuffer url,String scheme,String server, int port) { synchronized (url) @@ -684,10 +750,55 @@ public class URIUtil else url.append(scheme).append("://").append(server); - if (port > 0 && (("http".equalsIgnoreCase(scheme) && port != 80) || ("https".equalsIgnoreCase(scheme) && port != 443))) - url.append(':').append(port); + if (port > 0) + { + switch(scheme) + { + case "http": + if (port!=80) + url.append(':').append(port); + break; + + case "https": + if (port!=443) + url.append(':').append(port); + break; + + default: + url.append(':').append(port); + } + } } } + + public static boolean equalsIgnoreEncodings(String uriA, String uriB) + { + int lenA=uriA.length(); + int lenB=uriB.length(); + int a=0; + int b=0; + + while (a implements Cloneable int c; int totalLength = 0; - ByteArrayOutputStream2 output = new ByteArrayOutputStream2(); - int size=0; - - while ((c=in.read())>0) + try(ByteArrayOutputStream2 output = new ByteArrayOutputStream2();) { - switch ((char) c) + int size=0; + + while ((c=in.read())>0) { - case '&': - size=output.size(); - value = size==0?"":output.toString(charset); - output.setCount(0); - if (key != null) - { - map.add(key,value); - } - else if (value!=null&&value.length()>0) - { - map.add(value,""); - } - key = null; - value=null; - if (maxKeys>0 && map.size()>maxKeys) - throw new IllegalStateException("Form too many keys"); - break; - case '=': - if (key!=null) - { + switch ((char) c) + { + case '&': + size=output.size(); + value = size==0?"":output.toString(charset); + output.setCount(0); + if (key != null) + { + map.add(key,value); + } + else if (value!=null&&value.length()>0) + { + map.add(value,""); + } + key = null; + value=null; + if (maxKeys>0 && map.size()>maxKeys) + throw new IllegalStateException("Form too many keys"); + break; + case '=': + if (key!=null) + { + output.write(c); + break; + } + size=output.size(); + key = size==0?"":output.toString(charset); + output.setCount(0); + break; + case '+': + output.write(' '); + break; + case '%': + int code0=in.read(); + if ('u'==code0) + { + int code1=in.read(); + if (code1>=0) + { + int code2=in.read(); + if (code2>=0) + { + int code3=in.read(); + if (code3>=0) + output.write(new String(Character.toChars((convertHexDigit(code0)<<12)+(convertHexDigit(code1)<<8)+(convertHexDigit(code2)<<4)+convertHexDigit(code3))).getBytes(charset)); + } + } + + } + else if (code0>=0) + { + int code1=in.read(); + if (code1>=0) + output.write((convertHexDigit(code0)<<4)+convertHexDigit(code1)); + } + break; + default: output.write(c); break; - } - size=output.size(); - key = size==0?"":output.toString(charset); - output.setCount(0); - break; - case '+': - output.write(' '); - break; - case '%': - int code0=in.read(); - if ('u'==code0) - { - int code1=in.read(); - if (code1>=0) - { - int code2=in.read(); - if (code2>=0) - { - int code3=in.read(); - if (code3>=0) - output.write(new String(Character.toChars((convertHexDigit(code0)<<12)+(convertHexDigit(code1)<<8)+(convertHexDigit(code2)<<4)+convertHexDigit(code3))).getBytes(charset)); - } - } - - } - else if (code0>=0) - { - int code1=in.read(); - if (code1>=0) - output.write((convertHexDigit(code0)<<4)+convertHexDigit(code1)); - } - break; - default: - output.write(c); - break; - } - - totalLength++; - if (maxLength>=0 && totalLength > maxLength) - throw new IllegalStateException("Form too large"); - } + } - size=output.size(); - if (key != null) - { - value = size==0?"":output.toString(charset); - output.setCount(0); - map.add(key,value); + totalLength++; + if (maxLength>=0 && totalLength > maxLength) + throw new IllegalStateException("Form too large"); + } + + size=output.size(); + if (key != null) + { + value = size==0?"":output.toString(charset); + output.setCount(0); + map.add(key,value); + } + else if (size>0) + map.add(output.toString(charset),""); } - else if (size>0) - map.add(output.toString(charset),""); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8LineParser.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8LineParser.java index b54cf419391..e9e2159444c 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8LineParser.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8LineParser.java @@ -20,8 +20,6 @@ package org.eclipse.jetty.util; import java.nio.ByteBuffer; -import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception; - /** * Stateful parser for lines of UTF8 formatted text, looking for "\n" as a line termination character. *

      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 8f2d9dc7ab0..1b0d7366ebc 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 @@ -174,15 +174,15 @@ public abstract class AbstractLifeCycle implements LifeCycle { _state = __STARTED; if (LOG.isDebugEnabled()) - - LOG.debug(STARTED+" @{}ms {}",ManagementFactory.getRuntimeMXBean().getUptime(),this); + LOG.debug(STARTED+" @{}ms {}",ManagementFactory.getRuntimeMXBean().getUptime(),this); for (Listener listener : _listeners) listener.lifeCycleStarted(this); } private void setStarting() { - LOG.debug("starting {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("starting {}",this); _state = __STARTING; for (Listener listener : _listeners) listener.lifeCycleStarting(this); @@ -190,7 +190,8 @@ public abstract class AbstractLifeCycle implements LifeCycle private void setStopping() { - LOG.debug("stopping {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("stopping {}",this); _state = __STOPPING; for (Listener listener : _listeners) listener.lifeCycleStopping(this); @@ -199,7 +200,8 @@ public abstract class AbstractLifeCycle implements LifeCycle private void setStopped() { _state = __STOPPED; - LOG.debug("{} {}",STOPPED,this); + if (LOG.isDebugEnabled()) + LOG.debug("{} {}",STOPPED,this); for (Listener listener : _listeners) listener.lifeCycleStopped(this); } 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 464c0f7e4a8..28c45664bf7 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 @@ -320,7 +320,8 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container, throw new RuntimeException(e); } - LOG.debug("{} added {}",this,new_bean); + if (LOG.isDebugEnabled()) + LOG.debug("{} added {}",this,new_bean); return true; } 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 94936452bd3..29c54b31009 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 @@ -86,7 +86,8 @@ public class FileDestroyable implements Destroyable { if (file.exists()) { - LOG.debug("Destroy {}",file); + if (LOG.isDebugEnabled()) + LOG.debug("Destroy {}",file); IO.delete(file); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/AbstractLogger.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/AbstractLogger.java index 66453768a22..36d19780f03 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/AbstractLogger.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/AbstractLogger.java @@ -79,6 +79,8 @@ public abstract class AbstractLogger implements Logger public void debug(String msg, long arg) { if (isDebugEnabled()) - debug(msg,new Long(arg)); + { + debug(msg,new Object[] { new Long(arg) }); + } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java index fda1c722b5b..80622c05b63 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java @@ -239,6 +239,12 @@ public class StdErrLog extends AbstractLogger */ public static int getLoggingLevel(Properties props, final String name) { + if ((props == null) || (props.isEmpty())) + { + // Default Logging Level + return getLevelId("log.LEVEL","INFO"); + } + // Calculate the level this named logger should operate under. // Checking with FQCN first, then each package segment from longest to shortest. String nameSegment = name; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java index 0f6caf9b072..39064e378d1 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java @@ -40,7 +40,8 @@ public class AWTLeakPreventer extends AbstractLeakPreventer @Override public void prevent(ClassLoader loader) { - LOG.debug("Pinning classloader for java.awt.EventQueue using "+loader); + if (LOG.isDebugEnabled()) + LOG.debug("Pinning classloader for java.awt.EventQueue using "+loader); Toolkit.getDefaultToolkit(); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java index 0cfd3c9553d..1ca99601d26 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java @@ -34,7 +34,8 @@ public class AppContextLeakPreventer extends AbstractLeakPreventer @Override public void prevent(ClassLoader loader) { - LOG.debug("Pinning classloader for AppContext.getContext() with "+loader); + if (LOG.isDebugEnabled()) + LOG.debug("Pinning classloader for AppContext.getContext() with "+loader); ImageIO.getUseCache(); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java index d229ba740aa..a8d211bdda6 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java @@ -35,7 +35,8 @@ public class DriverManagerLeakPreventer extends AbstractLeakPreventer @Override public void prevent(ClassLoader loader) { - LOG.debug("Pinning DriverManager classloader with "+loader); + if (LOG.isDebugEnabled()) + LOG.debug("Pinning DriverManager classloader with "+loader); DriverManager.getDrivers(); } 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 6ea4de2e16d..e1b999556eb 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 @@ -47,7 +47,7 @@ public class GCThreadLeakPreventer extends AbstractLeakPreventer { try { - Class clazz = Class.forName("sun.misc.GC"); + Class clazz = Class.forName("sun.misc.GC"); Method requestLatency = clazz.getMethod("requestLatency", new Class[] {long.class}); requestLatency.invoke(null, Long.valueOf(Long.MAX_VALUE-1)); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java index 449884241b6..47776f4643a 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java @@ -98,7 +98,7 @@ public class FileResource extends Resource _file=file; _uri=normalizeURI(_file,url.toURI()); - _alias=checkAlias(_file); + _alias=checkFileAlias(_file); } /* -------------------------------------------------------- */ @@ -108,17 +108,12 @@ public class FileResource extends Resource _file=file; URI file_uri=_file.toURI(); _uri=normalizeURI(_file,uri); - - if (!_uri.equals(file_uri.toString())) - { - // URI and File URI are different. Is it just an encoding difference? - if (!file_uri.toString().equals(URIUtil.decodePath(uri.toString()))) - _alias=_file.toURI(); - else - _alias=checkAlias(_file); - } + + // Is it a URI alias? + if (!URIUtil.equalsIgnoreEncodings(_uri,file_uri.toString())) + _alias=_file.toURI(); else - _alias=checkAlias(_file); + _alias=checkFileAlias(_file); } /* -------------------------------------------------------- */ @@ -126,7 +121,7 @@ public class FileResource extends Resource { _file=file; _uri=normalizeURI(_file,_file.toURI()); - _alias=checkAlias(_file); + _alias=checkFileAlias(_file); } /* -------------------------------------------------------- */ @@ -144,7 +139,7 @@ public class FileResource extends Resource } /* -------------------------------------------------------- */ - private static URI checkAlias(File file) + private static URI checkFileAlias(File file) { try { @@ -153,7 +148,8 @@ public class FileResource extends Resource if (!abs.equals(can)) { - LOG.debug("ALIAS abs={} can={}",abs,can); + if (LOG.isDebugEnabled()) + LOG.debug("ALIAS abs={} can={}",abs,can); URI alias=new File(can).toURI(); // Have to encode the path as File.toURI does not! 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 434aa887565..9d3b932b665 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 @@ -73,7 +73,8 @@ class JarFileResource extends JarResource { try { - LOG.debug("Closing JarFile "+_jarFile.getName()); + if (LOG.isDebugEnabled()) + LOG.debug("Closing JarFile "+_jarFile.getName()); _jarFile.close(); } catch ( IOException ioe ) 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 new file mode 100644 index 00000000000..824e5c59fee --- /dev/null +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java @@ -0,0 +1,354 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.util.resource; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.channels.FileChannel; +import java.nio.channels.ReadableByteChannel; +import java.nio.file.DirectoryIteratorException; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.nio.file.StandardOpenOption; +import java.nio.file.attribute.FileTime; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; + +/** + * Java NIO Path equivalent of FileResource. + */ +public class PathResource extends Resource +{ + private static final Logger LOG = Log.getLogger(PathResource.class); + + private final Path path; + private final URI uri; + private LinkOption linkOptions[] = new LinkOption[] { LinkOption.NOFOLLOW_LINKS }; + + public PathResource(File file) + { + this(file.toPath()); + } + + public PathResource(Path path) + { + this.path = path; + this.uri = this.path.toUri(); + } + + public PathResource(URI uri) throws IOException + { + if (!uri.isAbsolute()) + { + throw new IllegalArgumentException("not an absolute uri"); + } + + if (!uri.getScheme().equalsIgnoreCase("file")) + { + throw new IllegalArgumentException("not file: scheme"); + } + + Path path; + try + { + path = new File(uri).toPath(); + } + catch (InvalidPathException e) + { + throw e; + } + catch (IllegalArgumentException e) + { + throw e; + } + catch (Exception e) + { + LOG.ignore(e); + throw new IOException("Unable to build Path from: " + uri,e); + } + + this.path = path; + this.uri = path.toUri(); + } + + public PathResource(URL url) throws IOException, URISyntaxException + { + this(url.toURI()); + } + + @Override + public Resource addPath(String apath) throws IOException, MalformedURLException + { + return new PathResource(this.path.resolve(apath)); + } + + @Override + public void close() + { + // not applicable for FileSytem / Path + } + + @Override + public boolean delete() throws SecurityException + { + try + { + return Files.deleteIfExists(path); + } + catch (IOException e) + { + LOG.ignore(e); + return false; + } + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + { + return true; + } + if (obj == null) + { + return false; + } + if (getClass() != obj.getClass()) + { + return false; + } + PathResource other = (PathResource)obj; + if (path == null) + { + if (other.path != null) + { + return false; + } + } + else if (!path.equals(other.path)) + { + return false; + } + return true; + } + + @Override + public boolean exists() + { + return Files.exists(path,linkOptions); + } + + @Override + public File getFile() throws IOException + { + return path.toFile(); + } + + public boolean getFollowLinks() + { + return (linkOptions != null) && (linkOptions.length > 0) && (linkOptions[0] == LinkOption.NOFOLLOW_LINKS); + } + + @Override + public InputStream getInputStream() throws IOException + { + return Files.newInputStream(path,StandardOpenOption.READ); + } + + @Override + public String getName() + { + return path.toAbsolutePath().toString(); + } + + @Override + public ReadableByteChannel getReadableByteChannel() throws IOException + { + return FileChannel.open(path,StandardOpenOption.READ); + } + + @Override + public URI getURI() + { + return this.uri; + } + + @Override + public URL getURL() + { + try + { + return path.toUri().toURL(); + } + catch (MalformedURLException e) + { + return null; + } + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = (prime * result) + ((path == null)?0:path.hashCode()); + return result; + } + + @Override + public boolean isContainedIn(Resource r) throws MalformedURLException + { + // not applicable for FileSystem / path + return false; + } + + @Override + public boolean isDirectory() + { + return Files.isDirectory(path,linkOptions); + } + + @Override + public long lastModified() + { + try + { + FileTime ft = Files.getLastModifiedTime(path,linkOptions); + return ft.toMillis(); + } + catch (IOException e) + { + LOG.ignore(e); + return 0; + } + } + + @Override + public long length() + { + try + { + return Files.size(path); + } + catch (IOException e) + { + // in case of error, use File.length logic of 0L + return 0L; + } + } + + @Override + public URI getAlias() + { + if (Files.isSymbolicLink(path)) + { + try + { + return path.toRealPath().toUri(); + } + catch (IOException e) + { + LOG.debug(e); + return null; + } + } + else + { + return null; + } + } + + @Override + public String[] list() + { + try (DirectoryStream dir = Files.newDirectoryStream(path)) + { + List entries = new ArrayList<>(); + for (Path entry : dir) + { + String name = entry.getFileName().toString(); + + if (Files.isDirectory(entry)) + { + name += "/"; + } + + entries.add(name); + } + int size = entries.size(); + return entries.toArray(new String[size]); + } + catch (DirectoryIteratorException e) + { + LOG.debug(e); + } + catch (IOException e) + { + LOG.debug(e); + } + return null; + } + + @Override + public boolean renameTo(Resource dest) throws SecurityException + { + if (dest instanceof PathResource) + { + PathResource destRes = (PathResource)dest; + try + { + Path result = Files.move(path,destRes.path,StandardCopyOption.ATOMIC_MOVE); + return Files.exists(result,linkOptions); + } + catch (IOException e) + { + LOG.ignore(e); + return false; + } + } + else + { + return false; + } + } + + public void setFollowLinks(boolean followLinks) + { + if (followLinks) + { + linkOptions = new LinkOption[0]; + } + else + { + linkOptions = new LinkOption[] { LinkOption.NOFOLLOW_LINKS }; + } + } +} 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 b36a9355823..426b46ea42e 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 @@ -352,6 +352,7 @@ public abstract class Resource implements ResourceFactory, Closeable /** * Returns an URL representing the given resource */ + // TODO: should deprecate this one and only use getURI() public abstract URL getURL(); /* ------------------------------------------------------------ */ @@ -405,6 +406,7 @@ public abstract class Resource implements ResourceFactory, Closeable /** * Deletes the given resource */ + // TODO: can throw IOException public abstract boolean delete() throws SecurityException; @@ -412,6 +414,7 @@ public abstract class Resource implements ResourceFactory, Closeable /** * Rename the given resource */ + // TODO: can throw IOException public abstract boolean renameTo( Resource dest) throws SecurityException; @@ -420,6 +423,7 @@ public abstract class Resource implements ResourceFactory, Closeable * Returns a list of resource names contained in the given resource * The resource names are not URL encoded. */ + // TODO: can throw IOException public abstract String[] list(); /* ------------------------------------------------------------ */ @@ -545,7 +549,7 @@ public abstract class Resource implements ResourceFactory, Closeable buf.append(""); } buf.append("\n"); - buf.append("\n"); + buf.append("\n"); return buf.toString(); } 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 1feb604790f..3db90dca446 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 @@ -160,17 +160,19 @@ public abstract class Credential implements Serializable digest = __md.digest(); } if (digest == null || digest.length != _digest.length) return false; + boolean digestMismatch = false; for (int i = 0; i < digest.length; i++) - if (digest[i] != _digest[i]) return false; - return true; + digestMismatch |= (digest[i] != _digest[i]); + return !digestMismatch; } else if (credentials instanceof MD5) { MD5 md5 = (MD5) credentials; if (_digest.length != md5._digest.length) return false; + boolean digestMismatch = false; for (int i = 0; i < _digest.length; i++) - if (_digest[i] != md5._digest[i]) return false; - return true; + digestMismatch |= (_digest[i] != md5._digest[i]); + return !digestMismatch; } else if (credentials instanceof Credential) { 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 016c81273eb..d7300954003 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 @@ -251,7 +251,8 @@ public class SslContextFactory extends AbstractLifeCycle if (_trustAll) { - LOG.debug("No keystore or trust store configured. ACCEPTING UNTRUSTED CERTIFICATES!!!!!"); + if (LOG.isDebugEnabled()) + LOG.debug("No keystore or trust store configured. ACCEPTING UNTRUSTED CERTIFICATES!!!!!"); // Create a trust manager that does not validate certificate chains trust_managers = TRUST_ALL_CERTS; } @@ -304,9 +305,11 @@ public class SslContextFactory extends AbstractLifeCycle } SSLEngine engine = newSSLEngine(); - LOG.debug("Enabled Protocols {} of {}",Arrays.asList(engine.getEnabledProtocols()),Arrays.asList(engine.getSupportedProtocols())); if (LOG.isDebugEnabled()) + { + LOG.debug("Enabled Protocols {} of {}",Arrays.asList(engine.getEnabledProtocols()),Arrays.asList(engine.getSupportedProtocols())); LOG.debug("Enabled Ciphers {} of {}",Arrays.asList(engine.getEnabledCipherSuites()),Arrays.asList(engine.getSupportedCipherSuites())); + } } } 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 5cc75121c0b..79629eb1ec3 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 @@ -39,7 +39,6 @@ import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.ContainerLifeCycle; 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.util.thread.ThreadPool.SizedThreadPool; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java index c2abcfc80e5..54dc636fb8f 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ThreadPool.java @@ -22,7 +22,6 @@ import java.util.concurrent.Executor; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; -import org.eclipse.jetty.util.component.LifeCycle; /* ------------------------------------------------------------ */ /** ThreadPool. diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/CollectionAssert.java b/jetty-util/src/test/java/org/eclipse/jetty/util/CollectionAssert.java new file mode 100644 index 00000000000..9ddba2aab32 --- /dev/null +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/CollectionAssert.java @@ -0,0 +1,137 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.util; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.junit.Assert; + +public class CollectionAssert +{ + public static void assertContainsUnordered(String msg, Collection expectedSet, Collection actualSet) + { + // same size? + boolean mismatch = expectedSet.size() != actualSet.size(); + + // test content + Set missing = new HashSet<>(); + for (String expected : expectedSet) + { + if (!actualSet.contains(expected)) + { + missing.add(expected); + } + } + + if (mismatch || missing.size() > 0) + { + // build up detailed error message + StringWriter message = new StringWriter(); + PrintWriter err = new PrintWriter(message); + + err.printf("%s: Assert Contains (Unordered)",msg); + if (mismatch) + { + err.print(" [size mismatch]"); + } + if (missing.size() >= 0) + { + err.printf(" [%d entries missing]",missing.size()); + } + err.println(); + err.printf("Actual Entries (size: %d)%n",actualSet.size()); + for (String actual : actualSet) + { + char indicator = expectedSet.contains(actual)?' ':'>'; + err.printf("%s| %s%n",indicator,actual); + } + err.printf("Expected Entries (size: %d)%n",expectedSet.size()); + for (String expected : expectedSet) + { + char indicator = actualSet.contains(expected)?' ':'>'; + err.printf("%s| %s%n",indicator,expected); + } + err.flush(); + Assert.fail(message.toString()); + } + } + + public static void assertOrdered(String msg, List expectedList, List actualList) + { + // same size? + boolean mismatch = expectedList.size() != actualList.size(); + + // test content + List badEntries = new ArrayList<>(); + int min = Math.min(expectedList.size(),actualList.size()); + int max = Math.max(expectedList.size(),actualList.size()); + for (int i = 0; i < min; i++) + { + if (!expectedList.get(i).equals(actualList.get(i))) + { + badEntries.add(i); + } + } + for (int i = min; i < max; i++) + { + badEntries.add(i); + } + + if (mismatch || badEntries.size() > 0) + { + // build up detailed error message + StringWriter message = new StringWriter(); + PrintWriter err = new PrintWriter(message); + + err.printf("%s: Assert Contains (Unordered)",msg); + if (mismatch) + { + err.print(" [size mismatch]"); + } + if (badEntries.size() >= 0) + { + err.printf(" [%d entries not matched]",badEntries.size()); + } + err.println(); + err.printf("Actual Entries (size: %d)%n",actualList.size()); + for (int i = 0; i < actualList.size(); i++) + { + String actual = actualList.get(i); + char indicator = badEntries.contains(i)?'>':' '; + err.printf("%s[%d] %s%n",indicator,i,actual); + } + + err.printf("Expected Entries (size: %d)%n",expectedList.size()); + for (int i = 0; i < expectedList.size(); i++) + { + String expected = expectedList.get(i); + char indicator = badEntries.contains(i)?'>':' '; + err.printf("%s[%d] %s%n",indicator,i,expected); + } + err.flush(); + Assert.fail(message.toString()); + } + } +} diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java index 2fde48331b0..37f7f932769 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java @@ -262,16 +262,14 @@ public class IteratingCallbackTest int processed=0; @Override - protected void completed() + protected void onCompleteSuccess() { completed.countDown(); } - @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { - super.failed(x); completed.countDown(); } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/URITest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java similarity index 89% rename from jetty-util/src/test/java/org/eclipse/jetty/util/URITest.java rename to jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java index 9ab2bd27e7a..e2b4955dc77 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/URITest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/URIUtilTest.java @@ -19,6 +19,8 @@ package org.eclipse.jetty.util; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.nio.charset.StandardCharsets; @@ -29,7 +31,7 @@ import org.junit.Test; /** Util meta Tests. * */ -public class URITest +public class URIUtilTest { /* ------------------------------------------------------------ */ @Test @@ -185,6 +187,27 @@ public class URITest assertEquals("parent null",null, URIUtil.parentPath(null)); } + /* ------------------------------------------------------------ */ + @Test + public void testEqualsIgnoreEncoding() + { + assertTrue(URIUtil.equalsIgnoreEncodings("http://example.com/foo/bar","http://example.com/foo/bar" )); + assertTrue(URIUtil.equalsIgnoreEncodings("/barry's","/barry%27s")); + assertTrue(URIUtil.equalsIgnoreEncodings("/barry%27s","/barry's")); + assertTrue(URIUtil.equalsIgnoreEncodings("/barry%27s","/barry%27s")); + assertTrue(URIUtil.equalsIgnoreEncodings("/b rry's","/b%20rry%27s")); + assertTrue(URIUtil.equalsIgnoreEncodings("/b rry%27s","/b%20rry's")); + assertTrue(URIUtil.equalsIgnoreEncodings("/b rry%27s","/b%20rry%27s")); + + assertTrue(URIUtil.equalsIgnoreEncodings("/foo%2fbar","/foo%2fbar")); + assertTrue(URIUtil.equalsIgnoreEncodings("/foo%2fbar","/foo%2Fbar")); + + assertFalse(URIUtil.equalsIgnoreEncodings("ABC", "abc")); + assertFalse(URIUtil.equalsIgnoreEncodings("/barry's","/barry%26s")); + + assertFalse(URIUtil.equalsIgnoreEncodings("/foo/bar","/foo%2fbar")); + assertFalse(URIUtil.equalsIgnoreEncodings("/foo2fbar","/foo/bar")); + } /* ------------------------------------------------------------ */ @Test diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java index 297b8e14027..5614edfb3ff 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java @@ -199,7 +199,7 @@ public class URLEncodedTest /* -------------------------------------------------------------- */ @Test public void testUrlEncodedStream() - throws Exception + throws Exception { String [][] charsets = new String[][] { diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java new file mode 100644 index 00000000000..c9af65b90d4 --- /dev/null +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java @@ -0,0 +1,501 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.util.resource; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.junit.Assume.*; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URI; +import java.net.URL; +import java.nio.ByteBuffer; +import java.nio.channels.ReadableByteChannel; +import java.nio.file.FileSystemException; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.eclipse.jetty.toolchain.test.FS; +import org.eclipse.jetty.toolchain.test.IO; +import org.eclipse.jetty.toolchain.test.OS; +import org.eclipse.jetty.toolchain.test.TestingDir; +import org.eclipse.jetty.util.BufferUtil; +import org.eclipse.jetty.util.CollectionAssert; +import org.junit.Rule; +import org.junit.Test; + +public abstract class AbstractFSResourceTest +{ + @Rule + public TestingDir testdir = new TestingDir(); + + public abstract Resource newResource(URI uri) throws IOException; + + public abstract Resource newResource(File file) throws IOException; + + private URI createEmptyFile(String name) throws IOException + { + File file = testdir.getFile(name); + file.createNewFile(); + return file.toURI(); + } + + @Test(expected = IllegalArgumentException.class) + public void testNonAbsoluteURI() throws Exception + { + newResource(new URI("path/to/resource")); + } + + @Test(expected = IllegalArgumentException.class) + public void testNotFileURI() throws Exception + { + newResource(new URI("http://www.eclipse.org/jetty/")); + } + + @Test(expected = IllegalArgumentException.class) + public void testBogusFilename() throws Exception + { + if (OS.IS_UNIX) + { + // A windows path is invalid under unix + newResource(new URI("file://Z:/:")); + } + else if (OS.IS_WINDOWS) + { + // "CON" is a reserved name under windows + newResource(new URI("file://CON")); + } + else + { + assumeFalse("Unknown OS type",false); + } + } + + @Test + public void testIsContainedIn() throws Exception + { + createEmptyFile("foo"); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("is contained in",res.isContainedIn(base),is(false)); + } + } + + @Test + public void testIsDirectory() throws Exception + { + File dir = testdir.getDir(); + createEmptyFile("foo"); + + File subdir = new File(dir,"sub"); + FS.ensureDirExists(subdir); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.isDirectory",res.isDirectory(),is(false)); + + Resource sub = base.addPath("sub"); + assertThat("sub/.isDirectory",sub.isDirectory(),is(true)); + } + } + + @Test + public void testLastModified() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + long expected = file.lastModified(); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.lastModified",res.lastModified(),is(expected)); + } + } + + @Test + public void testLastModified_NotExists() throws Exception + { + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.lastModified",res.lastModified(),is(0L)); + } + } + + @Test + public void testLength() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + try (StringReader reader = new StringReader("foo"); FileWriter writer = new FileWriter(file)) + { + IO.copy(reader,writer); + } + + long expected = file.length(); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.length",res.length(),is(expected)); + } + } + + @Test + public void testLength_NotExists() throws Exception + { + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.length",res.length(),is(0L)); + } + } + + @Test + public void testDelete() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + try (Resource base = newResource(testdir.getDir())) + { + // Is it there? + Resource res = base.addPath("foo"); + assertThat("foo.exists",res.exists(),is(true)); + // delete it + assertThat("foo.delete",res.delete(),is(true)); + // is it there? + assertThat("foo.exists",res.exists(),is(false)); + } + } + + @Test + public void testDelete_NotExists() throws Exception + { + try (Resource base = newResource(testdir.getDir())) + { + // Is it there? + Resource res = base.addPath("foo"); + assertThat("foo.exists",res.exists(),is(false)); + // delete it + assertThat("foo.delete",res.delete(),is(false)); + // is it there? + assertThat("foo.exists",res.exists(),is(false)); + } + } + + @Test + public void testName() throws Exception + { + String expected = testdir.getDir().getAbsolutePath(); + + try (Resource base = newResource(testdir.getDir())) + { + assertThat("base.name",base.getName(),is(expected)); + } + } + + @Test + public void testInputStream() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + String content = "Foo is here"; + + try (StringReader reader = new StringReader(content); FileWriter writer = new FileWriter(file)) + { + IO.copy(reader,writer); + } + + try (Resource base = newResource(testdir.getDir())) + { + Resource foo = base.addPath("foo"); + try (InputStream stream = foo.getInputStream(); InputStreamReader reader = new InputStreamReader(stream); StringWriter writer = new StringWriter()) + { + IO.copy(reader,writer); + assertThat("Stream",writer.toString(),is(content)); + } + } + } + + @Test + public void testReadableByteChannel() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + String content = "Foo is here"; + + try (StringReader reader = new StringReader(content); FileWriter writer = new FileWriter(file)) + { + IO.copy(reader,writer); + } + + try (Resource base = newResource(testdir.getDir())) + { + Resource foo = base.addPath("foo"); + try (ReadableByteChannel channel = foo.getReadableByteChannel()) + { + ByteBuffer buf = ByteBuffer.allocate(256); + channel.read(buf); + buf.flip(); + String actual = BufferUtil.toUTF8String(buf); + assertThat("ReadableByteChannel content",actual,is(content)); + } + } + } + + @Test + public void testGetURI() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + URI expected = file.toURI(); + + try (Resource base = newResource(testdir.getDir())) + { + Resource foo = base.addPath("foo"); + assertThat("getURI",foo.getURI(),is(expected)); + } + } + + @Test + public void testGetURL() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + URL expected = file.toURI().toURL(); + + try (Resource base = newResource(testdir.getDir())) + { + Resource foo = base.addPath("foo"); + assertThat("getURL",foo.getURL(),is(expected)); + } + } + + @Test + public void testList() throws Exception + { + File dir = testdir.getDir(); + FS.touch(new File(dir, "foo")); + FS.touch(new File(dir, "bar")); + FS.ensureDirExists(new File(dir, "tick")); + FS.ensureDirExists(new File(dir, "tock")); + + List expected = new ArrayList<>(); + expected.add("foo"); + expected.add("bar"); + expected.add("tick/"); + expected.add("tock/"); + + try (Resource base = newResource(testdir.getDir())) + { + String list[] = base.list(); + List actual = Arrays.asList(list); + + CollectionAssert.assertContainsUnordered("Resource Directory Listing", + expected,actual); + } + } + + @Test + public void testSymlink() throws Exception + { + File dir = testdir.getDir(); + + Path foo = new File(dir, "foo").toPath(); + Path bar = new File(dir, "bar").toPath(); + + try + { + Files.createFile(foo); + Files.createSymbolicLink(bar,foo); + } + catch (UnsupportedOperationException | FileSystemException e) + { + // if unable to create symlink, no point testing the rest + // this is the path that Microsoft Windows takes. + assumeNoException(e); + } + + try (Resource base = newResource(testdir.getDir())) + { + Resource resFoo = base.addPath("foo"); + Resource resBar = base.addPath("bar"); + + // Access to the same resource, but via a symlink means that they are not equivalent + assertThat("foo.equals(bar)", resFoo.equals(resBar), is(false)); + + assertThat("foo.alias", resFoo.getAlias(), nullValue()); + assertThat("bar.alias", resBar.getAlias(), is(foo.toUri())); + } + } + + @Test + public void testSemicolon() throws Exception + { + File dir = testdir.getDir(); + + try + { + // attempt to create file + Path foo = new File(dir, "foo;").toPath(); + Files.createFile(foo); + } + catch (Exception e) + { + // if unable to create file, no point testing the rest + // this is the path that Microsoft Windows takes. + assumeNoException(e); + } + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo;"); + assertThat("Alias: " + res,res.getAlias(),nullValue()); + } + } + + @Test + public void testExist_Normal() throws Exception + { + createEmptyFile("a.jsp"); + + URI ref = testdir.getDir().toURI().resolve("a.jsp"); + try (Resource fileres = newResource(ref)) + { + assertThat("Resource: " + fileres,fileres.exists(),is(true)); + } + } + + @Test + public void testSingleQuoteInFileName() throws Exception + { + createEmptyFile("foo's.txt"); + createEmptyFile("f o's.txt"); + + URI refQuoted = testdir.getDir().toURI().resolve("foo's.txt"); + + try (Resource fileres = newResource(refQuoted)) + { + assertThat("Exists: " + refQuoted,fileres.exists(),is(true)); + assertThat("Alias: " + refQuoted,fileres.getAlias(),nullValue()); + } + + URI refEncoded = testdir.getDir().toURI().resolve("foo%27s.txt"); + + try (Resource fileres = newResource(refEncoded)) + { + assertThat("Exists: " + refEncoded,fileres.exists(),is(true)); + assertThat("Alias: " + refEncoded,fileres.getAlias(),nullValue()); + } + + URI refQuoteSpace = testdir.getDir().toURI().resolve("f%20o's.txt"); + + try (Resource fileres = newResource(refQuoteSpace)) + { + assertThat("Exists: " + refQuoteSpace,fileres.exists(),is(true)); + assertThat("Alias: " + refQuoteSpace,fileres.getAlias(),nullValue()); + } + + URI refEncodedSpace = testdir.getDir().toURI().resolve("f%20o%27s.txt"); + + try (Resource fileres = newResource(refEncodedSpace)) + { + assertThat("Exists: " + refEncodedSpace,fileres.exists(),is(true)); + assertThat("Alias: " + refEncodedSpace,fileres.getAlias(),nullValue()); + } + + URI refA = testdir.getDir().toURI().resolve("foo's.txt"); + URI refB = testdir.getDir().toURI().resolve("foo%27s.txt"); + + StringBuilder msg = new StringBuilder(); + msg.append("URI[a].equals(URI[b])").append(System.lineSeparator()); + msg.append("URI[a] = ").append(refA).append(System.lineSeparator()); + msg.append("URI[b] = ").append(refB); + + // show that simple URI.equals() doesn't work + assertThat(msg.toString(),refA.equals(refB),is(false)); + + // now show that Resource.equals() does work + try (Resource a = newResource(refA); Resource b = newResource(refB);) + { + assertThat("A.equals(B)",a.equals(b),is(true)); + } + } + + @Test + public void testExist_BadNull() throws Exception + { + createEmptyFile("a.jsp"); + + try + { + // request with null at end + URI ref = testdir.getDir().toURI().resolve("a.jsp%00"); + assertThat("Null URI",ref,notNullValue()); + + newResource(ref); + fail("Should have thrown " + InvalidPathException.class); + } + catch (InvalidPathException e) + { + // Expected path + } + } + + @Test + public void testExist_BadNullX() throws Exception + { + createEmptyFile("a.jsp"); + + try + { + // request with null and x at end + URI ref = testdir.getDir().toURI().resolve("a.jsp%00x"); + assertThat("NullX URI",ref,notNullValue()); + + newResource(ref); + fail("Should have thrown " + InvalidPathException.class); + } + catch (InvalidPathException e) + { + // Expected path + } + } +} diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileResourceTest.java index 2b4659ea6fa..71b02db6caf 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileResourceTest.java @@ -18,108 +18,36 @@ package org.eclipse.jetty.util.resource; -import static org.hamcrest.Matchers.is; -import static org.junit.Assume.assumeTrue; - import java.io.File; import java.io.IOException; -import java.net.MalformedURLException; import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import org.eclipse.jetty.toolchain.test.OS; -import org.eclipse.jetty.toolchain.test.TestingDir; -import org.eclipse.jetty.util.UrlEncoded; -import org.junit.Assert; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -public class FileResourceTest +public class FileResourceTest extends AbstractFSResourceTest { - @Rule - public TestingDir testdir = new TestingDir(); - - private URI createDummyFile(String name) throws IOException + @Override + public Resource newResource(URI uri) throws IOException { - File file = testdir.getFile(name); - file.createNewFile(); - return file.toURI(); + return new FileResource(uri); } - private URL decode(URL url) throws MalformedURLException + @Override + public Resource newResource(File file) throws IOException { - String raw = url.toExternalForm(); - String decoded = UrlEncoded.decodeString(raw,0,raw.length(), StandardCharsets.UTF_8); - return new URL(decoded); + return new FileResource(file); } - @Test - public void testSemicolon() throws Exception - { - assumeTrue(!OS.IS_WINDOWS); - createDummyFile("foo;"); - - try(Resource base = new FileResource(testdir.getDir());) - { - Resource res = base.addPath("foo;"); - Assert.assertNull(res.getAlias()); - } - } - - @Test - public void testExist_Normal() throws Exception - { - createDummyFile("a.jsp"); - - URI ref = testdir.getDir().toURI().resolve("a.jsp"); - try(FileResource fileres = new FileResource(decode(ref.toURL()));) - { - Assert.assertThat("FileResource: " + fileres,fileres.exists(),is(true)); - } - } - @Ignore("Cannot get null to be seen by FileResource") @Test public void testExist_BadNull() throws Exception { - createDummyFile("a.jsp"); - - try - { - // request with null at end - URI ref = testdir.getDir().toURI().resolve("a.jsp%00"); - try(FileResource fileres = new FileResource(decode(ref.toURL()));) - { - Assert.assertThat("FileResource: " + fileres,fileres.exists(),is(false)); - } - } - catch(URISyntaxException e) - { - // Valid path - } } @Ignore("Validation shouldn't be done in FileResource") @Test public void testExist_BadNullX() throws Exception { - createDummyFile("a.jsp"); - - try - { - // request with null and x at end - URI ref = testdir.getDir().toURI().resolve("a.jsp%00x"); - try(FileResource fileres = new FileResource(decode(ref.toURL()));) - { - Assert.assertThat("FileResource: " + fileres,fileres.exists(),is(false)); - } - } - catch(URISyntaxException e) - { - // Valid path - } } } 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 new file mode 100644 index 00000000000..6e059a68c2a --- /dev/null +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java @@ -0,0 +1,38 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.util.resource; + +import java.io.File; +import java.io.IOException; +import java.net.URI; + +public class PathResourceTest extends AbstractFSResourceTest +{ + @Override + public Resource newResource(URI uri) throws IOException + { + return new PathResource(uri); + } + + @Override + public Resource newResource(File file) throws IOException + { + return new PathResource(file); + } +} diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java index 852a06b2933..688bb18ac8e 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java @@ -124,9 +124,9 @@ public class ResourceTest __userURL=uri.toURL(); __userURL = MavenTestingUtils.getTestResourcesDir().toURI().toURL(); - FilePermission perm = (FilePermission) __userURL.openConnection().getPermission(); - __userDir = new File(perm.getName()).getCanonicalPath() + File.separatorChar; - __relDir = "src/test/resources/".replace('/', File.separatorChar); + FilePermission perm = (FilePermission) __userURL.openConnection().getPermission(); + __userDir = new File(perm.getName()).getCanonicalPath() + File.separatorChar; + __relDir = "src/test/resources/".replace('/', File.separatorChar); //System.err.println("User Dir="+__userDir); //System.err.println("Rel Dir="+__relDir); 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 413f68892a3..cec0e58840a 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 @@ -20,7 +20,6 @@ package org.eclipse.jetty.webapp; import java.net.URL; -import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlParser; diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java index 4a7a04bb237..7bd19c7e3c4 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java @@ -75,10 +75,10 @@ public class FragmentConfiguration extends AbstractConfiguration { for (Resource key : frags.keySet()) { - if (key.isDirectory()) //tolerate the case where the library is a directory, not a jar. useful for OSGi for example - { - metaData.addFragment(key, frags.get(key)); - } + if (key.isDirectory()) //tolerate the case where the library is a directory, not a jar. useful for OSGi for example + { + metaData.addFragment(key, frags.get(key)); + } else //the standard case: a jar most likely inside WEB-INF/lib { metaData.addFragment(key, frags.get(key)); 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 8013e2cd914..4617c025503 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 @@ -21,7 +21,6 @@ package org.eclipse.jetty.webapp; import java.net.URI; import java.net.URL; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -131,41 +130,50 @@ public class MetaInfConfiguration extends AbstractConfiguration * Scan for META-INF/resources dir in the given jar. * * @param context - * @param jar + * @param target * @param cache * @throws Exception */ - public void scanForResources (WebAppContext context, Resource jar, ConcurrentHashMap cache) + public void scanForResources (WebAppContext context, Resource target, ConcurrentHashMap cache) throws Exception { Resource resourcesDir = null; - if (cache != null && cache.containsKey(jar)) + if (cache != null && cache.containsKey(target)) { - resourcesDir = cache.get(jar); + resourcesDir = cache.get(target); if (resourcesDir == EmptyResource.INSTANCE) { - if (LOG.isDebugEnabled()) LOG.debug(jar+" cached as containing no META-INF/resources"); + if (LOG.isDebugEnabled()) LOG.debug(target+" cached as containing no META-INF/resources"); return; } else - if (LOG.isDebugEnabled()) LOG.debug(jar+" META-INF/resources found in cache "); + if (LOG.isDebugEnabled()) LOG.debug(target+" META-INF/resources found in cache "); } else { //not using caches or not in the cache so check for the resources dir - if (LOG.isDebugEnabled()) LOG.debug(jar+" META-INF/resources checked"); - URI uri = jar.getURI(); - resourcesDir = Resource.newResource("jar:"+uri+"!/META-INF/resources"); + if (LOG.isDebugEnabled()) LOG.debug(target+" META-INF/resources checked"); + if (target.isDirectory()) + { + //TODO think how to handle an unpacked jar file (eg for osgi) + resourcesDir = target.addPath("/META-INF/resources"); + } + else + { + //Resource represents a packed jar + URI uri = target.getURI(); + resourcesDir = Resource.newResource("jar:"+uri+"!/META-INF/resources"); + } if (!resourcesDir.exists() || !resourcesDir.isDirectory()) resourcesDir = EmptyResource.INSTANCE; if (cache != null) { - Resource old = cache.putIfAbsent(jar, resourcesDir); + Resource old = cache.putIfAbsent(target, resourcesDir); if (old != null) resourcesDir = old; else - if (LOG.isDebugEnabled()) LOG.debug(jar+" META-INF/resources cache updated"); + if (LOG.isDebugEnabled()) LOG.debug(target+" META-INF/resources cache updated"); } if (resourcesDir == EmptyResource.INSTANCE) @@ -210,8 +218,16 @@ public class MetaInfConfiguration extends AbstractConfiguration { //not using caches or not in the cache so check for the web-fragment.xml if (LOG.isDebugEnabled()) LOG.debug(jar+" META-INF/web-fragment.xml checked"); - URI uri = jar.getURI(); - webFrag = Resource.newResource("jar:"+uri+"!/META-INF/web-fragment.xml"); + if (jar.isDirectory()) + { + //TODO ???? + webFrag = jar.addPath("/META-INF/web-fragment.xml"); + } + else + { + URI uri = jar.getURI(); + webFrag = Resource.newResource("jar:"+uri+"!/META-INF/web-fragment.xml"); + } if (!webFrag.exists() || webFrag.isDirectory()) webFrag = EmptyResource.INSTANCE; @@ -270,8 +286,17 @@ public class MetaInfConfiguration extends AbstractConfiguration else { //not using caches or not in the cache so find all tlds - URI uri = jar.getURI(); - Resource metaInfDir = Resource.newResource("jar:"+uri+"!/META-INF/"); + Resource metaInfDir = null; + if (jar.isDirectory()) + { + //TODO ?????? + metaInfDir = jar.addPath("/META-INF/"); + } + else + { + URI uri = jar.getURI(); + metaInfDir = Resource.newResource("jar:"+uri+"!/META-INF/"); + } //find any *.tld files inside META-INF or subdirs tlds = new HashSet(); 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 de6c181d4fe..ecee109d83f 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 @@ -33,7 +33,6 @@ import java.util.Set; import javax.servlet.DispatcherType; import javax.servlet.MultipartConfigElement; -import javax.servlet.ServletException; import javax.servlet.SessionTrackingMode; import org.eclipse.jetty.security.ConstraintAware; @@ -284,23 +283,15 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor } String servlet_class = node.getString("servlet-class", false, true); - + if ("".equals(servlet_class)) + servlet_class = null; //Handle the default jsp servlet instance - if (id != null && id.equals("jsp")) + if (id != null && id.equals("jsp") && servlet_class != null) { try { Loader.loadClass(this.getClass(), servlet_class); - - //Ensure there is a scratch dir - if (holder.getInitParameter("scratchdir") == null) - { - File tmp = context.getTempDirectory(); - File scratch = new File(tmp, "jsp"); - if (!scratch.exists()) scratch.mkdir(); - holder.setInitParameter("scratchdir", scratch.getAbsolutePath()); - } } catch (ClassNotFoundException e) { 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 2ae1cae451f..dfb2ee46bf1 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 @@ -221,7 +221,7 @@ public class WebAppClassLoader extends URLClassLoader * with '/'. */ public void addClassPath(String classPath) - throws IOException + throws IOException { if (classPath == null) return; 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 c2eec1e1977..e55b578b420 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 @@ -914,7 +914,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL /* ------------------------------------------------------------ */ protected void loadConfigurations() - throws Exception + throws Exception { //if the configuration instances have been set explicitly, use them if (_configurations.size()>0) diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java index 4ca4fc77b32..0e341fc2c9a 100644 --- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java +++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java @@ -33,7 +33,6 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jetty.util.resource.Resource; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/DecoderFactory.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/DecoderFactory.java index c89718592c8..7a74bbeee8a 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/DecoderFactory.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/DecoderFactory.java @@ -20,7 +20,6 @@ package org.eclipse.jetty.websocket.jsr356; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import javax.websocket.Decoder; import javax.websocket.EndpointConfig; @@ -99,7 +98,10 @@ public class DecoderFactory implements Configurable public DecoderMetadata getMetadataFor(Class type) { - LOG.debug("getMetadataFor({})",type); + if (LOG.isDebugEnabled()) + { + LOG.debug("getMetadataFor({})",type); + } DecoderMetadata metadata = metadatas.getMetadataByType(type); if (metadata != null) @@ -147,7 +149,10 @@ public class DecoderFactory implements Configurable @Override public void init(EndpointConfig config) { - LOG.debug("init({})",config); + if (LOG.isDebugEnabled()) + { + LOG.debug("init({})",config); + } // Instantiate all declared decoders for (DecoderMetadata metadata : metadatas) { diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/EncoderFactory.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/EncoderFactory.java index fda780b7b49..a41aa96b9fc 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/EncoderFactory.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/EncoderFactory.java @@ -20,7 +20,6 @@ package org.eclipse.jetty.websocket.jsr356; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import javax.websocket.Encoder; import javax.websocket.EndpointConfig; @@ -92,7 +91,10 @@ public class EncoderFactory implements Configurable public EncoderMetadata getMetadataFor(Class type) { - LOG.debug("getMetadataFor({})",type); + if (LOG.isDebugEnabled()) + { + LOG.debug("getMetadataFor({})",type); + } EncoderMetadata metadata = metadatas.getMetadataByType(type); if (metadata != null) @@ -140,7 +142,10 @@ public class EncoderFactory implements Configurable @Override public void init(EndpointConfig config) { - LOG.debug("init({})",config); + if (LOG.isDebugEnabled()) + { + LOG.debug("init({})",config); + } // Instantiate all declared encoders for (EncoderMetadata metadata : metadatas) diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerFactory.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerFactory.java index 5bf5a4685e2..8ab00ea5373 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerFactory.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageHandlerFactory.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import javax.websocket.MessageHandler; import org.eclipse.jetty.util.log.Log; @@ -46,7 +45,10 @@ public class MessageHandlerFactory public List getMetadata(Class handler) throws IllegalStateException { - LOG.debug("getMetadata({})",handler); + if (LOG.isDebugEnabled()) + { + LOG.debug("getMetadata({})",handler); + } List ret = registered.get(handler); if (ret != null) { @@ -64,19 +66,31 @@ public class MessageHandlerFactory if (MessageHandler.Partial.class.isAssignableFrom(handler)) { - LOG.debug("supports Partial: {}",handler); + if (LOG.isDebugEnabled()) + { + LOG.debug("supports Partial: {}",handler); + } partial = true; Class onMessageClass = ReflectUtils.findGenericClassFor(handler,MessageHandler.Partial.class); - LOG.debug("Partial message class: {}",onMessageClass); + if (LOG.isDebugEnabled()) + { + LOG.debug("Partial message class: {}",onMessageClass); + } metadatas.add(new MessageHandlerMetadata(handler,onMessageClass,partial)); } if (MessageHandler.Whole.class.isAssignableFrom(handler)) { - LOG.debug("supports Whole: {}",handler.getName()); + if (LOG.isDebugEnabled()) + { + LOG.debug("supports Whole: {}",handler.getName()); + } partial = false; Class onMessageClass = ReflectUtils.findGenericClassFor(handler,MessageHandler.Whole.class); - LOG.debug("Whole message class: {}",onMessageClass); + if (LOG.isDebugEnabled()) + { + LOG.debug("Whole message class: {}",onMessageClass); + } metadatas.add(new MessageHandlerMetadata(handler,onMessageClass,partial)); } diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/AnnotatedEndpointScanner.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/AnnotatedEndpointScanner.java index 655d6da92bb..ac163ab42ef 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/AnnotatedEndpointScanner.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/AnnotatedEndpointScanner.java @@ -22,7 +22,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; - import javax.websocket.EndpointConfig; import javax.websocket.OnClose; import javax.websocket.OnError; @@ -89,7 +88,10 @@ public class AnnotatedEndpointScanner metadata, Class pojo, Method method, Annotation annotation) { - LOG.debug("onMethodAnnotation({}, {}, {}, {})",metadata,pojo,method,annotation); + if (LOG.isDebugEnabled()) + { + LOG.debug("onMethodAnnotation({}, {}, {}, {})",metadata,pojo,method,annotation); + } if (isAnnotation(annotation,OnOpen.class)) { @@ -190,11 +192,17 @@ public class AnnotatedEndpointScanner Object ret = onBinary.call(websocket,buf,fin); if (ret != null) { - LOG.debug("returning: {}",ret); + if (LOG.isDebugEnabled()) + { + LOG.debug("returning: {}",ret); + } endpoint.sendObject(ret); } } @@ -125,7 +127,10 @@ public class JsrEvents Object ret = onBinaryStream.call(websocket,stream); if (ret != null) { - LOG.debug("returning: {}",ret); + if (LOG.isDebugEnabled()) + { + LOG.debug("returning: {}",ret); + } endpoint.sendObject(ret); } } @@ -167,7 +172,10 @@ public class JsrEvents Object ret = onPong.call(websocket,pong); if (ret != null) { - LOG.debug("returning: {}",ret); + if (LOG.isDebugEnabled()) + { + LOG.debug("returning: {}",ret); + } endpoint.sendObject(ret); } } @@ -181,7 +189,10 @@ public class JsrEvents Object ret = onText.call(websocket,text,fin); if (ret != null) { - LOG.debug("returning: {}",ret); + if (LOG.isDebugEnabled()) + { + LOG.debug("returning: {}",ret); + } endpoint.sendObject(ret); } } @@ -195,7 +206,10 @@ public class JsrEvents Object ret = onTextStream.call(websocket,reader); if (ret != null) { - LOG.debug("returning: {}",ret); + if (LOG.isDebugEnabled()) + { + LOG.debug("returning: {}",ret); + } endpoint.sendObject(ret); } } diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java index 0cf9df7ab51..ed4dfd06af8 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java @@ -23,7 +23,6 @@ import java.io.InputStream; import java.io.Reader; import java.nio.ByteBuffer; import java.util.Map; - import javax.websocket.CloseReason; import javax.websocket.DecodeException; @@ -83,13 +82,19 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver if (events.isBinaryPartialSupported()) { // Partial Message Support (does not use messageAppender) - LOG.debug("Partial Binary Message: fin={}",fin); + if (LOG.isDebugEnabled()) + { + LOG.debug("Partial Binary Message: fin={}",fin); + } activeMessage = new BinaryPartialOnMessage(this); } else { // Whole Message Support - LOG.debug("Whole Binary Message"); + if (LOG.isDebugEnabled()) + { + LOG.debug("Whole Binary Message"); + } activeMessage = new SimpleBinaryMessage(this); } } @@ -101,7 +106,10 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver // Streaming Message Support if (activeMessage == null) { - LOG.debug("Binary Message InputStream"); + if (LOG.isDebugEnabled()) + { + LOG.debug("Binary Message InputStream"); + } final MessageInputStream stream = new MessageInputStream(); activeMessage = stream; @@ -124,7 +132,10 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver } } - LOG.debug("handled = {}",handled); + if (LOG.isDebugEnabled()) + { + LOG.debug("handled = {}",handled); + } // Process any active MessageAppender if (handled && (activeMessage != null)) @@ -290,13 +301,19 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver if (events.isTextPartialSupported()) { // Partial Message Support - LOG.debug("Partial Text Message: fin={}",fin); + if (LOG.isDebugEnabled()) + { + LOG.debug("Partial Text Message: fin={}",fin); + } activeMessage = new TextPartialOnMessage(this); } else { // Whole Message Support - LOG.debug("Whole Text Message"); + if (LOG.isDebugEnabled()) + { + LOG.debug("Whole Text Message"); + } activeMessage = new SimpleTextMessage(this); } } @@ -308,7 +325,10 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver // Streaming Message Support if (activeMessage == null) { - LOG.debug("Text Message Writer"); + if (LOG.isDebugEnabled()) + { + LOG.debug("Text Message Writer"); + } final MessageReader stream = new MessageReader(new MessageInputStream()); activeMessage = stream; @@ -332,7 +352,10 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver } } - LOG.debug("handled = {}",handled); + if (LOG.isDebugEnabled()) + { + LOG.debug("handled = {}", handled); + } // Process any active MessageAppender if (handled && (activeMessage != null)) @@ -347,7 +370,10 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver @Override public void onTextMessage(String message) { - LOG.debug("onText({})",message); + if (LOG.isDebugEnabled()) + { + LOG.debug("onText({})",message); + } try { diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java index 9ac49062ace..1bed5196f56 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java @@ -23,7 +23,6 @@ import java.io.InputStream; import java.io.Reader; import java.nio.ByteBuffer; import java.util.Map; - import javax.websocket.CloseReason; import javax.websocket.Endpoint; import javax.websocket.MessageHandler; @@ -76,7 +75,10 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver final MessageHandlerWrapper wrapper = jsrsession.getMessageHandlerWrapper(MessageType.BINARY); if (wrapper == null) { - LOG.debug("No BINARY MessageHandler declared"); + if (LOG.isDebugEnabled()) + { + LOG.debug("No BINARY MessageHandler declared"); + } return; } if (wrapper.wantsPartialMessages()) @@ -128,7 +130,10 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver @Override public void onConnect() { - LOG.debug("onConnect({}, {})",jsrsession,config); + if (LOG.isDebugEnabled()) + { + LOG.debug("onConnect({}, {})",jsrsession,config); + } try { endpoint.onOpen(jsrsession,config); @@ -171,7 +176,10 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver final MessageHandlerWrapper wrapper = jsrsession.getMessageHandlerWrapper(MessageType.TEXT); if (wrapper == null) { - LOG.debug("No TEXT MessageHandler declared"); + if (LOG.isDebugEnabled()) + { + LOG.debug("No TEXT MessageHandler declared"); + } return; } if (wrapper.wantsPartialMessages()) @@ -232,14 +240,26 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver final MessageHandlerWrapper wrapper = jsrsession.getMessageHandlerWrapper(MessageType.PONG); if (wrapper == null) { - LOG.debug("No PONG MessageHandler declared"); + if (LOG.isDebugEnabled()) + { + LOG.debug("No PONG MessageHandler declared"); + } return; } - - ByteBuffer pongBuf = ByteBuffer.allocate(buffer.remaining()); - BufferUtil.put(buffer,pongBuf); - BufferUtil.flipToFlush(pongBuf,0); + ByteBuffer pongBuf = null; + + if (BufferUtil.isEmpty(buffer)) + { + pongBuf = BufferUtil.EMPTY_BUFFER; + } + else + { + pongBuf = ByteBuffer.allocate(buffer.remaining()); + BufferUtil.put(buffer,pongBuf); + BufferUtil.flipToFlush(pongBuf,0); + } + @SuppressWarnings("unchecked") Whole pongHandler = (Whole)wrapper.getHandler(); pongHandler.onMessage(new JsrPongMessage(pongBuf)); diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java index 441e8a60a80..4d537f7301a 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java @@ -54,6 +54,7 @@ import org.eclipse.jetty.websocket.common.test.BlockheadServer.ServerConnection; import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -250,6 +251,8 @@ public class DecoderReaderTest server.stop(); } + // TODO analyse and fix + @Ignore @Test public void testSingleQuotes() throws Exception { @@ -266,7 +269,9 @@ public class DecoderReaderTest Assert.assertThat("Quotes Author",quotes.author,is("Benjamin Franklin")); Assert.assertThat("Quotes Count",quotes.quotes.size(),is(3)); } - + + // TODO analyse and fix + @Ignore @Test public void testTwoQuotes() throws Exception { diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderTest.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderTest.java index 6931999e1c9..f90641ffed0 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderTest.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EncoderTest.java @@ -18,8 +18,6 @@ package org.eclipse.jetty.websocket.jsr356; -import static org.hamcrest.Matchers.*; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -28,7 +26,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.websocket.ClientEndpointConfig; import javax.websocket.ContainerProvider; import javax.websocket.EncodeException; @@ -52,6 +49,8 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.Matchers.containsString; + public class EncoderTest { private static class EchoServer implements Runnable @@ -182,7 +181,8 @@ public class EncoderTest public void write(Quotes quotes) throws IOException, EncodeException { - LOG.debug("Writing Quotes: {}",quotes); + if (LOG.isDebugEnabled()) + LOG.debug("Writing Quotes: {}",quotes); this.session.getBasicRemote().sendObject(quotes); } } diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EndpointEchoClient.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EndpointEchoClient.java index 958761bd1e4..6d2df3201be 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EndpointEchoClient.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EndpointEchoClient.java @@ -18,10 +18,7 @@ package org.eclipse.jetty.websocket.jsr356; -import static org.hamcrest.Matchers.notNullValue; - import java.io.IOException; - import javax.websocket.CloseReason; import javax.websocket.Endpoint; import javax.websocket.EndpointConfig; @@ -31,6 +28,8 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.junit.Assert; +import static org.hamcrest.Matchers.notNullValue; + /** * Basic Echo Client from extended Endpoint */ @@ -49,7 +48,8 @@ public class EndpointEchoClient extends Endpoint @Override public void onOpen(Session session, EndpointConfig config) { - LOG.debug("onOpen({}, {})",session,config); + if (LOG.isDebugEnabled()) + LOG.debug("onOpen({}, {})",session,config); this.session = session; Assert.assertThat("Session is required",session,notNullValue()); Assert.assertThat("EndpointConfig is required",config,notNullValue()); diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EndpointEchoTest.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EndpointEchoTest.java index 858f3414bc9..478e1683a80 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EndpointEchoTest.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/EndpointEchoTest.java @@ -18,11 +18,8 @@ package org.eclipse.jetty.websocket.jsr356; -import static org.hamcrest.Matchers.instanceOf; - import java.net.URI; import java.util.concurrent.TimeUnit; - import javax.websocket.ContainerProvider; import javax.websocket.Session; import javax.websocket.WebSocketContainer; @@ -38,6 +35,8 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import static org.hamcrest.Matchers.instanceOf; + public class EndpointEchoTest { private static final Logger LOG = Log.getLogger(EndpointEchoTest.class); @@ -92,9 +91,11 @@ public class EndpointEchoTest Assert.assertThat(echoer,instanceOf(javax.websocket.Endpoint.class)); // Issue connect using instance of class that extends Endpoint Session session = container.connectToServer(echoer,serverUri); - LOG.debug("Client Connected: {}",session); + if (LOG.isDebugEnabled()) + LOG.debug("Client Connected: {}",session); session.getBasicRemote().sendText("Echo"); - LOG.debug("Client Message Sent"); + if (LOG.isDebugEnabled()) + LOG.debug("Client Message Sent"); echoer.textCapture.messageQueue.awaitMessages(1,1000,TimeUnit.MILLISECONDS); } @@ -104,9 +105,11 @@ public class EndpointEchoTest WebSocketContainer container = ContainerProvider.getWebSocketContainer(); // Issue connect using class reference (class extends Endpoint) Session session = container.connectToServer(EndpointEchoClient.class,serverUri); - LOG.debug("Client Connected: {}",session); + if (LOG.isDebugEnabled()) + LOG.debug("Client Connected: {}",session); session.getBasicRemote().sendText("Echo"); - LOG.debug("Client Message Sent"); + if (LOG.isDebugEnabled()) + LOG.debug("Client Message Sent"); // TODO: figure out echo verification. // echoer.textCapture.messageQueue.awaitMessages(1,1000,TimeUnit.MILLISECONDS); } @@ -119,9 +122,11 @@ public class EndpointEchoTest Assert.assertThat(echoer,instanceOf(javax.websocket.Endpoint.class)); // Issue connect using instance of class that extends abstract that extends Endpoint Session session = container.connectToServer(echoer,serverUri); - LOG.debug("Client Connected: {}",session); + if (LOG.isDebugEnabled()) + LOG.debug("Client Connected: {}",session); session.getBasicRemote().sendText("Echo"); - LOG.debug("Client Message Sent"); + if (LOG.isDebugEnabled()) + LOG.debug("Client Message Sent"); echoer.messageQueue.awaitMessages(1,1000,TimeUnit.MILLISECONDS); } @@ -131,9 +136,11 @@ public class EndpointEchoTest WebSocketContainer container = ContainerProvider.getWebSocketContainer(); // Issue connect using class reference (class that extends abstract that extends Endpoint) Session session = container.connectToServer(EchoStringEndpoint.class,serverUri); - LOG.debug("Client Connected: {}",session); + if (LOG.isDebugEnabled()) + LOG.debug("Client Connected: {}",session); session.getBasicRemote().sendText("Echo"); - LOG.debug("Client Message Sent"); + if (LOG.isDebugEnabled()) + LOG.debug("Client Message Sent"); // TODO: figure out echo verification. // echoer.messageQueue.awaitMessages(1,1000,TimeUnit.MILLISECONDS); } diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/MessageQueue.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/MessageQueue.java index 71abd3a01f0..52d8120b1cc 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/MessageQueue.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/MessageQueue.java @@ -34,7 +34,10 @@ public class MessageQueue extends BlockingArrayQueue long msDur = TimeUnit.MILLISECONDS.convert(timeoutDuration,timeoutUnit); long now = System.currentTimeMillis(); long expireOn = now + msDur; - LOG.debug("Await Message.. Now: {} - expireOn: {} ({} ms)",now,expireOn,msDur); + if (LOG.isDebugEnabled()) + { + LOG.debug("Await Message.. Now: {} - expireOn: {} ({} ms)",now,expireOn,msDur); + } while (this.size() < expectedMessageCount) { diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScanner_InvalidSignaturesTest.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScanner_InvalidSignaturesTest.java index 8687ca5c479..b7c110264a7 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScanner_InvalidSignaturesTest.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScanner_InvalidSignaturesTest.java @@ -18,13 +18,10 @@ package org.eclipse.jetty.websocket.jsr356.endpoints; -import static org.hamcrest.Matchers.containsString; - import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpointConfig; import javax.websocket.DeploymentException; @@ -51,6 +48,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import static org.hamcrest.Matchers.containsString; + /** * Test {@link AnnotatedEndpointScanner} against various simple, 1 method, {@link ClientEndpoint} annotated classes with invalid signatures. */ @@ -106,7 +105,8 @@ public class ClientAnnotatedEndpointScanner_InvalidSignaturesTest } catch (InvalidSignatureException e) { - LOG.debug("{}:{}",e.getClass(),e.getMessage()); + if (LOG.isDebugEnabled()) + LOG.debug("{}:{}",e.getClass(),e.getMessage()); Assert.assertThat("Message",e.getMessage(),containsString(expectedAnnoClass.getSimpleName())); } } diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/TrackingSocket.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/TrackingSocket.java index 23a7a74b4a0..a202338d173 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/TrackingSocket.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/TrackingSocket.java @@ -18,13 +18,8 @@ package org.eclipse.jetty.websocket.jsr356.endpoints; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.websocket.CloseReason; import javax.websocket.CloseReason.CloseCode; @@ -33,6 +28,10 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.junit.Assert; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + /** * Abstract base socket used for tracking state and events within the socket for testing reasons. */ @@ -121,7 +120,8 @@ public abstract class TrackingSocket public void waitForData(int timeoutDuration, TimeUnit timeoutUnit) throws InterruptedException { - LOG.debug("Waiting for message"); + if (LOG.isDebugEnabled()) + LOG.debug("Waiting for message"); Assert.assertThat("Data Received",dataLatch.await(timeoutDuration,timeoutUnit),is(true)); } } diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/samples/AbstractStringEndpoint.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/samples/AbstractStringEndpoint.java index d936da14b33..cd50fc66e39 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/samples/AbstractStringEndpoint.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/samples/AbstractStringEndpoint.java @@ -39,7 +39,8 @@ public abstract class AbstractStringEndpoint extends Endpoint implements Message @Override public void onOpen(Session session, EndpointConfig config) { - LOG.debug("onOpen({}, {})",session,config); + if (LOG.isDebugEnabled()) + LOG.debug("onOpen({}, {})",session,config); session.addMessageHandler(this); this.session = session; this.config = config; @@ -47,7 +48,8 @@ public abstract class AbstractStringEndpoint extends Endpoint implements Message public void onClose(Session session, CloseReason closeReason) { - LOG.debug("onClose({}, {})",session,closeReason); + if (LOG.isDebugEnabled()) + LOG.debug("onClose({}, {})",session,closeReason); this.session = null; } diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/BasicServerEndpointConfigurator.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/BasicServerEndpointConfigurator.java index 5d17d99802b..89f4c914e78 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/BasicServerEndpointConfigurator.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/BasicServerEndpointConfigurator.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.websocket.jsr356.server; import java.util.List; - import javax.websocket.Extension; import javax.websocket.HandshakeResponse; import javax.websocket.server.HandshakeRequest; @@ -44,7 +43,10 @@ public class BasicServerEndpointConfigurator extends ServerEndpointConfig.Config @Override public T getEndpointInstance(Class endpointClass) throws InstantiationException { - LOG.debug(".getEndpointInstance({})",endpointClass); + if (LOG.isDebugEnabled()) + { + LOG.debug(".getEndpointInstance({})",endpointClass); + } try { return endpointClass.newInstance(); diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java index 211ebbf9a5c..729d0bf1df6 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java @@ -21,7 +21,6 @@ package org.eclipse.jetty.websocket.jsr356.server; import java.io.IOException; import java.util.ArrayList; import java.util.List; - import javax.websocket.Extension; import javax.websocket.Extension.Parameter; import javax.websocket.server.ServerEndpointConfig; @@ -73,7 +72,8 @@ public class JsrCreator implements WebSocketCreator } catch (IOException e) { - LOG.debug("Unable to send error response",e); + if (LOG.isDebugEnabled()) + LOG.debug("Unable to send error response",e); } return null; } @@ -132,7 +132,8 @@ public class JsrCreator implements WebSocketCreator } catch (InstantiationException e) { - LOG.debug("Unable to create websocket: " + config.getEndpointClass().getName(),e); + if (LOG.isDebugEnabled()) + LOG.debug("Unable to create websocket: " + config.getEndpointClass().getName(),e); return null; } } diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java index 73b01c885d3..2e1f7d94625 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java @@ -20,7 +20,6 @@ package org.eclipse.jetty.websocket.jsr356.server.deploy; import java.util.HashSet; import java.util.Set; - import javax.servlet.ServletContainerInitializer; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -74,16 +73,26 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit if (TypeUtil.isFalse(enable)) { if (c.isEmpty()) - LOG.debug("JSR-356 support disabled via attribute on context {} - {}",context.getContextPath(),context); + { + if (LOG.isDebugEnabled()) + { + LOG.debug("JSR-356 support disabled via attribute on context {} - {}",context.getContextPath(),context); + } + } else + { LOG.warn("JSR-356 support disabled via attribute on context {} - {}",context.getContextPath(),context); + } return; } // Disabled if not explicitly enabled and there are no discovered annotations or interfaces if (!TypeUtil.isTrue(enable) && c.isEmpty()) { - LOG.debug("No JSR-356 annotations or interfaces discovered. JSR-356 support disabled",context.getContextPath(),context); + if (LOG.isDebugEnabled()) + { + LOG.debug("No JSR-356 annotations or interfaces discovered. JSR-356 support disabled",context.getContextPath(),context); + } return; } @@ -107,7 +116,10 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit // Store a reference to the ServerContainer per javax.websocket spec 1.0 final section 6.4 Programmatic Server Deployment context.setAttribute(javax.websocket.server.ServerContainer.class.getName(),jettyContainer); - LOG.debug("Found {} classes",c.size()); + if (LOG.isDebugEnabled()) + { + LOG.debug("Found {} classes",c.size()); + } // Now process the incoming classes Set> discoveredExtendedEndpoints = new HashSet<>(); @@ -116,9 +128,12 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit filterClasses(c,discoveredExtendedEndpoints,discoveredAnnotatedEndpoints,serverAppConfigs); - LOG.debug("Discovered {} extends Endpoint classes",discoveredExtendedEndpoints.size()); - LOG.debug("Discovered {} @ServerEndpoint classes",discoveredAnnotatedEndpoints.size()); - LOG.debug("Discovered {} ServerApplicationConfig classes",serverAppConfigs.size()); + if (LOG.isDebugEnabled()) + { + LOG.debug("Discovered {} extends Endpoint classes",discoveredExtendedEndpoints.size()); + LOG.debug("Discovered {} @ServerEndpoint classes",discoveredAnnotatedEndpoints.size()); + LOG.debug("Discovered {} ServerApplicationConfig classes",serverAppConfigs.size()); + } // Process the server app configs to determine endpoint filtering boolean wasFiltered = false; @@ -127,7 +142,10 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit for (Class clazz : serverAppConfigs) { - LOG.debug("Found ServerApplicationConfig: {}",clazz); + if (LOG.isDebugEnabled()) + { + LOG.debug("Found ServerApplicationConfig: {}",clazz); + } try { ServerApplicationConfig config = clazz.newInstance(); @@ -160,8 +178,11 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit deployableExtendedEndpointConfigs = new HashSet<>(); } + if (LOG.isDebugEnabled()) + { + LOG.debug("Deploying {} ServerEndpointConfig(s)",deployableExtendedEndpointConfigs.size()); + } // Deploy what should be deployed. - LOG.debug("Deploying {} ServerEndpointConfig(s)",deployableExtendedEndpointConfigs.size()); for (ServerEndpointConfig config : deployableExtendedEndpointConfigs) { try @@ -174,7 +195,10 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit } } - LOG.debug("Deploying {} @ServerEndpoint(s)",deployableAnnotatedEndpoints.size()); + if (LOG.isDebugEnabled()) + { + LOG.debug("Deploying {} @ServerEndpoint(s)",deployableAnnotatedEndpoints.size()); + } for (Class annotatedClass : deployableAnnotatedEndpoints) { try diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java index 339d4776ba2..2c68effda3b 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java @@ -18,15 +18,12 @@ package org.eclipse.jetty.websocket.jsr356.server; -import static org.hamcrest.Matchers.*; - import java.net.URI; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; - import javax.websocket.Extension; import javax.websocket.HandshakeResponse; import javax.websocket.OnMessage; @@ -52,6 +49,9 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; + public class ConfiguratorTest { private static final Logger LOG = Log.getLogger(ConfiguratorTest.class); @@ -191,7 +191,8 @@ public class ConfiguratorTest } int port = connector.getLocalPort(); baseServerUri = new URI(String.format("ws://%s:%d/",host,port)); - LOG.debug("Server started on {}",baseServerUri); + if (LOG.isDebugEnabled()) + LOG.debug("Server started on {}",baseServerUri); } @AfterClass diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DummyConnection.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DummyConnection.java index 7111ed7ef20..9db71b71240 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DummyConnection.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DummyConnection.java @@ -145,7 +145,8 @@ public class DummyConnection implements LogicalConnection @Override public void setNextIncomingFrames(IncomingFrames incoming) { - LOG.debug("setNextIncomingFrames({})",incoming); + if (LOG.isDebugEnabled()) + LOG.debug("setNextIncomingFrames({})",incoming); } @Override diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/IdleTimeoutTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/IdleTimeoutTest.java index db85dc06b78..1c84bc1e1ff 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/IdleTimeoutTest.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/IdleTimeoutTest.java @@ -18,9 +18,6 @@ package org.eclipse.jetty.websocket.jsr356.server; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - import java.io.IOException; import java.net.URI; import java.util.Queue; @@ -46,6 +43,10 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + public class IdleTimeoutTest { private static final Logger LOG = Log.getLogger(IdleTimeoutTest.class); @@ -90,15 +91,19 @@ public class IdleTimeoutTest { client.start(); JettyEchoSocket clientEcho = new JettyEchoSocket(); - LOG.debug("Client Attempting to connnect"); + if (LOG.isDebugEnabled()) + LOG.debug("Client Attempting to connnect"); Future future = client.connect(clientEcho,uri); // wait for connect future.get(1,TimeUnit.SECONDS); - LOG.debug("Client Connected"); + if (LOG.isDebugEnabled()) + LOG.debug("Client Connected"); // wait 1 second - LOG.debug("Waiting 1 second"); + if (LOG.isDebugEnabled()) + LOG.debug("Waiting 1 second"); TimeUnit.SECONDS.sleep(1); - LOG.debug("Waited 1 second"); + if (LOG.isDebugEnabled()) + LOG.debug("Waited 1 second"); if (clientEcho.getClosed() == false) { // Try to write diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScanner_InvalidSignaturesTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScanner_InvalidSignaturesTest.java index 7b3fe36f6e3..75e0a736293 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScanner_InvalidSignaturesTest.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScanner_InvalidSignaturesTest.java @@ -18,13 +18,10 @@ package org.eclipse.jetty.websocket.jsr356.server; -import static org.hamcrest.Matchers.containsString; - import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import javax.websocket.DeploymentException; import javax.websocket.OnClose; import javax.websocket.OnError; @@ -49,6 +46,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import static org.hamcrest.Matchers.containsString; + /** * Test {@link AnnotatedEndpointScanner} against various simple, 1 method {@link ServerEndpoint} annotated classes with invalid signatures. */ @@ -104,7 +103,8 @@ public class ServerAnnotatedEndpointScanner_InvalidSignaturesTest } catch (InvalidSignatureException e) { - LOG.debug("{}:{}",e.getClass(),e.getMessage()); + if (LOG.isDebugEnabled()) + LOG.debug("{}:{}",e.getClass(),e.getMessage()); Assert.assertThat("Message",e.getMessage(),containsString(expectedAnnoClass.getSimpleName())); } } diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/StreamTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/StreamTest.java index 2a062eaa209..dbe27e340ce 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/StreamTest.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/StreamTest.java @@ -18,8 +18,6 @@ package org.eclipse.jetty.websocket.jsr356.server; -import static org.hamcrest.Matchers.*; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -34,7 +32,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; import javax.websocket.CloseReason.CloseCode; @@ -71,6 +68,9 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.Matchers.equalToIgnoringCase; +import static org.hamcrest.Matchers.is; + public class StreamTest { private static final Logger LOG = Log.getLogger(StreamTest.class); @@ -114,7 +114,8 @@ public class StreamTest } int port = connector.getLocalPort(); serverUri = new URI(String.format("ws://%s:%d/",host,port)); - LOG.debug("Server started on {}",serverUri); + if (LOG.isDebugEnabled()) + LOG.debug("Server started on {}",serverUri); } @AfterClass @@ -290,7 +291,8 @@ public class StreamTest if (outputFile.exists()) { closeReason = String.format("Received %,d bytes",outputFile.length()); - LOG.debug(closeReason); + if (LOG.isDebugEnabled()) + LOG.debug(closeReason); } else { diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java index da417a4e1be..18d35d9eaa1 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java @@ -18,13 +18,8 @@ package org.eclipse.jetty.websocket.jsr356.server; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.websocket.CloseReason; import javax.websocket.CloseReason.CloseCode; @@ -33,6 +28,10 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.junit.Assert; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + /** * Abstract base socket used for tracking state and events within the socket for testing reasons. */ @@ -121,7 +120,8 @@ public abstract class TrackingSocket public void waitForData(int timeoutDuration, TimeUnit timeoutUnit) throws InterruptedException { - LOG.debug("Waiting for message"); + if (LOG.isDebugEnabled()) + LOG.debug("Waiting for message"); Assert.assertThat("Data Received",dataLatch.await(timeoutDuration,timeoutUnit),is(true)); } } diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/WSServer.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/WSServer.java index 9297c7f3d2f..cd636f821e4 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/WSServer.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/WSServer.java @@ -18,8 +18,6 @@ package org.eclipse.jetty.websocket.jsr356.server; -import static org.hamcrest.Matchers.notNullValue; - import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -49,6 +47,8 @@ import org.eclipse.jetty.webapp.WebInfConfiguration; import org.eclipse.jetty.webapp.WebXmlConfiguration; import org.junit.Assert; +import static org.hamcrest.Matchers.notNullValue; + /** * Utility to build out exploded directory WebApps, in the /target/tests/ directory, for testing out servers that use javax.websocket endpoints. *

      @@ -178,8 +178,8 @@ public class WSServer } int port = connector.getLocalPort(); serverUri = new URI(String.format("ws://%s:%d%s/",host,port,contextPath)); - LOG.debug("Server started on {}",serverUri); - + if (LOG.isDebugEnabled()) + LOG.debug("Server started on {}",serverUri); } public void stop() diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java index c94f7e1e863..649300062c4 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserSocket.java @@ -23,7 +23,6 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Locale; import java.util.Random; - import javax.websocket.CloseReason; import javax.websocket.OnClose; import javax.websocket.OnMessage; @@ -206,13 +205,15 @@ public class JsrBrowserSocket { if (this.session == null) { - LOG.debug("Not connected"); + if (LOG.isDebugEnabled()) + LOG.debug("Not connected"); return; } if (session.isOpen() == false) { - LOG.debug("Not open"); + if (LOG.isDebugEnabled()) + LOG.debug("Not open"); return; } diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/pong/PongSocket.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/pong/PongSocket.java index fe4981a991f..26defa035e9 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/pong/PongSocket.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/pong/PongSocket.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.websocket.jsr356.server.samples.pong; import java.nio.charset.StandardCharsets; - import javax.websocket.EndpointConfig; import javax.websocket.OnMessage; import javax.websocket.OnOpen; @@ -48,7 +47,8 @@ public class PongSocket @OnMessage public void onPong(PongMessage pong) { - LOG.debug("onPong(): PongMessage.appData={}",BufferUtil.toDetailString(pong.getApplicationData())); + if (LOG.isDebugEnabled()) + LOG.debug("onPong(): PongMessage.appData={}",BufferUtil.toDetailString(pong.getApplicationData())); byte buf[] = BufferUtil.toArray(pong.getApplicationData()); String message = new String(buf,StandardCharsets.UTF_8); this.session.getAsyncRemote().sendText("@OnMessage(PongMessage)[" + path + "]:" + message); diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java index 433f3cedd28..4a9a9816205 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java @@ -180,8 +180,8 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen } } - // Validate websocket URI - LOG.debug("connect websocket {} to {}",websocket,toUri); + if (LOG.isDebugEnabled()) + LOG.debug("connect websocket {} to {}",websocket,toUri); // Grab Connection Manager initialiseClient(); @@ -213,7 +213,8 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen promise.setUpgradeListener(upgradeListener); } - LOG.debug("Connect Promise: {}",promise); + if (LOG.isDebugEnabled()) + LOG.debug("Connect Promise: {}",promise); // Execute the connection on the executor thread executor.execute(promise); @@ -225,7 +226,8 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen @Override protected void doStart() throws Exception { - LOG.debug("Starting {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Starting {}",this); if (sslContextFactory != null) { @@ -253,13 +255,15 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen super.doStart(); - LOG.debug("Started {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Started {}",this); } @Override protected void doStop() throws Exception { - LOG.debug("Stopping {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Stopping {}",this); if (cookieStore != null) { @@ -268,7 +272,9 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen } super.doStop(); - LOG.debug("Stopped {}",this); + + if (LOG.isDebugEnabled()) + LOG.debug("Stopped {}",this); } /** @@ -418,10 +424,12 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen continue; } - LOG.debug("added {}",extension); + if (LOG.isDebugEnabled()) + LOG.debug("added {}",extension); extensions.add(extension); } - LOG.debug("extensions={}",extensions); + if (LOG.isDebugEnabled()) + LOG.debug("extensions={}",extensions); return extensions; } @@ -463,14 +471,16 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen @Override public void onSessionClosed(WebSocketSession session) { - LOG.debug("Session Closed: {}",session); + if (LOG.isDebugEnabled()) + LOG.debug("Session Closed: {}",session); removeBean(session); } @Override public void onSessionOpened(WebSocketSession session) { - LOG.debug("Session Opened: {}",session); + if (LOG.isDebugEnabled()) + LOG.debug("Session Opened: {}",session); } public void setAsyncWriteTimeout(long ms) diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java index fe385d3756e..4fa47276ebb 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java @@ -117,11 +117,13 @@ public class UpgradeConnection extends AbstractConnection EndPoint endPoint = getEndPoint(); // We need to gently close first, to allow // SSL close alerts to be sent by Jetty - LOG.debug("Shutting down output {}",endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Shutting down output {}",endPoint); endPoint.shutdownOutput(); if (!onlyOutput) { - LOG.debug("Closing {}",endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Closing {}",endPoint); endPoint.close(); } } diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java index 6616f54f996..68e2274a2a8 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; import java.util.concurrent.Executor; - import javax.net.ssl.SSLEngine; import org.eclipse.jetty.io.ByteBufferPool; @@ -54,7 +53,8 @@ public class WebSocketClientSelectorManager extends SelectorManager @Override protected void connectionFailed(SocketChannel channel, Throwable ex, Object attachment) { - LOG.debug("Connection Failed",ex); + if (LOG.isDebugEnabled()) + LOG.debug("Connection Failed",ex); ConnectPromise connect = (ConnectPromise)attachment; connect.failed(ex); } @@ -67,7 +67,8 @@ public class WebSocketClientSelectorManager extends SelectorManager @Override public Connection newConnection(final SocketChannel channel, EndPoint endPoint, final Object attachment) throws IOException { - LOG.debug("newConnection({},{},{})",channel,endPoint,attachment); + if (LOG.isDebugEnabled()) + LOG.debug("newConnection({},{},{})",channel,endPoint,attachment); ConnectPromise connectPromise = (ConnectPromise)attachment; try @@ -114,7 +115,8 @@ public class WebSocketClientSelectorManager extends SelectorManager @Override protected EndPoint newEndPoint(SocketChannel channel, ManagedSelector selectSet, SelectionKey selectionKey) throws IOException { - LOG.debug("newEndPoint({}, {}, {})",channel,selectSet,selectionKey); + if (LOG.isDebugEnabled()) + LOG.debug("newEndPoint({}, {}, {})",channel,selectSet,selectionKey); return new SelectChannelEndPoint(channel,selectSet,selectionKey,getScheduler(),policy.getIdleTimeout()); } diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java index 1bc082eb759..ac4c4130f79 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java @@ -67,8 +67,8 @@ public class ClientConnectTest Throwable cause = e.getCause(); if(!errorClass.isInstance(cause)) { - cause.printStackTrace(System.err); - Assert.assertThat("ExecutionException.cause",cause,instanceOf(errorClass)); + cause.printStackTrace(System.err); + Assert.assertThat("ExecutionException.cause",cause,instanceOf(errorClass)); } // Validate websocket captured cause @@ -359,15 +359,15 @@ public class ClientConnectTest } catch (ExecutionException e) { - if(OS.IS_WINDOWS) - { - // On windows, this is a SocketTimeoutException - assertExpectedError(e, wsocket, SocketTimeoutException.class); - } else - { - // Expected path - java.net.ConnectException - assertExpectedError(e,wsocket,ConnectException.class); - } + if(OS.IS_WINDOWS) + { + // On windows, this is a SocketTimeoutException + assertExpectedError(e, wsocket, SocketTimeoutException.class); + } else + { + // Expected path - java.net.ConnectException + assertExpectedError(e,wsocket,ConnectException.class); + } } } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java index 04637e392da..90da7db023e 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java @@ -352,7 +352,8 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Inc { try { - LOG.debug("{}.onSessionClosed()",listener.getClass().getSimpleName()); + if (LOG.isDebugEnabled()) + LOG.debug("{}.onSessionClosed()",listener.getClass().getSimpleName()); listener.onSessionClosed(this); } catch (Throwable t) diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/AbstractEventDriver.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/AbstractEventDriver.java index 7a55b2db4f9..e5e924f100e 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/AbstractEventDriver.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/AbstractEventDriver.java @@ -167,7 +167,8 @@ public abstract class AbstractEventDriver implements IncomingFrames, EventDriver } default: { - LOG.debug("Unhandled OpCode: {}",opcode); + if (LOG.isDebugEnabled()) + LOG.debug("Unhandled OpCode: {}",opcode); } } } @@ -211,7 +212,8 @@ public abstract class AbstractEventDriver implements IncomingFrames, EventDriver @Override public void openSession(WebSocketSession session) { - LOG.debug("openSession({})",session); + if (LOG.isDebugEnabled()) + LOG.debug("openSession({})",session); this.session = session; try { @@ -226,7 +228,8 @@ public abstract class AbstractEventDriver implements IncomingFrames, EventDriver protected void terminateConnection(int statusCode, String rawreason) { - LOG.debug("terminateConnection({},{})",statusCode,rawreason); + if (LOG.isDebugEnabled()) + LOG.debug("terminateConnection({},{})",statusCode,rawreason); session.close(statusCode,CloseFrame.truncate(rawreason)); } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScanner.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScanner.java index 1e276e76af4..6562c274bfc 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScanner.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScanner.java @@ -104,7 +104,8 @@ public class JettyAnnotatedScanner extends AbstractMethodAnnotationScanner pojo, Method method, Annotation annotation) { - LOG.debug("onMethodAnnotation({}, {}, {}, {})",metadata,pojo,method,annotation); + if (LOG.isDebugEnabled()) + LOG.debug("onMethodAnnotation({}, {}, {}, {})",metadata,pojo,method,annotation); if (isAnnotation(annotation,OnWebSocketConnect.class)) { diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java index 2a465ab751f..4856c1e1ddc 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java @@ -82,7 +82,8 @@ public class JettyListenerEventDriver extends AbstractEventDriver @Override public void onConnect() { - LOG.debug("onConnect()"); + if (LOG.isDebugEnabled()) + LOG.debug("onConnect()"); listener.onWebSocketConnect(session); } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java index 85077873563..0e9ad54ea44 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java @@ -77,7 +77,6 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames protected void doStart() throws Exception { super.doStart(); - LOG.debug("doStart"); // Wire up Extensions if ((extensions != null) && (extensions.size() > 0)) @@ -225,7 +224,9 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames */ public void negotiate(List configs) { - LOG.debug("Extension Configs={}",configs); + if (LOG.isDebugEnabled()) + LOG.debug("Extension Configs={}",configs); + this.extensions = new ArrayList<>(); String rsvClaims[] = new String[3]; @@ -260,7 +261,8 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames extensions.add(ext); addBean(ext); - LOG.debug("Adding Extension: {}",config); + if (LOG.isDebugEnabled()) + LOG.debug("Adding Extension: {}",config); // Record RSV Claims if (ext.isRsv1User()) @@ -282,7 +284,8 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames public void outgoingFrame(Frame frame, WriteCallback callback, BatchMode batchMode) { FrameEntry entry = new FrameEntry(frame,callback,batchMode); - LOG.debug("Queuing {}",entry); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {}",entry); entries.offer(entry); flusher.iterate(); } @@ -377,20 +380,30 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames current = entries.poll(); if (current == null) { - LOG.debug("Entering IDLE"); + if (LOG.isDebugEnabled()) + LOG.debug("Entering IDLE"); return Action.IDLE; } - LOG.debug("Processing {}",current); + if (LOG.isDebugEnabled()) + LOG.debug("Processing {}",current); nextOutgoing.outgoingFrame(current.frame,this,current.batchMode); return Action.SCHEDULED; } @Override - protected void completed() + protected void onCompleteSuccess() { // This IteratingCallback never completes. } - + + @Override + protected void onCompleteFailure(Throwable x) + { + // This IteratingCallback never fails. + // The callback are those provided by WriteCallback (implemented + // below) and even in case of writeFailed() we call succeeded(). + } + @Override public void writeSuccess() { diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java index a5f05240eef..ef5d6d221c4 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java @@ -135,7 +135,9 @@ public abstract class CompressExtension extends AbstractExtension ByteAccumulator accumulator = new ByteAccumulator(maxSize); decompressor.setInput(input, 0, input.length); - LOG.debug("Decompressing {} bytes", input.length); + + if (LOG.isDebugEnabled()) + LOG.debug("Decompressing {} bytes", input.length); try { @@ -164,7 +166,8 @@ public abstract class CompressExtension extends AbstractExtension accumulator.addChunk(output, 0, decompressed); } } - LOG.debug("Decompressed {}->{} bytes", input.length, accumulator.getLength()); + if (LOG.isDebugEnabled()) + LOG.debug("Decompressed {}->{} bytes", input.length, accumulator.getLength()); return accumulator; } catch (DataFormatException x) @@ -187,7 +190,8 @@ public abstract class CompressExtension extends AbstractExtension } FrameEntry entry = new FrameEntry(frame, callback, batchMode); - LOG.debug("Queuing {}", entry); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {}", entry); entries.offer(entry); flusher.iterate(); } @@ -201,7 +205,8 @@ public abstract class CompressExtension extends AbstractExtension } catch (Throwable x) { - LOG.debug("Exception while notifying success of callback " + callback, x); + if (LOG.isDebugEnabled()) + LOG.debug("Exception while notifying success of callback " + callback, x); } } @@ -214,7 +219,8 @@ public abstract class CompressExtension extends AbstractExtension } catch (Throwable x) { - LOG.debug("Exception while notifying failure of callback " + callback, x); + if (LOG.isDebugEnabled()) + LOG.debug("Exception while notifying failure of callback " + callback, x); } } @@ -290,7 +296,8 @@ public abstract class CompressExtension extends AbstractExtension ByteBuffer data = frame.getPayload(); int remaining = data.remaining(); int inputLength = Math.min(remaining, INPUT_BUFSIZE); - LOG.debug("Compressing {}: {} bytes in {} bytes chunk", entry, remaining, inputLength); + if (LOG.isDebugEnabled()) + LOG.debug("Compressing {}: {} bytes in {} bytes chunk", entry, remaining, inputLength); // Avoid to copy the bytes if the ByteBuffer // is backed by an array. @@ -368,10 +375,19 @@ public abstract class CompressExtension extends AbstractExtension } @Override - protected void completed() + protected void onCompleteSuccess() { // This IteratingCallback never completes. } + + @Override + protected void onCompleteFailure(Throwable x) + { + // Fail all the frames in the queue. + FrameEntry entry; + while ((entry = entries.poll()) != null) + notifyCallbackFailure(entry.callback, x); + } @Override public void writeSuccess() @@ -388,10 +404,6 @@ public abstract class CompressExtension extends AbstractExtension // If something went wrong, very likely the compression context // will be invalid, so we need to fail this IteratingCallback. failed(x); - // Now no more frames can be queued, fail those in the queue. - FrameEntry entry; - while ((entry = entries.poll()) != null) - notifyCallbackFailure(entry.callback, x); } } } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/fragment/FragmentExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/fragment/FragmentExtension.java index 2684690e409..fb11f58dd47 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/fragment/FragmentExtension.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/fragment/FragmentExtension.java @@ -69,7 +69,8 @@ public class FragmentExtension extends AbstractExtension } FrameEntry entry = new FrameEntry(frame, callback, batchMode); - LOG.debug("Queuing {}", entry); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {}", entry); entries.offer(entry); flusher.iterate(); } @@ -143,18 +144,27 @@ public class FragmentExtension extends AbstractExtension ByteBuffer payloadFragment = payload.slice(); payload.limit(limit); fragment.setPayload(payloadFragment); - LOG.debug("Fragmented {}->{}", frame, fragment); + if (LOG.isDebugEnabled()) + LOG.debug("Fragmented {}->{}", frame, fragment); payload.position(newLimit); nextOutgoingFrame(fragment, this, entry.batchMode); } @Override - protected void completed() + protected void onCompleteSuccess() { // This IteratingCallback never completes. } - + + @Override + protected void onCompleteFailure(Throwable x) + { + // This IteratingCallback never fails. + // The callback are those provided by WriteCallback (implemented + // below) and even in case of writeFailed() we call succeeded(). + } + @Override public void writeSuccess() { @@ -185,7 +195,8 @@ public class FragmentExtension extends AbstractExtension } catch (Throwable x) { - LOG.debug("Exception while notifying success of callback " + callback, x); + if (LOG.isDebugEnabled()) + LOG.debug("Exception while notifying success of callback " + callback, x); } } @@ -198,7 +209,8 @@ public class FragmentExtension extends AbstractExtension } catch (Throwable x) { - LOG.debug("Exception while notifying failure of callback " + callback, x); + if (LOG.isDebugEnabled()) + LOG.debug("Exception while notifying failure of callback " + callback, x); } } } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java index e00e339c4a5..e696fd62095 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java @@ -78,7 +78,8 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp return; } - LOG.debug("Write flush failure",x); + if (LOG.isDebugEnabled()) + LOG.debug("Write flush failure",x); ioState.onWriteFailure(x); } } @@ -155,7 +156,8 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp private void onLocalClose() { - LOG.debug("Local Close Confirmed {}",close); + if (LOG.isDebugEnabled()) + LOG.debug("Local Close Confirmed {}",close); if (close.isAbnormal()) { ioState.onAbnormalClose(close); @@ -260,7 +262,8 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp @Override public void close(int statusCode, String reason) { - LOG.debug("close({},{})",statusCode,reason); + if (LOG.isDebugEnabled()) + LOG.debug("close({},{})",statusCode,reason); CloseInfo close = new CloseInfo(statusCode,reason); this.outgoingFrame(close.asFrame(),new OnCloseLocalCallback(close),BatchMode.OFF); } @@ -273,13 +276,15 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp private void disconnect(boolean onlyOutput) { - LOG.debug("{} disconnect({})",policy.getBehavior(),onlyOutput?"outputOnly":"both"); + if (LOG.isDebugEnabled()) + LOG.debug("{} disconnect({})",policy.getBehavior(),onlyOutput?"outputOnly":"both"); // close FrameFlusher, we cannot write anymore at this point. flusher.close(); EndPoint endPoint = getEndPoint(); // We need to gently close first, to allow // SSL close alerts to be sent by Jetty - LOG.debug("Shutting down output {}",endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Shutting down output {}",endPoint); endPoint.shutdownOutput(); if (!onlyOutput) { @@ -296,7 +301,8 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp } catch (RejectedExecutionException e) { - LOG.debug("Job not dispatched: {}",task); + if (LOG.isDebugEnabled()) + LOG.debug("Job not dispatched: {}",task); } } @@ -401,7 +407,8 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp @Override public void onClose() { - LOG.debug("{} onClose()",policy.getBehavior()); + if (LOG.isDebugEnabled()) + LOG.debug("{} onClose()",policy.getBehavior()); super.onClose(); // ioState.onDisconnected(); flusher.close(); @@ -410,11 +417,13 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp @Override public void onConnectionStateChange(ConnectionState state) { - LOG.debug("{} Connection State Change: {}",policy.getBehavior(),state); + if (LOG.isDebugEnabled()) + LOG.debug("{} Connection State Change: {}",policy.getBehavior(),state); switch (state) { case OPEN: - LOG.debug("fillInterested"); + if (LOG.isDebugEnabled()) + LOG.debug("fillInterested"); fillInterested(); break; case CLOSED: @@ -446,7 +455,8 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp @Override public void onFillable() { - LOG.debug("{} onFillable()",policy.getBehavior()); + if (LOG.isDebugEnabled()) + LOG.debug("{} onFillable()",policy.getBehavior()); stats.countOnFillableEvents.incrementAndGet(); ByteBuffer buffer = bufferPool.acquire(getInputBufferSize(),true); try @@ -501,7 +511,8 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp { IOState state = getIOState(); ConnectionState cstate = state.getConnectionState(); - LOG.debug("{} Read Timeout - {}",policy.getBehavior(),cstate); + if (LOG.isDebugEnabled()) + LOG.debug("{} Read Timeout - {}",policy.getBehavior(),cstate); if (cstate == ConnectionState.CLOSED) { diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java index b062aac9666..da4312b57c4 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java @@ -29,7 +29,6 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.ArrayQueue; 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; @@ -91,13 +90,13 @@ public class FrameFlusher } @Override - protected void completed() + protected void onCompleteSuccess() { // This IteratingCallback never completes. } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { for (FrameEntry entry : entries) { @@ -105,7 +104,6 @@ public class FrameFlusher entry.release(); } entries.clear(); - super.failed(x); failure = x; onFailure(x); } @@ -394,7 +392,8 @@ public class FrameFlusher } catch (Throwable x) { - LOG.debug("Exception while notifying failure of callback " + callback,x); + if (LOG.isDebugEnabled()) + LOG.debug("Exception while notifying failure of callback " + callback,x); } } @@ -409,7 +408,8 @@ public class FrameFlusher } catch (Throwable x) { - LOG.debug("Exception while notifying success of callback " + callback,x); + if (LOG.isDebugEnabled()) + LOG.debug("Exception while notifying success of callback " + callback,x); } } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FutureWriteCallback.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FutureWriteCallback.java index 142b9a98dbb..10b9d7b785e 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FutureWriteCallback.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FutureWriteCallback.java @@ -33,14 +33,16 @@ public class FutureWriteCallback extends FutureCallback implements WriteCallback @Override public void writeFailed(Throwable cause) { - LOG.debug(".writeFailed",cause); + if (LOG.isDebugEnabled()) + LOG.debug(".writeFailed",cause); failed(cause); } @Override public void writeSuccess() { - LOG.debug(".writeSuccess"); + if (LOG.isDebugEnabled()) + LOG.debug(".writeSuccess"); succeeded(); } } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java index 35c87d91786..9ae21e71f17 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java @@ -174,7 +174,8 @@ public class IOState private void notifyStateListeners(ConnectionState state) { - LOG.debug("Notify State Listeners: {}",state); + if (LOG.isDebugEnabled()) + LOG.debug("Notify State Listeners: {}",state); for (ConnectionStateListener listener : listeners) { if (LOG.isDebugEnabled()) @@ -192,7 +193,8 @@ public class IOState */ public void onAbnormalClose(CloseInfo close) { - LOG.debug("onAbnormalClose({})",close); + if (LOG.isDebugEnabled()) + LOG.debug("onAbnormalClose({})",close); ConnectionState event = null; synchronized (this) { @@ -225,7 +227,8 @@ public class IOState ConnectionState event = null; ConnectionState abnormalEvent = null; ConnectionState initialState = this.state; - LOG.debug("onCloseLocal({}) : {}",close,initialState); + if (LOG.isDebugEnabled()) + LOG.debug("onCloseLocal({}) : {}",close,initialState); if (initialState == ConnectionState.CLOSED) { // already closed @@ -239,7 +242,8 @@ public class IOState LOG.debug("FastClose in CONNECTED detected"); // Force the state open (to allow read/write to endpoint) onOpened(); - LOG.debug("FastClose continuing with Closure"); + if (LOG.isDebugEnabled()) + LOG.debug("FastClose continuing with Closure"); } synchronized (this) @@ -300,7 +304,8 @@ public class IOState */ public void onCloseRemote(CloseInfo close) { - LOG.debug("onCloseRemote({})",close); + if (LOG.isDebugEnabled()) + LOG.debug("onCloseRemote({})",close); ConnectionState event = null; synchronized (this) { @@ -321,7 +326,8 @@ public class IOState in = false; inputAvailable = false; - LOG.debug("onCloseRemote(), input={}, output={}",in,out); + if (LOG.isDebugEnabled()) + LOG.debug("onCloseRemote(), input={}, output={}",in,out); if (!in && !out) { diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java index 710ae1fc576..944c931fc4a 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java @@ -129,7 +129,8 @@ public class MessageInputStream extends InputStream implements MessageAppender @Override public void messageComplete() { - LOG.debug("Message completed"); + if (LOG.isDebugEnabled()) + LOG.debug("Message completed"); buffers.offer(EOF); } @@ -140,7 +141,8 @@ public class MessageInputStream extends InputStream implements MessageAppender { if (closed.get()) { - LOG.debug("Stream closed"); + if (LOG.isDebugEnabled()) + LOG.debug("Stream closed"); return -1; } @@ -166,7 +168,8 @@ public class MessageInputStream extends InputStream implements MessageAppender if (activeBuffer == EOF) { - LOG.debug("Reached EOF"); + if (LOG.isDebugEnabled()) + LOG.debug("Reached EOF"); // Be sure that this stream cannot be reused. closed.set(true); // Removed buffers that may have remained in the queue. @@ -179,7 +182,8 @@ public class MessageInputStream extends InputStream implements MessageAppender } catch (InterruptedException x) { - LOG.debug("Interrupted while waiting to read", x); + if (LOG.isDebugEnabled()) + LOG.debug("Interrupted while waiting to read", x); closed.set(true); return -1; } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java index 6da8f3e9429..719273d8c45 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java @@ -30,8 +30,8 @@ import org.eclipse.jetty.websocket.api.BatchMode; import org.eclipse.jetty.websocket.api.WriteCallback; import org.eclipse.jetty.websocket.api.extensions.OutgoingFrames; import org.eclipse.jetty.websocket.common.BlockingWriteCallback; -import org.eclipse.jetty.websocket.common.WebSocketSession; import org.eclipse.jetty.websocket.common.BlockingWriteCallback.WriteBlocker; +import org.eclipse.jetty.websocket.common.WebSocketSession; import org.eclipse.jetty.websocket.common.frames.BinaryFrame; /** @@ -117,7 +117,8 @@ public class MessageOutputStream extends OutputStream { flush(true); bufferPool.release(buffer); - LOG.debug("Stream closed, {} frames sent", frameCount); + if (LOG.isDebugEnabled()) + LOG.debug("Stream closed, {} frames sent", frameCount); // Notify without holding locks. notifySuccess(); } @@ -139,7 +140,8 @@ public class MessageOutputStream extends OutputStream closed = fin; BufferUtil.flipToFlush(buffer, 0); - LOG.debug("flush({}): {}", fin, BufferUtil.toDetailString(buffer)); + if (LOG.isDebugEnabled()) + LOG.debug("flush({}): {}", fin, BufferUtil.toDetailString(buffer)); frame.setPayload(buffer); frame.setFin(fin); diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java index 477046b2089..a7e1aff10da 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java @@ -21,7 +21,6 @@ package org.eclipse.jetty.websocket.common.message; import java.io.IOException; import java.io.InputStreamReader; import java.nio.ByteBuffer; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; /** diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java index 5afe710c1b8..ed968f38008 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java @@ -30,8 +30,8 @@ import org.eclipse.jetty.websocket.api.BatchMode; import org.eclipse.jetty.websocket.api.WriteCallback; import org.eclipse.jetty.websocket.api.extensions.OutgoingFrames; import org.eclipse.jetty.websocket.common.BlockingWriteCallback; -import org.eclipse.jetty.websocket.common.WebSocketSession; import org.eclipse.jetty.websocket.common.BlockingWriteCallback.WriteBlocker; +import org.eclipse.jetty.websocket.common.WebSocketSession; import org.eclipse.jetty.websocket.common.frames.TextFrame; /** @@ -121,7 +121,8 @@ public class MessageWriter extends Writer { flush(true); bufferPool.release(buffer); - LOG.debug("Stream closed, {} frames sent", frameCount); + if (LOG.isDebugEnabled()) + LOG.debug("Stream closed, {} frames sent", frameCount); // Notify without holding locks. notifySuccess(); } @@ -143,7 +144,8 @@ public class MessageWriter extends Writer closed = fin; ByteBuffer data = utf.getByteBuffer(); - LOG.debug("flush({}): {}", fin, BufferUtil.toDetailString(buffer)); + if (LOG.isDebugEnabled()) + LOG.debug("flush({}): {}", fin, BufferUtil.toDetailString(buffer)); frame.setPayload(data); frame.setFin(fin); diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventCapture.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventCapture.java index 38451bb3835..64b417dae51 100644 --- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventCapture.java +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventCapture.java @@ -18,10 +18,6 @@ package org.eclipse.jetty.websocket.common.events; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.startsWith; - import java.util.regex.Pattern; import org.eclipse.jetty.toolchain.test.EventQueue; @@ -29,6 +25,10 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.junit.Assert; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.startsWith; + @SuppressWarnings("serial") public class EventCapture extends EventQueue { @@ -67,7 +67,8 @@ public class EventCapture extends EventQueue public void add(String format, Object... args) { String msg = String.format(format,args); - LOG.debug("EVENT: {}",msg); + if (LOG.isDebugEnabled()) + LOG.debug("EVENT: {}",msg); super.offer(msg); } diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/LocalWebSocketConnection.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/LocalWebSocketConnection.java index 2244c93cb5c..e3c109b653a 100644 --- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/LocalWebSocketConnection.java +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/LocalWebSocketConnection.java @@ -82,21 +82,24 @@ public class LocalWebSocketConnection implements LogicalConnection, IncomingFram @Override public void close(int statusCode, String reason) { - LOG.debug("close({}, {})",statusCode,reason); + if (LOG.isDebugEnabled()) + LOG.debug("close({}, {})",statusCode,reason); CloseInfo close = new CloseInfo(statusCode,reason); ioState.onCloseLocal(close); } public void connect() { - LOG.debug("connect()"); + if (LOG.isDebugEnabled()) + LOG.debug("connect()"); ioState.onConnected(); } @Override public void disconnect() { - LOG.debug("disconnect()"); + if (LOG.isDebugEnabled()) + LOG.debug("disconnect()"); } @Override @@ -179,7 +182,8 @@ public class LocalWebSocketConnection implements LogicalConnection, IncomingFram @Override public void onConnectionStateChange(ConnectionState state) { - LOG.debug("Connection State Change: {}",state); + if (LOG.isDebugEnabled()) + LOG.debug("Connection State Change: {}",state); switch (state) { case CLOSED: @@ -200,7 +204,8 @@ public class LocalWebSocketConnection implements LogicalConnection, IncomingFram public void open() { - LOG.debug("open()"); + if (LOG.isDebugEnabled()) + LOG.debug("open()"); ioState.onOpened(); } diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageWriterTest.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageWriterTest.java index 43f68ecf00a..d65214ec7c1 100644 --- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageWriterTest.java +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageWriterTest.java @@ -18,8 +18,6 @@ package org.eclipse.jetty.websocket.common.message; -import static org.hamcrest.Matchers.is; - import java.util.Arrays; import org.eclipse.jetty.io.MappedByteBufferPool; @@ -40,6 +38,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; +import static org.hamcrest.Matchers.is; + public class MessageWriterTest { private static final Logger LOG = Log.getLogger(MessageWriterTest.class); @@ -122,7 +122,8 @@ public class MessageWriterTest { int bufsize = (int)(policy.getMaxTextMessageBufferSize() * 2.5); char buf[] = new char[bufsize]; - LOG.debug("Buffer size: {}",bufsize); + if (LOG.isDebugEnabled()) + LOG.debug("Buffer size: {}",bufsize); Arrays.fill(buf,'x'); buf[bufsize - 1] = 'o'; // mark last entry for debugging diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/TrackingInputStreamSocket.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/TrackingInputStreamSocket.java index e552ab4293c..8aa4b090123 100644 --- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/TrackingInputStreamSocket.java +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/TrackingInputStreamSocket.java @@ -18,8 +18,6 @@ package org.eclipse.jetty.websocket.common.message; -import static org.hamcrest.Matchers.is; - import java.io.IOException; import java.io.InputStream; import java.util.concurrent.CountDownLatch; @@ -35,6 +33,8 @@ import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; import org.eclipse.jetty.websocket.api.annotations.WebSocket; import org.junit.Assert; +import static org.hamcrest.Matchers.is; + @WebSocket public class TrackingInputStreamSocket { @@ -76,7 +76,8 @@ public class TrackingInputStreamSocket @OnWebSocketClose public void onClose(int statusCode, String reason) { - LOG.debug("{} onClose({},{})",id,statusCode,reason); + if (LOG.isDebugEnabled()) + LOG.debug("{} onClose({},{})",id,statusCode,reason); closeCode = statusCode; closeMessage.append(reason); closeLatch.countDown(); @@ -91,7 +92,8 @@ public class TrackingInputStreamSocket @OnWebSocketMessage public void onInputStream(InputStream stream) { - LOG.debug("{} onInputStream({})",id,stream); + if (LOG.isDebugEnabled()) + LOG.debug("{} onInputStream({})",id,stream); try { String msg = IO.toString(stream); diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java index b85806ef007..0686827af5d 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java @@ -512,8 +512,11 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc extensionStack.configure(wsConnection.getParser()); extensionStack.configure(wsConnection.getGenerator()); - LOG.debug("HttpConnection: {}", http); - LOG.debug("WebSocketConnection: {}", wsConnection); + if (LOG.isDebugEnabled()) + { + LOG.debug("HttpConnection: {}", http); + LOG.debug("WebSocketConnection: {}", wsConnection); + } // Setup Session WebSocketSession session = createSession(request.getRequestURI(), driver, wsConnection); @@ -553,11 +556,15 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc // Tell jetty about the new upgraded connection request.setServletAttribute(HttpConnection.UPGRADE_CONNECTION_ATTRIBUTE, wsConnection); + if (LOG.isDebugEnabled()) + LOG.debug("Handshake Response: {}", handshaker); + // Process (version specific) handshake response - LOG.debug("Handshake Response: {}", handshaker); handshaker.doHandshakeResponse(request, response); - LOG.debug("Websocket upgrade {} {} {} {}", request.getRequestURI(), version, response.getAcceptedSubProtocol(), wsConnection); + if (LOG.isDebugEnabled()) + LOG.debug("Websocket upgrade {} {} {} {}", request.getRequestURI(), version, response.getAcceptedSubProtocol(), wsConnection); + return true; } } diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java index 76b7b06ad06..b2a9deb0928 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java @@ -20,7 +20,6 @@ package org.eclipse.jetty.websocket.server; import java.io.IOException; import java.util.EnumSet; - import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -66,7 +65,9 @@ public class WebSocketUpgradeFilter extends ContainerLifeCycle implements Filter fholder.setDisplayName("WebSocket Upgrade Filter"); String pathSpec = "/*"; context.addFilter(fholder,pathSpec,EnumSet.of(DispatcherType.REQUEST)); - LOG.debug("Adding {} mapped to {} to {}",filter,pathSpec,context); + + if (LOG.isDebugEnabled()) + LOG.debug("Adding {} mapped to {} to {}",filter,pathSpec,context); // Store reference to the WebSocketUpgradeFilter context.setAttribute(WebSocketUpgradeFilter.class.getName(),filter); diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/pathmap/PathMappings.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/pathmap/PathMappings.java index 454b5c95a1c..243af2d86de 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/pathmap/PathMappings.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/pathmap/PathMappings.java @@ -177,7 +177,8 @@ public class PathMappings implements Iterable>, Dumpable } // TODO: warning on replacement of existing mapping? mappings.add(entry); - LOG.debug("Added {} to {}",entry,this); + if (LOG.isDebugEnabled()) + LOG.debug("Added {} to {}",entry,this); Collections.sort(mappings); } diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java index 79711a66a0b..64270af3473 100644 --- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java +++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java @@ -22,7 +22,6 @@ import java.io.Closeable; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.PrintWriter; import java.util.Map; import java.util.Stack; @@ -61,7 +60,7 @@ public class XmlAppendable _out.append("\n"); } - public XmlAppendable open(String tag, Map attributes) throws IOException + public XmlAppendable openTag(String tag, Map attributes) throws IOException { _out.append(_space).append('<').append(tag); attributes(attributes); @@ -72,7 +71,7 @@ public class XmlAppendable return this; } - public XmlAppendable open(String tag) throws IOException + public XmlAppendable openTag(String tag) throws IOException { _out.append(_space).append('<').append(tag).append(">\n"); _space=_space+SPACES.substring(0,_indent); @@ -159,7 +158,7 @@ public class XmlAppendable return this; } - public XmlAppendable close() throws IOException + public XmlAppendable closeTag() throws IOException { if (_tags.isEmpty()) throw new IllegalStateException("Tags closed"); diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java index 673a1dabc02..678f95184a9 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java @@ -79,7 +79,7 @@ public class TestConfiguration extends HashMap public void setPropertyTest(int value) { - propValue=value; + propValue=value; } public TestConfiguration getNested() diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java index 6a1556e4ddd..0e491f6b74f 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java @@ -33,7 +33,7 @@ public class XmlAppendableTest XmlAppendable out = new XmlAppendable(b); Map attr = new LinkedHashMap<>(); - out.open("test"); + out.openTag("test"); attr.put("name", "attr value"); attr.put("noval", null); @@ -43,10 +43,10 @@ public class XmlAppendableTest out.tag("tag", attr); out.tag("tag", attr, "content"); - out.open("level1").tag("tag", "content").tag("tag", "content").close(); - out.open("level1", attr).open("level2").tag("tag", "content").tag("tag", "content").close().close(); + out.openTag("level1").tag("tag", "content").tag("tag", "content").closeTag(); + out.openTag("level1", attr).openTag("level2").tag("tag", "content").tag("tag", "content").closeTag().closeTag(); - out.close(); + out.closeTag(); String expected = "" + "\n" + diff --git a/pom.xml b/pom.xml index 4578536f2bd..e21470cb961 100644 --- a/pom.xml +++ b/pom.xml @@ -258,9 +258,11 @@ org.apache.maven.plugins maven-surefire-plugin + 2.17 -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails false + random