Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-05 13:29:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,555 Commits 68 Branches 466 Tags
Commit Graph

131 Commits

Author SHA1 Message Date
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
6cc0734a1a jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback 2012-10-02 13:48:51 -07: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
Joakim Erdfelt
857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07: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
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
c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins
83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Simone Bordet
2339da7cc0 Jetty9 - Marked tests as @Slow. 2012-08-28 13:04:18 +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
171ad66962 Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 12:20:44 +02:00
Simone Bordet
06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Joakim Erdfelt
3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell
5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Greg Wilkins
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
Jesse McConnell
00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Greg Wilkins
32c5f6c093 jetty-9 reduced LazyList usage 2012-08-08 11:58:50 +10:00
Thomas Becker
137ccca7c5 jetty9 - Make WriteFlusher.java threadsafe 2012-08-03 01:06:41 +02:00
Simone Bordet
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
Simone Bordet
b4b1bc814c Jetty9 - SPDY: fixed copyright headers. 2012-07-30 23:02:26 +02:00
Simone Bordet
8d12e49988 Jetty9 - SPDY: removed System.out statements. 2012-07-30 23:02:25 +02:00
Thomas Becker
51d7404956 jetty-9: spdy replaced log4j with jetty-logging.properties 2012-07-30 16:19:24 +02:00
Simone Bordet
2dcee671e1 Jetty9 - Removed leftover debug statement. 2012-07-27 23:28:27 +02:00
Thomas Becker
369bc035fc jetty-9: jetty-spdy refactored to match jetty-9. 2012-07-27 16:18:47 +02:00
Thomas Becker
b36a6cc9cc jetty-9 checkout jetty-spdy from jetty-8 2012-07-27 15:51:14 +02:00
Jan Bartel
c67b2d89c0 Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-27 16:05:15 +10:00
Thomas Becker
37e0b8ffe4 spdy: StandardSession format toString method 2012-07-26 13:10:08 +02:00
Jesse McConnell
136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell
1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell
f755d014cd [maven-release-plugin] prepare for next development iteration 2012-07-16 13:23:59 -05:00
Jesse McConnell
04b7e807a0 [maven-release-plugin] prepare release jetty-7.6.5.v20120716 2012-07-16 13:23:53 -05:00
Jesse McConnell
c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell
f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Jesse McConnell
205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell
c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Jesse McConnell
12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell
bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Jesse McConnell
5222459aa7 Merge branch 'master' into jetty-8 2012-07-13 09:05:05 -05:00
Thomas Becker
198f713f7d spdy: spdy-proxy refactoring to allow multiple ProxyEngine implementations for different protocols. Header name fix to lowercase header names before creating the bytes to sent over the wire. 2012-07-13 11:53:56 +02:00
Jesse McConnell
81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell
aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Jesse McConnell
0fa17c13b1 Merge branch 'master' into jetty-8 2012-07-11 10:10:00 -05:00
Thomas Becker
ac7c3c8f0d spdy: move x-spdy-push header to internal request. fix StandardStream.toString() 2012-07-06 15:46:31 +02:00
Thomas Becker
091fd73c3e spdy: add StandardSession and StandardStream toString() improvements 2012-07-04 15:43:09 +02:00
Greg Wilkins
a519ecc1fb improved SPDY dump 2012-07-03 15:31:56 +02:00
Jesse McConnell
571b1da632 Merge branch 'master' into jetty-8 2012-06-14 15:46:59 -05:00
Simone Bordet
bb3fa1cd7a Added Session.getStream(int). 2012-06-12 00:31:00 +02:00