6f0d9e546c
Merge from 'master' to 'ws-refactor'
2012-11-13 13:52:54 -07:00
d229364f9d
Fixing jetty-osgi for new websocket artifacts
2012-11-13 12:50:27 -07:00
a37f9c813d
get aggregate back into release
2012-11-13 10:16:24 -06:00
f35f32ac48
Eliminated jetty-proxy module.
...
Moved ConnectHandler to jetty-server and ProxyServlet to jetty-servlets.
2012-11-13 17:11:46 +01:00
ba40f7897d
Completed port of ConnectHandler and ProxyServlet implementations.
2012-11-13 15:35:51 +01:00
97640eeea0
[Bug 394143] add jetty-all aggregate via release profile
2012-11-12 17:13:06 -06:00
952d6b7316
[Bug 394144] add jetty-jaspi
2012-11-12 17:05:50 -06:00
f03e11c0f2
make sure dists are not installed by default for now
2012-11-08 14:37:33 -06:00
0a3e559ec6
initial setup for deb generation
2012-11-08 14:15:23 -06:00
28fd4cceac
Implemented proxy functionalities for both client and server.
2012-11-07 20:13:53 +01:00
0411045449
[maven-release-plugin] prepare for next development iteration
2012-11-05 13:54:10 -06:00
87b67d477b
[maven-release-plugin] prepare release jetty-9.0.0.M2
2012-11-05 13:53:54 -06:00
2f735cf5a9
Adding jetty-jaas module to build for jetty-9
2012-11-02 15:43:59 +11:00
ec089948fb
392237 Make rfc2616 webapp work in jetty-9
2012-10-29 15:53:51 +11:00
b8d6b4da8b
Making session tests work; incorporating renewing session id keeping old object.
2012-10-27 18:44:35 +11:00
1271143ad9
wire maven plugins back in
2012-10-18 11:16:15 -05:00
6c2fb983a9
fix modules
2012-10-18 10:56:38 -05:00
7a95722d66
392237 cleaned pom
2012-10-18 14:49:22 +11:00
dd6c20e378
392237 moved examples to common folder
2012-10-18 14:29:55 +11:00
a046ff085a
remove jetty-policy from jetty9
2012-10-17 17:36:53 -05:00
9d0828614f
jetty-9 ported rewrite
2012-10-12 23:56:44 +11:00
6c011025b6
jetty-9 added a pretty welcome page
2012-10-12 15:36:32 +11:00
f2595a7ec3
Bumping up to jetty-test-helper 2.0 with new @Rule TestTracker & AdvancedRunner status messages.
2012-10-10 09:10:51 -07:00
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
29c18fc4d5
OSGi manifests generation fixes cleanup
2012-09-25 11:24:16 +08:00
1cfa277c6c
jetty-9 osgi support
2012-09-24 13:04:57 +08:00
d59e8ddd44
jetty-9: Added -XX:+PrintGCDetails to the Maven Surefire Plugin.
2012-09-21 17:34:21 +02:00
01c9aa93e9
spring dep passed CQ, module included
2012-09-21 07:26:01 -05:00
15804e76e2
jetty-9 use latest test helper
2012-09-21 08:43:21 +10:00
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
f275a045c3
Fixing 'enforce-orbit-deps' enforcer rules to actually work + allow provided scope
2012-09-20 12:04:41 -07:00
1301bca9f5
set parent to released version
2012-09-20 14:01:47 -05:00
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
857498b115
Upgrading to junit-dep-4.10.jar (banning junit.jar)
2012-09-20 11:52:59 -07:00
003c0d16a5
remove bits that can't be released yet
2012-09-20 13:51:32 -05:00
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
7f448c22be
jetty-9 - Updated JUnit to 4.10.
2012-09-20 18:27:21 +02:00
1301686281
Moved new jetty-client-new module to jetty-client.
2012-09-06 08:46:56 +02:00
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
2dfcebfc04
jetty-9 distribution working
2012-09-06 14:54:55 +10:00
4de5b0ad63
Merged branch 'jetty-9' into jetty-9-client.
2012-08-30 17:24:49 +02:00
0f06d7ef20
move around modules in pom
2012-08-29 14:59:50 -05:00
1d1b0a1b82
Jetty9 - Updated toolchain dependency to 1.8.
2012-08-29 18:44:52 +02:00
1265c27607
Jetty9 - Including the jetty-maven-plugin module.
2012-08-29 18:12:28 +02:00
2e81b63807
add jetty-jsp into build and add jetty-jspc-maven-plugin in as well
2012-08-29 11:08:52 -05:00
6dadf2a8a4
[Bug 387928] retire jetty-ajp
2012-08-23 14:09:29 -05:00
a77093dd94
add jetty-ant module from codehaus via CQ6712
2012-08-21 16:58:16 -05:00
0ad217f39a
add jetty-ant module from codehaus via CQ6712
2012-08-21 16:56:35 -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
c82871b10f
Merge branch 'master' into jetty-8
2012-08-16 17:10:35 -05:00
Joakim Erdfelt
Jesse McConnell
Simone Bordet
Jan Bartel
Greg Wilkins
Hugues Malphettes