Tomcat7 #5
Closed
Tomcat7 #5
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
Full source based dropped in place. Please note that differences are in line breaks. It appears that both eclipse and git hub gui will remove formats for line break that show as squigly square. Other than that, code is the same in most locations. Also, tomcat base updated from 7.0.4 to 7.0.29. Some methods were removed as they were deprectated. Others were retained due to usage currently.
three more files that missed the first commit.
|
Re-edit the pull request and change the destination to be the tomcat7 branch, not master. |
|
I think you'll have a much easier time doing this on top of my new 1.5 branch. Most chnges are already there and you might just need a refresh of thirdparty/tomcat7 and maybe a few smaller changes in the tomcat7 specific code itself. |
|
Closing, since the other pull request was merged onto the tomcat7 branch. |
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.
Here is tomcat 7 up to the latest branch 7.0.29 with all the other pieces upgraded. Guess this could be a start to the other work you already did on 1.5 version. I haven't looked at that yet but I think I got the idea as to what you are doing with it to allow each of the different streams (spring, tomcat).
Please note: I dumped all source/test files so I think they might have all got pulled unless the gui sees no changes. I did that because I feel the line breaks in the original may not be the most appropriate format but that isn't a call I can make. It appears to me that the gui will force getting rid of the square seen at the end of each line when viewing whitespace. I believe eclipse does the same if a cleanup is performed but I haven't verified that as I'm trying to avoid my habit of doing source cleanup as it definitely can change things. In general, I usually have all the settings in eclipse set for source cleanup that I can get away with easily.
If all this works out well, tomcat 5.5 might be worth doing the same with to get rid of the separate branches but not sure how beneficial that would be when it already has an EOL later this year.