Move CRaCMXBeanImpl and export jdk.crac.management

Issue #20587 Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
eclipse-openj9 · Nov 16, 2024 · 1af5097 · 1af5097
1 parent 9464ff3
commit 1af5097
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.../java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java b/.../java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java
@@ -775,7 +775,7 @@ static void registerAll() {
 				.validateAndRegister();
 
 /*[IF CRAC_SUPPORT]*/
-			create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.CRaCMXBeanImpl.getInstance())
+			create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.internal.CRaCMXBeanImpl.getInstance())
 				.addInterface(jdk.crac.management.CRaCMXBean.class)
 				.validateAndRegister();
 /*[ENDIF] CRAC_SUPPORT */

diff --git a/.../jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java b/.../jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java
@@ -112,7 +112,7 @@ public final class PlatformMBeanProvider extends sun.management.spi.PlatformMBea
 		}
 
 /*[IF CRAC_SUPPORT]*/
-		ComponentBuilder.create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.CRaCMXBeanImpl.getInstance()) // $NON-NLS-1$
+		ComponentBuilder.create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.internal.CRaCMXBeanImpl.getInstance()) // $NON-NLS-1$
 			.addInterface(jdk.crac.management.CRaCMXBean.class)
 			.register(allComponents);
 /*[ENDIF] CRAC_SUPPORT */

diff --git a/jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBean.java b/jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBean.java
@@ -23,6 +23,7 @@
 package jdk.crac.management;
 
 import java.lang.management.PlatformManagedObject;
+import jdk.crac.management.internal.CRaCMXBeanImpl;
 
 /**
  * A management interface of the CRaC functionality in the Java virtual machine.

diff --git a/...s/jdk/crac/management/CRaCMXBeanImpl.java → ...c/management/internal/CRaCMXBeanImpl.java b/...s/jdk/crac/management/CRaCMXBeanImpl.java → ...c/management/internal/CRaCMXBeanImpl.java
@@ -20,11 +20,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  */
-package jdk.crac.management;
+package jdk.crac.management.internal;
 
 import java.util.concurrent.TimeUnit;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+import jdk.crac.management.CRaCMXBean;
 import openj9.internal.criu.InternalCRIUSupport;
 
 /**

diff --git a/jcl/src/jdk.management/share/classes/module-info.java.extra b/jcl/src/jdk.management/share/classes/module-info.java.extra
@@ -22,6 +22,9 @@
  */
 
 exports com.ibm.lang.management;
-exports openj9.lang.management;
 exports com.ibm.virtualization.management;
+/*[IF CRAC_SUPPORT]*/
+exports jdk.crac.management;
+/*[ENDIF] CRAC_SUPPORT */
+exports openj9.lang.management;
 provides sun.management.spi.PlatformMBeanProvider with com.ibm.lang.management.internal.PlatformMBeanProvider;