Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,118 Commits 61 Branches 460 Tags 355 MiB
Commit Graph

462 Commits

Author SHA1 Message Date
Joakim Erdfelt 2be5a2bda4
Increasing reliability of test when run on different filesystems 2022-10-13 09:55:18 -05:00
Joakim Erdfelt 5ae363d4e1
Increasing reliability of test on ee9/ee8 2022-10-13 09:54:27 -05:00
Joakim Erdfelt fee44a65f5
Adding TODO about odd WEB-INF behavior 2022-10-13 09:54:02 -05:00
Joakim Erdfelt c9910cec13
ServerListener uses Path as it has to Write a file reliably 2022-10-13 09:53:39 -05:00
Joakim Erdfelt caf69690ca
Adding TODO about copyTo() with IncludeExcludeSet 2022-10-13 09:53:18 -05:00
Joakim Erdfelt c66d64f761
Perform URI check properly, skip ResourceFactory for LocationEntry check 2022-10-13 09:50:22 -05:00
Joakim Erdfelt 6f91c93c06
Use MavenPaths.targetTestDir() instead 2022-10-13 09:49:52 -05:00
Joakim Erdfelt 58b416952c
Cleanup AttributeNormalizerTest 2022-10-13 09:49:03 -05:00
Lachlan Roberts 57f71ce77e extract the generation of getCompressedContentFormats to separate contentFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-13 18:08:50 +11:00
Lachlan Roberts 2d161bfecd cleanups of HttpContentWrapper and ResourceService 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-13 17:25:47 +11:00
Olivier Lamy 573f27fd88
cherry-pick of #7803 (#8708) 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-13 15:53:38 +10:00
Simone Bordet 557696653d
Re-enable RequestLog tests. 
Re-implemented features that were commented out.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-12 17:46:49 +02:00
Lachlan Roberts 6771db40bf replace use of CachedContentFactory with CachingContentFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-12 19:20:35 +11:00
Lachlan Roberts affa747b21 use jetty-core ResourceContentFactory in ee9 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-12 18:52:01 +11:00
Lachlan Roberts 6db4bf8aa0 remove getPrecompressedContents from HttpContent and ee9 impl 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-12 18:44:00 +11:00
Lachlan Roberts 6a6681a2df fix stampede creating CachingHttpContent & remove usage of getPreCompressedContentFormats 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-12 16:11:33 +11:00
Jan Bartel 756cf2102e
Fix jaas demos (#8689) 
* Fix jaas demos add distro test
 2022-10-12 09:33:14 +11:00
Lachlan Roberts a7383ea4de only check file modified time once per second for cached files 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-11 18:41:56 +11:00
Lachlan Roberts 1353f16d57 Refactor for CachingContentFactory and ResourceService 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-11 11:08:42 +11:00
Simone Bordet 2cbb0e19e0
Forward port of PR #7778 to `jetty-12.0.x`. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-10 16:22:26 +02:00
Olivier Lamy b1f8019860
simplify poms, add back missing changes from #7850 and #7687 (#8697) 
* simplify poms, add back missing changes from #7850
* remove non used plugin, missing from #7687


Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-10 12:52:40 +10:00
Joakim Erdfelt 1ae87e03bb
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-servlet-pathmapping-regex 2022-10-07 08:43:49 -05:00
Simone Bordet c785f08b17
[Jetty 12] Made WebSocket over HTTP/2 work. (#8685) 
* Made WebSocket over HTTP/2 work.

Re-enabled tests, and restored HTTP2StreamEndPoint,
as well as implemented getTunnelSupport() for HTTP/2.

Removed from HttpStream methods for upgrade that are
not necessary anymore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-07 12:50:42 +02:00
Joakim Erdfelt dd3e3cf6e8
Aligning changes between ee9 & ee10 2022-10-07 05:36:20 -05:00
Joakim Erdfelt bada439bac
Missed ee9 changes 2022-10-07 05:26:06 -05:00
Joakim Erdfelt 9acc24212e
Merge pull request #8692 from eclipse/fix/jetty-12-remove-qosfilter-deprecated-methods 
Jetty 12 - Remove deprecated methods from QoSFilter
 2022-10-07 05:21:50 -05:00
Joakim Erdfelt 3dd47d1bff
Cleanup post-cherry-pick of RegexPathSpec changes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-07 05:12:56 -05:00
Joakim Erdfelt 25dd6d0ef7
Cherry-pick of Improvements to PathSpec for Jetty 10.0.x (#8136) 
* Cherry-pick of Improvements to PathSpec.
* From commit: 5b4d1dd1c6
* Fixing ConstraintSecurityHandler usage of PathMappings
* Fixing bad INCLUDE logic from cherry-pick in ServletHandler.doScope()
* Cleanup of non ServletPathSpec behaviors in ServletPathMapping class
* Skip optional group name/info lookup if regex fails.
* Prevent NPE on static servletPathMappings
* Update WebSocketMappings to use new PathMappings.getMatched(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-06 15:50:18 -05:00
Greg Wilkins 351fe53c9a
Fix #7891 regex pathInfo (#7892) 
Fix 7891 regex pathInfo

+ Use the pathSpec methods to set servletPath and pathInfo when possible

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-10-06 15:44:01 -05:00
Greg Wilkins 024a053455
Issue #7748 - allow override of path mapping behavior in ServletContextHandler (#7614) 
Added protected method to ServletHandler to allow other servlet mappings (eg regex) in embedded/extended usage

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-06 15:42:12 -05:00
markslater 1f844e8d57
#7863 Include value of first accept-encoding header where multiple accept-encoding headers are given. (#7864) 
Signed-off-by: markslater <mark.slater@mail.com>
 2022-10-06 13:10:25 -05:00
Joakim Erdfelt d7288cbcd2
Remove deprecated methods from QoSFilter 2022-10-06 11:36:32 -05:00
Joakim Erdfelt 281f0dc495
Fix bad test cases from merge 2022-10-06 09:17:48 -05:00
Olivier Lamy eb9d07378a
move flatten mojo configuration in top pom, fix boms and remove non needed content (#8686) 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-06 06:50:45 +10:00
Joakim Erdfelt 9a7ce7a1f1
Fixing jackson-databind use in maven-plugins 2022-10-05 15:24:49 -05:00
Joakim Erdfelt 04dd551919
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-10-05 13:04:56 -05:00
Simone Bordet 7ed59f46c8
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-05 12:16:02 +02:00
Lachlan 05a4b96632
Merge pull request #8621 from eclipse/jetty-12.0.x-CachedContentFactory 
Fix Caching ContentFactories in Jetty-12
 2022-10-04 18:57:29 +11:00
Simone Bordet a3f2268766
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-03 18:28:36 +02:00
Lachlan 04e1df9373
Merge pull request #8619 from eclipse/jetty-12.0.x-8606-scopeListeners 
Issue #8606 - Fix to ContextScopeListener for AsyncIOServletTest
 2022-09-30 13:41:44 +10:00
Joakim Erdfelt 597a6af31d
Jetty 12 : `Descriptor` cleanup (#8611) 
+ Sanity check Resource being provided
+ Descriptor toString changed to include full URI to descriptor
  so that it can be used consistently in Logging and Exception messages.
+ New Descriptor.toURI() for use in Servlet Source and other logging messages
+ Servlet Source value is now the URI of the Descriptor
+ More cleanup around `Source` location/name
   .getResource() must be a Resource
   as it's used in the AnnotationIntrospector
   all others use new .getName()
   Not all location/name usages can be loaded as
   a Resource.
 2022-09-28 09:09:16 -05:00
Lachlan Roberts b893186f5e Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8606-scopeListeners 2022-09-28 14:43:24 +10:00
Joakim Erdfelt 97eedaf9a6
Jetty 12 - Delay Resource Alias calculation until it's requested/needed (#8573) 
* Delay Resource alias calculation until it's requested.
* Rename .getAlias() to .getTargetURI()
* PathResource resolveTargetAliasPath to resolveTargetPath
 2022-09-27 13:03:47 -05:00
Joakim Erdfelt d73252a28c
Jetty 12 : `ResourceListing` produces XHTML (and is validated in test cases) (#8471) 
* Produce XHTML output with tests that validate the XHTML.
* Adding ResourceListingTest and ensuring ResourceListing output is well formed.
* Introduce non-directory entry in ResourceListing test for ResourceCollection
 2022-09-27 11:42:05 -05:00
Lachlan Roberts c58f769117 refactor test for resource lastModified comparisons 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-27 14:15:12 +10:00
Lachlan Roberts bed034c22d more fixes for test cases in DefaultServletTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-27 11:01:56 +10:00
Simone Bordet 06be091089
Introduced [Callback|Promise]Completable.with(Consumer) to simplify usage of CompletableFuture APIs. 
Updated code to use the new APIs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-26 22:15:17 +02:00
Simone Bordet f8f60822a7
Restored interim responses functionality (100 Continue, 102 Processing, 103 Early Hints) (#8615) 
* Restored interim responses functionality (100 Continue, 102 Processing, 103 Early Hints) for core, ee9 and ee10.

Added ProcessingProtocolHandler and EarlyHintsProtocolHandler for the client.

Re-enabled all tests for interim responses for all protocols.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-26 16:48:11 +02:00
Joakim Erdfelt 144c78fe39
Jetty 12 : QuickStart generation based on Path, usage based on Resource (#8614) 
* QuickStart generation based on Path, usage based on Resource
* QuickStart usage in jetty-maven-plugin uses Path
* Cleanup MavenWebAppContext constructor exceptions
* Improving quickStart stream filtering and array conversion
* Creating WEB-INF, if missing, now more reliable
 2022-09-23 12:50:52 -05:00
Joakim Erdfelt 3eca6901cc
Jetty 12 : ResourceFactory.of(WebAppContext) to WebAppContext.getResourceFactory() (#8610) 
* ResourceFactory.of(WebAppContext) to WebAppContext.getResourceFactory()
 2022-09-23 05:38:21 -05:00
Lachlan Roberts bd1edb4736 Issue #8606 - Fixes for AsyncIOServletTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-23 17:48:22 +10:00
Greg Wilkins 2ca6dce08e Merged HotSwapHandler from ee9 to common 2022-09-23 17:21:54 +10:00
Greg Wilkins c4200aee9f Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-09-23 16:56:56 +10:00
Lachlan Roberts eaeb64f3b1 Issue #7286 - fix potential issue with websocket write timeout 
Let websocket-core handle any idleTimeout & writeTimeouts instead of bad attempt to do it in Jetty/Javax API layers.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-23 15:16:10 +10:00
Joakim Erdfelt a3c2055e10 Bump log4j2 to 2.19.0 (#8605) 
* Bump log4j2 to 2.19.0
+ Remove old exclusions to log4j in infinispan
  (no longer relevant)
* fix usage of log4j-slf4j2-impl

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-09-23 15:14:57 +10:00
Joakim Erdfelt b75896c2f5
Jetty 12 : XmlAppendable use Charset, not String (#8609) 
* XmlAppendable use charset, not string
* Collapse Constructors into one
 2022-09-22 15:06:02 -05:00
Simone Bordet d3e16fcff9 Updates from reviews. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Simone Bordet 910bb41702 Removed duplicate client transport tests already present in core. 
Properly implemented request and response trailers for all the transports, both client and server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Simone Bordet 854d5cdf6a Renamed ee9 client transport tests package. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Simone Bordet 8e68505524 Moving from ee9 to core more client transport tests. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Simone Bordet d001d95d9f Moving from ee9 to core the client transport tests that are generic enough to work in core. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Joakim Erdfelt 4fe414a762
Jetty 12 : precompressed content support for `ResourceService` (#8595) 
* Remove Resource.getWeakETag in favor of new EtagUtils
* Protect bad usages of CachingContentFactory
* Working precompressed content for ResourceService
* Fixing DefaultServlet handling of ResourceService.writeHttpError() overrides
* Protect NPE in CachingContentFactory.isValid()
* Complete callback in DefaultServlet.writeHttpError
* Addressing review comments
* Testing for whole content
* Improve MemoryResource handling of name/filename
* EtagUtils handling of Resource
* Better protection of bad Resource impls in EtagUtils
* Update CachingContentFactory
+ Using Resource.lastModified were possible
+ CachingHttpContent has better Resource
  protection, and uses Etag from delegate
+ CachingHttpContent uses delegate where
  possible.
+ Store Etag HttpField in CachingHttpContent
  and allow override in constructor
* Simpler CachingHttpContent.isValid()
* Better handling of PrecompressedHttpContent

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-09-21 09:39:21 -05:00
Lachlan 050b4a988b
Merge pull request #8598 from eclipse/jetty-12.0.x-RemoteEndpointApiFix 
Complete TODO to fix WebSocket RemoteEndpoint API in Jetty 12
 2022-09-21 18:15:12 +10:00
Lachlan 97dd7b30d2
Merge pull request #8413 from eclipse/jetty-12.0.x-websocket-upgrade-contract 
Jetty 12 : Strengthen WebSocket upgrade contract and other improvements
 2022-09-21 18:14:27 +10:00
Joakim Erdfelt 95bf791b71
Jetty 12 - Improve FileID and use where appropriate (#8589) 
* Use FileID where appropriate
* Adding FileID.matchesExtension
* Fixing demo modules start test
 2022-09-20 09:35:50 -05:00
Lachlan Roberts e43346b042 fix error in AnnotatedPartialListenerTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-20 12:32:12 +10:00
Lachlan Roberts 88adc23915 Complete todo to fix WebSocket RemoteEndpoint API 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-19 19:11:31 +10:00
Lachlan Roberts 5296424e0a Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocket-upgrade-contract 2022-09-19 18:34:49 +10:00
Joakim Erdfelt 9668d614d9
Issue #8474 - Jetty 12 - `Resource.list()` API change + `Resource.getFileName()` addition (#8582) 
* Issue #8474 - Resource.list and Resource.getFileName work
* Correcting signature of Resource.list and use it
* Introduce Resource.getFileName and use it
* Adding URIUtil.addPath() test to show file+str behavior

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-09-14 15:48:01 -05:00
Joakim Erdfelt 141c58208d
Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-09-13 10:11:40 -05:00
Lachlan Roberts 5d0f781cb7 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocket-upgrade-contract 2022-09-08 10:43:26 +10:00
Joakim Erdfelt 84c6f30dfd
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-pathresource-alias-detection-in-jarfile 2022-09-07 05:52:41 -05:00
Joakim Erdfelt 54cc1a3ff9
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-pathresource-alias-detection-in-jarfile 2022-09-06 19:36:53 -05:00
Joakim Erdfelt 156f57c9a0
Compartor chain instead 2022-09-06 17:07:40 -05:00
Joakim Erdfelt 678b9dada5
Overlay.unpackTo() needs to work if dir doesn't exist yet 2022-09-06 16:59:30 -05:00
Joakim Erdfelt 1cd0ac4959
Changes from review 2022-09-06 15:12:32 -05:00
Joakim Erdfelt c122c99163
lastAccessed is now an Instant 2022-09-06 15:09:44 -05:00
Joakim Erdfelt 7f88878df9
Change signature of Resource.lastModified() 
+ Now returns Instant
 2022-09-06 13:21:25 -05:00
Simone Bordet 8953873e67
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-06 12:31:54 +02:00
Olivier Lamy 0acd7df84b
jetty 12.0.x error unwrap servlet exception (#8491) 
* unwrap servlet exception per default as expected by TCK

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-09-03 13:54:53 +10:00
Ludovic Orban bb83e835cf Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-09-02 09:12:24 +02:00
Olivier Lamy 0e526d9b3f fix deployment of some demo modules 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-23 12:15:38 +10:00
Olivier Lamy c8c6ae5fcf
skip deployment of test jars and remove some not needed bom dependencies (#8481) 
* skip deployment of test jars and remove some not needed bom dependencies

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-20 19:54:29 +10:00
Olivier Lamy 8e732ccf72
using bom within the reactor is really a bad idea and it sources from ee10 in ee9 as well (#8479) 
* using bom with the reactor is really a bad idea and it sources from ee10 in ee9 as well

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-19 21:24:09 +10:00
Olivier Lamy 8fdbf50222
Restore jetty-ee8-maven-plugin mvove back ITs to jetty-eeX-maven-plugin modules (#8472) 
add back jetty-ee8-maven-plugin
- add back jetty-ee8-jspc-maven-plugin
- remove not used site plugin and simplify code
- moving back ee9 maven plugin ITs to the module
- back of ee10 maven ITs test to the plugin module


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-19 17:50:58 +10:00
Simone Bordet a3ba86266a
Implemented ProxyHandler in new module jetty-core/jetty-proxy. (#8475) 
Moved ConnectHandler to org.eclipse.jetty.server.handler, where it should have been from the start.

Cleaned up and corrected behavior of SecureRequestCustomizer.
Now the response is wrapped with isSecure=true if it arrived over a secure transport.
The request URI scheme indicates whether the request is secure towards the origin server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-19 09:38:34 +02:00
Lachlan Roberts f6c923db10 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-17 19:24:20 +10:00
Lachlan Roberts ac18a0aec2 Issue #8448 - remove blocker usage from websocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-17 17:28:38 +10:00
Lachlan Roberts 82618073d5 PR #8413 - move wrapped req/resp attributes into WebSocketConstants 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-17 16:41:23 +10:00
Lachlan Roberts 87f2393467 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocket-upgrade-contract 2022-08-17 16:00:39 +10:00
Lachlan Roberts bf83e55999 keep CreatorNegotiator internal 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-17 15:54:09 +10:00
Joakim Erdfelt 180d68f585
Updating WebAppDefaultServletTest 2022-08-16 19:25:27 -05:00
Joakim Erdfelt 6191377504
Proper "?" vs "%3F" handling 2022-08-16 16:31:42 -05:00
Joakim Erdfelt 739a0f77da
Fixing OneWebApp (EE9) test issue 2022-08-16 15:05:28 -05:00
Joakim Erdfelt 94317e2a6a
Fixing ProxyWebAppTest test issue 2022-08-16 15:05:19 -05:00
Joakim Erdfelt d16b1cd595
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-pathresource-alias-detection-in-jarfile 2022-08-15 18:39:21 -05:00
Lachlan Roberts f19577c197 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8426-aliaschecker-review 2022-08-15 17:05:58 +10:00
Lachlan Roberts 2c42c0de83 Issue #8456 - serve jetty-dir.css as resource in ee10 ResourceService 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-15 15:33:28 +10:00
Lachlan Roberts ffc14a80b9 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8426-aliaschecker-review 2022-08-15 13:16:51 +10:00
Greg Wilkins af5fecd18d
Jetty 12 : Rename resourceBase to baseResource (#8310) 
* rename to baseResource
 2022-08-15 12:24:13 +10:00
Lachlan Roberts a6b88cfead fix failures in ResourceHandlerTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-15 11:00:25 +10:00
Lachlan Roberts 8e172f311e Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8426-aliaschecker-review 2022-08-15 10:40:59 +10:00
Lachlan Roberts 9e745f7fdb Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-15 10:32:03 +10:00
Lachlan Roberts ef700ff288 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-15 10:26:36 +10:00
Simone Bordet 601cba0b18
Fixed javadocs. 
Javadoc generation for the jetty-quic-quiche-* modules may need
to use a <profile> since the APIs used depend on the Java version.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-13 17:45:26 +02:00
Olivier Lamy c011126e63
fix hardcoding versions in mod files (#8459) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-13 19:43:07 +10:00
Simone Bordet 6f0f8854de
Merged branch 'jetty-12.0.x' into 'jetty-12.0.x-module-renaming'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 17:31:01 +02:00
Olivier Lamy 44a37746e6
Jetty 12 : reactivate `jetty-ee9-demo-embedded` and `jetty-ee9-demo-proxy-webapp` and add more (#8419) 
* ee8 demos to use ee9 demos resources
* add jetty-ee8-demo-jaas-webapp
* add jetty-ee8-demo-jndi-webapp jetty-ee8-demo-mock-resources
* uhm jetty-ee8-demo-jetty-webapp have some issues
* fix jetty-ee8-demo-jetty-webapp
* fix some jetty-ee9-demo-embedded and add back jetty-ee8-demo-proxy-webapp
* demo-embedded need to have jetty-ee9-demo-jsp-webapp built first
* fixing more demos modules. Activate dist test for demo modules and all env


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-12 17:52:53 +10:00
Simone Bordet 1eea480764
Jetty 12 module renaming - jetty-websocket. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 122b095260
Jetty 12 module renaming - jetty-http3. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 7d264e6024
Jetty 12 module renaming - jetty-http2. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 11c3642892
Jetty 12 module renaming - jetty-fcgi. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Greg Wilkins a494afa635 fix #8448 Blocking is not complete 
Use FutureCallback when usage is optional
 2022-08-11 15:26:20 +10:00
Lachlan Roberts 8f27e9a463 ee9 should use jett-core protected targets and alias checkers 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-11 13:59:54 +10:00
Greg Wilkins fcdb8305de WIP #8441 isNotNormalWithinSelf 
Added method to be optimized later
 2022-08-11 12:52:19 +10:00
Greg Wilkins a0d6f42e73 Fix #8442 server propagation 
Test setServer propagation
protect from inadvertent null setting
 2022-08-11 09:05:12 +10:00
Joakim Erdfelt 842af3ed22
Avoid recreating `Resource` during container/jar pattern filtering in `MetaInfConfiguration` 
* Delete PatternMatcher.java
 2022-08-10 16:12:15 -05:00
Joakim Erdfelt 505baf4a4c
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-pathresource-alias-detection-in-jarfile 2022-08-10 13:03:37 -05:00
Joakim Erdfelt 9312359b13
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x 2022-08-10 12:59:37 -05:00
Joakim Erdfelt 0023281e3f
Adding in-code comments about WebAppContext.getWebInf behavior 2022-08-10 12:59:29 -05:00
Simone Bordet af77a53e39
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-10 16:51:35 +02:00
Greg Wilkins d9b53a6174 fix ee9 demo context paths 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-08-10 17:33:58 +10:00
Jan Bartel 42f72268cf
Jetty 12 : #8408 Support new `<cookie-config>` concepts in Servlet 6 (#8420) 
* Issue #8408 Implement new session cookie attributes
 2022-08-10 16:33:08 +10:00
Lachlan Roberts d210677182 re-enable ee9 openid module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-10 13:51:47 +10:00
Greg Wilkins 408de26ec2 Created core-demo and updated demo root 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-08-10 12:04:39 +10:00
Joakim Erdfelt 81f80fa365
Putting content.jar in a place that EE8 tooling can find. 2022-08-09 14:56:26 -05:00
Joakim Erdfelt f7b8ed4c06
Rework PathResource.checkAliasPath to handle `jar:file:` paths more elegantly. 2022-08-09 10:54:54 -05:00
Joakim Erdfelt 199a9cd2ad
Jetty 12 : XML namespace cleanup (#8406) 
* Adding Servlet 6 XML Entities
* Fixing bad xsi:schemaLocation entries
* Update all jetty-ee10 web XMLs to JakartaEE version 6.0 based
* Using XML Catalog
* Introducing catalogs for:
   - default XML xsd/dtd (catalog-org.w3.xml)
   - Configure dtd (catalog-configure.xml)
   - EE10 Servlet 6 xsd/dtd (catalog-ee10.xml)
   - EE9 Servlet 5 xsd/dtd (catalog-ee9.xml)
   - EE8 Servlet 4 xsd/dtd (catalog-ee8.xml)
* New XmlParser.addCatalog(URI catalogXml, Class<?> classBase)
   to allow the loading of a catalog which has it's resources
   referenced via the classBase.getResource(name)
* WebDescriptor uses Environment to load appropriate catalog.
* Remove XmlParser.redirectEntity(String, String)
 2022-08-09 06:34:29 -05:00
Lachlan Roberts 6101384cf6 use attributes instead of attachable for wrapped request/response 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-09 15:46:14 +10:00
Joakim Erdfelt 21546e390c
Jetty 12 : Simplify `AnnotationParser` scanning for class files (#8404) 
* Improved FileID.isHidden
* Simplified AnnotationParser
  + Not using MultiReleaseJarFile
  + Walk of a Directory or a JAR is the same
  + Reduced parse method count
  + Fixed TestAnnotationParser
     Using proper fully qualified classnames now (were not yet converted over to jetty-12 naming)
* Single parseClass method
* Single parseDir method
* Adapting ee9 AnnotationParser to have the same behaviors as ee10.
* Deleting TestAnnotationInheritance tests
  + We don't want the AnnotationParser
    creating new Resource objects for Class.getSuperClass()
    resources that don't belong to
    the same Resource that the passed
    in class belongs to (as this is out of
    scope for the Mount management).

    Imagine if told to parse ClassB
    which extends from ClassFoo, which
    is in a different JAR than ClassB?

    This concept from Jetty 9/10/11
    was only used in testcases and not
    in live runtime code, so it was
    removed.

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-05 15:42:27 -05:00
Joakim Erdfelt fee8f2b4f4
JettyEmbedded needs a Server instance earlier for applyXmlConfigurations and its ResourceFactory to operate properly 2022-08-05 12:59:22 -05:00
Joakim Erdfelt fe21198499
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-rework-resource-factory 2022-08-05 11:11:39 -05:00
Joakim Erdfelt d7768b3f53
QuickStartTest - inline ResourceFactory 2022-08-05 10:53:47 -05:00
Joakim Erdfelt dd6953e018
Restore TODO in ee9 DefaultServlet 2022-08-05 10:49:16 -05:00
Joakim Erdfelt b7d7a9918a
Proper JettyEmbedder XML to Server logic 2022-08-05 10:46:20 -05:00
Joakim Erdfelt a864a9313b
Remove System.err output 2022-08-05 10:40:14 -05:00
Joakim Erdfelt 21a40f60a7
Inline ResourceFactory 2022-08-05 10:31:26 -05:00
Joakim Erdfelt b8334b6786
Use XML created Server 2022-08-05 10:23:56 -05:00
Joakim Erdfelt 4af68620ae
Add TODO about PropertyUserStore.setConfig(String) 2022-08-05 10:17:52 -05:00
Joakim Erdfelt cd375d2835
Inline ResourceFactory.of(Container) usages in demos 2022-08-05 10:15:12 -05:00
Olivier Lamy 439bd12c7f fix NPE 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-05 15:54:10 +10:00
Joakim Erdfelt 7e9aeaa343
Revert src/test/resources/* to target/test-classes/* in ee9 2022-08-04 19:33:08 -05:00
Joakim Erdfelt 40b1bcef5f
More work to use ResourceFactory properly 2022-08-04 17:54:37 -05:00
Joakim Erdfelt 8877f52dd7
Add WebAppContext.getResourceFactory() 2022-08-04 17:22:26 -05:00
Joakim Erdfelt 58eea0541c
Allow ResourceHandler to serve content from base resource 2022-08-04 17:22:02 -05:00
Joakim Erdfelt 532933be0b
jetty-ee#-webapp mount fixes 2022-08-04 13:35:30 -05:00
Joakim Erdfelt f92c992178
Allow DefaultServlet to resolve static resources 2022-08-04 13:10:19 -05:00
Joakim Erdfelt 6f6c327d8e
Improve reliability of TempDirTest 2022-08-04 12:38:23 -05:00
Joakim Erdfelt 19039f4df8
Remove maxBuffer from ContentFactory.getContent(String) (#8403) 2022-08-04 17:32:50 +02:00
Simone Bordet 90fc840f43
Jetty 12 : Renamed FutureFormFields to just FormFields, as it is mostly used (#8411) 
Renamed FutureFormFields to just FormFields, as it is mostly used
as a CompletableFuture, and the "Future" prefix is soo Java 5 :)

Improved releasing of chunks in FormFields implementation.

Improved configuration of FormFields for max number of fields and max form content length.

Fixed Field.toString().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-04 17:18:13 +02:00