[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[List Home]
|
[jetty-commit] [Git@Eclipse] Jetty: primary project repository branch jetty-9-oneconnector updated. jetty-8.1.5.v20120716-628-gb52930b
|
- From: genie@xxxxxxxxxxx (Greg Wilkins)
- Date: Thu, 2 Aug 2012 02:09:18 -0400 (EDT)
- Delivered-to: jetty-commit@eclipse.org
The branch, jetty-9-oneconnector has been updated
via b52930be14eb743de039d1d8614267b2d62c4930 (commit)
via 2da412009efb76cf5ae72933d44c16f8fc223251 (commit)
via a4da8f2323cac9fde7ece418135b2dd3cecee30f (commit)
via 7c4fd9326e2e3fbe4d868ed0b085dc4a134d7d92 (commit)
via a8a3bade3319b090208b69ed6a0cb47f0cd06c1d (commit)
via 96b5c05674e16d335db78d40e0983aad791cf163 (commit)
via d6ef039f2c9aa36ff1c788e0ee483a5d86b9db85 (commit)
via 56a2cedaa50542b4821f5353b621d456abc415dc (commit)
via 2a470631bfdf10f26279cca6fb8ecab86f9c58d5 (commit)
via 9e332c925530c88c19591b149cf5293287b255fe (commit)
via 3621bec43cf1eadb2affa20c644a7d45ec1c4e66 (commit)
via 2f4c86be354717f7d1b9775f1aca73d379750802 (commit)
via 4b59767bd29da578bbee15118cb513d883d600e4 (commit)
via 07929fee884bf3a115f954bbb6ecaf89e398b914 (commit)
via 7c742ee4e81635de0fdd8c5fc930313f0a030243 (commit)
via b2a8fc02dcd3ede89c77d20ce8cc9d285695e39f (commit)
via ab89924261bb2465a370929cb34917cef302b668 (commit)
via a97fe106f9b11d6d3f3791ad10b36101736c0c17 (commit)
via 9a568514a6c3790bf8cef345532bd3e738736295 (commit)
via 9a34c08b8e53988c708e255412e94bd8c8e9378e (commit)
via 08a82609784f443447b9d3cb222600e6a56d46bd (commit)
via 78802c35c203d6d2a1b084ca8035e819872c64e8 (commit)
via 50ac775bf5ca0b753a1d17b0327d7a9a874ecb70 (commit)
via acdc1c1abd06be872439456858a9ed51c8c64952 (commit)
via 01529ba12894b476f13dbe02598ff660976caa9c (commit)
via e772e26b5b75bf0ca2d53a570593e87112355765 (commit)
via 32e9548f0ceb624e4938f89a6295dd401d778d71 (commit)
via 7d2d40dc2b8dc1b858152e0dc795206cd3214049 (commit)
via 9c717d552ff1e1b151a79e14426f4f5e06902678 (commit)
via b4b1bc814c23fb14b223dca000f853f305f1fbd0 (commit)
via 8d12e4998836a695b48db2f397b42861befa2dff (commit)
via 35b61feae2d505938c720594e108d872d8aa17b2 (commit)
via e75e0e9a04d733f1b0134d5b509aa052ba2cbd8f (commit)
via 30ae8370bd9c9bbb1675a5703ec0b3193fb32c36 (commit)
via f34d74ec8433f8d784028085461102535c602eac (commit)
via 0c1ca16e864172bd7b06fa883b3fd999d4b2c662 (commit)
via aa24693870b87ee19eb1d3f8c467aba23a3e88c1 (commit)
via 929defa465d82b66a6951f8b7f155c4fbbbffe6b (commit)
via 9999db9c94499e18fbcf83bd14927f98e1aeab90 (commit)
via 7246b279e27fdee2a2b42f7f6251f00f4832ef79 (commit)
via 51d74049564308cd0b1f3e1c74eb43785feacc9e (commit)
via 3447bd2767343bf5544d60c06c000c64c810d245 (commit)
via da2b457eaa97fa9a7fe1ac76b62719137c678954 (commit)
via 36729c424886e0544bca345f56d96c3b1c6fbe26 (commit)
via c2299154448fc4a5e690fef9165c93cba2921142 (commit)
via fa721bf5104ec9415b43914a0741684d42a54eeb (commit)
via 3abb8cfd37c931f9c5717364c875076e73cfd325 (commit)
via 0af40c4db2dc01da763f54d7cc02716b02eab218 (commit)
via ef7c46f56af3d6a15151f9fde9942b5539ba4d58 (commit)
via c2aae7c517a0bad244b80d0f645a78dd7bd0a8ec (commit)
via f2c86b2d002cddaefc7e28adebb637956d9c7ea0 (commit)
via 99afabdf925fa88d250ce3d915667f59475c636f (commit)
from 039499d610c28d2a6fd669a25c482ef20f48431b (commit)
- Log -----------------------------------------------------------------
commit b52930be14eb743de039d1d8614267b2d62c4930
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date: Thu Aug 2 16:08:49 2012 +1000
jetty-9 merged Async and non-Async classes for EndPoint and Connection
commit 2da412009efb76cf5ae72933d44c16f8fc223251
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date: Thu Aug 2 14:55:26 2012 +1000
jetty-9 one connector passing more tests
commit a4da8f2323cac9fde7ece418135b2dd3cecee30f
Merge: 7c4fd93 a8a3bad
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date: Thu Aug 2 14:18:38 2012 +1000
Merge branch 'jetty-9' into jetty-9-oneconnector
commit 7c4fd9326e2e3fbe4d868ed0b085dc4a134d7d92
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date: Thu Aug 2 14:17:49 2012 +1000
jetty-9 one connector passing more tests
commit 96b5c05674e16d335db78d40e0983aad791cf163
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date: Thu Aug 2 11:51:54 2012 +1000
jetty-9 one connector passing most tests
commit d6ef039f2c9aa36ff1c788e0ee483a5d86b9db85
Merge: 56a2ced 9e332c9
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date: Thu Aug 2 08:15:19 2012 +1000
Merge branch 'jetty-9' into jetty-9-oneconnector
commit 56a2cedaa50542b4821f5353b621d456abc415dc
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date: Thu Aug 2 08:14:02 2012 +1000
jetty-9 further work on oneconnector... passing more tests
commit 2a470631bfdf10f26279cca6fb8ecab86f9c58d5
Merge: 039499d b2a8fc0
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date: Thu Aug 2 08:11:12 2012 +1000
Merge branch 'jetty-9' into jetty-9-oneconnector
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
-----------------------------------------------------------------------
Summary of changes:
.../org/eclipse/jetty/embedded/LikeJettyXml.java | 18 +-
.../org/eclipse/jetty/embedded/ManyConnectors.java | 10 +-
.../org/eclipse/jetty/embedded/ManyContexts.java | 4 +-
.../jetty/embedded/ManyServletContexts.java | 1 -
.../java/org/eclipse/jetty/embedded/OneWebApp.java | 4 +-
.../eclipse/jetty/embedded/GzipHandlerTest.java | 9 +-
...syncConnection.java => AbstractConnection.java} | 20 +-
.../org/eclipse/jetty/io/AbstractEndPoint.java | 33 +
.../eclipse/jetty/io/AsyncByteArrayEndPoint.java | 172 ----
.../java/org/eclipse/jetty/io/AsyncEndPoint.java | 129 ---
.../org/eclipse/jetty/io/ByteArrayEndPoint.java | 144 +++-
.../java/org/eclipse/jetty/io/ChannelEndPoint.java | 16 +-
.../io/{AsyncConnection.java => Connection.java} | 20 +-
.../main/java/org/eclipse/jetty/io/EndPoint.java | 112 +++-
.../java/org/eclipse/jetty/io/ReadInterest.java | 2 +-
.../eclipse/jetty/io/SelectChannelEndPoint.java | 119 ++-
.../java/org/eclipse/jetty/io/SelectorManager.java | 150 ++--
.../java/org/eclipse/jetty/io/WriteFlusher.java | 15 +-
.../org/eclipse/jetty/io/ssl/SslConnection.java | 486 ++++++-----
.../jetty/io/AsyncByteArrayEndPointTest.java | 192 ----
.../eclipse/jetty/io/ByteArrayEndPointTest.java | 179 ++++-
.../io/SelectChannelEndPointInterestsTest.java | 199 +++++
.../jetty/io/SelectChannelEndPointSslTest.java | 23 +-
.../jetty/io/SelectChannelEndPointTest.java | 126 ++--
.../org/eclipse/jetty/io/SslConnectionTest.java | 26 +-
.../org/eclipse/jetty/io/WriteFlusherTest.java | 191 ++++
.../java/org/eclipse/jetty/jmx/ObjectMBean.java | 3 -
.../org/eclipse/jetty/jmx/ObjectMBeanTest.java | 3 -
.../java/org/eclipse/jetty/proxy/ProxyServer.java | 2 +-
.../jetty/proxy/AbstractBalancerServletTest.java | 9 +-
jetty-security/pom.xml | 4 +-
.../eclipse/jetty/security/SpnegoLoginService.java | 1 +
.../security/authentication/FormAuthenticator.java | 1 +
.../org/eclipse/jetty/security/ConstraintTest.java | 320 ++++----
.../jetty/security/DataConstraintsTest.java | 13 +-
.../eclipse/jetty/server/AbstractConnector.java | 46 +-
.../eclipse/jetty/server/AbstractNetConnector.java | 6 +-
.../java/org/eclipse/jetty/server/HttpChannel.java | 15 +-
.../org/eclipse/jetty/server/HttpChannelState.java | 1 +
.../eclipse/jetty/server/HttpConfiguration.java | 5 +-
.../org/eclipse/jetty/server/HttpConnection.java | 27 +-
.../org/eclipse/jetty/server/LocalConnector.java | 162 +++--
.../jetty/server/SelectChannelConnector.java | 23 +-
.../nio/NetworkTrafficSelectChannelConnector.java | 4 +-
.../org/eclipse/jetty/server/ssl/SslConnector.java | 1 -
.../server/ssl/SslSelectChannelConnector.java | 16 -
.../jetty/server/ConnectorCloseTestBase.java | 5 +-
.../eclipse/jetty/server/ConnectorTimeoutTest.java | 8 +-
.../eclipse/jetty/server/HttpConnectionTest.java | 48 +-
.../jetty/server/HttpServerTestFixture.java | 8 +-
.../org/eclipse/jetty/server/HttpWriterTest.java | 4 +-
.../java/org/eclipse/jetty/server/RFC2616Test.java | 21 +-
.../java/org/eclipse/jetty/server/RequestTest.java | 39 +-
.../org/eclipse/jetty/server/ResponseTest.java | 29 +-
.../server/SelectChannelConnectorCloseTest.java | 7 +
.../jetty/server/SelectChannelStatisticsTest.java | 15 +-
.../server/SlowClientWithPipelinedRequestTest.java | 7 +-
.../handler/ContextHandlerCollectionTest.java | 2 +-
.../jetty/server/handler/ContextHandlerTest.java | 8 +-
.../org/eclipse/jetty/server/ssl/SSLCloseTest.java | 22 +-
.../eclipse/jetty/server/ssl/SSLEngineTest.java | 37 +-
.../ssl/SSLSelectChannelConnectorLoadTest.java | 1 -
.../jetty/server/ssl/SslBytesServerTest.java | 100 +--
.../jetty/server/ssl/SslRenegotiateTest.java | 262 ------
.../eclipse/jetty/server/ssl/SslUploadTest.java | 1 -
.../org/eclipse/jetty/servlet/DefaultServlet.java | 10 +-
.../org/eclipse/jetty/servlet/FilterHolder.java | 1 -
.../org/eclipse/jetty/servlet/FilterMapping.java | 1 +
.../org/eclipse/jetty/servlet/ServletHandler.java | 1 +
.../org/eclipse/jetty/servlet/ServletHolder.java | 2 +-
.../org/eclipse/jetty/servlet/ServletTester.java | 8 -
.../AsyncContextDispatchWithQueryStrings.java | 7 +-
.../eclipse/jetty/servlet/AsyncContextTest.java | 12 +-
.../eclipse/jetty/servlet/DefaultServletTest.java | 1 +
.../org/eclipse/jetty/servlet/DispatcherTest.java | 1 -
.../java/org/eclipse/jetty/servlet/HolderTest.java | 13 +-
.../eclipse/jetty/servlet/ResponseHeadersTest.java | 3 +-
.../eclipse/jetty/servlets/CrossOriginFilter.java | 1 +
.../java/org/eclipse/jetty/servlets/DoSFilter.java | 2 -
.../org/eclipse/jetty/servlets/GzipFilter.java | 2 +-
.../jetty/servlets/IncludableGzipFilter.java | 2 +-
.../eclipse/jetty/servlets/MultiPartFilter.java | 1 +
.../eclipse/jetty/servlets/UserAgentFilter.java | 1 +
.../jetty/servlets/AbstractDoSFilterTest.java | 1 +
.../servlets/GzipFilterContentLengthTest.java | 1 +
.../jetty/servlets/GzipWithPipeliningTest.java | 2 +-
.../jetty/servlets/IncludableGzipFilterTest.java | 1 -
.../jetty/servlets/MultipartFilterTest.java | 9 +-
.../org/eclipse/jetty/servlets/PipelineHelper.java | 4 +-
.../org/eclipse/jetty/servlets/PutFilterTest.java | 6 +-
.../org/eclipse/jetty/servlets/QoSFilterTest.java | 4 +-
.../eclipse/jetty/servlets/gzip/GzipTester.java | 7 +-
jetty-spdy/spdy-core/pom.xml | 6 -
.../java/org/eclipse/jetty/spdy/Controller.java | 27 +-
.../main/java/org/eclipse/jetty/spdy/ISession.java | 33 +-
.../org/eclipse/jetty/spdy/StandardSession.java | 54 +-
.../org/eclipse/jetty/spdy/StandardStreamTest.java | 10 +-
.../src/test/resources/jetty-logging.properties | 2 +-
.../spdy-core/src/test/resources/log4j.properties | 14 -
.../src/main}/resources/jetty-logging.properties | 2 +-
.../src/main/resources/log4j.properties | 16 -
jetty-spdy/spdy-jetty-http/pom.xml | 6 -
.../jetty/spdy/http/ServerHTTPSPDYTest.java | 27 +-
.../src/test/resources/jetty-logging.properties | 2 +-
.../src/test/resources/log4j.properties | 14 -
jetty-spdy/spdy-jetty/pom.xml | 6 -
.../eclipse/jetty/spdy/AsyncConnectionFactory.java | 6 +-
.../org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java | 12 +-
.../spdy/NextProtoNegoClientAsyncConnection.java | 25 +-
.../spdy/NextProtoNegoServerAsyncConnection.java | 27 +-
.../eclipse/jetty/spdy/SPDYAsyncConnection.java | 53 +-
.../java/org/eclipse/jetty/spdy/SPDYClient.java | 30 +-
.../eclipse/jetty/spdy/SPDYServerConnector.java | 24 +-
.../spdy/ServerSPDYAsyncConnectionFactory.java | 14 +-
.../org/eclipse/jetty/spdy/ClosedStreamTest.java | 1 -
.../src/test/resources/jetty-logging.properties | 2 +-
.../spdy-jetty/src/test/resources/log4j.properties | 16 -
.../org/eclipse/jetty/util/Utf8Appendable.java | 1 +
.../org/eclipse/jetty/util/Utf8StringBuilder.java | 2 +-
.../org/eclipse/jetty/util/annotation/Name.java | 2 +-
.../java/org/eclipse/jetty/util/log/StdErrLog.java | 9 +-
.../eclipse/jetty/util/ssl/SslContextFactory.java | 104 ---
.../jetty/util/thread/QueuedThreadPool.java | 19 +-
.../org/eclipse/jetty/util/log/StdErrLogTest.java | 34 +-
.../jetty/util/ssl/SslContextFactoryTest.java | 24 +-
.../jetty/webapp/StandardDescriptorProcessor.java | 10 -
.../org/eclipse/jetty/webapp/WebAppContext.java | 2 -
.../websocket/client/io/HandshakeConnection.java | 10 +-
.../client/io/WebSocketClientAsyncConnection.java | 22 +
.../client/io/WebSocketClientSelectorManager.java | 29 +-
.../websocket/client/examples/TestClient.java | 10 +-
.../websocket/driver/WebSocketEventDriver.java | 40 +-
.../extensions/deflate/DeflateFrameExtension.java | 4 +-
.../extensions/fragment/FragmentExtension.java | 4 +-
.../jetty/websocket/io/ControlFrameBytes.java | 2 +-
.../eclipse/jetty/websocket/io/DataFrameBytes.java | 1 -
.../org/eclipse/jetty/websocket/io/FrameBytes.java | 2 +-
.../websocket/io/WebSocketAsyncConnection.java | 128 ++--
.../jetty/websocket/io/WebSocketSession.java | 23 +
.../eclipse/jetty/websocket/protocol/Frame.java | 2 +-
.../jetty/websocket/protocol/Generator.java | 6 +-
.../eclipse/jetty/websocket/protocol/OpCode.java | 73 +-
.../eclipse/jetty/websocket/protocol/Parser.java | 92 ++-
.../jetty/websocket/protocol/WebSocketFrame.java | 39 +-
.../websocket/driver/WebSocketEventDriverTest.java | 10 +-
.../websocket/protocol/ClosePayloadParserTest.java | 5 +-
.../websocket/protocol/IncomingFramesCapture.java | 27 +-
.../websocket/protocol/OutgoingFramesCapture.java | 10 +-
.../server/WebSocketServerAsyncConnection.java | 41 +
.../websocket/server/WebSocketServerFactory.java | 61 +-
.../jetty/websocket/server/WebSocketServlet.java | 21 +-
.../jetty/websocket/server/ByteBufferAssert.java | 5 +
.../websocket/server/DeflateExtensionTest.java | 8 +-
.../websocket/server/FragmentExtensionTest.java | 6 +-
.../websocket/server/IdentityExtensionTest.java | 6 +-
.../websocket/server/SimpleServletServer.java | 2 +-
.../websocket/server/WebSocketLoadRFC6455Test.java | 14 +-
.../websocket/server/WebSocketOverSSLTest.java | 3 +-
.../websocket/server/WebSocketServletRFCTest.java | 32 +-
.../jetty/websocket/server/ab/AbstractABCase.java | 48 +-
.../jetty/websocket/server/ab/AllTests.java | 2 +-
.../eclipse/jetty/websocket/server/ab/Fuzzer.java | 213 +++++
.../jetty/websocket/server/ab/TestABCase1.java | 571 +++++++++----
.../jetty/websocket/server/ab/TestABCase2.java | 358 ++++++++
.../jetty/websocket/server/ab/TestABCase3.java | 231 +++++
.../jetty/websocket/server/ab/TestABCase4.java | 293 +++++++
.../jetty/websocket/server/ab/TestABCase5.java | 918 +++++++++++++-------
.../jetty/websocket/server/ab/TestABCase6.java | 846 ++++++++++++++++++
.../jetty/websocket/server/ab/TestABCase7_9.java | 14 +-
.../server/blockhead/BlockheadClient.java | 63 +-
.../server/examples/echo/EchoFragmentSocket.java | 7 +-
.../server/examples/echo/ExampleEchoServer.java | 2 +-
.../jetty/websocket/server/helper}/Hex.java | 30 +-
...arseCapture.java => IncomingFramesCapture.java} | 57 +-
.../websocket/server/helper/MessageSender.java | 77 --
.../server/helper}/OutgoingFramesCapture.java | 14 +-
.../src/test/resources/jetty-logging.properties | 10 +-
.../eclipse/jetty/xml/XmlConfigurationTest.java | 15 +-
.../jetty/continuation/test/ContinuationBase.java | 6 +-
.../jetty/continuation/ContinuationTest.java | 7 +-
.../jetty/continuation/FauxContinuationTest.java | 7 +-
test-jetty-webapp/src/main/java/com/acme/Dump.java | 2 -
.../main/java/com/acme/WebSocketChatServlet.java | 5 +-
.../test/java/org/eclipse/jetty/TestServer.java | 4 +-
184 files changed, 5861 insertions(+), 3103 deletions(-)
rename jetty-io/src/main/java/org/eclipse/jetty/io/{AbstractAsyncConnection.java => AbstractConnection.java} (86%)
delete mode 100644 jetty-io/src/main/java/org/eclipse/jetty/io/AsyncByteArrayEndPoint.java
delete mode 100644 jetty-io/src/main/java/org/eclipse/jetty/io/AsyncEndPoint.java
rename jetty-io/src/main/java/org/eclipse/jetty/io/{AsyncConnection.java => Connection.java} (55%)
delete mode 100644 jetty-io/src/test/java/org/eclipse/jetty/io/AsyncByteArrayEndPointTest.java
create mode 100644 jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointInterestsTest.java
create mode 100644 jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
delete mode 100644 jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslRenegotiateTest.java
copy {jetty-jmx => jetty-spdy/spdy-core}/src/test/resources/jetty-logging.properties (67%)
delete mode 100644 jetty-spdy/spdy-core/src/test/resources/log4j.properties
copy {jetty-jmx/src/test => jetty-spdy/spdy-jetty-http-webapp/src/main}/resources/jetty-logging.properties (67%)
delete mode 100644 jetty-spdy/spdy-jetty-http-webapp/src/main/resources/log4j.properties
copy {jetty-jmx => jetty-spdy/spdy-jetty-http}/src/test/resources/jetty-logging.properties (67%)
delete mode 100644 jetty-spdy/spdy-jetty-http/src/test/resources/log4j.properties
copy {jetty-jmx => jetty-spdy/spdy-jetty}/src/test/resources/jetty-logging.properties (67%)
delete mode 100644 jetty-spdy/spdy-jetty/src/test/resources/log4j.properties
create mode 100644 jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientAsyncConnection.java
create mode 100644 jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerAsyncConnection.java
create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java
create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java
create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
copy {jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip => jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper}/Hex.java (68%)
rename jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/{FrameParseCapture.java => IncomingFramesCapture.java} (59%)
delete mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/MessageSender.java
copy jetty-websocket/{websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol => websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper}/OutgoingFramesCapture.java (84%)
hooks/post-receive
--
Jetty: primary project repository