Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,704 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

124 Commits

Author SHA1 Message Date
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 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 12f03cf370 Fix names of ee9 services files 2022-07-07 15:05:22 +10:00
Jan Bartel 8f853f7fb6 Fix pattern to scan for container jars to match servlet api 2022-07-05 11:03:51 +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
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
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 5e2aae669a updated ee9 test 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-07-04 11:41:18 +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 b031681395 temporary remove of ee9 test 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-07-04 11:37:45 +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
Lachlan Roberts d05d6634a6 re-enable JettyClientClassLoaderTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-28 16:24:52 +10:00
Lachlan Roberts b1a1a60994 fix JettyWebSocketFilterTest in ee9-websocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-28 16:24:52 +10:00
Jan Bartel 80854f8eea Fix jetty-ee9-home build by enabling jetty-ee9-quickstart. 2022-06-27 11:30:02 +10:00
Joakim Erdfelt 1999b39808
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-26 12:04:51 -05: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 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 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 08a8e8d4e4 fix websocket compile issue 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-22 17:34:45 +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
Jan Bartel 3a2a647b08 Fix ee9 jspc maven plugin it tests 2022-06-22 09:29:26 +10:00
Lachlan Roberts e9b8dc14bc disable failing ee9 jetty websocket tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-21 13:25:19 +10:00
Lachlan Roberts 9756a15f57 disable failing ee9 jakarta websocket tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-21 13:00:58 +10:00
Lachlan Roberts 189b96da8c fix JakartaWebSocketRestartTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-20 20:24:24 +10:00
Olivier Lamy 6c4f3b37e7
rename ee9-demo to jetty-ee9-demo (#8178) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-06-20 14:48:22 +10:00