jmc
jmc copied to clipboard
7307: Move org.openjdk.jmc.flightrecorder.configuration bundle from application to core
This PR addresses JMC-7307 [0], in which it would be helpful to have flightrecorder.configuration
distributed in jmc core.
flightrecorder.configuration
itself is a pretty straightforward movement of code, as it doesn't have any dependencies. Having said that, there are some flightrecorder-configuration-related classes in controlpanel.ui
which would be nice to have in core as well, and would probably do well in flightrecorder.configuration
. This includes VolatileStorageDelegate, and the 12 classes in configuration.model.xml
. The controlpanel.ui.configuration
unit tests can also come over to core, because they only tested the model xml code anyways.
So in total, we're looking at flightrecorder.configuration
and the former controlpanel.ui.configuration
test coming over to core, and the following classes:
- org.openjdk.jmc.flightrecorder.configuration.model.VolatileStorageDelegate
- org.openjdk.jmc.flightrecorder.configuration.model.xml.IXMLValidator
- org.openjdk.jmc.flightrecorder.configuration.model.xml.JFCGrammar
- org.openjdk.jmc.flightrecorder.configuration.model.xml.JFCXMLValidator
- org.openjdk.jmc.flightrecorder.configuration.model.xml.PrettyPrinter
- org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLAttribute
- org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLAttributeInstance
- org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLModel
- org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLNode
- org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLNodeType
- org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLTag
- org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLTagInstance
- org.openjdk.jmc.flightrecorder.configuration.model.xml.XMLValidationResult
[0] https://bugs.openjdk.java.net/browse/JMC-7307
Progress
- [x] Commit message must refer to an issue
- [x] Change must be properly reviewed (1 review required, with at least 1 Committer)
Issue
- JMC-7307: Move org.openjdk.jmc.flightrecorder.configuration bundle from application to core
Reviewers
- Jean-Philippe Bempel (@jpbempel - Committer) ⚠️ Review applies to 55e2e655
- Brice Dutheil (@bric3 - Author) ⚠️ Review applies to 55e2e655
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jmc pull/299/head:pull/299
$ git checkout pull/299
Update a local copy of the PR:
$ git checkout pull/299
$ git pull https://git.openjdk.org/jmc pull/299/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 299
View PR using the GUI difftool:
$ git pr show -t 299
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jmc/pull/299.diff
:wave: Welcome back aptmac! A progress list of the required criteria for merging this PR into master
will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.
Webrevs
@aptmac This change is no longer ready for integration - check the PR body for details.
Rebased & addressed the misnaming of the package in the JFCXMLValidator logger.
Thanks for the reviews! This PR introduces some large changes for core, and will be targeting jmc 9.
@aptmac this pull request can not be integrated into master
due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:
git checkout PR-7307
git fetch https://git.openjdk.org/jmc master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push
Now that JMC 9 looks like it's around the corner, I've rebased this PR on top of the current master branch.
One more comment: The following files need to be deleted as well: application/org.openjdk.jmc.flightrecorder.configuration/.project application/tests/org.openjdk.jmc.flightrecorder.configuration.test/.project application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/META-INF/MANIFEST.MF
I'm addressing the issues in common.test via #448
Thanks @RealCLanger ! Lots of great review points, much appreciate you taking a look at the PR. I'll see if I can find some time this week to address what you've raised.
Thanks @RealCLanger ! Lots of great review points, much appreciate you taking a look at the PR. I'll see if I can find some time this week to address what you've raised.
BTW, did I mention that it would be helpful if you could enable GHA?
@aptmac Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.
I opened up https://github.com/openjdk/jmc/pull/469 to continue this PR since Alex is still away, could use a review whenever anyone gets time
Will close in favour of: https://github.com/openjdk/jmc/pull/469