8086: Some refactoring for jmc/core

Reviewed-by: bdutheil, aptmac
openjdk · Jun 20, 2023 · cf2fe2b · cf2fe2b
1 parent cedf50f
commit cf2fe2b
Show file tree

Hide file tree

Showing 114 changed files with 66,512 additions and 862 deletions.
diff --git a/application/pom.xml b/application/pom.xml
@@ -142,11 +142,6 @@
 			<artifactId>common</artifactId>
 			<version>${revision}${changelist}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>common.test</artifactId>
-			<version>${revision}${changelist}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder</artifactId>
@@ -172,11 +167,6 @@
 			<artifactId>jdp</artifactId>
 			<version>${revision}${changelist}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder.test</artifactId>
-			<version>${revision}${changelist}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/application/tests/pom.xml b/application/tests/pom.xml
@@ -137,6 +137,13 @@
 			</build>
 		</profile>
 	</profiles>
+	<dependencies>
+		<dependency>
+			<groupId>org.openjdk.jmc</groupId>
+			<artifactId>testlib</artifactId>
+			<version>${revision}${changelist}</version>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>

diff --git a/application/uitests/org.openjdk.jmc.test.jemmy/META-INF/MANIFEST.MF b/application/uitests/org.openjdk.jmc.test.jemmy/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@ Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.junit,
  org.eclipse.swt,
+ org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.forms,
+ org.openjdk.jmc.flightrecorder,
  org.openjdk.jmc.testlib,
  org.openjdk.jmc.rjmx,
  org.openjdk.jmc.rjmx.ui,
- org.eclipse.ui,
- org.openjdk.jmc.flightrecorder,
  org.adoptopenjdk.jemmy-awt-input,
  org.adoptopenjdk.jemmy-browser,
  org.adoptopenjdk.jemmy-core,

diff --git a/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml b/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml
@@ -45,34 +45,6 @@
 		<spotless.config.path>${basedir}/../../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
 	</properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>common</artifactId>
-			<version>${revision}${changelist}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>common.test</artifactId>
-			<version>${revision}${changelist}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder</artifactId>
-			<version>${revision}${changelist}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder.rules</artifactId>
-			<version>${revision}${changelist}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder.rules.jdk</artifactId>
-			<version>${revision}${changelist}</version>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>

