| Summary: | support decomposed start.ini | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | [RT] Jetty | Reporter: | Greg Wilkins <gregw> | ||||||
| Component: | server | Assignee: | Thomas Becker <tbecker> | ||||||
| Status: | RESOLVED FIXED | QA Contact: | |||||||
| Severity: | enhancement | ||||||||
| Priority: | P3 | CC: | jetty-inbox, tbecker | ||||||
| Version: | 7.6.0.RC0 | ||||||||
| Target Milestone: | 7.5.x | ||||||||
| Hardware: | All | ||||||||
| OS: | All | ||||||||
| See Also: | https://bugs.eclipse.org/bugs/show_bug.cgi?id=364501 | ||||||||
| Whiteboard: | |||||||||
| Attachments: |
|
||||||||
|
Description
Greg Wilkins
Created attachment 208856 [details]
POC patch provided by tbecker
Thomas, thanks for the patch. I've refactored it a little bit and made sure that there is good ordering of the start.d fragments. I also have moved it all back to Main.java, so that jetty_home processing can be centralised. I also broke up the parseCommandLine into better testable methods.... but more tests are needed. I have committed this for 7.6.0.RC3 - but not refactored start.ini yet Can you review (and usage text probably needs more work) - thanks Greg, thx for the work. Will review your changes now. Would have been good if you had commited my patch and then applied your changes in another commit. Then it's easier for me to track what you've changed compared to my version. Created attachment 208922 [details]
proposed patch
Like your changes. Changed the test and refactored a bit to extend the test to parse files in start.d directory again.
Also changed usage.txt a bit.
In Main.java I've found this in Main.loadStartIni(...):
catch (IOException e)
{
// usageExit(e,ERR_UNKNOWN);
}
What's the intention in commenting the usageExit call here? Any IOException will silently be ignored when reading start.ini files. Is this intended?
Patch attached. Would be good if you can commit my patch even if you change it also to get me some commit karma.
Applied (and exit usage uncommented) |