Compare commits
No commits in common. "imports/c8-beta-stream-rhel8/jmc-7.0.0-4.module+el8.1.1+4696+a8c87273" and "c8-stream-rhel8" have entirely different histories.
imports/c8
...
c8-stream-
|
|
@ -1 +1 @@
|
|||
SOURCES/9871e02a9e40.tar.gz
|
||||
SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
f204e02359b91f8158edb5dc2934e6506567bce1 SOURCES/9871e02a9e40.tar.gz
|
||||
d9f36ea4af8af8ecb0328e1188455c64d7f8da5d SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
|
||||
index 775f1d8..979a323 100644
|
||||
--- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
|
||||
+++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
|
||||
@@ -54,7 +54,6 @@
|
||||
@@ -57,7 +57,6 @@ Export-Package: org.openjdk.jmc.rjmx,
|
||||
org.openjdk.jmc.rjmx.triggers;
|
||||
x-friends:="org.openjdk.jmc.console.ui.notification,
|
||||
org.openjdk.jmc.alert,
|
||||
|
|
@ -10,9 +11,10 @@ diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application
|
|||
org.openjdk.jmc.rjmx.triggers.actions.internal;x-friends:="org.openjdk.jmc.console.ui.notification",
|
||||
org.openjdk.jmc.rjmx.triggers.condition.internal;x-friends:="org.openjdk.jmc.console.ui.notification,org.openjdk.jmc.test.jemmy",
|
||||
diff --git a/application/pom.xml b/application/pom.xml
|
||||
index 9f8783a..7aa8842 100644
|
||||
--- a/application/pom.xml
|
||||
+++ b/application/pom.xml
|
||||
@@ -50,7 +50,6 @@
|
||||
@@ -59,7 +59,6 @@
|
||||
<module>org.openjdk.jmc.console.jconsole</module>
|
||||
<module>org.openjdk.jmc.console.pde</module>
|
||||
<module>org.openjdk.jmc.console.persistence</module>
|
||||
|
|
@ -20,7 +22,7 @@ diff --git a/application/pom.xml b/application/pom.xml
|
|||
<module>org.openjdk.jmc.console.ui</module>
|
||||
<module>org.openjdk.jmc.console.ui.diagnostic</module>
|
||||
<module>org.openjdk.jmc.console.ui.mbeanbrowser</module>
|
||||
@@ -72,7 +71,6 @@
|
||||
@@ -81,7 +80,6 @@
|
||||
<module>org.openjdk.jmc.feature.pde</module>
|
||||
<module>org.openjdk.jmc.feature.rcp</module>
|
||||
<module>org.openjdk.jmc.feature.rcp.update</module>
|
||||
|
|
@ -29,17 +31,18 @@ diff --git a/application/pom.xml b/application/pom.xml
|
|||
<module>org.openjdk.jmc.flightrecorder.controlpanel.ui</module>
|
||||
<module>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</module>
|
||||
diff --git a/license/THIRDPARTYREADME.txt b/license/THIRDPARTYREADME.txt
|
||||
index 596a8db..ba7bf83 100644
|
||||
--- a/license/THIRDPARTYREADME.txt
|
||||
+++ b/license/THIRDPARTYREADME.txt
|
||||
@@ -296,191 +296,6 @@
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
@@ -297,187 +297,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
-
|
||||
-%% The following notice is provided with respect to Twitter4J 4.0.7,
|
||||
|
||||
-%% The following notice is provided with respect to Twitter4J v4.0.7,
|
||||
-which may be included with this product.
|
||||
-
|
||||
-
|
||||
- Copyright 2007 Yusuke Yamamoto
|
||||
-
|
||||
- Apache License
|
||||
- Version 2.0, January 2004
|
||||
- http://www.apache.org/licenses/
|
||||
|
|
@ -215,11 +218,7 @@ diff --git a/license/THIRDPARTYREADME.txt b/license/THIRDPARTYREADME.txt
|
|||
- incurred by, or claims asserted against, such Contributor by reason
|
||||
- of your accepting any such warranty or additional liability.
|
||||
-
|
||||
-Twitter4J SUBCOMPONENTS:
|
||||
-
|
||||
-Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
|
||||
-
|
||||
-
|
||||
%% The following notice is provided with respect to JavaBeans Activation
|
||||
Framework (JAF) 1.2.1, which may be included with this product.
|
||||
%% The following notice is provided with respect to D3 v6.1.3, which may
|
||||
be included with this product.
|
||||
|
||||
|
|
@ -1,13 +1,35 @@
|
|||
diff --git a/pom.xml b/pom.xml
|
||||
index 3c27d3b..22ce8b7 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -99,95 +99,6 @@
|
||||
@@ -109,95 +109,6 @@
|
||||
<url>${snapshot.repo}</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
- <profiles>
|
||||
- <profile>
|
||||
- <id>2019-03</id>
|
||||
- <id>2020-12</id>
|
||||
- <build>
|
||||
- <plugins>
|
||||
- <plugin>
|
||||
- <groupId>org.eclipse.tycho</groupId>
|
||||
- <artifactId>target-platform-configuration</artifactId>
|
||||
- <version>${tycho.version}</version>
|
||||
- <configuration>
|
||||
- <target>
|
||||
- <artifact>
|
||||
- <groupId>org.openjdk.jmc</groupId>
|
||||
- <artifactId>platform-definition-2020-12</artifactId>
|
||||
- <version>8.0.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
- </profile>
|
||||
- <profile>
|
||||
- <id>2020-09</id>
|
||||
- <activation>
|
||||
- <activeByDefault>true</activeByDefault>
|
||||
- </activation>
|
||||
|
|
@ -21,8 +43,8 @@ diff --git a/pom.xml b/pom.xml
|
|||
- <target>
|
||||
- <artifact>
|
||||
- <groupId>org.openjdk.jmc</groupId>
|
||||
- <artifactId>platform-definition-2019-03</artifactId>
|
||||
- <version>7.0.0-SNAPSHOT</version>
|
||||
- <artifactId>platform-definition-2020-09</artifactId>
|
||||
- <version>8.0.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
|
|
@ -31,7 +53,7 @@ diff --git a/pom.xml b/pom.xml
|
|||
- </build>
|
||||
- </profile>
|
||||
- <profile>
|
||||
- <id>2018-12</id>
|
||||
- <id>2020-06</id>
|
||||
- <build>
|
||||
- <plugins>
|
||||
- <plugin>
|
||||
|
|
@ -42,8 +64,8 @@ diff --git a/pom.xml b/pom.xml
|
|||
- <target>
|
||||
- <artifact>
|
||||
- <groupId>org.openjdk.jmc</groupId>
|
||||
- <artifactId>platform-definition-2018-12</artifactId>
|
||||
- <version>7.0.0-SNAPSHOT</version>
|
||||
- <artifactId>platform-definition-2020-06</artifactId>
|
||||
- <version>8.0.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
|
|
@ -52,7 +74,7 @@ diff --git a/pom.xml b/pom.xml
|
|||
- </build>
|
||||
- </profile>
|
||||
- <profile>
|
||||
- <id>2018-09</id>
|
||||
- <id>2020-03</id>
|
||||
- <build>
|
||||
- <plugins>
|
||||
- <plugin>
|
||||
|
|
@ -63,29 +85,8 @@ diff --git a/pom.xml b/pom.xml
|
|||
- <target>
|
||||
- <artifact>
|
||||
- <groupId>org.openjdk.jmc</groupId>
|
||||
- <artifactId>platform-definition-2018-09</artifactId>
|
||||
- <version>7.0.0-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
- </profile>
|
||||
- <profile>
|
||||
- <id>photon</id>
|
||||
- <build>
|
||||
- <plugins>
|
||||
- <plugin>
|
||||
- <groupId>org.eclipse.tycho</groupId>
|
||||
- <artifactId>target-platform-configuration</artifactId>
|
||||
- <version>${tycho.version}</version>
|
||||
- <configuration>
|
||||
- <target>
|
||||
- <artifact>
|
||||
- <groupId>org.openjdk.jmc</groupId>
|
||||
- <artifactId>platform-definition-photon</artifactId>
|
||||
- <version>7.0.0-SNAPSHOT</version>
|
||||
- <artifactId>platform-definition-2020-03</artifactId>
|
||||
- <version>8.0.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
index f42eed3..b53c5e5 100644
|
||||
--- a/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
@@ -95,7 +95,7 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.lz4.lz4-java"
|
||||
+ id="lz4-java"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
diff --git a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
|
||||
index cd6d0f9..22638fe 100644
|
||||
--- a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
|
||||
@@ -130,7 +130,7 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.lz4.lz4-java"
|
||||
+ id="lz4-java"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml
|
||||
index 8e0dd86..aba63c8 100644
|
||||
--- a/releng/third-party/pom.xml
|
||||
+++ b/releng/third-party/pom.xml
|
||||
@@ -88,11 +88,6 @@
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>org.lz4:lz4-java:${lz4.version}</id>
|
||||
- <override>true</override>
|
||||
- <instructions>
|
||||
- <Bundle-Name>org.lz4.lz4-java</Bundle-Name>
|
||||
- <Bundle-SymbolicName>org.lz4.lz4-java</Bundle-SymbolicName>
|
||||
- </instructions>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>org.hdrhistogram:HdrHistogram:${hdrhistogram.version}</id>
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
diff --git a/pom.xml b/pom.xml
|
||||
index 329f840..c5f06c9 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -77,7 +77,7 @@
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
- <tycho.version>2.0.0</tycho.version>
|
||||
+ <tycho.version>2.1.0</tycho.version>
|
||||
<maven.buildnumber.version>1.4</maven.buildnumber.version>
|
||||
<maven.deploy.version>2.8.2</maven.deploy.version>
|
||||
<maven.directory.version>0.3.1</maven.directory.version>
|
||||
@@ -144,7 +144,8 @@
|
||||
<artifactId>tycho-compiler-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
- <useProjectSettings>false</useProjectSettings>
|
||||
+ <useProjectSettings>false</useProjectSettings>
|
||||
+ <deriveReleaseCompilerArgumentFromTargetLevel>false</deriveReleaseCompilerArgumentFromTargetLevel>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
@ -0,0 +1,130 @@
|
|||
diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
|
||||
index 9e05408..733fcd4 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
|
||||
@@ -42,80 +42,4 @@
|
||||
</parent>
|
||||
<artifactId>org.openjdk.jmc.flightrecorder.graphview</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
-
|
||||
- <properties>
|
||||
- <download.maven.plugin.version>1.4.2</download.maven.plugin.version>
|
||||
- <download-maven-plugin.phase>process-resources</download-maven-plugin.phase>
|
||||
- <download-maven-plugin.output>${project.basedir}/src/main/resources/jslibs</download-maven-plugin.output>
|
||||
- <spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
|
||||
- <spotless.config.path.js>${basedir}/../../configuration/ide/eclipse/formatting/formattingjs.xml</spotless.config.path.js>
|
||||
- </properties>
|
||||
-
|
||||
- <build>
|
||||
- <plugins>
|
||||
- <plugin>
|
||||
- <groupId>com.googlecode.maven-download-plugin</groupId>
|
||||
- <artifactId>download-maven-plugin</artifactId>
|
||||
- <version>${download.maven.plugin.version}</version>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <id>d3-v5-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://d3js.org/d3.v5.min.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- <skipCache>true</skipCache>
|
||||
- <overwrite>true</overwrite>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>wasm</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/index.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- <skipCache>true</skipCache>
|
||||
- <overwrite>true</overwrite>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>d3-graphviz-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- <skipCache>true</skipCache>
|
||||
- <overwrite>true</overwrite>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>graphvizlib-wasm</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/graphvizlib.wasm</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- <skipCache>true</skipCache>
|
||||
- <overwrite>true</overwrite>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
</project>
|
||||
diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
|
||||
index 1389545..d356c2e 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
|
||||
@@ -85,18 +85,7 @@ import org.openjdk.jmc.ui.misc.DisplayToolkit;
|
||||
public class GraphView extends ViewPart implements ISelectionListener {
|
||||
private static final String HTML_PAGE;
|
||||
static {
|
||||
- String jsD3V5 = "jslibs/d3.v5.min.js";
|
||||
- String jsGraphviz = "jslibs/index.js";
|
||||
- String wasmGraphviz = "jslibs/graphvizlib.wasm";
|
||||
- String jsGraphizD3 = "jslibs/d3-graphviz.js";
|
||||
-
|
||||
- String wasmBase64 = loadBase64FromFile(wasmGraphviz);
|
||||
-
|
||||
- HTML_PAGE = String.format(loadStringFromFile("page.template"), loadLibraries(jsD3V5),
|
||||
- // we inline base64 wasm in the library code to avoid fetching it at runtime
|
||||
- loadStringFromFile(jsGraphviz, "wasmBinaryFile=\"graphvizlib.wasm\";",
|
||||
- "wasmBinaryFile=dataURIPrefix + '" + wasmBase64 + "';"),
|
||||
- loadLibraries(jsGraphizD3));
|
||||
+ HTML_PAGE = String.format(loadStringFromFile("page.template"));
|
||||
}
|
||||
|
||||
private enum ModelState {
|
||||
diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
|
||||
index eb7423a..e424576 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
|
||||
@@ -3,12 +3,13 @@
|
||||
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
- <script>%1$s</script>
|
||||
- <script>%2$s</script>
|
||||
- <script>%3$s</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
+ <script type="text/javascript" src="https://d3js.org/d3.v5.min.js"></script>
|
||||
+ <script type="text/javascript" src="https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/index.js"></script>
|
||||
+ <script type="text/javascript" src="https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js"></script>
|
||||
+ <script type="text/javascript" src="https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/graphvizlib.wasm"></script>
|
||||
<div id="graph" style="text-align: center;"></div>
|
||||
<script type="text/javascript">
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml
|
||||
index 2ebccfb..1cc8aca 100644
|
||||
--- a/application/org.openjdk.jmc.rcp.product/pom.xml
|
||||
+++ b/application/org.openjdk.jmc.rcp.product/pom.xml
|
||||
@@ -74,7 +74,6 @@
|
||||
<rootFolders>
|
||||
<win32>${productName}</win32>
|
||||
<macosx>${productName}.app</macosx>
|
||||
- <linux>${productName}</linux>
|
||||
</rootFolders>
|
||||
</product>
|
||||
</products>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
index 1eb682d..569f7e2 100644
|
||||
--- a/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
@@ -168,7 +168,7 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="com.sun.mail.jakarta.mail"
|
||||
+ id="com.sun.mail.javax.mail"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
|
|
@ -0,0 +1,208 @@
|
|||
diff --git a/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java b/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
|
||||
index a6a2a7c..a252f9e 100644
|
||||
--- a/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
|
||||
+++ b/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
|
||||
@@ -43,7 +43,6 @@ import org.eclipse.jface.action.IToolBarManager;
|
||||
import org.eclipse.jface.dialogs.IMessageProvider;
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
import org.eclipse.jface.resource.JFaceResources;
|
||||
-import org.eclipse.jface.resource.ResourceLocator;
|
||||
import org.eclipse.swt.graphics.Image;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
@@ -54,6 +53,7 @@ import org.eclipse.ui.forms.IManagedForm;
|
||||
import org.eclipse.ui.forms.IMessageManager;
|
||||
import org.eclipse.ui.forms.editor.FormPage;
|
||||
import org.eclipse.ui.forms.widgets.Form;
|
||||
+import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
import org.openjdk.jmc.console.ui.ConsolePlugin;
|
||||
import org.openjdk.jmc.console.ui.editor.IConsolePageContainer;
|
||||
import org.openjdk.jmc.console.ui.editor.IConsolePageStateHandler;
|
||||
@@ -175,7 +175,7 @@ public class ConsoleFormPage extends FormPage implements IConsolePageContainer {
|
||||
String iconName = config.getAttribute(ATTRIBUTE_ICON);
|
||||
if (iconName != null) {
|
||||
String pluginId = config.getDeclaringExtension().getContributor().getName();
|
||||
- ImageDescriptor iconDesc = ResourceLocator.imageDescriptorFromBundle(pluginId, iconName).orElse(null);
|
||||
+ ImageDescriptor iconDesc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconName);
|
||||
if (iconDesc != null) {
|
||||
icon = (Image) JFaceResources.getResources().get(iconDesc);
|
||||
} else {
|
||||
diff --git a/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java b/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
|
||||
index d0be24a..e3f1000 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
|
||||
@@ -38,7 +38,6 @@ import java.util.List;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
-import org.eclipse.jface.resource.ResourceLocator;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.custom.SashForm;
|
||||
import org.eclipse.swt.graphics.Image;
|
||||
@@ -46,6 +45,7 @@ import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.ui.forms.widgets.Form;
|
||||
import org.eclipse.ui.forms.widgets.FormToolkit;
|
||||
import org.eclipse.ui.forms.widgets.Section;
|
||||
+import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
import org.openjdk.jmc.common.IState;
|
||||
import org.openjdk.jmc.common.IWritableState;
|
||||
import org.openjdk.jmc.common.item.Aggregators;
|
||||
@@ -98,8 +98,8 @@ public class JfxPage extends AbstractDataPage {
|
||||
|
||||
@Override
|
||||
public ImageDescriptor getImageDescriptor(IState state) {
|
||||
- return ResourceLocator.imageDescriptorFromBundle("org.openjdk.jmc.flightrecorder.ext.jfx", //$NON-NLS-1$
|
||||
- "icons/pulse.png").orElse(null); //$NON-NLS-1$
|
||||
+ return AbstractUIPlugin.imageDescriptorFromPlugin("org.openjdk.jmc.flightrecorder.ext.jfx", //$NON-NLS-1$
|
||||
+ "icons/pulse.png"); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
|
||||
index a8b76b0..bb57f10 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
|
||||
@@ -69,7 +69,6 @@ import org.eclipse.jface.action.IMenuManager;
|
||||
import org.eclipse.jface.action.IToolBarManager;
|
||||
import org.eclipse.jface.action.Separator;
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
-import org.eclipse.jface.resource.ResourceLocator;
|
||||
import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.swt.SWT;
|
||||
@@ -93,6 +92,7 @@ import org.eclipse.ui.IWorkbenchPart;
|
||||
import org.eclipse.ui.PartInitException;
|
||||
import org.eclipse.ui.PlatformUI;
|
||||
import org.eclipse.ui.part.ViewPart;
|
||||
+import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
import org.openjdk.jmc.common.item.IItemCollection;
|
||||
import org.openjdk.jmc.common.item.ItemCollectionToolkit;
|
||||
import org.openjdk.jmc.common.util.StringToolkit;
|
||||
@@ -490,7 +490,7 @@ public class FlameGraphView extends ViewPart implements ISelectionListener {
|
||||
}
|
||||
|
||||
private static ImageDescriptor flameviewImageDescriptor(String iconName) {
|
||||
- return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, DIR_ICONS + iconName).orElse(null); //$NON-NLS-1$
|
||||
+ return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, DIR_ICONS + iconName); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
private static String getIconBase64(String iconName) {
|
||||
diff --git a/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java b/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
|
||||
index 748cebc..019ce5e 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
|
||||
@@ -39,7 +39,6 @@ import java.util.stream.Stream;
|
||||
import org.eclipse.jface.layout.GridDataFactory;
|
||||
import org.eclipse.jface.layout.GridLayoutFactory;
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
-import org.eclipse.jface.resource.ResourceLocator;
|
||||
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
|
||||
import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.jface.viewers.TreePath;
|
||||
@@ -51,6 +50,7 @@ import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Text;
|
||||
import org.eclipse.ui.forms.widgets.Form;
|
||||
import org.eclipse.ui.forms.widgets.FormToolkit;
|
||||
+import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
import org.openjdk.jmc.common.IState;
|
||||
import org.openjdk.jmc.common.IWritableState;
|
||||
import org.openjdk.jmc.common.item.IItemIterable;
|
||||
@@ -231,7 +231,7 @@ public class MetadataPage extends AbstractDataPage {
|
||||
|
||||
@Override
|
||||
public ImageDescriptor getImageDescriptor(IState state) {
|
||||
- return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, ICON).orElse(null);
|
||||
+ return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, ICON);
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java b/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
|
||||
index bcdf8b9..fff9296 100644
|
||||
--- a/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
|
||||
+++ b/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
|
||||
@@ -39,7 +39,6 @@ import java.util.logging.Logger;
|
||||
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
import org.eclipse.jface.resource.ImageRegistry;
|
||||
-import org.eclipse.jface.resource.ResourceLocator;
|
||||
import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
import org.openjdk.jmc.common.io.IOToolkit;
|
||||
import org.openjdk.jmc.rcp.application.p2.AddRepositoriesJob;
|
||||
@@ -144,6 +143,6 @@ public class ApplicationPlugin extends AbstractUIPlugin {
|
||||
* @return the image descriptor
|
||||
*/
|
||||
public static ImageDescriptor getImageDescriptor(String path) {
|
||||
- return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
|
||||
+ return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
|
||||
}
|
||||
}
|
||||
diff --git a/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java b/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
|
||||
index 6380709..4a66939 100644
|
||||
--- a/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
|
||||
+++ b/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
|
||||
@@ -34,16 +34,16 @@ package org.openjdk.jmc.rjmx.ui.internal;
|
||||
|
||||
import org.eclipse.jface.action.Action;
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
-import org.eclipse.jface.resource.ResourceLocator;
|
||||
import org.eclipse.ui.forms.SectionPart;
|
||||
+import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
import org.openjdk.jmc.ui.misc.MCSectionPart;
|
||||
|
||||
/**
|
||||
* Action for removing a {@link SectionPart} in a {@link SectionPartManager}
|
||||
*/
|
||||
public class RemoveAction extends Action {
|
||||
- private final static ImageDescriptor ICON = ResourceLocator.imageDescriptorFromBundle("org.eclipse.ui", //$NON-NLS-1$
|
||||
- "icons/full/elcl16/close_view.gif").orElse(null); //$NON-NLS-1$
|
||||
+ private final static ImageDescriptor ICON = AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ui", //$NON-NLS-1$
|
||||
+ "icons/full/elcl16/close_view.gif"); //$NON-NLS-1$
|
||||
final private SectionPartManager m_sectionPartmanager;
|
||||
final private MCSectionPart m_part;
|
||||
|
||||
diff --git a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
|
||||
index 5cd717b..d6a19a9 100644
|
||||
--- a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
|
||||
+++ b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
|
||||
@@ -35,7 +35,7 @@ package org.openjdk.jmc.ui;
|
||||
import java.util.MissingResourceException;
|
||||
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
-import org.eclipse.jface.resource.ResourceLocator;
|
||||
+import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
|
||||
/**
|
||||
* Storage for common ImageDescriptors.
|
||||
@@ -177,7 +177,7 @@ public class CoreImages {
|
||||
}
|
||||
|
||||
private static ImageDescriptor createDescriptor(String relPath) {
|
||||
- ImageDescriptor desc = ResourceLocator.imageDescriptorFromBundle(UIPlugin.PLUGIN_ID, relPath).orElse(null);
|
||||
+ ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(UIPlugin.PLUGIN_ID, relPath);
|
||||
if (desc == null) {
|
||||
// FIXME: Throwing an exception has the development time advantage of being very intrusive. For release time, logging might be better.
|
||||
throw new MissingResourceException("Missing image '" + relPath + '\'', ImageDescriptor.class.getName(), //$NON-NLS-1$
|
||||
diff --git a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
|
||||
index de112b0..e04e796 100644
|
||||
--- a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
|
||||
+++ b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
|
||||
@@ -34,7 +34,8 @@ package org.openjdk.jmc.ui.misc;
|
||||
|
||||
import org.eclipse.core.runtime.IAdapterFactory;
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
-import org.eclipse.jface.resource.ResourceLocator;
|
||||
+import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
+
|
||||
import org.openjdk.jmc.ui.common.resource.IImageResource;
|
||||
import org.openjdk.jmc.ui.common.resource.Resource;
|
||||
import org.openjdk.jmc.ui.common.util.AdapterUtil;
|
||||
@@ -49,8 +50,7 @@ public class ImageDescriptorAdapterFactory implements IAdapterFactory {
|
||||
if (imageResource != null) {
|
||||
Resource r = imageResource.getImageResource();
|
||||
if (r != null) {
|
||||
- return adapterType.cast(ResourceLocator
|
||||
- .imageDescriptorFromBundle(r.getPluginId(), r.getResourcePath()).orElse(null));
|
||||
+ return adapterType.cast(AbstractUIPlugin.imageDescriptorFromPlugin(r.getPluginId(), r.getResourcePath()));
|
||||
}
|
||||
}
|
||||
IGraphical g = AdapterUtil.getAdapter(adaptableObject, IGraphical.class);
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
index b53c5e5..1eb682d 100644
|
||||
--- a/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
@@ -62,17 +62,6 @@
|
||||
<import plugin="org.eclipse.e4.core.contexts"/>
|
||||
</requires>
|
||||
|
||||
- <plugin
|
||||
- id="com.make.chromium.cef.win32.win32.x86_64"
|
||||
- os="win32"
|
||||
- ws="win32"
|
||||
- arch="x86_64"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
<plugin
|
||||
id="org.openjdk.jmc.attach"
|
||||
download-size="0"
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
|
||||
index d356c2e..41dff7a 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
|
||||
@@ -38,6 +38,7 @@ import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.text.MessageFormat;
|
||||
+import java.util.Arrays;
|
||||
import java.util.Base64;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
@@ -172,7 +173,7 @@ public class GraphView extends ViewPart implements ISelectionListener {
|
||||
|
||||
private class NodeThresholdSelection extends Action implements IMenuCreator {
|
||||
private Menu menu;
|
||||
- private final List<Pair<String, Integer>> items = List.of(new Pair<>("100", 100), new Pair<>("500", 500),
|
||||
+ private final List<Pair<String, Integer>> items = Arrays.asList(new Pair<>("100", 100), new Pair<>("500", 500),
|
||||
new Pair<>("1000", 1000));
|
||||
|
||||
NodeThresholdSelection() {
|
||||
|
|
@ -1,29 +1,31 @@
|
|||
diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml
|
||||
index 1e295ca..9687dd4 100644
|
||||
--- a/application/org.openjdk.jmc.feature.rcp/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
|
||||
@@ -52,18 +52,10 @@
|
||||
@@ -51,18 +51,10 @@
|
||||
id="org.openjdk.jmc.feature.console"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
- <includes
|
||||
- id="org.openjdk.jmc.feature.rcp.ja"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
- <includes
|
||||
<includes
|
||||
id="org.openjdk.jmc.feature.core"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
- <includes
|
||||
- id="org.openjdk.jmc.feature.rcp.zh_CN"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
- <includes
|
||||
<includes
|
||||
id="org.openjdk.jmc.feature.flightrecorder"
|
||||
version="0.0.0"/>
|
||||
|
||||
@@ -105,24 +97,6 @@
|
||||
@@ -104,24 +96,6 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- <plugin
|
||||
- id="org.openjdk.jmc.rcp.application.ja"
|
||||
- nl="ja_JP,ja"
|
||||
- download-size="0"
|
||||
|
|
@ -41,7 +43,6 @@ diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/o
|
|||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
<plugin
|
||||
id="org.openjdk.jmc.rcp.intro"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/org.openjdk.jmc.feature.ide/feature.xml
|
||||
index 8e2f469a..3544694a 100644
|
||||
--- a/application/org.openjdk.jmc.feature.ide/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.ide/feature.xml
|
||||
@@ -65,11 +65,4 @@
|
||||
@@ -69,11 +69,4 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
|
@ -15,13 +16,14 @@ diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/o
|
|||
</feature>
|
||||
\ No newline at end of file
|
||||
diff --git a/application/pom.xml b/application/pom.xml
|
||||
index adefed26..87cb00c0 100644
|
||||
--- a/application/pom.xml
|
||||
+++ b/application/pom.xml
|
||||
@@ -79,7 +79,6 @@
|
||||
@@ -94,7 +94,6 @@
|
||||
<module>org.openjdk.jmc.flightrecorder.ui</module>
|
||||
<module>org.openjdk.jmc.greychart</module>
|
||||
<module>org.openjdk.jmc.greychart.ui</module>
|
||||
- <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>
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml
|
||||
index 8e6b303..8060da9 100644
|
||||
--- a/application/org.openjdk.jmc.rcp.product/pom.xml
|
||||
+++ b/application/org.openjdk.jmc.rcp.product/pom.xml
|
||||
@@ -141,11 +141,4 @@
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
diff --git a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF
|
||||
index bf02b43..a4d5a67 100644
|
||||
--- a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF
|
||||
+++ b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF
|
||||
@@ -12,7 +12,9 @@
|
||||
@@ -12,7 +12,9 @@ Require-Bundle: org.junit,
|
||||
org.openjdk.jmc.rjmx.services.jfr,
|
||||
org.openjdk.jmc.rjmx,
|
||||
org.openjdk.jmc.common,
|
||||
|
|
@ -1,15 +1,17 @@
|
|||
diff --git a/pom.xml b/pom.xml
|
||||
index 59f292a..2985869 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -116,20 +116,10 @@
|
||||
@@ -117,21 +117,11 @@
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<environments>
|
||||
<environment>
|
||||
- <environment>
|
||||
- <os>win32</os>
|
||||
- <ws>win32</ws>
|
||||
- <arch>x86_64</arch>
|
||||
- </environment>
|
||||
- <environment>
|
||||
<environment>
|
||||
<os>linux</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86_64</arch>
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/application/pom.xml b/application/pom.xml
|
||||
index 6b92b98..34b9077 100644
|
||||
--- a/application/pom.xml
|
||||
+++ b/application/pom.xml
|
||||
@@ -173,11 +173,6 @@
|
||||
<artifactId>flightrecorder.test</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.jacoco</groupId>
|
||||
- <artifactId>jacoco-maven-plugin</artifactId>
|
||||
- <version>0.8.3</version>
|
||||
- </dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
|
|
@ -0,0 +1,185 @@
|
|||
diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml b/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml
|
||||
index 89cc5e9a..d61b28c6 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml
|
||||
@@ -42,94 +42,4 @@
|
||||
</parent>
|
||||
<artifactId>org.openjdk.jmc.flightrecorder.flameview</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
-
|
||||
- <properties>
|
||||
- <download.maven.plugin.version>1.6.0</download.maven.plugin.version>
|
||||
- <download-maven-plugin.phase>process-resources</download-maven-plugin.phase>
|
||||
- <download-maven-plugin.output>${project.basedir}/src/main/resources/jslibs</download-maven-plugin.output>
|
||||
- <spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
|
||||
- <spotless.config.path.js>${basedir}/../../configuration/ide/eclipse/formatting/formattingjs.xml</spotless.config.path.js>
|
||||
- </properties>
|
||||
-
|
||||
- <build>
|
||||
- <plugins>
|
||||
- <plugin>
|
||||
- <groupId>com.googlecode.maven-download-plugin</groupId>
|
||||
- <artifactId>download-maven-plugin</artifactId>
|
||||
- <version>${download.maven.plugin.version}</version>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <id>d3-flamegraph-css</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.css</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>d3-v6-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://d3js.org/d3.v6.min.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>d3-flamegraph-tooltip-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph-tooltip.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>d3-flamegraph-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- </plugin>
|
||||
- <!-- The formatter currently dislikes the javascript for some reason, but this is how to enable JavaScript formatting
|
||||
- <plugin>
|
||||
- <groupId>com.diffplug.spotless</groupId>
|
||||
- <artifactId>spotless-maven-plugin</artifactId>
|
||||
- <version>${spotless.version}</version>
|
||||
- <configuration>
|
||||
- <formats>
|
||||
- <format>
|
||||
- <includes>
|
||||
- <include>src/main/js/*.js</include>
|
||||
- </includes>
|
||||
- <eclipseWtp>
|
||||
- <type>JS</type>
|
||||
- <files>
|
||||
- <file>${spotless.config.path.js}</file>
|
||||
- </files>
|
||||
- </eclipseWtp>
|
||||
- </format>
|
||||
- </formats>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- -->
|
||||
- </plugins>
|
||||
- </build>
|
||||
</project>
|
||||
diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
|
||||
index dc43ba8c..a8b76b0c 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
|
||||
@@ -61,7 +61,6 @@ import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ThreadFactory;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.logging.Level;
|
||||
-import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.eclipse.jface.action.Action;
|
||||
@@ -120,27 +119,17 @@ public class FlameGraphView extends ViewPart implements ISelectionListener {
|
||||
private static final String TOOLTIP_DESCRIPTION = getFlameviewMessage(FLAMEVIEW_SELECT_HTML_TOOLTIP_DESCRIPTION);
|
||||
private static final String HTML_PAGE;
|
||||
static {
|
||||
- // from: https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.css
|
||||
- String cssD3Flamegraph = "jslibs/d3-flamegraph.css";
|
||||
- // from: https://d3js.org/d3.v6.min.js
|
||||
- String jsD3V6 = "jslibs/d3.v6.min.js";
|
||||
- // from: https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph-tooltip.js
|
||||
- String jsD3Tip = "jslibs/d3-flamegraph-tooltip.js";
|
||||
- // from: https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.js
|
||||
- String jsD3FlameGraph = "jslibs/d3-flamegraph.js";
|
||||
- // jmc flameview coloring, tooltip and other functions
|
||||
String jsFlameviewName = "flameview.js";
|
||||
String cssFlameview = "flameview.css";
|
||||
|
||||
- String jsD3 = loadLibraries(jsD3V6, jsD3FlameGraph, jsD3Tip);
|
||||
- String styleheets = loadLibraries(cssD3Flamegraph, cssFlameview);
|
||||
+ String styleheets = fileContent(cssFlameview);
|
||||
String jsFlameviewColoring = fileContent(jsFlameviewName);
|
||||
|
||||
String magnifierIcon = getIconBase64(ImageConstants.ICON_MAGNIFIER);
|
||||
|
||||
// formatter arguments for the template: %1 - CSSs stylesheets,
|
||||
- // %2 - Search Icon Base64, %3 - 3rd party scripts, %4 - Flameview Coloring,
|
||||
- HTML_PAGE = String.format(fileContent("page.template"), styleheets, magnifierIcon, jsD3, jsFlameviewColoring);
|
||||
+ // %2 - Search Icon Base64, %3 - Flameview Coloring,
|
||||
+ HTML_PAGE = String.format(fileContent("page.template"), styleheets, magnifierIcon, jsFlameviewColoring);
|
||||
}
|
||||
|
||||
private static final int MODEL_EXECUTOR_THREADS_NUMBER = 3;
|
||||
@@ -490,14 +479,6 @@ public class FlameGraphView extends ViewPart implements ISelectionListener {
|
||||
}
|
||||
}
|
||||
|
||||
- private static String loadLibraries(String ... libs) {
|
||||
- if (libs == null || libs.length == 0) {
|
||||
- return "";
|
||||
- } else {
|
||||
- return Stream.of(libs).map(FlameGraphView::fileContent).collect(Collectors.joining("\n"));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
private static String fileContent(String fileName) {
|
||||
try {
|
||||
return StringToolkit.readString(FlameGraphView.class.getClassLoader().getResourceAsStream(fileName));
|
||||
diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template
|
||||
index 67bc3c75..a01571d9 100644
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
+ <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.css"></link>
|
||||
<style type="text/css">%1$s</style>
|
||||
<style type="text/css" media="print">
|
||||
body {
|
||||
@@ -21,12 +22,12 @@
|
||||
<img src="data:image/png;base64, %2$s" width="12" height="12">
|
||||
</div>
|
||||
<div id="chart"></div>
|
||||
+ <script type="text/javascript" src="https://d3js.org/d3.v6.min.js"></script>
|
||||
+ <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.js"></script>
|
||||
+ <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph-tooltip.js"></script>
|
||||
<script type="text/javascript">
|
||||
%3$s
|
||||
</script>
|
||||
- <script type="text/javascript">
|
||||
- %4$s
|
||||
- </script>
|
||||
<script type="text/javascript">
|
||||
|
||||
const minSearchTextSize = 3;
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/application/org.openjdk.jmc.rcp.product/jmc.product b/application/org.openjdk.jmc.rcp.product/jmc.product
|
||||
index 54b2590..ba10585 100644
|
||||
--- a/application/org.openjdk.jmc.rcp.product/jmc.product
|
||||
+++ b/application/org.openjdk.jmc.rcp.product/jmc.product
|
||||
@@ -56,8 +56,7 @@
|
||||
</programArgsMac>
|
||||
<programArgsWin>
|
||||
</programArgsWin>
|
||||
- <vmArgs>-XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:FlightRecorderOptions=stackdepth=128 -XX:+FlightRecorder -XX:StartFlightRecording=name=JMC_Default,maxsize=100m -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED
|
||||
- -Dsun.java.command=JMC
|
||||
+ <vmArgs>-XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED
|
||||
</vmArgs>
|
||||
<vmArgsLin>--add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED
|
||||
</vmArgsLin>
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
# HG changeset patch
|
||||
# Parent 9696af3e434734700a8c37680ce3742ab940eccb
|
||||
|
||||
diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
--- a/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.core/feature.xml
|
||||
@@ -161,13 +161,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="com.sun.mail.jakarta.mail"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="com.sun.activation.jakarta.activation"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -175,7 +168,7 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="javax.mail.dsn"
|
||||
+ id="com.sun.mail.javax.mail"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
diff --git a/application/org.openjdk.jmc.osgi.extension/.project b/application/org.openjdk.jmc.osgi.extension/.project
|
||||
--- a/application/org.openjdk.jmc.osgi.extension/.project
|
||||
+++ b/application/org.openjdk.jmc.osgi.extension/.project
|
||||
@@ -20,8 +20,14 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
+ <buildCommand>
|
||||
+ <name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
+ <arguments>
|
||||
+ </arguments>
|
||||
+ </buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
diff --git a/releng/platform-definitions/platform-definition-2018-09/.project b/releng/platform-definitions/platform-definition-2018-09/.project
|
||||
--- a/releng/platform-definitions/platform-definition-2018-09/.project
|
||||
+++ b/releng/platform-definitions/platform-definition-2018-09/.project
|
||||
@@ -5,7 +5,13 @@
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
+ <buildCommand>
|
||||
+ <name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
+ <arguments>
|
||||
+ </arguments>
|
||||
+ </buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/application/org.openjdk.jmc.rjmx/src/main/resources/org/openjdk/jmc/rjmx/messages/internal/messages.properties b/application/org.openjdk.jmc.rjmx/src/main/resources/org/openjdk/jmc/rjmx/messages/internal/messages.properties
|
||||
--- a/application/org.openjdk.jmc.rjmx/src/main/resources/org/openjdk/jmc/rjmx/messages/internal/messages.properties
|
||||
+++ b/application/org.openjdk.jmc.rjmx/src/main/resources/org/openjdk/jmc/rjmx/messages/internal/messages.properties
|
||||
@@ -54,7 +54,7 @@
|
||||
JVMSupport_FLIGHT_RECORDER_NOT_FULLY_SUPPORTED_OLD_HOTSPOT_SHORT=Flight Recorder is not fully supported for JVMs with Java versions below 7u40
|
||||
JVMSupport_FLIGHT_RECORDER_NOT_SUPPORTED_NOT_HOTSPOT=Flight Recorder is not supported for non HotSpot JVMs
|
||||
JVMSupport_FLIGHT_RECORDER_NOT_SUPPORTED_NOT_HOTSPOT_SHORT=Flight Recorder is not supported for non HotSpot JVMs
|
||||
-JVMSupport_FLIGHT_RECORDER_NOT_ENABLED=Flight Recorder features are not enabled. To enable this you need to use a Java 7u4 or later JVM started with -XX:+UnlockCommercialFeatures -XX:+FlightRecorder.
|
||||
+JVMSupport_FLIGHT_RECORDER_NOT_ENABLED=Flight Recorder features are not enabled. To enable this the target application needs to use OpenJDK 11+ or Oracle Java 7u4+ started with -XX:+UnlockCommercialFeatures -XX:+FlightRecorder.
|
||||
JVMSupport_FLIGHT_RECORDER_NOT_ENABLED_SHORT=Flight Recorder features are not enabled
|
||||
JVMSupport_FLIGHT_RECORDER_DISABLED=Flight Recorder is explicitly disabled. To enable the Flight Recorder, remove -XX:-FlightRecorder from the command line.
|
||||
JVMSupport_FLIGHT_RECORDER_DISABLED_SHORT=Flight Recorder is explicitly disabled
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
diff --git a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
|
||||
--- a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
|
||||
+++ b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
|
||||
@@ -10,7 +10,7 @@
|
||||
Require-Bundle: org.openjdk.jmc.rjmx.ui;visibility:=reexport,
|
||||
org.eclipse.e4.core.contexts;bundle-version="1.3.0",
|
||||
org.eclipse.e4.core.di;bundle-version="1.3.0";visibility:=reexport,
|
||||
- javax.annotation;bundle-version="1.0.0";visibility:=reexport,
|
||||
+ javax.annotation-api;bundle-version="1.2.0";visibility:=reexport,
|
||||
javax.inject;bundle-version="1.0.0";visibility:=reexport,
|
||||
org.openjdk.jmc.commands
|
||||
Bundle-ActivationPolicy: lazy
|
||||
@@ -22,7 +22,7 @@
|
||||
org.openjdk.jmc.console.ui.editor,
|
||||
org.openjdk.jmc.console.ui.editor.internal;x-friends:="org.openjdk.jmc.console.ui.mbeanbrowser,org.openjdk.jmc.rcp.intro"
|
||||
Bundle-ClassPath: .
|
||||
-Import-Package: javax.annotation;version="1.0.0",
|
||||
+Import-Package: javax.annotation;version="1.2.0",
|
||||
javax.inject;version="1.0.0"
|
||||
Automatic-Module-Name: org.openjdk.jmc.console.ui
|
||||
|
||||
diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml
|
||||
--- a/application/org.openjdk.jmc.feature.rcp/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
|
||||
@@ -84,7 +84,8 @@
|
||||
<import plugin="org.eclipse.ui.intro"/>
|
||||
<import plugin="org.eclipse.ui.net"/>
|
||||
<import plugin="org.eclipse.equinox.event"/>
|
||||
- <import plugin="javax.el"/>
|
||||
+ <import plugin="javax.el-api"/>
|
||||
+ <import plugin="jakarta.activation-api"/>
|
||||
<import plugin="org.eclipse.equinox.p2.director.app"/>
|
||||
</requires>
|
||||
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
diff --git a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
|
||||
--- a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
|
||||
@@ -94,13 +94,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.openjdk.jmc.javafx.osgi"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.openjdk.jmc.flightrecorder.rules.extensionprovider"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
|
||||
@@ -9,7 +9,6 @@
|
||||
Require-Bundle: org.openjdk.jmc.rjmx,
|
||||
org.openjdk.jmc.flightrecorder;visibility:=reexport,
|
||||
org.openjdk.jmc.ui;visibility:=reexport,
|
||||
- org.openjdk.jmc.javafx.osgi,
|
||||
org.openjdk.jmc.flightrecorder.rules,
|
||||
org.openjdk.jmc.flightrecorder.rules.jdk,
|
||||
org.openjdk.jmc.flightrecorder.configuration,
|
||||
diff --git a/application/pom.xml b/application/pom.xml
|
||||
--- a/application/pom.xml
|
||||
+++ b/application/pom.xml
|
||||
@@ -61,12 +61,10 @@
|
||||
<module>org.openjdk.jmc.feature.core</module>
|
||||
<module>org.openjdk.jmc.feature.flightrecorder</module>
|
||||
<module>org.openjdk.jmc.feature.flightrecorder.ext.g1</module>
|
||||
- <module>org.openjdk.jmc.feature.flightrecorder.ext.jfx</module>
|
||||
<module>org.openjdk.jmc.feature.flightrecorder.metadata</module>
|
||||
<module>org.openjdk.jmc.feature.ide</module>
|
||||
<module>org.openjdk.jmc.feature.ide.launch</module>
|
||||
<module>org.openjdk.jmc.feature.jconsole</module>
|
||||
- <module>org.openjdk.jmc.feature.joverflow</module>
|
||||
<module>org.openjdk.jmc.feature.license</module>
|
||||
<module>org.openjdk.jmc.feature.pde</module>
|
||||
<module>org.openjdk.jmc.feature.rcp</module>
|
||||
@@ -75,7 +73,6 @@
|
||||
<module>org.openjdk.jmc.flightrecorder.controlpanel.ui</module>
|
||||
<module>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</module>
|
||||
<module>org.openjdk.jmc.flightrecorder.ext.g1</module>
|
||||
- <module>org.openjdk.jmc.flightrecorder.ext.jfx</module>
|
||||
<module>org.openjdk.jmc.flightrecorder.metadata</module>
|
||||
<module>org.openjdk.jmc.flightrecorder.pde</module>
|
||||
<module>org.openjdk.jmc.flightrecorder.rules.extensionprovider</module>
|
||||
@@ -85,10 +82,7 @@
|
||||
<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.javafx.osgi</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>
|
||||
<module>org.openjdk.jmc.pde</module>
|
||||
<module>org.openjdk.jmc.rcp.application</module>
|
||||
diff --git a/application/tests/pom.xml b/application/tests/pom.xml
|
||||
--- a/application/tests/pom.xml
|
||||
+++ b/application/tests/pom.xml
|
||||
@@ -48,7 +48,6 @@
|
||||
<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>
|
||||
<module>org.openjdk.jmc.ui.common.test</module>
|
||||
|
|
@ -20,34 +20,20 @@ function _sym {
|
|||
echo "linking $1 to $2"
|
||||
rm -rf $1
|
||||
ln -s $2 $1
|
||||
else
|
||||
else
|
||||
echo "Failed to find $1"
|
||||
ls -l
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
pushd $1
|
||||
# owasp-java-encoder
|
||||
_sym org.owasp.encoder_1.2.2.jar /usr/share/java/owasp-java-encoder/encoder.jar
|
||||
# jaf
|
||||
_sym com.sun.activation.jakarta.activation_1.2.1.jar /usr/share/java/jaf/jakarta.activation.jar
|
||||
_sym jakarta.activation-api_1.2.1.jar /usr/share/java/jaf/jakarta.activation-api.jar
|
||||
# jmc-core
|
||||
_sym org.openjdk.jmc.common_7.0.0.jar /usr/share/java/jmc-core/common.jar
|
||||
_sym org.openjdk.jmc.flightrecorder_7.0.0.jar /usr/share/java/jmc-core/flightrecorder.jar
|
||||
_sym org.openjdk.jmc.flightrecorder.rules_7.0.0.jar /usr/share/java/jmc-core/flightrecorder.rules.jar
|
||||
_sym org.openjdk.jmc.flightrecorder.rules.jdk_7.0.0.jar /usr/share/java/jmc-core/flightrecorder.rules.jdk.jar
|
||||
popd
|
||||
|
||||
function _symlink {
|
||||
_f=$(ls | grep -e "^$1" || :)
|
||||
if [ -n "$_f" ] ; then
|
||||
rm -rf $_f
|
||||
for SCL_JAVA_DIR in ${SCL_JAVA_DIRS}; do
|
||||
if [ -f ${SCL_JAVA_DIR}/$2 ]; then
|
||||
echo "found ${SCL_JAVA_DIR}/$2"
|
||||
echo "linking $1 to $2"
|
||||
echo "linking ${_f%.jar}.jar to ${SCL_JAVA_DIR}/$2"
|
||||
ln -s ${SCL_JAVA_DIR}/$2 ${_f%.jar}.jar
|
||||
return 0
|
||||
fi
|
||||
|
|
@ -57,26 +43,16 @@ function _symlink {
|
|||
fi
|
||||
}
|
||||
|
||||
# pushd $1
|
||||
# _symlink javax.annotation-api_ glassfish-annotation-api.jar
|
||||
|
||||
# _symlink com.sun.el.javax.el_ glassfish-el.jar
|
||||
# _symlink javax.el-api_ glassfish-el-api.jar
|
||||
|
||||
# _symlink javax.inject_ atinject.jar
|
||||
|
||||
# _symlink javax.servlet.jsp_ glassfish-jsp-api/javax.servlet.jsp-api.jar
|
||||
# _symlink javax.servlet-api_ glassfish-servlet-api.jar
|
||||
|
||||
# _symlink org.apache.commons.codec_ commons-codec.jar
|
||||
# _symlink org.apache.commons.io_ commons-io.jar
|
||||
# _symlink org.apache.commons.jxpath_ commons-jxpath.jar
|
||||
# _symlink org.apache.commons.logging_ commons-logging.jar
|
||||
|
||||
# _symlink org.apache.httpcomponents.httpcore_ httpcomponents/httpcore.jar
|
||||
# _symlink org.apache.httpcomponents.httpclient_ httpcomponents/httpclient.jar
|
||||
|
||||
# _symlink org.tukaani.xz_ xz-java.jar
|
||||
# _symlink org.w3c.dom.svg_ xml-commons-apis-ext.jar
|
||||
# _symlink org.xmlpull_ xpp3.jar
|
||||
# popd
|
||||
pushd $1
|
||||
# owasp-java-encoder
|
||||
_sym org.owasp.encoder_1.2.2.jar /usr/share/java/owasp-java-encoder/encoder.jar
|
||||
# jakarta-activation
|
||||
_sym com.sun.activation.jakarta.activation_1.2.1.jar /usr/share/java/jaf/jakarta.activation.jar
|
||||
# HdrHistogram
|
||||
_sym org.hdrhistogram.HdrHistogram_2.1.11.jar /usr/share/java/HdrHistogram.jar
|
||||
# jmc-core
|
||||
_symlink org.openjdk.jmc.common_ common.jar
|
||||
_symlink org.openjdk.jmc.flightrecorder_ flightrecorder.jar
|
||||
_symlink org.openjdk.jmc.flightrecorder.rules_ flightrecorder.rules.jar
|
||||
_symlink org.openjdk.jmc.flightrecorder.rules.jdk_ flightrecorder.rules.jdk.jar
|
||||
popd
|
||||
147
SPECS/jmc.spec
147
SPECS/jmc.spec
|
|
@ -1,19 +1,18 @@
|
|||
# Version
|
||||
%global major 7
|
||||
%global major 8
|
||||
%global minor 0
|
||||
%global patchlevel 0
|
||||
%global patchlevel 1
|
||||
|
||||
# Revision
|
||||
%global revnum 4
|
||||
|
||||
# set to 1 for hg snapshots, 0 for release
|
||||
# set to 1 for snapshots, 0 for release
|
||||
%global usesnapshot 0
|
||||
|
||||
# SNAPSHOT version
|
||||
%global hgrevhash 9871e02a9e40
|
||||
%global hgrevdate 20190528
|
||||
%global revhash 699a121bd449fe8a9350221282bd3f809691a766
|
||||
%global revdate 20210623
|
||||
|
||||
%global tarball_name jmc7-%{hgrevhash}
|
||||
%global tarball_name jmc-%{revhash}
|
||||
|
||||
# Install jmc in /usr/lib/jmc (arch-specific and multilib exempt)
|
||||
%global _jmcdir %{_prefix}/lib/%{name}
|
||||
|
|
@ -21,7 +20,7 @@
|
|||
%global debug_package %{nil}
|
||||
|
||||
%if %{usesnapshot}
|
||||
%global releasestr %{revnum}.%{hgrevdate}hg%{hgrevhash}
|
||||
%global releasestr %{revnum}.%{revdate}
|
||||
%else
|
||||
%global releasestr %{revnum}
|
||||
%endif
|
||||
|
|
@ -51,53 +50,72 @@ Summary: JDK Mission Control is a profiling and diagnostics tool
|
|||
License: UPL
|
||||
URL: http://openjdk.java.net/projects/jmc/
|
||||
|
||||
Source0: https://hg.openjdk.java.net/jmc/jmc7/archive/9871e02a9e40.tar.gz
|
||||
Source0: https://github.com/openjdk/jmc/archive/%{revhash}.tar.gz
|
||||
Source1: %{name}.desktop
|
||||
Source2: %{name}.1
|
||||
Source3: symlink_libs.sh
|
||||
|
||||
# Remove optional twitter related functionality
|
||||
Patch0: remove-twitter.patch
|
||||
# Update javax dependency names to match what is found in Fedora
|
||||
Patch1: javax.patch
|
||||
Patch0: 0-remove-twitter.patch
|
||||
# Remove maven build profiles that won't be used in local build
|
||||
Patch2: remove-profiles.patch
|
||||
Patch1: 1-remove-profiles.patch
|
||||
# Remove localization files that currently cannot be supported
|
||||
# due to a packaging issue for Eclipse language packs
|
||||
# eclipse-nls-ja and eclipse-nls-zh
|
||||
# They currently provide multiple archs within the same package
|
||||
# and the local build system cannot fulfill dependencies from them
|
||||
Patch3: remove-localization.patch
|
||||
# Remove optional openjfx related functionality
|
||||
Patch4: remove-jfx.patch
|
||||
Patch2: 2-remove-localization.patch
|
||||
# Remove unused module org.openjdk.jmc.ide.jdt
|
||||
Patch5: remove-ide-jdt.patch
|
||||
Patch3: 3-remove-ide-jdt.patch
|
||||
# Remove unused remote repository definition
|
||||
Patch6: remove-buchen-repo.patch
|
||||
Patch4: 4-remove-buchen-repo.patch
|
||||
# Add dependency on org. hamcrest-core to provide class used in unit tests
|
||||
Patch7: add-hamcrest.patch
|
||||
Patch5: 5-add-hamcrest.patch
|
||||
# Remove windows and mac arches
|
||||
Patch8: remove-arch.patch
|
||||
# Updates message for Java versions that support JFR
|
||||
Patch9: fix-jfr-message.patch
|
||||
# Fix javamail plugin listing
|
||||
Patch10: fix-javamail.patch
|
||||
Patch6: 6-remove-arch.patch
|
||||
# Remove unnecessary dependency
|
||||
Patch7: 7-remove-jacoco-dep.patch
|
||||
# Revert downloading of flameview assets from the web
|
||||
Patch8: 8-revert-flameview.patch
|
||||
# Drop JFR flags (temporary)
|
||||
Patch9: 9-update-flags.patch
|
||||
# Revert the adjusted lz4-java name as seen in jmc
|
||||
Patch10: 10-revert-lz4-java-name-override.patch
|
||||
# Patch pom.xml Use to tycho version 2.1
|
||||
Patch11: 11-tycho.patch
|
||||
# Revert downloading of graphview assets from the web
|
||||
Patch12: 12-revert-graphview.patch
|
||||
# Simplify the path to the jmc product
|
||||
Patch13: 13-revert-6852.patch
|
||||
# Update javamail dependency names
|
||||
Patch14: 14-fix-javamail.patch
|
||||
# Revert usage of ResourceLocator as it isn't available in Eclipse 4.12
|
||||
Patch15: 15-revert-resourcelocator.patch
|
||||
# Remove Chromium (currently Windows-only) from the plugin list
|
||||
Patch16: 16-remove-chromium.patch
|
||||
# Revert usage of List.of in GraphView
|
||||
Patch17: 17-revert-list-of.patch
|
||||
|
||||
ExclusiveArch: x86_64
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: java-11-openjdk
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: osgi(javax.annotation-api)
|
||||
|
||||
BuildRequires: eclipse-pde
|
||||
BuildRequires: tycho
|
||||
|
||||
BuildRequires: HdrHistogram >= 2.1.11
|
||||
BuildRequires: javamail
|
||||
BuildRequires: mvn(org.commonjava.maven.plugins:directory-maven-plugin)
|
||||
BuildRequires: mvn(com.sun.activation:jakarta.activation)
|
||||
BuildRequires: mvn(org.openjdk.jmc:common)
|
||||
BuildRequires: osgi(org.openjdk.jmc.flightrecorder.test)
|
||||
BuildRequires: osgi(javax.annotation-api)
|
||||
|
||||
Requires: java-openjdk >= 1:1.8
|
||||
Requires: lz4-java
|
||||
|
||||
Requires: osgi(com.sun.activation.jakarta.activation)
|
||||
Requires: osgi(org.openjdk.jmc.common)
|
||||
|
|
@ -105,6 +123,7 @@ Requires: osgi(org.openjdk.jmc.flightrecorder)
|
|||
Requires: osgi(org.openjdk.jmc.flightrecorder.rules)
|
||||
Requires: osgi(org.openjdk.jmc.flightrecorder.rules.jdk)
|
||||
Requires: osgi(org.owasp.encoder)
|
||||
Requires: osgi(org.hdrhistogram.HdrHistogram) >= 2.1.11
|
||||
|
||||
Requires: gtk3
|
||||
Requires: webkitgtk4
|
||||
|
|
@ -131,15 +150,30 @@ applications running locally or deployed in production environments.
|
|||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
|
||||
%pom_disable_module releng
|
||||
%pom_disable_module l10n application
|
||||
%pom_disable_module org.openjdk.jmc.updatesite.ide application
|
||||
%pom_disable_module org.openjdk.jmc.updatesite.rcp application
|
||||
|
||||
# disable tests that require the use of jfr
|
||||
%pom_disable_module org.openjdk.jmc.rjmx.services.jfr.test application/tests
|
||||
%pom_disable_module org.openjdk.jmc.flightrecorder.controlpanel.ui.test application/tests
|
||||
|
||||
%pom_remove_plugin com.github.spotbugs:spotbugs-maven-plugin
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
|
||||
%pom_remove_plugin :jacoco-maven-plugin application/tests
|
||||
%pom_remove_plugin :jacoco-maven-plugin application/uitests
|
||||
%pom_disable_module coverage application
|
||||
|
||||
# Info.plist are mac files and we only build for Linux
|
||||
%pom_remove_plugin name.abuchen:fix-info-plist-maven-plugin application/org.openjdk.jmc.rcp.product
|
||||
|
||||
|
|
@ -150,9 +184,10 @@ TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></
|
|||
%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV"
|
||||
|
||||
%build
|
||||
|
||||
# some tests require large heap and fail with OOM
|
||||
# depending on the builder resources
|
||||
%mvn_build -j -- -Dmaven.test.failure.ignore=true
|
||||
%mvn_build -j -- -Dmaven.test.failure.ignore=true -DbuildId=rhel -DbuildNumber=%{revhash} -Dbuild.date=%{revdate}
|
||||
|
||||
%install
|
||||
|
||||
|
|
@ -180,7 +215,7 @@ install -d -m 755 %{buildroot}%{_bindir}
|
|||
ln -s %{_jmcdir}/%{name} %{buildroot}%{_bindir}/%{name}
|
||||
|
||||
# replace jars with symlinks to installed libraries
|
||||
bash %{SOURCE3} %{buildroot}%{_jmcdir}/plugins %{_javadir} %{_jnidir} %{_javadir_maven} %{_jnidir_maven}
|
||||
bash %{SOURCE3} %{buildroot}%{_jmcdir}/plugins %{_javadir} %{_jnidir} %{_javadir_maven} %{_jnidir_maven} %{_javadir}/jmc-core
|
||||
|
||||
# create application launcher in desktop menu
|
||||
install -d -m 755 %{buildroot}%{_datadir}/pixmaps
|
||||
|
|
@ -210,11 +245,69 @@ sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini" %{buildroot}%{_mandir}/man1/
|
|||
%{_datadir}/applications/%{name}.desktop
|
||||
|
||||
%changelog
|
||||
* Tue Oct 05 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-4
|
||||
- Rebuild with updated dependencies
|
||||
|
||||
* Thu Aug 26 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-3
|
||||
- Bump version to build with updated tycho
|
||||
|
||||
* Wed Aug 19 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-2
|
||||
- Re-set the buildId, buildNumber, and build.date during maven build
|
||||
|
||||
* Tue Aug 10 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-1
|
||||
- Update to jmc 8.0.1-ga
|
||||
|
||||
* Tue Aug 10 2021 Alex Macdonald <almacdon@redhat.com> - 8.1.0-1
|
||||
- Update to jmc-ga tagged commit d0f89f0
|
||||
|
||||
* Wed Feb 24 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-8
|
||||
- Set the buildId, buildNumber, and build.date during maven build
|
||||
|
||||
* Fri Feb 19 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-7
|
||||
- Fix incorrect macro for name
|
||||
|
||||
* Fri Feb 19 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-6
|
||||
- Revert previous JAVA_HOME export
|
||||
- Add patch to remove use of List.of in GraphView
|
||||
|
||||
* Fri Feb 19 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-5
|
||||
- Export JAVA_HOME to be openjdk 11
|
||||
|
||||
* Thu Feb 18 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-4
|
||||
- Revert usage of ResourceLocator to be eclipse 4.12 compliant
|
||||
|
||||
* Wed Feb 17 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-3
|
||||
- Revert removal of fix-javamail patch
|
||||
|
||||
* Wed Feb 17 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-2
|
||||
- Revert osgi reference from jakarta.annotation to javax.annotation
|
||||
|
||||
* Fri Feb 12 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-1
|
||||
- Update to jmc8 branch commit 8ab40bf
|
||||
|
||||
* Thu Apr 23 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-5
|
||||
- Update jacoco removal patch
|
||||
|
||||
* Thu Apr 23 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-4
|
||||
- Update to latest commit e67446b5fc9d
|
||||
|
||||
* Fri Apr 17 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-3
|
||||
- include jmc-core in the directories to search in symlink_libs.sh
|
||||
|
||||
* Fri Apr 17 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-2
|
||||
- Remove jacoco from the pom and disable coverage
|
||||
|
||||
* Thu Apr 16 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-1
|
||||
- Updated to version 7.1.1
|
||||
|
||||
* Thu Nov 14 2019 Jie Kang <jkang@redhat.com> - 7.0.0-4
|
||||
- Fix requires
|
||||
|
||||
* Wed Nov 13 2019 Jie Kang <jkang@redhat.com> - 7.0.0-3
|
||||
- Fix exclusions
|
||||
|
||||
* Wed Nov 13 2019 Jie Kang <jkang@redhat.com> - 7.0.0-2
|
||||
- Update require and provide exclusions
|
||||
|
||||
* Tue Mar 12 2019 Jie Kang <jkang@redhat.com> - 7.0.0-1
|
||||
- Initial package
|
||||
|
|
|
|||
Loading…
Reference in New Issue