Commit Graph

5258 Commits

Author SHA1 Message Date
Jesse McConnell 3cc93b5798 adding jetty-spring module 2012-08-29 11:18:06 -05:00
Simone Bordet 8920cd16b6 Jetty9 - Ported the HTTP SPDY Proxy code. 2012-08-29 18:12:28 +02:00
Simone Bordet 1265c27607 Jetty9 - Including the jetty-maven-plugin module. 2012-08-29 18:12:28 +02:00
Simone Bordet 4180db6fae Jetty9 - Removed unnecessary _server field. 2012-08-29 18:09:18 +02:00
Jesse McConnell 2e81b63807 add jetty-jsp into build and add jetty-jspc-maven-plugin in as well 2012-08-29 11:08:52 -05:00
Thomas Becker 8fbe6c59d5 jetty-9 merge 2012-08-29 17:27:26 +02:00
Thomas Becker fe88df1def jetty-9 move SimpleHttpParser and SimpleHttpResponse to jetty-test-helper 2012-08-29 15:53:51 +02:00
Simone Bordet c866595bea Jetty9 - Fixed test that was dependent on case-insensitive file systems.
Reformatted, JDK7-ified and cleaned up the code.
2012-08-29 12:07:06 +02:00
Simone Bordet dd8958ffe8 Jetty9 - Fixed parsing in case of a <Configure> element without <Arg> elements,
which may happen if the configuration is not the one that creates the Server instance,
but just adds additional configuration to it.

