-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Jetty 12.0.x resource Servlet #11933
Conversation
This could be 12.0 ... or perhaps best to be 12.1 |
@lorban thoughts? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a good first step that IMHO could be merged in as-is, but it needs changes to the javadoc of ResourceServlet
and probably some changes to the doc too.
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
Outdated
Show resolved
Hide resolved
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like the DefaultServlet
is now pretty much the same as the ResourceServlet
? What are the actual differences?
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java
Outdated
Show resolved
Hide resolved
They are substantially similar, so the change is mostly in perception and future flexibility. But there are real changes in this PR:
|
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java
Show resolved
Hide resolved
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java
Show resolved
Hide resolved
...ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/DefaultServletTest.java
Outdated
Show resolved
Hide resolved
...ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/DefaultServletTest.java
Show resolved
Hide resolved
@lorban slight javadoc change, so please review. |
Build documentation examples
Build documentation examples
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 subject to fixing the ci build failure.
I think the CI failures are flakes (we gotta get on top of that!) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Javadoc could be improved a bit, and we need to decide what to do about that jetty-asciidoctor-extensions
module.
Otherwise LGTM.
@@ -14,5 +14,6 @@ | |||
|
|||
<modules> | |||
<module>jetty</module> | |||
<module>jetty-documentation</module> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is also the jetty-asciidoctor-extensions
module that's not activated and stuck at version 12.0.10-SNAPSHOT
. Shouldn't it be enabled too?
import org.slf4j.LoggerFactory; | ||
|
||
/** | ||
* <p>A Servlet that handles static resources.</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should the javadoc say something to users willing to configure a ResourceServlet
instance at /
? Should we warn when we detect that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure anything needs to be said. They can definitely deploy a ResourceServlet at '/' and it will work fine. They just miss out on any extras or efficiencies we may put into DefaultServlet.
Fix #10738
This is the start of a split of the DefaultServlet into a ResourceServlet.