diff --git a/application/uitests/pom.xml b/application/uitests/pom.xml
@@ -50,7 +50,6 @@
 		<test.excludes.default>**/*$*</test.excludes.default>
 		<ui.test.excludes>**/uitest/**,${test.excludes.default}</ui.test.excludes>
 		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
-		<jmc.version>${revision}${changelist}</jmc.version>
 	</properties>
 
 	<modules>
@@ -65,38 +64,8 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>common</artifactId>
-			<version>${jmc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>common.test</artifactId>
-			<version>${jmc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder</artifactId>
-			<version>${jmc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder.rules</artifactId>
-			<version>${jmc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder.rules.jdk</artifactId>
-			<version>${jmc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder.serializers</artifactId>
-			<version>${jmc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>flightrecorder.writer</artifactId>
-			<version>${jmc.version}</version>
+			<artifactId>testlib</artifactId>
+			<version>${revision}${changelist}</version>
 		</dependency>
 	</dependencies>
 	<profiles>

diff --git a/core/coverage/pom.xml b/core/coverage/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2019, 2021, Red Hat Inc. All rights reserved.
+   Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2019, 2023, Red Hat Inc. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -42,11 +42,9 @@
 	<artifactId>coverage.core</artifactId>
 	<name>Code coverage report jmc/core</name>
 	<packaging>pom</packaging>
-
 	<properties>
-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
-
 	<dependencies>
 		<!-- First all the modules in core/ -->
 		<dependency>
@@ -84,11 +82,15 @@
 			<artifactId>jdp</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.openjdk.jmc</groupId>
+			<artifactId>testlib</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<!-- Second all the modules in core/tests/ -->
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>common.test</artifactId>
-			<type>test-jar</type>
 			<scope>test</scope>
 			<version>${project.version}</version>
 		</dependency>

diff --git a/core/org.openjdk.jmc.common/pom.xml b/core/org.openjdk.jmc.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -40,7 +40,7 @@
 	</parent>
 	<artifactId>common</artifactId>
 	<properties>
-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/core/org.openjdk.jmc.flightrecorder.rules.jdk/pom.xml b/core/org.openjdk.jmc.flightrecorder.rules.jdk/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -40,14 +40,9 @@
 	</parent>
 	<artifactId>flightrecorder.rules.jdk</artifactId>
 	<properties>
-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>common</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder</artifactId>

diff --git a/core/org.openjdk.jmc.flightrecorder.rules/pom.xml b/core/org.openjdk.jmc.flightrecorder.rules/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -40,7 +40,7 @@
 	</parent>
 	<artifactId>flightrecorder.rules</artifactId>
 	<properties>
-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/core/org.openjdk.jmc.flightrecorder.serializers/pom.xml b/core/org.openjdk.jmc.flightrecorder.serializers/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2021, 2022, Datadog, Inc. All rights reserved.
+   Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2021, 2023, Datadog, Inc. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -41,23 +41,13 @@
 	</parent>
 	<artifactId>flightrecorder.serializers</artifactId>
 	<properties>
-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.openjdk.jmc</groupId>
-			<artifactId>common</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.lz4</groupId>
-			<artifactId>lz4-java</artifactId>
-			<version>1.8.0</version>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/core/org.openjdk.jmc.flightrecorder.writer/pom.xml b/core/org.openjdk.jmc.flightrecorder.writer/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2021, 2022, Datadog, Inc. All rights reserved.
+   Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2021, 2023, Datadog, Inc. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -41,7 +41,7 @@
 	</parent>
 	<artifactId>flightrecorder.writer</artifactId>
 	<properties>
-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/core/org.openjdk.jmc.flightrecorder/pom.xml b/core/org.openjdk.jmc.flightrecorder/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -40,7 +40,7 @@
 	</parent>
 	<artifactId>flightrecorder</artifactId>
 	<properties>
-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/core/org.openjdk.jmc.jdp/pom.xml b/core/org.openjdk.jmc.jdp/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -40,6 +40,6 @@
 	</parent>
 	<artifactId>jdp</artifactId>
 	<properties>
-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 </project>
diff --git a/.../tests/org.openjdk.jmc.testlib/.classpath → core/org.openjdk.jmc.testlib/.classpath b/.../tests/org.openjdk.jmc.testlib/.classpath → core/org.openjdk.jmc.testlib/.classpath
diff --git a/....openjdk.jmc.testlib/META-INF/MANIFEST.MF → ....openjdk.jmc.testlib/META-INF/MANIFEST.MF b/....openjdk.jmc.testlib/META-INF/MANIFEST.MF → ....openjdk.jmc.testlib/META-INF/MANIFEST.MF
@@ -6,8 +6,9 @@ Bundle-SymbolicName: org.openjdk.jmc.testlib;singleton:=true
 Bundle-Version: 9.0.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.openjdk.jmc.common,
- org.junit
+Require-Bundle: org.junit,
+ org.openjdk.jmc.common;visibility:=reexport,
+ org.openjdk.jmc.flightrecorder
 Export-Package: org.openjdk.jmc.test,
  org.openjdk.jmc.test.io,
  org.openjdk.jmc.test.mock.item

diff --git a/.../org.openjdk.jmc.testlib/build.properties → .../org.openjdk.jmc.testlib/build.properties b/.../org.openjdk.jmc.testlib/build.properties → .../org.openjdk.jmc.testlib/build.properties
diff --git a/core/tests/org.openjdk.jmc.testlib/pom.xml → core/org.openjdk.jmc.testlib/pom.xml b/core/tests/org.openjdk.jmc.testlib/pom.xml → core/org.openjdk.jmc.testlib/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -35,23 +35,27 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
-		<artifactId>missioncontrol.core.tests</artifactId>
+		<artifactId>missioncontrol.core</artifactId>
 		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>testlib</artifactId>
 	<properties>
-		<fail.if.no.tests>false</fail.if.no.tests>
-		<spotless.config.path>${basedir}/../../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.openjdk.jmc</groupId>
+			<artifactId>flightrecorder</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/...er/test/util/MockStacktraceGenerator.java → ...er/test/util/MockStacktraceGenerator.java b/...er/test/util/MockStacktraceGenerator.java → ...er/test/util/MockStacktraceGenerator.java
diff --git a/...trecorder/test/util/PrintoutsToolkit.java → ...trecorder/test/util/PrintoutsToolkit.java b/...trecorder/test/util/PrintoutsToolkit.java → ...trecorder/test/util/PrintoutsToolkit.java
diff --git a/...trecorder/test/util/RecordingToolkit.java → ...trecorder/test/util/RecordingToolkit.java b/...trecorder/test/util/RecordingToolkit.java → ...trecorder/test/util/RecordingToolkit.java
diff --git a/...rder/test/util/StacktraceTestToolkit.java → ...rder/test/util/StacktraceTestToolkit.java b/...rder/test/util/StacktraceTestToolkit.java → ...rder/test/util/StacktraceTestToolkit.java
diff --git a/...java/org/openjdk/jmc/test/MCTestCase.java → ...java/org/openjdk/jmc/test/MCTestCase.java b/...java/org/openjdk/jmc/test/MCTestCase.java → ...java/org/openjdk/jmc/test/MCTestCase.java
diff --git a/.../java/org/openjdk/jmc/test/SlowTests.java → .../java/org/openjdk/jmc/test/SlowTests.java b/.../java/org/openjdk/jmc/test/SlowTests.java → .../java/org/openjdk/jmc/test/SlowTests.java
diff --git a/...ava/org/openjdk/jmc/test/TestToolkit.java → ...ava/org/openjdk/jmc/test/TestToolkit.java b/...ava/org/openjdk/jmc/test/TestToolkit.java → ...ava/org/openjdk/jmc/test/TestToolkit.java
diff --git a/...org/openjdk/jmc/test/io/FileResource.java → ...org/openjdk/jmc/test/io/FileResource.java b/...org/openjdk/jmc/test/io/FileResource.java → ...org/openjdk/jmc/test/io/FileResource.java
diff --git a/...a/org/openjdk/jmc/test/io/IOResource.java → ...a/org/openjdk/jmc/test/io/IOResource.java b/...a/org/openjdk/jmc/test/io/IOResource.java → ...a/org/openjdk/jmc/test/io/IOResource.java
diff --git a/...rg/openjdk/jmc/test/io/IOResourceSet.java → ...rg/openjdk/jmc/test/io/IOResourceSet.java b/...rg/openjdk/jmc/test/io/IOResourceSet.java → ...rg/openjdk/jmc/test/io/IOResourceSet.java
diff --git a/.../openjdk/jmc/test/io/JarFileResource.java → .../openjdk/jmc/test/io/JarFileResource.java b/.../openjdk/jmc/test/io/JarFileResource.java → .../openjdk/jmc/test/io/JarFileResource.java
diff --git a/...openjdk/jmc/test/io/ResourceResource.java → ...openjdk/jmc/test/io/ResourceResource.java b/...openjdk/jmc/test/io/ResourceResource.java → ...openjdk/jmc/test/io/ResourceResource.java
diff --git a/.../test/mock/item/AttributeDescription.java → .../test/mock/item/AttributeDescription.java b/.../test/mock/item/AttributeDescription.java → .../test/mock/item/AttributeDescription.java
diff --git a/...k/jmc/test/mock/item/MockAggregators.java → ...k/jmc/test/mock/item/MockAggregators.java b/...k/jmc/test/mock/item/MockAggregators.java → ...k/jmc/test/mock/item/MockAggregators.java
diff --git a/...dk/jmc/test/mock/item/MockAttributes.java → ...dk/jmc/test/mock/item/MockAttributes.java b/...dk/jmc/test/mock/item/MockAttributes.java → ...dk/jmc/test/mock/item/MockAttributes.java
diff --git a/...k/jmc/test/mock/item/MockCollections.java → ...k/jmc/test/mock/item/MockCollections.java b/...k/jmc/test/mock/item/MockCollections.java → ...k/jmc/test/mock/item/MockCollections.java
diff --git a/.../openjdk/jmc/test/mock/item/MockItem.java → .../openjdk/jmc/test/mock/item/MockItem.java b/.../openjdk/jmc/test/mock/item/MockItem.java → .../openjdk/jmc/test/mock/item/MockItem.java
diff --git a/...mc/test/mock/item/MockItemCollection.java → ...mc/test/mock/item/MockItemCollection.java b/...mc/test/mock/item/MockItemCollection.java → ...mc/test/mock/item/MockItemCollection.java
diff --git a/.../jmc/test/mock/item/MockItemIterable.java → .../jmc/test/mock/item/MockItemIterable.java b/.../jmc/test/mock/item/MockItemIterable.java → .../jmc/test/mock/item/MockItemIterable.java
diff --git a/...dk/jmc/test/mock/item/MockNumberType.java → ...dk/jmc/test/mock/item/MockNumberType.java b/...dk/jmc/test/mock/item/MockNumberType.java → ...dk/jmc/test/mock/item/MockNumberType.java
diff --git a/...mc/test/mock/item/MockStacktraceType.java → ...mc/test/mock/item/MockStacktraceType.java b/...mc/test/mock/item/MockStacktraceType.java → ...mc/test/mock/item/MockStacktraceType.java
diff --git a/...enjdk/jmc/test/mock/item/MockTypeIDs.java → ...enjdk/jmc/test/mock/item/MockTypeIDs.java b/...enjdk/jmc/test/mock/item/MockTypeIDs.java → ...enjdk/jmc/test/mock/item/MockTypeIDs.java