Commit Graph

25856 Commits

Author SHA1 Message Date
Jan Bartel 50e2a819f1 Make display names of ee10 demo webapps consistent 2022-07-13 14:09:05 +10:00
Jan Bartel 122488d12b Fix name of async rest webapp 2022-07-13 13:47:41 +10:00
Jan Bartel fccf8a9f51 Enable tests 2022-07-13 13:41:17 +10:00
Lachlan Roberts 6de385eac8 Issue #8216 - change logic on when to redirect
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-13 13:37:12 +10:00
Greg Wilkins 2978472c2b Remove Generic Request/Response #8291
Use HttpFields in request and response
2022-07-13 13:36:51 +10:00
Greg Wilkins ee58d2a51f Remove Generic Request/Response #8291
Use HttpFields in request
2022-07-13 13:05:07 +10:00
Greg Wilkins 4d52f4a704 Re-enabled tests for #8291
Reenabled some tests and started fixing the issues found:
 + Get the correct API context
 + Handle fragments and queries on non slash directory redirection
2022-07-13 13:03:35 +10:00
Jan Bartel 1e30b3ace5 Add ee10 env scope for JNDI 2022-07-13 12:55:19 +10:00
Jan Bartel 927e94f673 Add env scope to JNDI 2022-07-13 12:13:01 +10:00
Jan Bartel 825a728d1d Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-demos 2022-07-13 10:19:43 +10:00
Jan Bartel b6d8bcb7b4 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-demos 2022-07-13 10:05:35 +10:00
Greg Wilkins 9b1cb302b6
Cleanup Resource.Mount (#8284)
* Introduced the `mountIfNeeded` method to cleanup mount code and reduce checks for "jar:"
 * Fixed Quickstart mounting close.
 * Improved error message
 * Fixed tests for mount cleanup
 * More forgiving newResource(URI) implementation
 * Even more forgiving newResource(URI) implementation
2022-07-13 09:25:14 +10:00
Ludovic Orban be95da326d
Bis: Jetty 12.0.x resource handler and default servlet (#8276)
Made ResourceService use a generic request so it can be used as handler or from servlets.    This is only a temporary solution.

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-07-13 09:21:27 +10:00
Olivier Lamy ae77d14cf9
add jetty-ee8-jndi (#8287)
* add jetty-ee8-jndi

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-12 20:19:29 +10:00
Jan Bartel 34d21dd1ec WIP get ee9 demos working; fix some ee10 demos 2022-07-12 18:23:37 +10:00
Greg Wilkins 4d55bcf6ec wip
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-07-12 17:42:24 +10:00
Lachlan Roberts 90fe5621f9 Issue #8216 - improve testing for end_session_endpoint
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-12 15:17:08 +10:00
Greg Wilkins b8b49132c5 deploy wip
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-07-12 13:41:22 +10:00
Greg Wilkins febfbfca3b For #8285 serve resource from jar
+ fixed ee9-demo-async-rest
+ CachedContentFactory now needs to ignore `UnsupportedOperationException`

I don't think this is a great fix, as throwing an exception in a normal path is not optimal.
2022-07-12 13:04:56 +10:00
Lachlan Roberts 26732c90a0 Issue #8216 - Use HttpServletRequest.logout() for openid end_session_endpoint redirect
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-12 12:40:45 +10:00
Olivier Lamy d164efb779
add jetty-ee8-home and unzip it in the jetty-home (#8283)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-12 12:04:26 +10:00
Lachlan Roberts 92cf466801 Merge commit '5282ca37ef7a81789b3c1d0a41854259898bce96' into jetty-10.0.x-8216-openid-logout 2022-07-12 11:52:09 +10:00
Lachlan Roberts 49afcfb846 fix JettyWebSocketRestartTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-12 10:46:56 +10:00
Lachlan Roberts de6e6d16ed fix handling of connection close header during websocket upgrade
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-12 10:46:56 +10:00
Lachlan Roberts 89ba826cb1 save parameters in the core UpgradeRequest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-12 10:46:56 +10:00
Greg Wilkins 9cf2151a50 Merge branch 'jetty-12.0.x' of github.com:eclipse/jetty.project into jetty-12.0.x 2022-07-12 10:11:50 +10:00
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
Ludovic Orban 23aa94b36a
rework Resource API (#8106) 2022-07-12 10:07:32 +10:00
Jan Bartel a5fcce595f WIP 2022-07-11 23:21:35 +10:00
Olivier Lamy 7062db01b1
enable mapping websocket ee9 to ee8 (#8279)
* websocket ee9 to ee8 dynamic generation
* temporary disable tests for jetty-ee8-plus

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-11 21:23:44 +10:00
Greg Wilkins b2c469f43c Merge branch 'jetty-12.0.x' of github.com:eclipse/jetty.project into jetty-12.0.x 2022-07-11 16:45:17 +10:00
Jan Bartel d03193a770 WIP make ee9 demos work 2022-07-11 16:43:35 +10:00
Greg Wilkins e17247a5f9 Cleanup of Deployer
+ Use Path more extensively
 + rename graph.Path to graph.Route to avoid name clash
2022-07-11 16:12:22 +10:00
Olivier Lamy 48fa4236ba
avoid 2 checkout 2022-07-11 11:28:34 +10:00
Jan Bartel 8e8dc5c23b Fix ee9 glassfish jstl test 2022-07-11 09:39:02 +10:00
Olivier Lamy 93e2bb87a6 do not record same tests results multiple times
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-10 21:51:58 +10:00
Jan Bartel b521fc4e7e Merge remote-tracking branch 'origin/jetty-12.0.x-enable-distribution-tests-rebase' into jetty-12.0.x 2022-07-09 16:08:36 +10:00
Joakim Erdfelt c58e05a6fa
Merge remote-tracking branch 'origin/jetty-11.0.x' into fix/jetty-11.0.x-cve-update 2022-07-08 16:51:10 -05:00
Joakim Erdfelt b4ce2f3a80
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-08 16:50:46 -05:00
Joakim Erdfelt 2e18276ff5
Updating for published CVES (#8274)
* Updating for published CVES

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-07-08 16:50:04 -05:00
Joakim Erdfelt 0ed713c46b
Try to improve logging output of jetty-ee10-maven-plugin IT tests. 2022-07-08 14:16:28 -05:00
Joakim Erdfelt 4a1391aa3c
Minor tweak to get rid of junit/checks warning in CI 2022-07-08 11:03:48 -05:00
Greg Wilkins 676833e57e
Jetty-12 Improved Content testing and javadoc (#8263)
Improved Content javadoc
Fixed ContentSourceTest that was consuming the same ByteBufferSource multiple times.
Using ByteBufferPool.NOOP instead of allocating NoopByteBufferPool.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-07-08 14:52:28 +02:00
Joakim Erdfelt 1031bf1374
Restore stage separated Jenkinsfile (#8272)
* Restore stage separated Jenkinsfile

* add -Dmaven.test.failure.ignore=true

* change -f jetty-home to -pl :jetty-home

* update script ci.sh with -pl :jetty-home

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-08 19:06:04 +10:00
Jan Bartel be672f3c91 Disable non-working tests temporarily. 2022-07-08 18:21:52 +10:00
Jan Bartel e31166f333 WIP fix quickstart tests 2022-07-08 12:48:16 +10:00
Greg Wilkins 2129666236 Cleanup properties
implemented contextPath property
2022-07-08 12:35:58 +10:00
Greg Wilkins 21165bf74a Fixed compile errors 2022-07-08 11:00:00 +10:00
Greg Wilkins 8322899650 reenable ee10 distribution tests
Signed-off-by:  Jan Bartel <janb@webtide.com>
2022-07-08 09:52:20 +10:00
Greg Wilkins 33487b5fd8 reenable ee9 distribution tests
Signed-off-by: Jan Bartel <janb@webtide.com>
2022-07-08 09:51:29 +10:00