RFR: 7307: Move org.openjdk.jmc.flightrecorder.configuration bundle from application to core [v3]

[Alex Macdonald]

On Thu, 10 Aug 2023 17:53:58 GMT, Joshua Matsuoka <jmatsuoka at openjdk.org> wrote:

>> This PR addresses JMC-7307 [[0]](https://bugs.openjdk.java.net/browse/JMC-7307), in which it would be helpful to have flightrecorder.configuration distributed in jmc core.
>> 
>> This PR continues from #299 , Alex is currently away so I'll be continuing this PR/bug. This PR builds off of Alex's existing branch and preserves the history. It fixes the merge conflicts and addresses the remaining review comments on #299 .
>> 
>> [0] https://bugs.openjdk.java.net/browse/JMC-7307
>
> Joshua Matsuoka has updated the pull request incrementally with one additional commit since the last revision:
> 
>   running spotlesS

Still a handful of merge artifacts left behind, most of them are in comments but there's 3 that aren't and are stopping the ci builds.

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/jvm/JVMType.java line 50:

> 48: 	HOTSPOT,
> 49: 	/**
> 50: 	 * <<<<<<< HEAD ======= The JVM is Substrate VM.

Stuck in a comment

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/jvm/JVMType.java line 54:

> 52: 	SUBSTRATE,
> 53: 	/**
> 54: 	 * >>>>>>> upstream/master The JVM is unknown.

Also in a comment

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/jvm/JVMType.java line 74:

> 72: 		} else if (JavaVMVersionToolkit.isHotspotJVMName(jvmName)) {
> 73: 			return JVMType.HOTSPOT;
> 74: <<<<<<< HEAD

This is where spotless wasn't too happy in that last run. There's two more to clean up below as well.

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/ISecurityManager.java line 192:

> 190: 	 *
> 191: 	 * @param encryptionCipher
> 192: 	 *            the encryption cipher to use. <<<<<<< HEAD

Leftover (<<<<<<< HEAD) in a comment.

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/security/ISecurityManager.java line 206:

> 204: 
> 205: 	/**
> 206: 	 * Triggers a change of the master password. <<<<<<< HEAD

Leftover (<<<<<<< HEAD) in a comment.

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/util/Environment.java line 93:

> 91: 
> 92: 	/**
> 93: 	 * <<<<<<< HEAD

Leftover (<<<<<<< HEAD) in a comment.

core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/util/Environment.java line 95:

> 93: 	 * <<<<<<< HEAD
> 94: 	 * 
> 95: 	 * @return the "normal" 100% scaled DPI setting of the OS, 96 for Windows & Linux and 72 for

This comment block will need to be cleanup up as well.

-------------

PR Review: https://git.openjdk.org/jmc/pull/469#pullrequestreview-1574335248
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1291752272
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1291752374
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1291752578
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1291753055
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1291753082
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1291753162
PR Review Comment: https://git.openjdk.org/jmc/pull/469#discussion_r1291753459