Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1

Author: joakime

VERSION.txt

@@ -1,3 +1,98 @@
+jetty-9.1.0.RC1 - 31 October 2013
+ + 294531 Unpacking webapp twice to the same directory name causes problems
+   with updated jars in WEB-INF/lib
+ + 397049 Cannot Provide Custom Credential to JDBCLoginService
+ + 403591 improve the Blocking Q implementation.
+ + 407716 fixed logs
+ + 410840 Change SSLSession.getPeerCertificateChain() to
+   SSLSession.getPeerCertificates().
+ + 415118 WebAppClassLoader.getResource(name) should strip .class from name
+ + 415609 spdy replace SessionInvoker with IteratingCallback. Introduce Flusher
+   class to separate queuing/flushing logic from StandardSession
+ + 416300 Order ServletContainerInitializer callbacks
+ + 416597 Allow classes and jars on the webappcontext extraclasspath to be
+   scanned for annotations by jetty-maven-plugin
+ + 417356 Add SOCKS support to jetty client.
+ + 417932 resources.mod should make ${jetty.base}/resources/ directory
+ + 417933 logging.mod ini template should include commented log.class settings
+ + 418212 org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs.
+ + 418441 Use of OPTIONS= in Jetty 9.1 should display WARNING message
+ + 418596 Faults in JARs during class scanning should report the jar that
+   caused the problem
+ + 418603 cannot specify a custom ServerEndpointConfig.Configurator
+ + 418625 WebSocket / Jsr RemoteEndpoint.sendObject(java.nio.HeapByteBuffer)
+   doesn't find encoder
+ + 418632 WebSocket / Jsr annotated @OnMessage with InputStream fails to be
+   called
+ + 418636 Name anonymous filter and holders with classname-hashcode
+ + 418732 Add whiteListByPath mode to IPAccessHandler
+ + 418767 run-forked goal ingores test scope dependencies with
+   useTestScope=true
+ + 418792 Session getProtocolVersion always returns null
+ + 418892 SSL session caching so unreliable it effectively does not work.
+ + 418922 Missing parameterization of etc/jetty-xinetd.xml
+ + 418923 Missing parameterization of etc/jetty-proxy.xml
+ + 419146 Parameterize etc/jetty-requestlog.xml values
+ + 419309 Added symlink checker to test webapp
+ + 419330 Allow access to setters on jetty-jspc-maven-plugin
+ + 419333 treat // as an alias in path
+ + 419344 NPNServerConnection does not close the EndPoint if it reads -1.
+ + 419350 Do not borrow space from passed arrays
+ + 419655 AnnotationParser throws NullPointerException when scanning files from
+   jar:file urls
+ + 419687 HttpClient's query parameters must be case sensitive.
+ + 419799 Async timeout dispatches to error page
+ + 419814 Annotation properties maxMessageSize and inputBufferSize don't work
+ + 419846 JDBCSessionManager doesn't determine dirty state correctly
+ + 419899 Do not wrap SSL Exception as EoFException
+ + 419901 Client always adds extra user-agent header.
+ + 419904 Data corruption on proxy PUT requests.
+ + 419914 QueuedThreadPool uses nanoTime
+ + 419937 Request isSecure cleared on recycle
+ + 419950 Provide constructor for StringContentProvider that takes Charset.
+ + 419964 InputStreamContentProvider does not close provided InputStream.
+ + 420012 Improve ProxyServlet.Transparent configuration in case prefix="/".
+ + 420033 AsyncContext.onTimeout exceptions passed to onError
+ + 420034 Removed threads/timers from Date caching
+ + 420039 BufferingResponseListener continues processing after aborting
+   request.
+ + 420048 DefaultServlet alias checks configured resourceBase
+ + 420103 Split out jmx-remote module from existing jmx module
+ + 420142 reimplemented graceful shutdown
+ + 420362 Response/request listeners called too many times.
+ + 420364 Bad synchronization in HttpConversation.
+ + 420374 Call super.close() in a finally block
+ + 420530 AbstractLoginModule never fails a login
+ + 420687 XML errors in jetty-plus/src/test/resources/web-fragment-*.xml
+ + 420776 complete error pages after startAsync
+
+jetty-9.1.0.RC0 - 30 September 2013
+ + 412469 make module for jetty-jaspi
+ + 416453 Add comments to embedded SplitFileServer example
+ + 416577 enhanced shutdown handler to send shutdown at startup
+ + 416674 run all jetty-ant tests on random ports
+ + 416940 avoid download of spring-beans.dtd
+ + 417152 WebSocket / Do all setup in websocket specific
+   ServletContainerInitializer
+ + 417239 re-implemented Request.getContentRead()
+ + 417284 Precompiled regex in HttpField
+ + 417289 SPDY replace use of direct buffers with indirect buffers or make it
+   configurable
+ + 417340 Upgrade JDT compiler to one that supports source/target of Java 1.7
+ + 417382 Upgrade to asm 4.1 and refactor annotation parsing
+ + 417475 Do not null context Trie during dynamic deploy
+ + 417490 WebSocket / @PathParam annotated parameters are null when the servlet
+   mapping uses a wildcard
+ + 417561 Refactor annotation related code: change log messages
+ + 417574 Setting options with _JAVA_OPTIONS breaks run-forked with
+   <waitForChild>true</waitForChild>
+ + 417831 Remove jetty-logging.properties from distro/resources
+ + 417938 Startup / Sort properties presented in --list-config alphabetically
+ + 418014 Handle NTFS canonical exceptions during alias check
+ + 418068 WebSocketClient has lazy or injected Executor
+ + 418212 org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
+ + 418227 Null cookie value test
+
 jetty-9.1.0.M0 - 16 September 2013
  + 393473 Add support for JSR-356 (javax.websocket) draft
  + 395444 Websockets not working with Chrome (deflate problem)