Also took the chance to JDK7-ify the code and remove old cruft and unused code.
2012-08-29 11:49:41 +02:00
Thomas Becker c3abbe5ecb jetty-9 fix wrong case in PluginManagerTest 2012-08-29 11:49:01 +02:00
Simone Bordet 1191f5ab5d Jetty9 - Added copyright header. 2012-08-28 21:57:09 +02:00
Simone Bordet acb89e0d2f Jetty9 - Added copyright header. 2012-08-28 21:55:44 +02:00
Simone Bordet d84eee0b46 Jetty9 - Reverted AbstractConnector to use MappedByteBufferPool, as ArrayByteBufferPool is leaking buffers. 2012-08-28 18:14:22 +02:00
Simone Bordet 861ae31fe7 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-28 16:42:31 +02:00
Simone Bordet d9eae6d4a2 Merge branch 'jetty-9' into jetty-9-aggregation 2012-08-28 16:41:47 +02:00
Simone Bordet 9522bcb404 Jetty9 - Including also the spdy-jetty-http-webapp module. 2012-08-28 16:39:09 +02:00
Jesse McConnell 5fcdb6ac1a Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-28 09:35:57 -05:00
Jesse McConnell 79861eaa05 adding in jetty-maven-plugin 2012-08-28 09:35:45 -05:00
Simone Bordet 7a2b53d987 Jetty9 - Dispatching the onConnect(Session) callback in a different thread.
This is needed for two reasons: the first is that onOpen() is called from the selector thread
and onConnect() may perform I/O (such as sending a SETTINGS frame), and second
because onOpen() may be called when NPN upgrades the connection.
In the latter case, SslConnection is busy with the SSL handshake (for example is filling)
and calling onConnect() triggers a write, that ends up in the SslConnection that sees that
it is still in the SSL handshake and needs to fill, resulting in a reentrant fill, which is not
supported correctly by SslConnection.
Dispatching to a new thread makes the call safe, since SslConnection is properly synchronized.
2012-08-28 15:20:14 +02:00
Simone Bordet 2339da7cc0 Jetty9 - Marked tests as @Slow. 2012-08-28 13:04:18 +02:00
Simone Bordet 7bbd9675cc Jetty9 - Fixed test making it more reliable. 2012-08-28 12:48:37 +02:00
Simone Bordet 5aa3702606 Jetty9 - Better logging. 2012-08-28 11:56:37 +02:00
Simone Bordet 6601b65162 Jetty9 - Made the test more reliable and marked it as slow. 2012-08-28 11:56:22 +02:00
Simone Bordet 7a1faf3c08 Jetty9 - Start counting for idleness when we register read interest.
Otherwise it was possible that the endPoint was created, upon creation
it started counting for idleness, after a while read interested was set
and the endPoint idle timed out before having the chance to read.
2012-08-28 11:55:01 +02:00
Simone Bordet 156f07d493 Jetty9 - Greatly simplified HttpChannelOverSPDY.
Removed old code that was not necessary anymore.
2012-08-28 09:33:11 +02:00
Simone Bordet 34ee7101cc Jetty9 - Added calls to notify() also when calling shutdown() and earlyEOF(), to wake up threads waiting in blockForContent().
Also improved the blockForContent() loop condition, to exit when a shutdown or earlyEOF happens.
2012-08-28 09:31:30 +02:00
Simone Bordet 0acf2f9650 Jetty9 - Generified HttpChannel and HttpParser listeners to follow the generification of HttpInput. 2012-08-28 09:29:08 +02:00
Simone Bordet 5e4a2508b1 Jetty9 - Removed System.err.println(). 2012-08-27 17:34:46 +02:00
Simone Bordet a224a8e962 Jetty9 - Ignored two tests because the functionality they test is not yet implemented. 2012-08-27 17:21:58 +02:00
Simone Bordet edd40ec299 Jetty9 - Fixed ProtocolNegotiationTest and additional minor cleanups/logging/comments. 2012-08-27 17:13:38 +02:00
Simone Bordet c2095d7170 Jetty9 - Moved wiring of SslConnection out of HttpServerConnectionFactory.
The wiring of SslConnection in HttpServerConnectionFactory was not the
right place because a ConnectionFactory should just create the Connection
instances, not also wiring them up.
It is responsibility of the connector to wire the SslConnection in.
Moving the wiring outside HttpServerConnectionFactory fixed also a few
SPDY tests, where the wiring was already done outside (and therefore
was done twice).
2012-08-27 17:07:00 +02:00
Simone Bordet 1a2266b1b8 Jetty9 - Fixed test by specifying hardcoded idle timeout to avoiding NPE. 2012-08-27 16:58:29 +02:00
Simone Bordet a935c26764 Jetty9 - Fixed typo. 2012-08-27 16:32:01 +02:00
Simone Bordet bc0f9cd9e6 Jetty9 - Made test more robust. 2012-08-27 09:21:56 +02:00
Simone Bordet 5a3a25c880 Jetty9 - Logging idle timeouts. 2012-08-27 09:21:35 +02:00
Simone Bordet 7b58c584b9 Jetty9 - Fixed tests: now creating a connector requires an instance of Server, otherwise throws an NPE. 2012-08-27 08:38:27 +02:00
Greg Wilkins 9a1a020f0e jetty-9 renamed HttpTransport.{commit|write} to send 2012-08-27 14:43:29 +10:00
Greg Wilkins 838ddcd444 jetty-9 wider test margin for DoSfilterTest 2012-08-27 14:01:26 +10:00
Greg Wilkins 6e9bea1938 jetty-9 gzip tests handle HTTP/1.0 EOF content 2012-08-27 13:35:31 +10:00
Greg Wilkins 54d6739879 jetty-9 improved test speed 2012-08-27 12:41:36 +10:00
Greg Wilkins d8b287134f jetty-9 improved range request processing and tests 2012-08-27 12:17:40 +10:00
Greg Wilkins 6d2fb580a1 jetty-9 fixed dispatcher tests. These have been wrong since 7? 2012-08-27 11:20:10 +10:00
Greg Wilkins 353978726b jetty-9 reverted isHead change 2012-08-27 11:14:19 +10:00
Greg Wilkins cb5dd493fb jetty-9 merged jetty-9-aggregation 2012-08-27 10:24:34 +10:00
Simone Bordet c743bf4081 Jetty9 - Using the correct length when copying bytes, otherwise BufferUnderflowExceptions are thrown. 2012-08-25 10:43:39 +02:00
Simone Bordet cda0528625 Jetty9 - Second draft of SPDY wiring: more test cases pass, still work to do. 2012-08-24 19:36:10 +02:00
Simone Bordet 6b3d5f5390 Jetty9 - First draft of SPDY wiring: most test cases pass, still work to do. 2012-08-24 16:18:53 +02:00
Greg Wilkins 726898ffd8 jetty-9 fixed after merged 2012-08-24 20:39:03 +10:00
Simone Bordet 171ad66962 Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 12:20:44 +02:00
Greg Wilkins 72bfacd5a4 Merge branch 'jetty-9' into jetty-9-aggregation 2012-08-24 20:17:08 +10:00