Support jetty-eeX-env.xml, as per jetty-eeX-web.xml #11752
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joakime
reviewed
May 6, 2024
| @@ -47,6 +47,8 @@ public class EnvConfiguration extends AbstractConfiguration | |||
| private static final Logger LOG = LoggerFactory.getLogger(EnvConfiguration.class); | |||
|
|
|||
| private static final String JETTY_ENV_BINDINGS = "org.eclipse.jetty.jndi.EnvConfiguration"; | |||
There was a problem hiding this comment.
this binding key isn't ee10 specific, should this be in core?
There was a problem hiding this comment.
Maybe but there's no good place to put it (yet?).
| @@ -47,6 +47,8 @@ public class EnvConfiguration extends AbstractConfiguration | |||
| private static final Logger LOG = LoggerFactory.getLogger(EnvConfiguration.class); | |||
|
|
|||
| private static final String JETTY_ENV_BINDINGS = "org.eclipse.jetty.jndi.EnvConfiguration"; | |||
There was a problem hiding this comment.
this name isn't ee11 specific, shouldn't this be in jetty-core?
| @@ -50,6 +49,8 @@ public class EnvConfiguration extends AbstractConfiguration | |||
| private static final Logger LOG = LoggerFactory.getLogger(EnvConfiguration.class); | |||
|
|
|||
| private static final String JETTY_ENV_BINDINGS = "org.eclipse.jetty.jndi.EnvConfiguration"; | |||
There was a problem hiding this comment.
This name isn't ee9 specific, shouldn't it be in jetty core?
gregw
requested changes
May 10, 2024
...-ee10/jetty-ee10-plus/src/main/java/org/eclipse/jetty/ee10/plus/webapp/EnvConfiguration.java
Outdated
Show resolved
Hide resolved
...-ee11/jetty-ee11-plus/src/main/java/org/eclipse/jetty/ee11/plus/webapp/EnvConfiguration.java
Outdated
Show resolved
Hide resolved
jetty-ee9/jetty-ee9-plus/src/main/java/org/eclipse/jetty/ee9/plus/webapp/EnvConfiguration.java
Outdated
Show resolved
Hide resolved
…0/plus/webapp/EnvConfiguration.java Co-authored-by: Greg Wilkins <gregw@webtide.com>
…lus/webapp/EnvConfiguration.java Co-authored-by: Greg Wilkins <gregw@webtide.com>
…1/plus/webapp/EnvConfiguration.java Co-authored-by: Greg Wilkins <gregw@webtide.com>
gregw
approved these changes
May 10, 2024
|
I think this and the jetty-web.xml change should be backported to 12.0 |
janbartel
added a commit
that referenced
this pull request
Jun 26, 2024
* Support jetty-eeX-env.xml, as per jetty-eeX-web.xml --------- Co-authored-by: Greg Wilkins <gregw@webtide.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Need to support ee specific jetty-env.xml file, just as we do for jetty-web.xml