@@ -163,53 +258,10 @@ jetty-9.1.0.M0 - 16 September 2013
    ServerEndpointConfig.Configurator.getNegotiatedExtensions() is never used
  + 417225 added Container.addEventListener method
  + 417260 Protected targets matched as true URI path segments
-
- jetty-9.0.6.v20130930 - 30 September 2013
- + 411069 better set compiler defaults to 1.7, including webdefault.xml for jsp
- + 411934 War overlay configuration assumes src/main/webapp exists
- + 413484 setAttribute in nosql session management better handles _dirty status
- + 413684 deprecated unsafe alias checkers
- + 413737 hide stacktrace in ReferrerPushStrategyTest
- + 414431 Avoid debug NPE race
- + 414898 Only upgrade v0 to v1 cookies on dquote , ; backslash space and tab
-   in the value
- + 415192 <jsp-file> maps to JspPropertyGroupServlet instead of JspServlet
- + 415194 Deployer gives management of context to context collection
- + 415302 
- + 415330 Avoid multiple callbacks at EOF
- + 415401 Add initalizeDefaults call to SpringConfigurationProcessor
- + 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent
-   NPE part 2
- + 415605 fix status code logging for async requests
- + 415999 Fix some of FindBugs warnings
- + 416015 Handle null Accept-Language and other headers
- + 416096 DefaultServlet leaves open file descriptors with file sizes greater
-   than response buffer
- + 416102 Clean up of async sendContent process
- + 416103 Added AllowSymLinkAliasChecker.java
- + 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it
-   receives a rst frame from the upstream spdy server
- + 416266 HttpServletResponse.encodeURL() encodes on first request when only
-   SessionTrackingMode.COOKIE is used
- + 416314 jetty async client wrong behaviour for HEAD Method + Redirect.
- + 416321 handle failure during blocked committing write
+   jetty-9.0.6.v20130930 - 30 September 2013
  + 416453 Add comments to embedded SplitFileServer example
- + 416477 Improved consumeAll error handling
- + 416568 Simplified servlet exception logging
  + 416577 enhanced shutdown handler to send shutdown at startup
- + 416585 WebInfConfiguration examines webapp classloader first instead of its
-   parent when looking for container jars
- + 416597 Allow classes and jars on the webappcontext extraclasspath to be
-   scanned for annotations
- + 416663 Content-length set by resourcehandler
- + 416674 run all jetty-ant tests on random ports
- + 416679 Change warning to debug if no transaction manager present
- + 416787 StringIndexOutOfBounds with a pathMap of ""
  + 416940 avoid download of spring-beans.dtd
- + 416990 JMX names statically unique
- + 417110 Demo / html body end tag missing in authfail.html
- + 417225 added Container.addEventListener method
- + 417260 Protected targets matched as true URI path segments
  + 417289 SPDY replace use of direct buffers with indirect buffers or make it
    configurable
  + 417475 Do not null context Trie during dynamic deploy
@@ -219,7 +271,7 @@ jetty-9.1.0.M0 - 16 September 2013
  + 418014 Handle NTFS canonical exceptions during alias check
  + 418212 org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
  + 418227 Null cookie value test
- 
+
 jetty-9.0.5.v20130815 - 15 August 2013
  + 414898 Only upgrade v0 to v1 cookies on dquote , ; backslash space and tab
    in the value

examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java

@@ -25,6 +25,7 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import javax.servlet.AsyncContext;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;

examples/embedded/src/main/java/HelloWorld.java

@@ -16,12 +16,14 @@
 //  ========================================================================
 //
 
+import java.io.IOException;
+
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import java.io.IOException;
-import org.eclipse.jetty.server.Server;
+
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 
 public class HelloWorld extends AbstractHandler

examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServer.java

@@ -25,6 +25,7 @@
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 public class ExampleServer
 {
@@ -44,7 +45,6 @@ public static void main(String[] args) throws Exception
         handlers.setHandlers(new Handler[]{context,new DefaultHandler()});
         server.setHandler(handlers);
 
-
         server.start();
         server.join();
     }

examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java

@@ -21,6 +21,7 @@
 
 
 import java.util.Properties;
+
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.webapp.WebAppContext;
 

examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java

@@ -24,8 +24,8 @@
 import org.eclipse.jetty.deploy.providers.WebAppProvider;
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.security.HashLoginService;
-import org.eclipse.jetty.server.ForwardedRequestCustomizer;
 import org.eclipse.jetty.server.AsyncNCSARequestLog;
+import org.eclipse.jetty.server.ForwardedRequestCustomizer;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java

@@ -24,17 +24,11 @@
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
 
 import org.eclipse.jetty.util.ConcurrentHashSet;

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java

@@ -18,15 +18,11 @@
 
 package org.eclipse.jetty.annotations;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.jetty.annotations.AnnotationParser.AbstractHandler;
 import org.eclipse.jetty.annotations.AnnotationParser.ClassInfo;
 import org.eclipse.jetty.util.ConcurrentHashSet;
-import org.eclipse.jetty.util.MultiMap;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java

@@ -18,8 +18,6 @@
 
 package org.eclipse.jetty.annotations;
 
-import java.util.List;
-
 import javax.servlet.Servlet;
 
 import org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler;

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationInheritance.java

@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.naming.Context;
@@ -37,7 +36,6 @@
 import org.eclipse.jetty.annotations.AnnotationParser.FieldInfo;
 import org.eclipse.jetty.annotations.AnnotationParser.MethodInfo;
 import org.eclipse.jetty.util.ConcurrentHashSet;
-import org.eclipse.jetty.util.MultiMap;
 import org.junit.After;
 import org.junit.Test;