Commit Graph

1979 Commits

Author SHA1 Message Date
Greg Wilkins 7c1e2b6dd0 343482 refactored overlay deployer layout to use WAR layout
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3070 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-04 05:29:09 +00:00
Simone Bordet 3d192f98ab Fixes #340040 (Support for a total timeout).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3069 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 08:57:26 +00:00
Simone Bordet 911860828a Fixed test (was referencing a wrong local variable).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3067 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 08:05:40 +00:00
Hugues Malphettes 9ca191cd4a bug 344529 Ability to customize the error handling of the OSGi HttpService
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3066 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 07:42:01 +00:00
Hugues Malphettes 25a7cc4ab7 bug 344529 Ability to customize the error handling of the OSGi HttpService
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3065 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 07:34:18 +00:00
Greg Wilkins 08b19babd2 refine demo for overlays
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3064 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 07:34:04 +00:00
Hugues Malphettes 9dfe601776 bug 341736 Use a lifecyclelistener instead of extending the Connector itself
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3062 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 03:57:24 +00:00
Hugues Malphettes cab968d649 bug 341736 Use a lifecyclelistener instead of extending the Connector itself
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3061 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 03:51:35 +00:00
Greg Wilkins a9a192bab5 344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3060 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 02:12:23 +00:00
Greg Wilkins 554309e5ac 344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3059 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 02:09:54 +00:00
Hugues Malphettes c8f531f699 missed one column when making jetty nested an optional dependency of jetty osgi boot
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3058 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 00:46:56 +00:00
Hugues Malphettes 3ccb505840 keep the dependency on jetty-nested optional
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3057 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 00:02:20 +00:00
Michael Gorovoy 69ee5b641d 344513 Attempting to set ConfigurationClasses in jetty-web.xml causes NPE
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3056 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 23:21:12 +00:00
Greg Wilkins 4e2d8d9c18 344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3055 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 14:58:00 +00:00
Greg Wilkins 9f6e934c4f 344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3054 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 09:30:21 +00:00
Greg Wilkins 88bfdd6631 344059 added extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3053 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 09:20:36 +00:00
Greg Wilkins a70bbc004d 344059 extension framework for websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3052 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 01:42:05 +00:00
Greg Wilkins f7ca15c499 removed debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3051 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 01:41:16 +00:00
Hugues Malphettes a8e35c0c4b Export the org.eclipse.jetty.osgi.nested package in case it is to be extended by someone
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3050 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 22:42:04 +00:00
Simone Bordet f8cb795a4f Setting non-blocking mode after connecting in blocking mode.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3049 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 15:00:00 +00:00
Hugues Malphettes 918193c61a add a few dependencies
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3048 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 13:18:25 +00:00
Hugues Malphettes 6caad913e4 bug 341736 Deploy the servletbridge extension bundle to pass the HttpServlet class from the bootstrapping webapp to equinox.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3047 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 13:08:23 +00:00
Hugues Malphettes 105f2e3d94 bug 341736 example webapp to bootstrap equinox with jetty-osgi. at the moment the equinox servletbridge jar cannot be found on maven central. so this build is using intalio.org to get going.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3046 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 07:13:26 +00:00
Hugues Malphettes 70cd112ab1 bug 341736 Extend the NestedConnector to hook cleanly into the equinox BridgeServlet
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3045 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 05:52:04 +00:00
Simone Bordet 26751210e4 Changes in preparation for #340040 (Support for a total timeout).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3044 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-29 13:47:09 +00:00
Hugues Malphettes 9be79e1750 The import package javax.servlet.http should specify the version 2.5.0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3043 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 07:55:20 +00:00
Hugues Malphettes a2d1063f92 The import package javax.servlet.http should specify the version 2.5
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3042 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 07:54:36 +00:00
Hugues Malphettes 87fa4e717b bug 344067 support for web-bundles that are unpacked.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3041 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 07:06:18 +00:00
Hugues Malphettes 168658aec8 quick workaround for the regression in the jetty-osgi testunit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3040 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 06:11:10 +00:00
Hugues Malphettes 3b39b91e58 quick workaround for the regression in the jetty-osgi testunit.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3039 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 06:10:13 +00:00
Hugues Malphettes 225d76bdd6 bug 344067 OSGi fragments can add static resources to a web-bundle.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3038 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 04:07:33 +00:00
Hugues Malphettes 496f9212a4 bug 344067 OSGi fragments can add static resources to a web-bundle.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3037 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 03:58:52 +00:00
Greg Wilkins 3e35b74651 344059 Websockets draft-07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3035 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 23:27:56 +00:00
Greg Wilkins 7227f8c6bb 343923 flush timeouts applied to outer loop
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3034 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 23:17:17 +00:00
Jan Bartel 3b6dd2778b JETTY-954 WebApp context can now throw optionally throw an error out of doStart(), and the Server doStart() is modified to not catch and log all errors.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3033 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 07:35:59 +00:00
Greg Wilkins 57c2cc31fa 343482 refactored overlay deployer layout to use WAR layout - work in progress
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3032 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 00:51:08 +00:00
Michael Gorovoy 856e4d7491 343707 'REQUEST' is printed on console for each incoming HTTP request
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3029 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-24 17:29:40 +00:00
Simone Bordet 057eb0a102 Fixes #343567 (HttpClient does not limit the destination's exchange queue).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3028 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-21 15:29:20 +00:00
Greg Wilkins e38ed57324 343083 make socket params available
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3027 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-21 00:51:00 +00:00
Simone Bordet ed46fbf209 Improved Javadocs.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3026 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-20 15:41:21 +00:00
Hugues Malphettes 6746c79e71 update the development environment to the current version.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3025 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-20 08:24:11 +00:00
Hugues Malphettes 511165b595 bug 343352
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3024 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-20 08:22:39 +00:00
Jesse McConnell fe12431d2e Bug 343277 add support for an optional context white list
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3022 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-19 15:27:43 +00:00
Greg Wilkins aa398ad41c 343083 Set nested dispatch type
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3020 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-18 05:37:50 +00:00
Greg Wilkins 936b80dd46 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:30 +00:00
Greg Wilkins a01a1edd70 [maven-release-plugin] prepare release jetty-7.4.0.v20110414
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:04 +00:00
Greg Wilkins 975ee04df4 minor cleanup of variable names and ordering
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3015 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 01:45:36 +00:00
Greg Wilkins eee81312e4 ready for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3014 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 22:48:42 +00:00
Greg Wilkins 58652d8f09 342700 refine websocket API for anticipated changes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3013 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 11:05:35 +00:00
Greg Wilkins 07462afa38 another attempt to make this work on windows
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3012 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 01:34:41 +00:00