Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,373 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

291 Commits

Author SHA1 Message Date
Greg Wilkins 8c3fa91b26 jetty-9 reverted to more start.ini rather than start.d usage as we will not be using plugins. More configuration documentation added 2012-10-11 16:15:57 +11:00
Simone Bordet 84f6f65e90 jetty-9: Improved configurability of SPDYClient.Factory. 2012-10-08 11:05:27 +02:00
Simone Bordet 2748a9381e jetty-9: Added support for connect timeout. 2012-10-08 11:05:26 +02:00
Greg Wilkins f4d12412eb jetty-9 added FilterConnectionFactory and made SpdyServer use it 2012-10-08 15:22:49 +11:00
Hugues Malphettes 3efefe37bc Clean-up OSGi test; add spdy OSGi test; fix felix 
Upgrade to the latest pax-exam
Support for felix-3.x and 4.x as tested
Fix the spdy MANIFEST.MF generations
Add an integration test for SPDY
Refactor the test code

Squashed commit of the following:

commit bd020ee1214992d8d21a11dc800e04dc5e9b2001
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Sat Oct 6 16:58:43 2012 +0800

    Add spdy integration test for OSGi and clean-up

    Refacor the pax-exam OSGi integration tests
    Add an integration test for spdy.
    Execute the test under 2 versions of felix and 2 versions of equinox.

commit f3151a272ab92560432f3b76f564bf06b19bc22b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Sat Oct 6 16:28:51 2012 +0800

    Fix the generated MANIFEST.MF

    OSGi integration test in the next commit.

commit 3152aa2b5e39cf2d3b81f8400488c0672e922b8d
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Fri Oct 5 16:58:29 2012 +0800

    Fix the startup of the servlet.

    setInitOrder(0) was working in jetty-7 and jetty-8 but not in jetty-9
    anymore. setInitOrder(1) is fine.

commit 8038d314f4f423e8608fd09dd42b840e101a0c13
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:28 2012 +0800

    Upgrade to pax-exam-2.6

commit 7136fa88e2410ac345b6ae0657d882c7e9714c0b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:07 2012 +0800

    Support for felix-3.x and felix-4.x

commit 0bcc6b0d8ed5144150f90f578a90c558419349d1
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:28 2012 +0800

    Upgrade to pax-exam-2.6

commit 2e17466624650df433b6c5f11abafb56539ee740
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:07 2012 +0800

    Support for felix-3.x and felix-4.x
 2012-10-06 17:26:14 +08:00
Greg Wilkins 435f8a6db8 jetty 9: Improved NPN client connection to perform the connection replacement from onFillable() rather than from NPN callback methods. 2012-10-02 15:49:25 -07:00
Greg Wilkins 604f4985d3 jetty 9: Improved NPN client connection to perform the connection replacement from onFillable() rather than from NPN callback methods. 2012-10-02 15:47:57 -07:00
Greg Wilkins 97d08c399a jetty-9 removed race with NPN replacing connection and extra wrap causing NPE in SSLEngineImpl 2012-10-02 15:00:31 -07:00
Greg Wilkins 6cc0734a1a jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback 2012-10-02 13:48:51 -07:00
Thomas Becker ef2939b86c jetty-9: AbstractTest replace deprecated TestWatchmen with TestWatcher 2012-10-02 12:12:33 +02:00
Hugues Malphettes 29c18fc4d5 OSGi manifests generation fixes cleanup 2012-09-25 11:24:16 +08:00
Hugues Malphettes 1cfa277c6c jetty-9 osgi support 2012-09-24 13:04:57 +08:00
Greg Wilkins 68ee346b8a jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle 2012-09-21 11:45:51 +10:00
Greg Wilkins b9ceb8703d Merge branch 'jetty-9' into jetty-9-open-close 2012-09-21 08:36:22 +10:00
Joakim Erdfelt 857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07:00
Simone Bordet 37a7e5977d Merged branch 'jetty-9' into jetty-9-open-close. 2012-09-20 18:46:16 +02:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Greg Wilkins 0d2627b6e9 jetty-9 improved onOpen onclose handling 2012-09-20 11:05:20 +10:00
Simone Bordet 851de69d9d jetty-9 - Third take at open/close refactoring. 2012-09-19 18:04:15 +02:00
Simone Bordet f257f4b2bb jetty-9 - First take at open/close refactoring. 2012-09-19 13:37:47 +02:00
Simone Bordet bfe08d1a99 jetty-9 - Reorganized SPDY modules. 
This change was due to the fact that the old spdy-core and spdy-jetty modules had classes in the same package,
which is a problem for OSGi.
The old spdy-jetty module has been split in 2: spdy-client and spdy-server, and other SPDY modules just underwent a
renaming to make them more sound.
 2012-09-18 23:33:31 +02:00
