diff options
Diffstat (limited to 'jetty-server/src/test/java/org/eclipse')
58 files changed, 222 insertions, 107 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractConnectorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractConnectorTest.java index 7808f9c771..1098eaf291 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractConnectorTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractConnectorTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java index 9df71674e4..7016fb017e 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java index 58cdaf2da6..fcc0fbf356 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelCloseTest.java index a7d0bcf606..bb2c9eec50 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelCloseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelCloseTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelServerTest.java index d4708357cd..843edf464d 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelServerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelTimeoutTest.java index 959f335662..a387435ddf 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/BlockingChannelTimeoutTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 14d0634a09..464dc46910 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java index a37f051043..2ca47dd0bd 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java index e5144b5554..272ff27feb 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java b/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java index 3cf9cf8a44..346bc594fd 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/EncodedHttpURITest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/EncodedHttpURITest.java index 911d89043c..b71e159c28 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/EncodedHttpURITest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/EncodedHttpURITest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HalfCloseRaceTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HalfCloseRaceTest.java index 31d78870d1..b416e876a6 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HalfCloseRaceTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HalfCloseRaceTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 f3393515d8..6982a6c627 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java index 4331cbda34..ec08234984 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java index f5330f651e..3c88fd7211 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 5e8cf48c8f..a5b2d60164 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java index 5f133b5fd1..fccb42d568 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/InclusiveByteRangeTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/InclusiveByteRangeTest.java index 8ff6100efb..ced50caec4 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/InclusiveByteRangeTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/InclusiveByteRangeTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java index 145a4f8997..2f0bc75c0f 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 c9ad906137..e7f4f6a87d 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RFC2616Test.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RFC2616Test.java index e9dad93861..5dc2a8d429 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/RFC2616Test.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/RFC2616Test.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 f60ea4d65f..756a9b300f 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java index 23945cb08e..583d905abc 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java index 8361cfd7ba..33ecc10e05 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java index 4c1fb0a3cd..c96c7f6b02 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java index b4c473a25d..e706d4d7d7 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java index c075a0289b..6d24df24a4 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java index eeedfa0122..839c2f7a79 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerTest.java index 7b558713d4..11875a28ec 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 596f9ccc2b..05073d8c90 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SlowClientWithPipelinedRequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SlowClientWithPipelinedRequestTest.java index 133f8374c3..acf1b79647 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SlowClientWithPipelinedRequestTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SlowClientWithPipelinedRequestTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SocketConnectorCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SocketConnectorCloseTest.java index ee4b47e636..17643f4dae 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SocketConnectorCloseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SocketConnectorCloseTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SocketServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SocketServerTest.java index 948ed2de55..e9a10571b2 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SocketServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SocketServerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SocketTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SocketTimeoutTest.java index 78cad06cb9..8794f1cebc 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SocketTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SocketTimeoutTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java index 96df44be93..f91408c2dd 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java index 4c1b1ce863..27a5a490c9 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 @@ -167,4 +167,4 @@ class SuspendHandler extends HandlerWrapper } } -}
\ No newline at end of file +} diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractConnectHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractConnectHandlerTest.java index 5dc6df077e..474950df52 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractConnectHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractConnectHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 @@ -33,22 +33,19 @@ import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.nio.SelectChannelConnector; -import org.junit.AfterClass; +import org.junit.After; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -/** - * @version $Revision$ $Date$ - */ public abstract class AbstractConnectHandlerTest { - protected static Server server; - protected static Connector serverConnector; - protected static Server proxy; - protected static Connector proxyConnector; + protected Server server; + protected Connector serverConnector; + protected Server proxy; + protected Connector proxyConnector; - protected static void startServer(Connector connector, Handler handler) throws Exception + protected void startServer(Connector connector, Handler handler) throws Exception { server = new Server(); serverConnector = connector; @@ -57,29 +54,34 @@ public abstract class AbstractConnectHandlerTest server.start(); } - protected static void startProxy() throws Exception + protected void startProxy() throws Exception + { + startProxy(new SelectChannelConnector(), new ConnectHandler()); + } + + protected void startProxy(Connector connector, ConnectHandler connectHandler) throws Exception { proxy = new Server(); - proxyConnector = new SelectChannelConnector(); + proxyConnector = connector; proxy.addConnector(proxyConnector); - proxy.setHandler(new ConnectHandler()); + proxy.setHandler(connectHandler); proxy.start(); } - @AfterClass - public static void stop() throws Exception + @After + public void stop() throws Exception { stopProxy(); stopServer(); } - protected static void stopServer() throws Exception + protected void stopServer() throws Exception { server.stop(); server.join(); } - protected static void stopProxy() throws Exception + protected void stopProxy() throws Exception { proxy.stop(); proxy.join(); @@ -113,7 +115,7 @@ public abstract class AbstractConnectHandlerTest { int readLen = 0; int length = Integer.parseInt(headers.get("content-length")); - body=new StringBuilder(length); + body = new StringBuilder(length); try { for (int i = 0; i < length; ++i) @@ -121,19 +123,17 @@ public abstract class AbstractConnectHandlerTest char c = (char)reader.read(); body.append(c); readLen++; - } - } catch (SocketTimeoutException e) { - System.err.printf("Read %,d bytes (out of an expected %,d bytes)%n",readLen,length); + System.err.printf("Read %,d bytes (out of an expected %,d bytes)%n", readLen, length); throw e; } } else if ("chunked".equals(headers.get("transfer-encoding"))) { - body = new StringBuilder(64*1024); + body = new StringBuilder(64 * 1024); while ((line = reader.readLine()) != null) { if ("0".equals(line)) @@ -151,7 +151,7 @@ public abstract class AbstractConnectHandlerTest { e.printStackTrace(); } - + int length = Integer.parseInt(line, 16); for (int i = 0; i < length; ++i) { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java index 6b6de89e32..a68552f570 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 @@ -25,9 +25,12 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; +import java.nio.channels.SocketChannel; import java.security.SecureRandom; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicReference; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; @@ -38,35 +41,40 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jetty.io.AsyncEndPoint; +import org.eclipse.jetty.io.Buffer; +import org.eclipse.jetty.io.EndPoint; +import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.server.ssl.SslSelectChannelConnector; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; -/** - * @version $Revision$ $Date$ - */ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest { - @BeforeClass - public static void init() throws Exception + @Before + public void init() throws Exception { - SslSelectChannelConnector connector = new SslSelectChannelConnector(); - connector.setMaxIdleTime(3600000); // TODO remove + startServer(prepareServerConnector(), new ServerHandler()); + startProxy(); + } + private SslSelectChannelConnector prepareServerConnector() + { + SslSelectChannelConnector connector = new SslSelectChannelConnector(); String keyStorePath = MavenTestingUtils.getTestResourceFile("keystore").getAbsolutePath(); SslContextFactory cf = connector.getSslContextFactory(); cf.setKeyStorePath(keyStorePath); cf.setKeyStorePassword("storepwd"); cf.setKeyManagerPassword("keypwd"); - - startServer(connector, new ServerHandler()); - startProxy(); + return connector; } @Test @@ -78,7 +86,6 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest "Host: " + hostPort + "\r\n" + "\r\n"; Socket socket = newSocket(); - socket.setSoTimeout(3600000); // TODO remove try { OutputStream output = socket.getOutputStream(); @@ -104,8 +111,8 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest request = "GET /echo HTTP/1.1\r\n" + - "Host: " + hostPort + "\r\n" + - "\r\n"; + "Host: " + hostPort + "\r\n" + + "\r\n"; output.write(request.getBytes("UTF-8")); output.flush(); @@ -182,6 +189,118 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest } } + @Test + public void testServerHalfClosesClientDoesNotCloseExpectIdleTimeout() throws Exception + { + stop(); + + final String uri = "/echo"; + int idleTimeout = 2000; + startServer(prepareServerConnector(), new AbstractHandler() + { + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + String requestURI = request.getRequestURI(); + if (uri.equals(requestURI)) + { + baseRequest.setHandled(true); + response.setHeader("Connection", "close"); + response.setContentLength(uri.length()); + response.getOutputStream().print(uri); + } + } + }); + Connector proxyConnector = new SelectChannelConnector(); + proxyConnector.setMaxIdleTime(idleTimeout); + + final AtomicReference<EndPoint> proxyToClientEndPoint = new AtomicReference<EndPoint>(); + final AtomicReference<EndPoint> proxyToServerEndPoint = new AtomicReference<EndPoint>(); + ConnectHandler connectHandler = new ConnectHandler() + { + @Override + protected ClientToProxyConnection newClientToProxyConnection(ConcurrentMap<String, Object> context, SocketChannel channel, EndPoint endPoint, long timeStamp) + { + proxyToClientEndPoint.set(endPoint); + return new ClientToProxyConnection(context, channel, endPoint, timeStamp); + } + + @Override + protected ProxyToServerConnection newProxyToServerConnection(ConcurrentMap<String, Object> context, Buffer buffer) + { + return new ProxyToServerConnection(context, buffer) + { + @Override + public void setEndPoint(AsyncEndPoint endpoint) + { + proxyToServerEndPoint.set(endpoint); + super.setEndPoint(endpoint); + } + }; + } + }; + connectHandler.setWriteTimeout(2 * idleTimeout); + startProxy(proxyConnector, connectHandler); + + String hostPort = "localhost:" + serverConnector.getLocalPort(); + String request = "" + + "CONNECT " + hostPort + " HTTP/1.1\r\n" + + "Host: " + hostPort + "\r\n" + + "\r\n"; + Socket socket = newSocket(); + try + { + OutputStream output = socket.getOutputStream(); + BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream())); + + output.write(request.getBytes("UTF-8")); + output.flush(); + + // Expect 200 OK from the CONNECT request + Response response = readResponse(input); + System.err.println(response); + assertEquals("200", response.getCode()); + + // Be sure the buffered input does not have anything buffered + assertFalse(input.ready()); + + // Upgrade the socket to SSL + SSLSocket sslSocket = wrapSocket(socket); + try + { + output = sslSocket.getOutputStream(); + input = new BufferedReader(new InputStreamReader(sslSocket.getInputStream())); + + request = "" + + "GET " + uri + " HTTP/1.1\r\n" + + "Host: " + hostPort + "\r\n" + + "\r\n"; + output.write(request.getBytes("UTF-8")); + output.flush(); + + response = readResponse(input); + assertEquals("200", response.getCode()); + assertEquals(uri, response.getBody()); + + Thread.sleep(4 * idleTimeout); + + EndPoint p2c = proxyToClientEndPoint.get(); + assertNotNull(p2c); + assertFalse(p2c.isOpen()); + EndPoint p2s = proxyToServerEndPoint.get(); + assertNotNull(p2s); + assertFalse(p2s.isOpen()); + } + finally + { + sslSocket.close(); + } + } + finally + { + socket.close(); + } + } + private SSLSocket wrapSocket(Socket socket) throws Exception { SSLContext sslContext = SSLContext.getInstance("SSLv3"); @@ -225,7 +344,7 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest ByteArrayOutputStream baos = new ByteArrayOutputStream(); InputStream input = httpRequest.getInputStream(); - int read = -1; + int read; while ((read = input.read()) >= 0) baos.write(read); baos.close(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java index 9b79a1df1e..8cf419db1a 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 @@ -18,9 +18,6 @@ package org.eclipse.jetty.server.handler; -import static org.junit.Assert.*; -import static org.junit.Assume.*; - import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -32,7 +29,6 @@ import java.net.Socket; import java.net.UnknownHostException; import java.nio.channels.SocketChannel; import java.util.concurrent.ConcurrentMap; - import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; @@ -44,16 +40,16 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.toolchain.test.OS; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; -/** - * @version $Revision$ $Date$ - */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeTrue; + public class ConnectHandlerTest extends AbstractConnectHandlerTest { - @BeforeClass - public static void init() throws Exception + @Before + public void init() throws Exception { startServer(new SelectChannelConnector(), new ServerHandler()); startProxy(); @@ -658,7 +654,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest ByteArrayOutputStream baos = new ByteArrayOutputStream(); InputStream input = httpRequest.getInputStream(); - int read = -1; + int read; while ((read = input.read()) >= 0) baos.write(read); baos.close(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerUnitTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerUnitTest.java index b2a6f3ecf5..bfd6c74d05 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerUnitTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerUnitTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 da2b401894..e5c1036853 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java index 43a89956c7..80c71c1bd5 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java index ff099de6ed..2d3dd5eed5 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java index 4afeb2353e..8463cf5a5b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java index bc378c27a0..9e7956f2c0 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ShutdownHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ShutdownHandlerTest.java index c9d950ded1..0484e3ab6b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ShutdownHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ShutdownHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java index 9b15c97040..4a36cd8870 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 12825dbf59..beb985b173 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java index c46b9b0852..bf6cd09a3a 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java index 41a221c4c2..4e8c84c791 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java index c6a8e95923..237a7be78b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java index 7ba13e1daf..6b04f3b24c 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 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 88e2714687..aaa9995ede 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 @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslRenegotiateTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslRenegotiateTest.java index 14a352fc37..328a66c5e0 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslRenegotiateTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslRenegotiateTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java index 1fef10793e..7b98ac665a 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java index e808ce8ac9..9b545ea2d5 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketTimeoutTest.java index 3ba33c3405..987bd1e5b7 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketTimeoutTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslUploadTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslUploadTest.java index c619bf7cd4..88d2e5aa22 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslUploadTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslUploadTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// 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 |