Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,373 Commits 55 Branches 466 Tags
Commit Graph

472 Commits

Author SHA1 Message Date
Hugues Malphettes
12ee234010 Adding the javadoc that seems to be expected 2012-10-06 21:03:48 +08: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
Joakim Erdfelt
857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07:00
Greg Wilkins
129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Jesse McConnell
6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05: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
Jesse McConnell
00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Simone Bordet
136f7924fd Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle. 2012-08-10 19:02:16 +02:00
Jan Bartel
cdbec2c78b Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-26 19:05:51 +10:00
hmalphettes
53105a689b Synthax to load an inner class via introspection need to use a dolloar 2012-07-25 16:03:18 +08:00
Simone Bordet
d2a0cb5c50 Jetty9 - Fixed compilation problems. 2012-07-23 15:38:27 +02:00
Jan Bartel
8e0dc72b23 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/pom.xml
 2012-07-23 13:24:57 +10:00
Greg Wilkins
b1750c0aae jetty-9 fixed bad merge of poms 2012-07-20 15:20:57 +10:00
Jan Bartel
20ca9ad3ac Merge remote-tracking branch 'origin/master' into osgi_refactor 
Remove a few System.err.printlns
 2012-07-20 15:01:58 +10: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
Jan Bartel
13f4c1fcb1 Emit Event Admin events, refactor to fix not knowing if DeploymentManager actually deploys a webapp or not. TODO: stop issuing Events for context handlers that are not webapps. 2012-06-06 10:24:07 +02:00
Jan Bartel
ccacf7c17c Implement protecting OSGI-INF, OSGI-OPTS as per OSGi Enterprise Spec. 2012-06-04 17:19:38 +02:00
Jan Bartel
8cb131c7fd Provide service properties and webapp attributes as specified by OSGi enterprise spec r4 2012-06-01 16:19:32 +02:00
Jan Bartel
6832d8805a Ensure each context that is deployed also is registered as an osgi service, taking care that contexts that were already registered as services are not re-registered. 2012-05-31 11:27:05 +02:00
Jan Bartel
36518d618b Update to 7.6.5 2012-05-31 11:25:33 +02:00
Jan Bartel
3e18545844 Merge remote-tracking branch 'origin/master' into osgi_refactor 2012-05-30 14:38:24 +02:00
Jesse McConnell
30e8e40ef2 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:41:45 -05:00
Jesse McConnell
667cf9a643 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 15:41:38 -05:00
Jesse McConnell
d23a3c90b5 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:40:47 -05:00
Jesse McConnell
57c73283d8 [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 15:40:35 -05:00
Jesse McConnell
e45a89694a [maven-release-plugin] prepare for next development iteration 2012-05-24 09:30:58 -05:00
Jesse McConnell
36fc6fe890 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 09:30:52 -05:00
Jesse McConnell
035e16aedc [maven-release-plugin] prepare for next development iteration 2012-05-24 09:27:27 -05:00
Jesse McConnell
f8c629026d [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 09:27:21 -05:00
Jesse McConnell
c7a9adaa32 reset for release 2012-05-24 08:33:44 -05:00
Jesse McConnell
c8fe38733f reset versions for release 2012-05-24 08:30:26 -05:00
Jesse McConnell
ea176f0586 [maven-release-plugin] prepare for next development iteration 2012-05-22 15:14:05 -05:00
Jesse McConnell
3fdda881d8 [maven-release-plugin] prepare release jetty-8.1.4.v20120522 2012-05-22 15:13:56 -05:00
Jesse McConnell
300a37319a [maven-release-plugin] prepare for next development iteration 2012-05-22 14:34:10 -05:00
Jesse McConnell
9ccd059375 [maven-release-plugin] prepare release jetty-7.6.4.v20120522 2012-05-22 14:33:59 -05:00
Jan Bartel
34954bc617 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-22 17:28:40 +02:00
Jan Bartel
050db55f1b NullPointer fix 2012-05-17 16:41:01 +02:00
Jan Bartel
4a312f7cb6 More refactoring. 2012-05-17 14:48:30 +02:00