Simone Bordet 707ff4aea8 jetty-9 - Ported test to use new HttpClient. 2012-09-17 16:59:24 +02:00
Simone Bordet 0915b2b0ab jetty-9 - Refactored code that was counting the number of reentrant invocations into a common utility class, ForkInvoker. 2012-09-17 14:39:13 +02:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Simone Bordet 88cbfed7e0 jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector. 2012-09-14 23:30:21 +02:00
Simone Bordet 3be83efbae jetty-9 - Calling connectionOpened() to trigger the necessary call to connection.onOpen(). 2012-09-14 23:30:21 +02:00
Simone Bordet cf3f12297f jetty-9 - Cosmetics. 2012-09-14 23:30:21 +02:00
Greg Wilkins 22ba57b8d2 jetty-9 refactored onOpen and onClose 2012-09-14 17:38:47 +10:00
Greg Wilkins 35a86c3373 jetty-9 more configuration clean ups 2012-09-13 16:49:15 +10:00
Greg Wilkins 9940796a32 jetty-9 xml configurations 2012-09-13 14:43:03 +10:00
Greg Wilkins c709981aa5 jetty-9 finished refactor for oneconnector and configuration pluggability 2012-09-13 10:00:44 +10:00
Greg Wilkins a41b6e32ac Merge branch 'jetty-9-configuration' into jetty-9 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
 2012-09-13 08:22:06 +10:00
Greg Wilkins b3e8f91026 jetty-9 flush returns boolean to say completely flushed or not 2012-09-13 08:11:05 +10:00
Greg Wilkins 79caf45604 Merge branch 'jetty-9' into jetty-9-configuration 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
 2012-09-12 23:11:12 +10:00
Greg Wilkins 427a01855c jetty-9 WriteFlusher handlers buffering endpoints 2012-09-12 23:06:19 +10:00
Greg Wilkins 73ebe89019 jetty-9 refactored configuration 2012-09-10 20:26:14 +10:00
Simone Bordet d8ed9116f1 jetty-9 - Moved SPDY's Headers class to jetty-util module as Fields. 2012-09-06 13:22:04 +02:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Greg Wilkins 3acf2e65ed jetty-9 moved servlet dependencies out of jetty-http 2012-09-06 09:13:17 +10:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins 8331b1db71 jetty-9 some useful debug 2012-08-31 14:05:40 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Greg Wilkins 72827aa44d jetty-9 TODOs 2012-08-31 08:05:09 +10:00
Simone Bordet 6531cbb69c Jetty9 - Renamed class removing "Async". 2012-08-30 11:14:00 +02:00
Simone Bordet 7586e5c9e9 Jetty9 - More tests for HTTP over SPDY. 2012-08-29 22:42:35 +02:00
Simone Bordet 2d7a80c44b Jetty9 - Parametrized tests on the SPDY version. 2012-08-29 21:04:00 +02:00
Simone Bordet bf30ec24a5 Jetty9 - Removed the concept of multiple connection factories in SPDYClient. 
A client is given a version when instantiated; as such it makes no sense to have
multiple connection factories, as the client only supports one SPDY version.
 2012-08-29 21:04:00 +02:00
Simone Bordet 8920cd16b6 Jetty9 - Ported the HTTP SPDY Proxy code. 2012-08-29 18:12:28 +02:00
Simone Bordet 9522bcb404 Jetty9 - Including also the spdy-jetty-http-webapp module. 2012-08-28 16:39:09 +02: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