Add Jakarta EE/Java EE support for Tomcat and TomEE #4822
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
|
@pepness NB16 has already branched. If you think there's an argument for including, will need rebasing on delivery and to be reviewed with release criteria in mind, as well as possibly the issue queue as there's a bunch of things reported in this area in 16-rc1. |
pepness
added
work-in-progress
do not merge
|
@neilcsmith-net my mistake, let's wait for NB 17 while I keep working on it. |
pepness
force-pushed
the
tomcat-jakarta-v2
branch
from
d8d71ff
to
2ff4a33
Compare
pepness
added
enterprise
mbien
reviewed
Dec 8, 2022
enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
Outdated
Show resolved
Hide resolved
enterprise/tomcat5/test/unit/src/org/netbeans/modules/tomcat5/TomcatFactoryTest.java
Outdated
Show resolved
Hide resolved
|
@pepness would be great to get this in for NB 17. Would be good to extract that one method and change the tests a bit, shouldn't take much time hopefully. |
|
@mbien I already did the changes you suggested and added initial support for Tomcat 11, just re-testing everything. Hopefully by tomorrow I will finish. |
|
@pepness awesome! no need to hurry, feature freeze is on the 17th. |
- Improve support for TomEE types and correctly identify them. - Add support for TomEE versions from 1.5 to 9 - Improve logic for supported profiles and jvm platforms for Tomcat and TomEE - Improve logic for getJavadoc() method
- Improve Tomcat/TomEE version enum - Add isAtLeast() method - Use enum isAtLeast() method to improve logic - Improve support for Jakarta EE JaxRS
- Add Tests for new Tomcat version comparison - Add Tests for new TomEE version comparison
- Use StandardCharsets - Use try-with-resources - Add @OverRide tags - Bump javac.source to 1.8 - Add missing attributes to a dtd file
- Fix the default jvm platform that is pre-selected
-Remove redundant call to loadTomEEInfo(), isTomEE() will call it before
-Add missing validation for Tomcat 5.0 -tomcat-coyote.jar location is different for tomcat 5.0 and 5.5
supported java versions. Thanks to Michael Bien.
only in this module.
pepness
force-pushed
the
tomcat-jakarta-v2
branch
from
6ec30d0
to
2a30cf7
Compare
This reverts commit 2a30cf7.
mbien
approved these changes
Jan 10, 2023
enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
Outdated
Show resolved
Hide resolved
enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
Outdated
Show resolved
Hide resolved
|
don't forget to squash as you see fit and lets get this in |
neilcsmith-net
pushed a commit
to neilcsmith-net/netbeans
that referenced
this pull request
Jan 11, 2023
- Add support for Tomcat 10 and 10.1 - Improve support for Tomcat versions from 5 to 10.1 - Add initial support for Tomcat 11 - Add support for TomEE versions from 1.5 to 9 - Improve support for TomEE types and correctly identify them. - Improve logic for supported profiles and jvm platforms for Tomcat and TomEE - Add new helper method versionRange and use it to define valid ranges of supported java versions. Kudos to Michael Bien. - Improve logic for getJavadoc() method - Improve Tomcat/TomEE version enum - Improve support for Jakarta EE JaxRS - Fix the default jvm platform that is pre-selected - Move call of isTomEEJaxRS(), should be called only if isTomEE() is true - Remove redundant call to loadTomEEInfo(), isTomEE() was calling it already - Add missing validation for Tomcat 5.0 - tomcat-coyote.jar location is different for tomcat 5.0 and 5.5 - Add Tests for new TomEEtype logic - Add Tests for new Tomcat version comparison - Add Tests for new TomEE version comparison - Use generics - Use StandardCharsets - Use try-with-resources - Add @OverRide tags - Bump javac.source to 1.8 - Add missing attributes to a dtd file
This was referenced Jan 21, 2023
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.
Testing:
Tomcat 9 and TomEE 8 support up to Jakarta EE 8
TomEE 9 support only Jakarta EE 9.1
Tomcat 10.1 support only Jakarta EE 10
Partial support for Tomcat 11 with Jakarta EE 10