Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Servlet 6.x (EE11) demos #12678

Merged
merged 24 commits into from
Jan 18, 2025
Merged

Servlet 6.x (EE11) demos #12678

merged 24 commits into from
Jan 18, 2025

Conversation

gregw
Copy link
Contributor

@gregw gregw commented Jan 8, 2025

Remove disabled embedded examples
Added servlet 6.x examples for

  • durable dispatch paths
  • ByteBuffer IO

Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
@gregw gregw marked this pull request as draft January 8, 2025 04:17
@gregw
Copy link
Contributor Author

gregw commented Jan 8, 2025

@janbartel @sbordet @lachlan-roberts I will soon be deleting all the remaining code from ./jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded. If you have any HTTP2, websocket or other tests from there that you think we need to keep, then can you collaborate on this branch and add them to jetty-demos/jetty-servlet6-demos in some form or other.

gregw added 4 commits January 8, 2025 15:40
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
 + moved EE11 embedded demos to servlet6
gregw added 7 commits January 9, 2025 14:16
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
 + moved EE11 embedded demos to servlet6
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
 + moved EE11 embedded demos to servlet6

 Fixed CachingHttpContentFactory
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
 + moved EE11 embedded demos to servlet6

 Fixed CachingHttpContentFactory
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
 + moved EE11 embedded demos to servlet6

 Fixed CachingHttpContentFactory
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
 + moved EE11 embedded demos to servlet6

 Fixed CachingHttpContentFactory
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
 + moved EE11 embedded demos to servlet6

 Fixed CachingHttpContentFactory
gregw added a commit that referenced this pull request Jan 12, 2025
This is a partial fix for #12681. It does not fix the actual release race on a single content, but by restricting the shrinking to a single thread, make the race less likely to occur.

There is a more comprehensive fix in #12678 for 12.1, but the cache has changed too much for a straight forward back port.
…the cache, otherwise delegate to the wrapped content

Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
@gregw gregw requested a review from lorban January 13, 2025 20:27
Remove disabled embedded examples
Added servlet 6.x examples for
 + durable dispatch paths
 + ByteBuffer IO
 + ambiguous URIs
 + moved EE11 embedded demos to servlet6

 Fixed CachingHttpContentFactory
@gregw gregw marked this pull request as ready for review January 13, 2025 20:29
gregw added a commit that referenced this pull request Jan 13, 2025
This is a partial fix for #12681. It does not fix the actual release race on a single content, but by restricting the shrinking to a single thread, make the race less likely to occur.

There is a more comprehensive fix in #12678 and #12704 for 12.1,
# Conflicts:
#	jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java
gregw added 2 commits January 14, 2025 08:40
…ntent-already-released' into fix/jetty-12.1.x/serlvet6-demos

# Conflicts:
#	jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java
…ntent-already-released' into fix/jetty-12.1.x/serlvet6-demos

# Conflicts:
#	jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java
@lorban
Copy link
Contributor

lorban commented Jan 14, 2025

I assume the CachingHttpContentFactory changes can go away once #12704 has been merged?

@gregw gregw requested a review from janbartel January 15, 2025 20:12
@@ -292,6 +292,16 @@
<type>jar</type>
<optional>true</optional>
</dependency>
<!-- Demo Servlet 6 Apps -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are the other new servlet6 webapps?

@gregw gregw requested a review from janbartel January 17, 2025 01:59
@gregw gregw merged commit a8869dd into jetty-12.1.x Jan 18, 2025
10 checks passed
@gregw gregw deleted the fix/jetty-12.1.x/serlvet6-demos branch January 18, 2025 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

5 participants