857498b115
Upgrading to junit-dep-4.10.jar (banning junit.jar)
2012-09-20 11:52:59 -07:00
37a7e5977d
Merged branch 'jetty-9' into jetty-9-open-close.
2012-09-20 18:46:16 +02:00
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
0d2627b6e9
jetty-9 improved onOpen onclose handling
2012-09-20 11:05:20 +10:00
851de69d9d
jetty-9 - Third take at open/close refactoring.
2012-09-19 18:04:15 +02:00
f257f4b2bb
jetty-9 - First take at open/close refactoring.
2012-09-19 13:37:47 +02:00
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
707ff4aea8
jetty-9 - Ported test to use new HttpClient.
2012-09-17 16:59:24 +02:00
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
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
88cbfed7e0
jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector.
2012-09-14 23:30:21 +02:00
3be83efbae
jetty-9 - Calling connectionOpened() to trigger the necessary call to connection.onOpen().
2012-09-14 23:30:21 +02:00
cf3f12297f
jetty-9 - Cosmetics.
2012-09-14 23:30:21 +02:00
22ba57b8d2
jetty-9 refactored onOpen and onClose
2012-09-14 17:38:47 +10:00
35a86c3373
jetty-9 more configuration clean ups
2012-09-13 16:49:15 +10:00
9940796a32
jetty-9 xml configurations
2012-09-13 14:43:03 +10:00
c709981aa5
jetty-9 finished refactor for oneconnector and configuration pluggability
2012-09-13 10:00:44 +10:00
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
b3e8f91026
jetty-9 flush returns boolean to say completely flushed or not
2012-09-13 08:11:05 +10:00
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
427a01855c
jetty-9 WriteFlusher handlers buffering endpoints
2012-09-12 23:06:19 +10:00
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
73ebe89019
jetty-9 refactored configuration
2012-09-10 20:26:14 +10:00
d8ed9116f1
jetty-9 - Moved SPDY's Headers class to jetty-util module as Fields.
2012-09-06 13:22:04 +02:00
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
3acf2e65ed
jetty-9 moved servlet dependencies out of jetty-http
2012-09-06 09:13:17 +10:00
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
6d2c793edc
Merge branch 'master' into jetty-8
2012-09-03 12:48:21 -05:00
fd01a1b496
JETTY-1541 fixed different behaviour for single byte writes
2012-09-03 17:57:37 +10:00
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
8331b1db71
jetty-9 some useful debug
2012-08-31 14:05:40 +10:00
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
72827aa44d
jetty-9 TODOs
2012-08-31 08:05:09 +10:00
6531cbb69c
Jetty9 - Renamed class removing "Async".
2012-08-30 11:14:00 +02:00
7586e5c9e9
Jetty9 - More tests for HTTP over SPDY.
2012-08-29 22:42:35 +02:00
2d7a80c44b
Jetty9 - Parametrized tests on the SPDY version.
2012-08-29 21:04:00 +02:00
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
8920cd16b6
Jetty9 - Ported the HTTP SPDY Proxy code.
2012-08-29 18:12:28 +02:00
9522bcb404
Jetty9 - Including also the spdy-jetty-http-webapp module.
2012-08-28 16:39:09 +02:00
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
2339da7cc0
Jetty9 - Marked tests as @Slow.
2012-08-28 13:04:18 +02:00
156f07d493
Jetty9 - Greatly simplified HttpChannelOverSPDY.
...
Removed old code that was not necessary anymore.
2012-08-28 09:33:11 +02:00
a224a8e962
Jetty9 - Ignored two tests because the functionality they test is not yet implemented.
2012-08-27 17:21:58 +02:00
edd40ec299
Jetty9 - Fixed ProtocolNegotiationTest and additional minor cleanups/logging/comments.
2012-08-27 17:13:38 +02:00
1a2266b1b8
Jetty9 - Fixed test by specifying hardcoded idle timeout to avoiding NPE.
2012-08-27 16:58:29 +02:00
bc0f9cd9e6
Jetty9 - Made test more robust.
2012-08-27 09:21:56 +02:00
5a3a25c880
Jetty9 - Logging idle timeouts.
2012-08-27 09:21:35 +02:00
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
9a1a020f0e
jetty-9 renamed HttpTransport.{commit|write} to send
2012-08-27 14:43:29 +10:00
cda0528625
Jetty9 - Second draft of SPDY wiring: more test cases pass, still work to do.
2012-08-24 19:36:10 +02:00
6b3d5f5390
Jetty9 - First draft of SPDY wiring: most test cases pass, still work to do.
2012-08-24 16:18:53 +02:00
171ad66962
Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 12:20:44 +02:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
086e74bed8
jetty-9 merged jetty-8
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
b73ca3e316
interims changes
2012-08-17 11:52:59 +02:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
f8950b64bd
merge with jetty-9
2012-08-16 09:56:51 +02:00
aa22952368
interims commit
2012-08-16 09:47:33 +02:00
279f24faaa
Jetty9 - Removed duplicate logger definitions.
2012-08-13 11:48:32 +02:00
73a89427b1
jetty-9 fixed some XML validation issues
2012-08-12 11:23:20 +10:00
488f53f8d6
jetty-9 cleaned up the stop and stopTimeout handlng
2012-08-11 12:51:32 +10:00
2d832fa9ad
Jetty9 - Introduced Connection.close() for better stop of lifecycle components.
2012-08-10 10:32:45 +02:00
afe489e986
jetty-9 potential SSL fix
2012-08-10 15:21:52 +10:00
16b404754e
jetty-9 improved logging
2012-08-10 13:31:11 +10:00
731eb31c7e
interims changes
2012-08-09 18:54:41 +02:00
c4912f4a1d
Jetty9 - Removed "async" from class/method names.
2012-08-08 11:28:53 +02:00
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
b1bb418fea
Jetty9 - SPDY cleanups.
2012-08-03 19:17:11 +02:00
433839bd47
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 19:10:21 +02:00
29833f000b
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
2012-08-03 12:39:21 +10:00
137ccca7c5
jetty9 - Make WriteFlusher.java threadsafe
2012-08-03 01:06:41 +02:00
a4018d3484
merge with jetty-9
2012-08-02 15:00:43 +02:00
4e94601619
jetty-9: Make WriteFlusher threadsafe.
2012-08-02 14:38:54 +02:00
0865a9cfb0
jetty-9 removed more AsyncConnection names
2012-08-02 18:10:29 +10:00
b63e09df61
jetty-9 rudimentary connectionFactory impl
2012-08-02 17:44:29 +10:00
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
7c4fd9326e
jetty-9 one connector passing more tests
2012-08-02 14:17:49 +10:00
78802c35c2
Jetty9 - SPDY: computing return value for write() and small optimization in fill().
2012-07-31 16:18:42 +02:00
9c717d552f
Jetty9 - SPDY: gracefully shutting down the Session in case of read of -1 from the remote peer.
...
A special item is queued into the Session for flushing, and when it is dequeued it closes the
underlying connection.
This allows pending writes to complete before the underlying connection is closed.
2012-07-30 23:02:26 +02:00
b4b1bc814c
Jetty9 - SPDY: fixed copyright headers.
2012-07-30 23:02:26 +02:00
8d12e49988
Jetty9 - SPDY: removed System.out statements.
2012-07-30 23:02:25 +02:00
51d7404956
jetty-9: spdy replaced log4j with jetty-logging.properties
2012-07-30 16:19:24 +02:00
36729c4248
Jetty9 - Always returning false from onReadTimeout(). Either we do not have to close, or the goAway() will close after it is written.
2012-07-30 12:45:39 +02:00
3abb8cfd37
Jetty9 - Reverted test logging to INFO.
2012-07-29 15:04:27 +02:00
2dcee671e1
Jetty9 - Removed leftover debug statement.
2012-07-27 23:28:27 +02:00
592cb3432e
Jetty9 - Introduced NextProtoNego AsyncConnections to handle SSL with NPN.
2012-07-27 21:54:09 +02:00
369bc035fc
jetty-9: jetty-spdy refactored to match jetty-9.
2012-07-27 16:18:47 +02:00
b36a6cc9cc
jetty-9 checkout jetty-spdy from jetty-8
2012-07-27 15:51:14 +02:00
c67b2d89c0
Merge remote-tracking branch 'origin/master' into jetty-8
2012-07-27 16:05:15 +10:00
Joakim Erdfelt
Simone Bordet
Greg Wilkins
Jesse McConnell
Thomas Becker
Jan Bartel