Skip to content
Permalink
Browse files

6668: Move org.openjdk.jmc.jdp bundle from application to core

Reviewed-by: hdafgard
  • Loading branch information
jiekang authored and Henrik Dafgård committed Jan 16, 2020
1 parent f74caa8 commit 87905922639233c74e9b3d6806b3854e71e160f0
Showing with 88 additions and 95 deletions.
  1. +11 −22 application/coverage/pom.xml
  2. +7 −3 application/pom.xml
  3. +1 −2 application/tests/pom.xml
  4. +13 −3 core/coverage/pom.xml
  5. 0 {application → core}/org.openjdk.jmc.jdp/.classpath
  6. 0 {application → core}/org.openjdk.jmc.jdp/.project
  7. 0 {application → core}/org.openjdk.jmc.jdp/.settings/org.eclipse.jdt.core.prefs
  8. 0 {application → core}/org.openjdk.jmc.jdp/META-INF/MANIFEST.MF
  9. +1 −1 {application → core}/org.openjdk.jmc.jdp/build.properties
  10. +3 −25 {application → core}/org.openjdk.jmc.jdp/pom.xml
  11. +1 −1 {application → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/client/Discoverable.java
  12. +1 −1 ...lication → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/client/DiscoveryEvent.java
  13. +1 −1 ...ation → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/client/DiscoveryListener.java
  14. +1 −1 {application → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/client/JDPClient.java
  15. +1 −1 ...lication → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/client/PacketListener.java
  16. +1 −1 ...ication → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/client/PacketProcessor.java
  17. +1 −1 {application → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/client/Pruner.java
  18. +1 −1 {application → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/client/package-info.java
  19. +1 −1 ...ication → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/common/CodingException.java
  20. +1 −1 {application → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/common/Configuration.java
  21. +1 −1 ...on → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/common/ConfigurationFactory.java
  22. +1 −1 {application → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/common/JDPPacket.java
  23. +1 −1 ...→ core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/common/JRockitJDPPacketDecoder.java
  24. +1 −1 {application → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/common/package-info.java
  25. +2 −2 {application → core}/org.openjdk.jmc.jdp/src/main/java/org/openjdk/jmc/jdp/jmx/JMXDataKeys.java
  26. +1 −0 core/pom.xml
  27. 0 {application → core}/tests/org.openjdk.jmc.jdp.test/.classpath
  28. 0 {application → core}/tests/org.openjdk.jmc.jdp.test/.project
  29. 0 {application → core}/tests/org.openjdk.jmc.jdp.test/META-INF/MANIFEST.MF
  30. +1 −1 {application → core}/tests/org.openjdk.jmc.jdp.test/build.properties
  31. +19 −8 {application → core}/tests/org.openjdk.jmc.jdp.test/pom.xml
  32. +1 −1 {application → core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/AllTests.java
  33. +1 −1 ...cation → core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/ClientTester.java
  34. +1 −1 ...cation → core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/ServerTester.java
  35. +1 −1 ... core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/client/JDPClientTest.java
  36. +1 −1 ...n → core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/client/JDPJMXTest.java
  37. +1 −1 ... core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/client/JDPPacketTest.java
  38. +1 −1 ... core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/client/JDPServerTest.java
  39. +1 −1 ... → core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/client/TestToolkit.java
  40. +1 −1 ... → core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/server/Broadcaster.java
  41. +1 −1 ...on → core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/server/JDPServer.java
  42. +1 −1 ...re}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/server/jmx/JMXJDPServer.java
  43. +1 −1 ... core}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/server/jmx/PIDHelper.java
  44. +1 −1 ...re}/tests/org.openjdk.jmc.jdp.test/src/test/java/org/openjdk/jmc/jdp/server/jmx/package-info.java
  45. +2 −1 core/tests/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, Red Hat Inc. All rights reserved.
Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2020, Red Hat Inc. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -279,11 +279,6 @@
<artifactId>org.openjdk.jmc.ide.ui</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>org.openjdk.jmc.jdp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>org.openjdk.jmc.joverflow</artifactId>
@@ -410,12 +405,6 @@
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>org.openjdk.jmc.jdp.test</artifactId>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>org.openjdk.jmc.joverflow.test</artifactId>
@@ -516,13 +505,13 @@
</executions>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,7 +97,6 @@
<module>org.openjdk.jmc.ide.jdt</module>
<module>org.openjdk.jmc.ide.launch</module>
<module>org.openjdk.jmc.ide.ui</module>
<module>org.openjdk.jmc.jdp</module>
<module>org.openjdk.jmc.joverflow</module>
<module>org.openjdk.jmc.joverflow.ui</module>
<module>org.openjdk.jmc.osgi.extension</module>
@@ -166,6 +165,11 @@
<artifactId>flightrecorder.rules.jdk</artifactId>
<version>8.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>jdp</artifactId>
<version>8.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
@@ -184,4 +188,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,7 +48,6 @@
<module>org.openjdk.jmc.flightrecorder.ui.test</module>
<module>org.openjdk.jmc.greychart.test</module>
<module>org.openjdk.jmc.ide.launch.test</module>
<module>org.openjdk.jmc.jdp.test</module>
<module>org.openjdk.jmc.joverflow.test</module>
<module>org.openjdk.jmc.rjmx.services.jfr.test</module>
<module>org.openjdk.jmc.rjmx.test</module>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, Red Hat Inc. All rights reserved.
Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2020, Red Hat Inc. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,6 +69,11 @@
<artifactId>flightrecorder.rules.jdk</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>jdp</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Second all the modules in core/tests/ -->
<dependency>
<groupId>org.openjdk.jmc</groupId>
@@ -95,6 +100,11 @@
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>jdp.test</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
@@ -117,4 +127,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
#
# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,34 +35,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openjdk.jmc</groupId>
<artifactId>missioncontrol.application</artifactId>
<artifactId>missioncontrol.core</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.openjdk.jmc.jdp</artifactId>
<packaging>eclipse-plugin</packaging>
<artifactId>jdp</artifactId>

<properties>
<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<extraClasspathElements>
<dependency>
<groupId>sun.jdk</groupId>
<artifactId>tools</artifactId>
<version>1.8.0</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</extraClasspathElements>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -33,7 +33,7 @@
package org.openjdk.jmc.jdp.jmx;

/**
* The keys for data exposed by the {@link JMXJDPServer}.
* The keys for data exposed by the JMXJDPServer
*/
public final class JMXDataKeys {
public static final String KEY_JMX_SERVICE_URL = "JMX_SERVICE_URL"; //$NON-NLS-1$
@@ -54,6 +54,7 @@
<module>org.openjdk.jmc.flightrecorder</module>
<module>org.openjdk.jmc.flightrecorder.rules</module>
<module>org.openjdk.jmc.flightrecorder.rules.jdk</module>
<module>org.openjdk.jmc.jdp</module>
<module>tests</module>
<module>coverage</module>
</modules>
@@ -1,5 +1,5 @@
#
# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,26 +35,37 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openjdk.jmc</groupId>
<artifactId>missioncontrol.application.tests</artifactId>
<artifactId>missioncontrol.core.tests</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.openjdk.jmc.jdp.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<artifactId>jdp.test</artifactId>

<properties>
<spotless.config.path>${basedir}/../../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
</properties>

<dependencies>
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>jdp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Djava.net.preferIPv4Stack=true</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*

0 comments on commit 8790592

Please sign in to comment.
You can’t perform that action at this time.