8ecb4b8669
Fixed merge
2022-07-04 12:34:53 +10:00
e8f09cb3e0
restored ee10 test
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-07-04 11:43:02 +10:00
fd5ae09449
move ee10 test back to ee9
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-07-04 11:38:22 +10:00
fe83ea87dc
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-07-04 11:32:33 +10:00
07a30cc3e3
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-jndi
2022-06-30 16:39:54 +10:00
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
c8e6bbdf1b
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-06-29 17:28:06 +10:00
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
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
2a9bf55adb
Fix missed renames for ee9/10 tests
2022-06-29 10:53:56 +10:00
633c85337c
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-jndi
2022-06-29 10:17:05 +10:00
e990f0dfbb
Fix names of jetty-ee9/10-test submodules
2022-06-29 10:11:42 +10:00
c7f9ef797b
Fix jndi and enable tests
2022-06-29 09:44:05 +10:00
bfaf0facb5
Reenable ee10 MetaInfConfigurationTest.
2022-06-28 14:09:49 +10:00
db3d12f2c4
fix regex test for ee10
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-06-27 12:16:24 +10:00
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
54358b94e2
re-enable ClientConnectTest for websocket ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 11:34:49 +10:00
3c92cf6fec
re-enable WebAppClassLoaderTest for websocket ee9 & ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 11:27:19 +10:00
79385c79b3
re-enable OnMessageReturnTest for websocket ee9 & ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 11:25:07 +10:00
1e532032f3
re-enable LargeAnnotatedTest for websocket ee9 & ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 11:23:22 +10:00
ac68dd05a6
re-enable EndpointViaConfigTest for websocket ee9 & ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:55:02 +10:00
c6206c9b6f
re-enable JakartaClientShutdownWithServerWebAppTest for websocket ee9 & ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:54:05 +10:00
69b6eb1f3e
re-enable ContainerProviderServerTest for websocket ee9 & ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:50:57 +10:00
300f219b25
re-enable LargeContainerTest for websocket ee9 & ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:50:08 +10:00
8b3a37cfb9
re-enable GracefulCloseTest for websocket ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:49:07 +10:00
a85e80269b
reenable PingPongTest for websocket ee9 and ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-24 10:44:47 +10:00
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
04e0ee7fe7
Undisable jetty-plus tests; remove unused jetty-plus.xml
2022-06-23 10:09:34 +10:00
c734008155
Fix eeX jetty-homes generation.
2022-06-22 18:45:33 +10:00
10ad518da9
fixed websocket JakartaClientClassLoaderTest for ee9 and ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-22 16:59:41 +10:00
be2b231b08
fix websocket IdleTimeoutTest for ee9 and ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-22 16:57:01 +10:00
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
9893c81abf
Jetty 12.0.x update jakarta api versions ( #8192 )
...
* update to latest jakarta official releases
2022-06-22 10:32:54 +10:00
1ee5904450
fix compile errors for ee10 websocket
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-16 17:51:23 +10:00
eccbfce6dd
Rename infinspan-xxx to jetty-infinispan-xxx
2022-06-16 16:31:42 +10:00
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
89359cc0eb
Removing deprecated jetty-util Log classes
2022-06-15 16:06:51 -05:00
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
6b1dfec971
reenabled more ee9 modules
2022-06-15 10:05:56 +10:00
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
fd3a0d9123
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-06-10 10:33:29 +10:00
d1e5ffa4d9
Merge branch 'jetty-11.0.x' into jetty-12.0.x
2022-06-09 09:04:44 -05:00
7b62fe95e8
Remove unneeded import
2022-06-07 17:08:49 +10:00
1eaa050163
fix merge
...
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-07 14:11:33 +10:00
f4e1ef04f9
Fix proxy webapp; fix ContextHandlerCollection.mapContexts
2022-06-07 13:07:16 +10:00
253dc1e577
Merge branch 'jetty-11.0.x' into jetty-12.0.x
2022-06-07 11:18:38 +10:00
d402995f4d
Add missing jetty-ee10-annotations.jar into ee10-annotations.mod
2022-06-06 17:23:35 +10:00
38bfb43a05
Implement more of security for ee10 servlets
2022-06-06 17:13:58 +10:00
f8ae3837c4
Fix resourceBase in MetaInfConfiguration; fix typo in ee10-demo-jetty.xml
2022-06-06 11:32:36 +10:00
2a1b68d30f
Fix package of servlets in web-fragment.xml
2022-06-06 09:43:58 +10:00
a5c438fd29
Rename demo-eeX to eeX-demo ( #8097 )
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-06-06 08:58:09 +10:00
d9dafa08f0
Merge remote-tracking branch 'origin/jetty-12.0.x-fix-jspinit' into jetty-12.0.x
2022-06-02 13:03:29 +10:00
b4e59bc4a7
Merge remote-tracking branch 'origin/jetty-12.0.x-fix-servletcontext' into jetty-12.0.x
2022-06-02 13:03:01 +10:00
ca2fc17e5c
Merge remote-tracking branch 'origin/jetty-12.0.x-fix-servletcontext' into jetty-12.0.x-fix-jspinit
2022-06-02 08:46:19 +10:00
4043fbd7f2
Make _servletContext final.
2022-06-02 08:45:25 +10:00
cbeeb67e93
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-06-01 15:18:53 +02:00
a00280ea9f
Fix demo-ee10-jndi/jetty-env.xml
2022-06-01 16:58:59 +10:00
4425d20deb
Fix ServletHolder.initJsp
2022-06-01 16:56:52 +10:00
3b99c8c4e7
WebAppContext and ServletContextHandler must share ServletApiContext instance.
2022-06-01 16:26:36 +10:00
f6aba98886
Fix websocket modules
2022-06-01 16:25:29 +10:00
e7274e3bb1
Add ee8 modules with sources generated from ee9 sources ( #8066 )
...
* auto translate some modules from EE9 to EE8
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-01 13:38:42 +10:00
d69202f3d8
Fix ee10 jsp module
2022-05-31 11:20:24 +10:00
4fde2b7769
Merge remote-tracking branch 'origin/jetty-12.0.x-more-modules-enabled' into jetty-12.0.x
2022-05-31 10:40:04 +10:00
7a6ccce49a
Rewrite of the content handling, both on client and on server. ( #7985 )
...
Introduced a new io.Content class, with Content.Source, Content.Sink and Content.Chunk.
Updated the server-side to use io.Content instead of the previous server-side Content class.
Updated the client-side to use io.Content with a little specialization necessary for clients only.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2022-05-30 13:34:51 +02:00
43c662a3ac
Fix more ee10 modules.
2022-05-30 18:50:23 +10:00
f9b39d932a
Reworked BadMessage handling
...
Throw BadMessage from processing rather than onRequest
2022-05-28 15:49:38 +10:00
5067351607
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-05-26 15:30:20 +10:00
34c51c5dd5
Merge remote-tracking branch 'origin/jetty-12.0.x-deploy-webapps' into jetty-12.0.x
2022-05-26 13:47:38 +10:00
570cf12754
WIP fix mvn coords for demo webapp modules
2022-05-26 07:59:52 +10:00
a5bb51785d
WIP rename ee10 demo modules; fix modules
2022-05-25 19:07:18 +10:00
494c06abcb
MultiPartParserTest
2022-05-25 18:07:47 +10:00
eea3a11dd7
WIP deploy ee10 and ee9 webapps.
2022-05-25 17:35:52 +10:00
b767ba0dcd
Fix ee10 test
2022-05-24 21:06:58 +10:00
39c5395fb1
Add --reads org.eclipse.jetty.logging to surefire config
2022-05-24 20:34:13 +10:00
8677f5fac5
Jetty-12 Deploy
...
Cleanup dump and environment invocation
2022-05-21 09:56:01 +10:00
315600184d
Jetty-12 Deploy
...
hacky fix to dumping attributes
2022-05-20 17:25:21 +10:00
4bc0316091
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-05-16 14:46:33 +10:00
66140afded
WIP copy ee9 session tests to ee10 and get them working
2022-05-13 15:26:31 +02:00
22c1a2e901
Fixed webdefault-eeX.xml references
2022-05-13 10:16:06 +02:00
bfcd7845eb
Fixed references to webdefault.xml that now are webdefault-ee9.xml and webdefault-ee10.xml.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-05-12 17:01:42 +02:00
385f00f72b
Merge remote-tracking branch 'jetty-11.0.x' into `jetty-12.0.x`
2022-05-11 16:52:08 -05:00
f90e73ddb5
WIP deploying webapps
2022-05-10 00:02:06 +02:00
de1c74cdb9
servlet api as well
...
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-05-09 20:42:47 +10:00
0de3b48d82
websocket ServerCloseTest has been fixed
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-09 17:16:55 +10:00
af8e89c1b1
implement dummy shutdown method on ContextHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-09 17:14:00 +10:00
23dcefcd47
copy servlet attributes & params on jetty websocket upgrade
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-09 17:07:48 +10:00
9522fa3d87
Remove ee10 http-spi
2022-05-05 18:57:14 +02:00
6fb717b1b4
Merge pull request #7956 from eclipse/jetty-12.0.x-lachlan
...
fixes to Jetty 12 for Servlet/WebSocket tests
2022-05-05 15:48:31 +10:00
f40f4095d5
Revert "canonically encode pathspecs"
...
This reverts commit 83cca5671c
2022-05-05 13:49:10 +10:00
83cca5671c
canonically encode pathspecs
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-05 09:39:55 +10:00
e7be6f1422
fix bug in ResponseHttpFields
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-05 09:07:15 +10:00
5fb45f7273
fix WebSocket HttpFieldsWrapper
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-05 08:59:29 +10:00
1c1847be6f
rework and cleanup code for ensureConsumeAllOrNotPersistent
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-05 08:42:18 +10:00
85af234ed6
WIP for deployer
2022-05-04 19:41:38 +02:00
30c85c702e
WIP move session tests to ee9 before duplicating to ee10
2022-05-04 15:10:13 +02:00
ab0bb9911f
change groupId org.eclipse.jetty.ee10 -> org.eclipse.jetty.ee10.websocket for websocket ( #7954 )
...
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-05-04 20:35:34 +10:00
12f443db7d
re-enable AsyncContextListenersTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 15:30:39 +10:00
8f981500b8
update SpnegoAuthenticatorTest and fix bug in ConfigurableSpnegoAuthenticator
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:40:14 +10:00
686827feaf
Fix expectation for ErrorPageTest.testBadMessage()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:12:34 +10:00
3ae3457cb9
fix ErrorHandler exclusion based on HTTP method
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:11:28 +10:00
10a9490269
Fix some test cases in ErrorPageTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:11:12 +10:00
e80a301be3
fix WebSocketListenerTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-04 14:10:48 +10:00
428a9d568f
Reverted to use Resource as BaseResource
2022-05-03 19:28:53 +02:00
0a32147e89
Jetty-12 Restructure
...
Copied ee10 from hackathon branch
Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Ludovic Orban <lorban@webtide.com>
Co-authored-by: Olivier Lamy <olamy@webtide.com>
Co-authored-by: Simone Bordet <sbordet@webtide.com>
2022-05-03 15:52:44 +02:00
Greg Wilkins
Jan Bartel
Lachlan Roberts
Olivier Lamy
Joakim Erdfelt
Simone Bordet