Greg Wilkins
e249d39427
MemoryResource ( #8451 )
...
Added MemoryResource to simplify favicon and similar handling
2022-08-12 10:36:23 +10:00
Greg Wilkins
7d2f9fa3c0
Fixed build
2022-08-12 08:48:11 +10:00
Jan Bartel
8c4474d614
Squashed commit of the following:
...
commit dfe4640d8de7bf815f06ab56eea0c40a1ae34fbb
Merge: dfe0f76e5f fac047905a
Author: Jan Bartel <janb@webtide.com>
Date: Fri Aug 12 08:36:00 2022 +1000
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8430-implement-declareroles
commit dfe0f76e5f9dfaf62a7e3a31eeba3a9ef8b9e5c2
Merge: 0e099459ac 21944ab95c
Author: Jan Bartel <janb@webtide.com>
Date: Wed Aug 10 16:48:13 2022 +1000
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8430-implement-declareroles
commit 0e099459acbf97e00b85a4d36a390f2c459f24d3
Author: Jan Bartel <janb@webtide.com>
Date: Tue Aug 9 13:38:43 2022 +1000
Issue #8430 implement declareRoles for ee10
2022-08-12 08:38:02 +10:00
Greg Wilkins
fac047905a
suppress stack
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-08-12 08:31:49 +10:00
Jan Bartel
52f1c91cca
Merge remote-tracking branch 'origin/jetty-12.0.x-8447-remove-ELContextCleaner-ee10' into jetty-12.0.x
2022-08-12 08:23:09 +10:00
Jan Bartel
95af780d17
Implement special extension to allow headers to be set in include
2022-08-12 08:17:56 +10:00
Jan Bartel
4475537339
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8447-remove-ELContextCleaner-ee10
2022-08-12 07:09:34 +10:00
Ludovic Orban
08f344e7f6
add TODOs for Resource.combine
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-11 12:03:13 +02:00
Jan Bartel
d35892c0c2
Issue #8447 Remove ELContextCleaner for ee10
2022-08-11 17:55:37 +10:00
Greg Wilkins
20bab8a471
Fix build
2022-08-11 16:34:10 +10:00
Greg Wilkins
8f8101ba81
fix #8448 warning on 304
...
Improved logging
2022-08-11 16:12:24 +10:00
Greg Wilkins
a494afa635
fix #8448 Blocking is not complete
...
Use FutureCallback when usage is optional
2022-08-11 15:26:20 +10:00
Greg Wilkins
9833be0374
WIP #8441 isNotNormalWithinSelf
...
oops
2022-08-11 13:32:01 +10:00
Greg Wilkins
fcdb8305de
WIP #8441 isNotNormalWithinSelf
...
Added method to be optimized later
2022-08-11 12:52:19 +10:00
Greg Wilkins
a0d6f42e73
Fix #8442 server propagation
...
Test setServer propagation
protect from inadvertent null setting
2022-08-11 09:05:12 +10:00
Joakim Erdfelt
842af3ed22
Avoid recreating `Resource` during container/jar pattern filtering in `MetaInfConfiguration`
...
* Delete PatternMatcher.java
2022-08-10 16:12:15 -05:00
Joakim Erdfelt
3b690fdefd
Adding in-code comments about Handler.setServer(Server)
2022-08-10 13:01:08 -05:00
Joakim Erdfelt
9312359b13
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x
2022-08-10 12:59:37 -05:00
Joakim Erdfelt
0023281e3f
Adding in-code comments about WebAppContext.getWebInf behavior
2022-08-10 12:59:29 -05:00
Simone Bordet
af77a53e39
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-10 16:51:35 +02:00
Simone Bordet
b8e0db70e4
Updated imports to jakarta.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-10 15:00:08 +02:00
Simone Bordet
1e778bd97b
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-10 14:56:43 +02:00
Simone Bordet
99a983ebf0
Fixed type from "int" to "boolean" in jetty-threadpool.xml.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-10 14:51:26 +02:00
Simone Bordet
be3d16bdbb
Fixes #8007 - Support Loom. ( #8360 )
...
Implemented support for virtual threads for HTTP/1.1, HTTP/2 and HTTP/3.
The virtual thread support is in AdaptiveExecutionStrategy.
When virtual threads are supported and enabled, reserved threads are disabled and
blocking tasks are run in a virtual thread instead that being executed by the Executor.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-10 14:31:04 +02:00
Ludovic Orban
50b7dc4bbc
#8188 : fix test flakiness by using a thread-safe collection to track leaded buffers
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-10 10:35:34 +02:00
Ludovic Orban
7b57307c71
#8188 : fix test flakiness by handling null buffers returned by the pool
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-10 10:35:34 +02:00
Greg Wilkins
a19c1ef2ed
fix all ee9 demo context paths
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-08-10 17:47:08 +10:00
Greg Wilkins
d9b53a6174
fix ee9 demo context paths
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-08-10 17:33:58 +10:00
Jan Bartel
21944ab95c
Issue #8431 Servlet 6 allows dynamic listeners to call getters ( #8432 )
2022-08-10 16:34:50 +10:00
Jan Bartel
42f72268cf
Jetty 12 : #8408 Support new `<cookie-config>` concepts in Servlet 6 ( #8420 )
...
* Issue #8408 Implement new session cookie attributes
2022-08-10 16:33:08 +10:00
Lachlan Roberts
d210677182
re-enable ee9 openid module
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-08-10 13:51:47 +10:00
Greg Wilkins
408de26ec2
Created core-demo and updated demo root
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-08-10 12:04:39 +10:00
Joakim Erdfelt
199a9cd2ad
Jetty 12 : XML namespace cleanup ( #8406 )
...
* Adding Servlet 6 XML Entities
* Fixing bad xsi:schemaLocation entries
* Update all jetty-ee10 web XMLs to JakartaEE version 6.0 based
* Using XML Catalog
* Introducing catalogs for:
- default XML xsd/dtd (catalog-org.w3.xml)
- Configure dtd (catalog-configure.xml)
- EE10 Servlet 6 xsd/dtd (catalog-ee10.xml)
- EE9 Servlet 5 xsd/dtd (catalog-ee9.xml)
- EE8 Servlet 4 xsd/dtd (catalog-ee8.xml)
* New XmlParser.addCatalog(URI catalogXml, Class<?> classBase)
to allow the loading of a catalog which has it's resources
referenced via the classBase.getResource(name)
* WebDescriptor uses Environment to load appropriate catalog.
* Remove XmlParser.redirectEntity(String, String)
2022-08-09 06:34:29 -05:00
Joakim Erdfelt
e7e570f4bb
Invert merge hack from @Lachlan to return true on symbolic link
2022-08-08 11:41:11 -05:00
Ludovic Orban
871f1f8b4d
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-08 10:36:37 +02:00
Ludovic Orban
4c3cf18248
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-08 10:32:41 +02:00
Ludovic Orban
110896b4d1
#8414 : fix drainTo when head == tail but the queue isn't empty
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-08 10:28:31 +02:00
Lachlan Roberts
19e2e7babc
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-08-08 16:15:53 +10:00
Lachlan Roberts
40123bfbfc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2022-08-08 13:38:30 +10:00
Lachlan
998bc8c7e8
Merge pull request #8315 from eclipse/jetty-10.0.x-8296-AliasChecking
...
Issue #8296 and #8259 - AllowedResourceAliasChecker improvements
2022-08-08 13:23:02 +10:00
Joakim Erdfelt
21546e390c
Jetty 12 : Simplify `AnnotationParser` scanning for class files ( #8404 )
...
* Improved FileID.isHidden
* Simplified AnnotationParser
+ Not using MultiReleaseJarFile
+ Walk of a Directory or a JAR is the same
+ Reduced parse method count
+ Fixed TestAnnotationParser
Using proper fully qualified classnames now (were not yet converted over to jetty-12 naming)
* Single parseClass method
* Single parseDir method
* Adapting ee9 AnnotationParser to have the same behaviors as ee10.
* Deleting TestAnnotationInheritance tests
+ We don't want the AnnotationParser
creating new Resource objects for Class.getSuperClass()
resources that don't belong to
the same Resource that the passed
in class belongs to (as this is out of
scope for the Mount management).
Imagine if told to parse ClassB
which extends from ClassFoo, which
is in a different JAR than ClassB?
This concept from Jetty 9/10/11
was only used in testcases and not
in live runtime code, so it was
removed.
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-05 15:42:27 -05:00
Joakim Erdfelt
322e902111
Merge pull request #8409 from eclipse/jetty-12.0.x-rework-resource-factory
...
Jetty 12 : Rework `ResourceFactory` and `Resource`
2022-08-05 14:05:58 -05:00
Joakim Erdfelt
fee8f2b4f4
JettyEmbedded needs a Server instance earlier for applyXmlConfigurations and its ResourceFactory to operate properly
2022-08-05 12:59:22 -05:00
Joakim Erdfelt
fe21198499
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-rework-resource-factory
2022-08-05 11:11:39 -05:00
Joakim Erdfelt
e683825480
Merge pull request #8416 from eclipse/fix/jetty-12-reworkd-resource-factory-server-resource
...
Jetty 12 : Better handling of `jetty-dir.css` and `favicon.ico` resources
2022-08-05 11:00:50 -05:00
Joakim Erdfelt
56749ec5c6
Merge branch 'fix/jetty-12-reworkd-resource-factory-server-resource' of github.com:eclipse/jetty.project into fix/jetty-12-reworkd-resource-factory-server-resource
2022-08-05 10:57:00 -05:00
Joakim Erdfelt
d7768b3f53
QuickStartTest - inline ResourceFactory
2022-08-05 10:53:47 -05:00
Joakim Erdfelt
dd6953e018
Restore TODO in ee9 DefaultServlet
2022-08-05 10:49:16 -05:00
Joakim Erdfelt
b7d7a9918a
Proper JettyEmbedder XML to Server logic
2022-08-05 10:46:20 -05:00
Joakim Erdfelt
a864a9313b
Remove System.err output
2022-08-05 10:40:14 -05:00