Commit Graph

25731 Commits

Author SHA1 Message Date
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
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
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 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
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
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 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
Greg Wilkins c53bc0709c Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-07 23:18:17 +10:00
Greg Wilkins b57e7eafdd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-07 23:11:11 +10:00
Greg Wilkins c1c2bdbb45
Fix errors in Mapped pool and javadoc (#8264)
* Fix errors in javadoc
* Further RBBP improvements
2022-07-07 22:49:04 +10:00
Olivier Lamy c6264abed7
Issue #7970 fix Maven having trouble to find correct method to use from parent class (#8268)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-07 22:07:57 +10:00
Olivier Lamy ed8c66f482
Using -DskipTests should not run maven-invoker-plugin tests (#8269)
* remove this hardcoded override

* removed override configuration
2022-07-07 22:07:34 +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
Olivier Lamy f5e3ba459a
Update Jenkinsfile 2022-07-07 17:17:15 +10:00
Greg Wilkins 7be7427aac Removed warnings and stop throwing in finally 2022-07-07 16:57:59 +10:00
Jan Bartel 4e9870eb3a Fix name of ee10 services file 2022-07-07 15:07:02 +10:00
Jan Bartel 12f03cf370 Fix names of ee9 services files 2022-07-07 15:05:22 +10:00
dependabot[bot] 93be234873
Merge pull request #8247 from eclipse/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi.util-3.7.1 2022-07-06 23:49:30 +00:00
Jan Bartel 764499a828 Add other dependencies introduced by org.eclipse.osgi.util upgrade 2022-07-07 08:11:40 +10:00
Greg Wilkins 6247ab0dbc Implemented ContextHandler availability 2022-07-06 11:58:40 +10:00
Jan Bartel 8f853f7fb6 Fix pattern to scan for container jars to match servlet api 2022-07-05 11:03:51 +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
Lachlan Roberts ab16327315 restore ee9 version
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-04 17:41:19 +10:00
Lachlan Roberts b6a6ef9106 moved to new location
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-04 17:40:28 +10:00
Lachlan Roberts 4a6e9d40b9 temporarily remove files from merge
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-04 17:39:16 +10:00
Lachlan Roberts fb5ee6a2f4 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-04 17:35:28 +10:00
Lachlan Roberts f3409f8ca0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-04 17:10:16 +10:00
Lachlan 475d0512a5
Merge pull request #8221 from eclipse/jetty-10.0.x-8216-openid-logout
Issue #8216 - make processing of metadata in OpenIdConfiguration extensible
2022-07-04 17:10:00 +10:00
Greg Wilkins b6671d6352 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-04 16:04:11 +10:00