Commit Graph

521 Commits

Author SHA1 Message Date
Jan Bartel 1ee6fe4cba Change session renewal to be in line with servlet3.1; make session tests work; fix mongo session manager (scavenging) 2012-10-27 17:38:43 +11:00
Jan Bartel 958d0c6949 Start incorporating (EDR version) servlet 3.1 spec 2012-10-27 17:38:43 +11:00
Jesse McConnell 1271143ad9 wire maven plugins back in 2012-10-18 11:16:15 -05:00
Jesse McConnell 6c2fb983a9 fix modules 2012-10-18 10:56:38 -05:00
Greg Wilkins 7a95722d66 392237 cleaned pom 2012-10-18 14:49:22 +11:00
Greg Wilkins dd6c20e378 392237 moved examples to common folder 2012-10-18 14:29:55 +11:00
Jesse McConnell a046ff085a remove jetty-policy from jetty9 2012-10-17 17:36:53 -05:00
Greg Wilkins 9d0828614f jetty-9 ported rewrite 2012-10-12 23:56:44 +11:00
Greg Wilkins 6c011025b6 jetty-9 added a pretty welcome page 2012-10-12 15:36:32 +11:00
Joakim Erdfelt f2595a7ec3 Bumping up to jetty-test-helper 2.0 with new @Rule TestTracker & AdvancedRunner status messages. 2012-10-10 09:10:51 -07: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
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
Simone Bordet d59e8ddd44 jetty-9: Added -XX:+PrintGCDetails to the Maven Surefire Plugin. 2012-09-21 17:34:21 +02:00
Jesse McConnell 01c9aa93e9 spring dep passed CQ, module included 2012-09-21 07:26:01 -05:00
Greg Wilkins 15804e76e2 jetty-9 use latest test helper 2012-09-21 08:43:21 +10:00
Joakim Erdfelt 864384bd85 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-20 12:05:01 -07:00
Joakim Erdfelt f275a045c3 Fixing 'enforce-orbit-deps' enforcer rules to actually work + allow provided scope 2012-09-20 12:04:41 -07:00
Jesse McConnell 1301bca9f5 set parent to released version 2012-09-20 14:01:47 -05:00
Jesse McConnell 26af53752e Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-20 13:56:32 -05:00
Joakim Erdfelt 857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07:00
Jesse McConnell 003c0d16a5 remove bits that can't be released yet 2012-09-20 13:51:32 -05:00
Simone Bordet be865fa191 jetty-9: reverted JUnit to 4.8.1; trying to upgrade it breaks the whole build. 2012-09-20 19:09:33 +02:00
Simone Bordet 7f448c22be jetty-9 - Updated JUnit to 4.10. 2012-09-20 18:27:21 +02:00
Simone Bordet 1301686281 Moved new jetty-client-new module to jetty-client. 2012-09-06 08:46:56 +02:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Greg Wilkins 2dfcebfc04 jetty-9 distribution working 2012-09-06 14:54:55 +10:00
Simone Bordet 4de5b0ad63 Merged branch 'jetty-9' into jetty-9-client. 2012-08-30 17:24:49 +02:00
Jesse McConnell 0f06d7ef20 move around modules in pom 2012-08-29 14:59:50 -05:00
Simone Bordet 1d1b0a1b82 Jetty9 - Updated toolchain dependency to 1.8. 2012-08-29 18:44:52 +02:00
Simone Bordet 1265c27607 Jetty9 - Including the jetty-maven-plugin module. 2012-08-29 18:12:28 +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
Jesse McConnell 6dadf2a8a4 [Bug 387928] retire jetty-ajp 2012-08-23 14:09:29 -05:00
Jesse McConnell a77093dd94 add jetty-ant module from codehaus via CQ6712 2012-08-21 16:58:16 -05:00
Jesse McConnell 0ad217f39a add jetty-ant module from codehaus via CQ6712 2012-08-21 16:56:35 -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 c82871b10f Merge branch 'master' into jetty-8 2012-08-16 17:10:35 -05:00
Jesse McConnell 8dc7a7b1d7 add license-check profile and header template file 2012-08-16 15:26:38 -05:00
Thomas Becker 8ba068c73b jetty-9: jetty-plugins module added 2012-08-09 19:11:20 +02:00
Greg Wilkins 03ebcc881c jetty-9 include more modules 2012-08-09 19:31:50 +10:00
Greg Wilkins 689daf092d ported websocketchat to new API 2012-08-08 14:56:47 +10:00
Jesse McConnell ea6a9f8b91 Merge branch 'master' into jetty-8 2012-08-07 08:58:34 -05:00
Jesse McConnell b4ec1f36ed [Bug 386591] add UnixCrypt note to about.html 2012-08-07 08:57:26 -05:00
Thomas Becker 369bc035fc jetty-9: jetty-spdy refactored to match jetty-9. 2012-07-27 16:18:47 +02:00
Joakim Erdfelt acabe78101 Adding 'release' profile to hold release only module build related tasks. 2012-07-26 10:38:55 -07:00
Greg Wilkins 8101b67ce8 jetty-9 lots of code cleanups from findbugs, warnings and TODOs 2012-07-23 14:08:35 +10:00
Joakim Erdfelt 547cd4e142 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-20 11:49:31 -07:00
Joakim Erdfelt d60e03b575 Bumping up to jetty-test-helper 1.7-SNAPSHOT and enabling snapshot repo 2012-07-20 11:49:07 -07:00
Jesse McConnell 4bc3881501 add bin/ to ignore and update pom to 20-SNAPSHOT 2012-07-20 13:06:35 -05:00
Simone Bordet 6aba6d1e8c Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00