Commit Graph

111 Commits

Author SHA1 Message Date
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
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 4e9870eb3a Fix name of ee10 services file 2022-07-07 15:07:02 +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
Jan Bartel fc3fb15dc4 Fix jetty-ee10-demo-jndi/jetty-webapp and ContextProvider 2022-07-04 15:42:17 +10:00
Greg Wilkins 8ecb4b8669 Fixed merge 2022-07-04 12:34:53 +10:00
Greg Wilkins e8f09cb3e0 restored ee10 test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-07-04 11:43:02 +10:00
Greg Wilkins fd5ae09449 move ee10 test back to ee9
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-07-04 11:38:22 +10:00
Greg Wilkins fe83ea87dc Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-04 11:32:33 +10:00
Jan Bartel 07a30cc3e3 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-jndi 2022-06-30 16:39:54 +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
Lachlan Roberts c8e6bbdf1b Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-29 17:28:06 +10:00
Lachlan Roberts ee02d163c3 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-29 17:22:20 +10:00
Jan Bartel 5c267ce7ed
Jetty 12.0.x eex jettymavenplugin (#8200)
* Fix ee9/10 jetty maven plugin and refactor it tests
2022-06-29 17:18:18 +10:00
Jan Bartel 2a9bf55adb Fix missed renames for ee9/10 tests 2022-06-29 10:53:56 +10:00
Jan Bartel 633c85337c Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-jndi 2022-06-29 10:17:05 +10:00
Jan Bartel e990f0dfbb Fix names of jetty-ee9/10-test submodules 2022-06-29 10:11:42 +10:00
Jan Bartel c7f9ef797b Fix jndi and enable tests 2022-06-29 09:44:05 +10:00
Jan Bartel bfaf0facb5 Reenable ee10 MetaInfConfigurationTest. 2022-06-28 14:09:49 +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
Lachlan Roberts 6ce10d67f7 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-websocket 2022-06-24 12:48:30 +10:00
Lachlan Roberts 54358b94e2 re-enable ClientConnectTest for websocket ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 11:34:49 +10:00
Lachlan Roberts 3c92cf6fec re-enable WebAppClassLoaderTest for websocket ee9 & ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 11:27:19 +10:00
Lachlan Roberts 79385c79b3 re-enable OnMessageReturnTest for websocket ee9 & ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 11:25:07 +10:00
Lachlan Roberts 1e532032f3 re-enable LargeAnnotatedTest for websocket ee9 & ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 11:23:22 +10:00
Lachlan Roberts ac68dd05a6 re-enable EndpointViaConfigTest for websocket ee9 & ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:55:02 +10:00
Lachlan Roberts c6206c9b6f re-enable JakartaClientShutdownWithServerWebAppTest for websocket ee9 & ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:54:05 +10:00
Lachlan Roberts 69b6eb1f3e re-enable ContainerProviderServerTest for websocket ee9 & ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:50:57 +10:00
Lachlan Roberts 300f219b25 re-enable LargeContainerTest for websocket ee9 & ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:50:08 +10:00
Lachlan Roberts 8b3a37cfb9 re-enable GracefulCloseTest for websocket ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:49:07 +10:00
Lachlan Roberts a85e80269b reenable PingPongTest for websocket ee9 and ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:44:47 +10:00
Lachlan Roberts 82d7bb5669 fix and improve AltFilterTest in websocket ee9 and ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-23 16:15:03 +10:00
Jan Bartel 04e0ee7fe7 Undisable jetty-plus tests; remove unused jetty-plus.xml 2022-06-23 10:09:34 +10:00
Jan Bartel c734008155 Fix eeX jetty-homes generation. 2022-06-22 18:45:33 +10:00
Lachlan Roberts 10ad518da9 fixed websocket JakartaClientClassLoaderTest for ee9 and ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-22 16:59:41 +10:00
Lachlan Roberts be2b231b08 fix websocket IdleTimeoutTest for ee9 and ee10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-22 16:57:01 +10:00
Lachlan Roberts 52d044f742 Merge remote-tracking branch 'origin/jetty-12.0.x-ee9-websocket' into jetty-12.0.x 2022-06-22 13:21:59 +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
Lachlan Roberts 1ee5904450 fix compile errors for ee10 websocket
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-16 17:51:23 +10:00
Jan Bartel eccbfce6dd Rename infinspan-xxx to jetty-infinispan-xxx 2022-06-16 16:31:42 +10:00
Olivier Lamy 09abf2f021
rename ee10-demo to jetty-ee10-demo (#8172)
* rename ee10-demo to jetty-ee10-demo

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-16 15:47:08 +10:00
Joakim Erdfelt 89359cc0eb
Removing deprecated jetty-util Log classes 2022-06-15 16:06:51 -05:00
Jan Bartel 5d44ae79e5
Jetty 12.0.x remove taglibjar (#8167)
*Prevent test creating src/main/webapp/WEB-INF/lib/taglib.jar
2022-06-15 15:22:53 +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
Lachlan Roberts fd3a0d9123 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-10 10:33:29 +10: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 7b62fe95e8 Remove unneeded import 2022-06-07 17:08:49 +10:00