Commit Graph

39 Commits

Author SHA1 Message Date
Ludovic Orban 23a0203547 rework Resource API (#8106)
* remove Resource.getFile() and replace its usages with Resource.getPath()
* remove all public PathResource ctors + add non-leaky FS mounting mechanism + interpret string as Path when not a schemed URI
* rename Resource.getResource to Resource.resolve, specifying that the subpath is URI-path-interpreted
* remove useless API methods + deprecate all path-related API
* make subpaths beginning with / resolved as relative to the given uri
* introduce filesystem pooling and generalize resource resolving code
* remove URLResource
* remove unneeded factory method
* both file: and jrt: should not be pooled
* move deprecated impls from PathResource down to Resource + fix some tests
* handle Resource's pointing to non-existent jar files
* Force Resource URIs to end with "/" when the resource is a directory
* Produce warning if attempting to release a mounted filesystem uri that doesn't exist in the pool.

Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2022-07-12 10:10:30 +10:00
Greg Wilkins 4c827b986c Minor renaming for clarity
Renamed Blocking to Blocker
Added Handler.Processor.Blocking and Handler.Processor.NonBlocking
2022-07-07 19:38:23 +10:00
Jan Bartel a4b9f19e26 Fix injection of AsyncListener 2022-07-05 09:33:21 +10:00
Lachlan Roberts 4e7fa4b943 add changes from merge
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-04 17:53:46 +10:00
Greg Wilkins ea5bedf072
Jetty 12.0.x deployment (#8208)
Deploy webapps for different environments from the same webapps directory.
The maximal environment known to the AppProviders is used as the default environment.
An explicit environment can be set in a properties file for an application, which is also used for property substitution in any context xml file.
2022-06-30 09:51:19 +10:00
Greg Wilkins db3d12f2c4 fix regex test for ee10
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-06-27 12:16:24 +10:00
Jan Bartel 9893c81abf
Jetty 12.0.x update jakarta api versions (#8192)
* update to latest jakarta official releases
2022-06-22 10:32:54 +10:00
Greg Wilkins 6b1dfec971 reenabled more ee9 modules 2022-06-15 10:05:56 +10:00
Simone Bordet 77825755cc
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-06-13 15:13:57 +02:00
Joakim Erdfelt d1e5ffa4d9
Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-06-09 09:04:44 -05:00
Jan Bartel 38bfb43a05 Implement more of security for ee10 servlets 2022-06-06 17:13:58 +10:00
Jan Bartel d9dafa08f0 Merge remote-tracking branch 'origin/jetty-12.0.x-fix-jspinit' into jetty-12.0.x 2022-06-02 13:03:29 +10:00
Jan Bartel b4e59bc4a7 Merge remote-tracking branch 'origin/jetty-12.0.x-fix-servletcontext' into jetty-12.0.x 2022-06-02 13:03:01 +10:00
Jan Bartel ca2fc17e5c Merge remote-tracking branch 'origin/jetty-12.0.x-fix-servletcontext' into jetty-12.0.x-fix-jspinit 2022-06-02 08:46:19 +10:00
Jan Bartel 4043fbd7f2 Make _servletContext final. 2022-06-02 08:45:25 +10:00
Simone Bordet cbeeb67e93
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-06-01 15:18:53 +02:00
Jan Bartel 4425d20deb Fix ServletHolder.initJsp 2022-06-01 16:56:52 +10:00
Jan Bartel 3b99c8c4e7 WebAppContext and ServletContextHandler must share ServletApiContext instance. 2022-06-01 16:26:36 +10:00
Jan Bartel 4fde2b7769 Merge remote-tracking branch 'origin/jetty-12.0.x-more-modules-enabled' into jetty-12.0.x 2022-05-31 10:40:04 +10:00
Simone Bordet 7a6ccce49a
Rewrite of the content handling, both on client and on server. (#7985)
Introduced a new io.Content class, with Content.Source, Content.Sink and Content.Chunk.

Updated the server-side to use io.Content instead of the previous server-side Content class.
Updated the client-side to use io.Content with a little specialization necessary for clients only.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2022-05-30 13:34:51 +02:00
Jan Bartel 43c662a3ac Fix more ee10 modules. 2022-05-30 18:50:23 +10:00
Jan Bartel eea3a11dd7 WIP deploy ee10 and ee9 webapps. 2022-05-25 17:35:52 +10:00
Greg Wilkins b767ba0dcd Fix ee10 test 2022-05-24 21:06:58 +10:00
Jan Bartel 39c5395fb1 Add --reads org.eclipse.jetty.logging to surefire config 2022-05-24 20:34:13 +10:00
Joakim Erdfelt 385f00f72b
Merge remote-tracking branch 'jetty-11.0.x' into `jetty-12.0.x` 2022-05-11 16:52:08 -05:00
Greg Wilkins f90e73ddb5 WIP deploying webapps 2022-05-10 00:02:06 +02:00
Lachlan 6fb717b1b4
Merge pull request #7956 from eclipse/jetty-12.0.x-lachlan
fixes to Jetty 12 for Servlet/WebSocket tests
2022-05-05 15:48:31 +10:00
Lachlan Roberts f40f4095d5 Revert "canonically encode pathspecs"
This reverts commit 83cca5671c.
2022-05-05 13:49:10 +10:00
Lachlan Roberts 83cca5671c canonically encode pathspecs
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-05 09:39:55 +10:00
Lachlan Roberts e7be6f1422 fix bug in ResponseHttpFields
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-05 09:07:15 +10:00
Lachlan Roberts 1c1847be6f rework and cleanup code for ensureConsumeAllOrNotPersistent
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-05 08:42:18 +10:00
Jan Bartel 30c85c702e WIP move session tests to ee9 before duplicating to ee10 2022-05-04 15:10:13 +02:00
Lachlan Roberts 12f443db7d re-enable AsyncContextListenersTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 15:30:39 +10:00
Lachlan Roberts 8f981500b8 update SpnegoAuthenticatorTest and fix bug in ConfigurableSpnegoAuthenticator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:40:14 +10:00
Lachlan Roberts 686827feaf Fix expectation for ErrorPageTest.testBadMessage()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:12:34 +10:00
Lachlan Roberts 3ae3457cb9 fix ErrorHandler exclusion based on HTTP method
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:11:28 +10:00
Lachlan Roberts 10a9490269 Fix some test cases in ErrorPageTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:11:12 +10:00
Greg Wilkins 428a9d568f Reverted to use Resource as BaseResource 2022-05-03 19:28:53 +02:00
Greg Wilkins 0a32147e89 Jetty-12 Restructure
Copied ee10 from hackathon branch

Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Ludovic Orban <lorban@webtide.com>
Co-authored-by: Olivier Lamy <olamy@webtide.com>
Co-authored-by: Simone Bordet <sbordet@webtide.com>
2022-05-03 15:52:44 +02:00