re-import sources as agreed with the maintainer
This commit is contained in:
Adam Samalik
parent
8fc5ae8e1c
commit
33528701dc
|
|
@ -1,2 +1,6 @@
|
|||
SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz
|
||||
/9871e02a9e40.tar.gz
|
||||
/9c1257c91ebf.tar.gz
|
||||
/e67446b5fc9d.tar.gz
|
||||
/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz
|
||||
/d0f89f0aa00c1dca2cc89712091d938454a16ff3.tar.gz
|
||||
/699a121bd449fe8a9350221282bd3f809691a766.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,358 +0,0 @@
|
|||
# HG changeset patch
|
||||
# Parent 37a493c3f60b2015c37630807015b217b98106cf
|
||||
|
||||
diff -r 37a493c3f60b -r bbf0648beb5c application/org.openjdk.jmc.flightrecorder.flameview/.classpath
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/.classpath Tue Nov 12 16:25:24 2019 +0100
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/.classpath Mon Nov 25 17:57:23 2019 -0500
|
||||
@@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src/main/java"/>
|
||||
- <classpathentry kind="src" path="src/main/resources"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
diff -r 37a493c3f60b -r bbf0648beb5c application/org.openjdk.jmc.flightrecorder.flameview/build.properties
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/build.properties Tue Nov 12 16:25:24 2019 +0100
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/build.properties Mon Nov 25 17:57:23 2019 -0500
|
||||
@@ -1,5 +1,4 @@
|
||||
-source.. = src/main/java/,\
|
||||
- src/main/resources/
|
||||
+source.. = src/main/java/
|
||||
output.. = target/classes/
|
||||
bin.includes = META-INF/,\
|
||||
.,\
|
||||
diff -r 37a493c3f60b -r bbf0648beb5c application/org.openjdk.jmc.flightrecorder.flameview/pom.xml
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml Tue Nov 12 16:25:24 2019 +0100
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml Mon Nov 25 17:57:23 2019 -0500
|
||||
@@ -41,94 +41,4 @@
|
||||
</parent>
|
||||
<artifactId>org.openjdk.jmc.flightrecorder.flameview</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>
|
||||
- </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/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-flamegraph.css</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>ie-html5shiv-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>ie-respond-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://oss.maxcdn.com/respond/1.4.2/respond.min.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>d3-v4-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://d3js.org/d3.v4.min.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- <execution>
|
||||
- <id>d3-tip-js</id>
|
||||
- <phase>${download-maven-plugin.phase}</phase>
|
||||
- <goals>
|
||||
- <goal>wget</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <url>https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.9.1/d3-tip.min.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/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-flamegraph.min.js</url>
|
||||
- <unpack>false</unpack>
|
||||
- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
|
||||
- </configuration>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
</project>
|
||||
diff -r 37a493c3f60b -r bbf0648beb5c application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java Tue Nov 12 16:25:24 2019 +0100
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java Mon Nov 25 17:57:23 2019 -0500
|
||||
@@ -34,14 +34,11 @@
|
||||
package org.openjdk.jmc.flightrecorder.flameview.views;
|
||||
|
||||
import java.io.IOException;
|
||||
-
|
||||
-import java.text.MessageFormat;
|
||||
import java.util.concurrent.CancellationException;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.logging.Level;
|
||||
-import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.eclipse.jface.action.Action;
|
||||
@@ -77,32 +74,7 @@
|
||||
import org.openjdk.jmc.ui.misc.DisplayToolkit;
|
||||
|
||||
public class FlameGraphView extends ViewPart implements ISelectionListener {
|
||||
- private static final String HTML_PAGE;
|
||||
- static {
|
||||
- // from: https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-flamegraph.css
|
||||
- String cssD3Flamegraph = "jslibs/d3-flamegraph.css";
|
||||
- // from: https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js
|
||||
- String jsHtml5shiv = "jslibs/html5shiv.min.js";
|
||||
- // from: https://oss.maxcdn.com/respond/1.4.2/respond.min.js
|
||||
- String jsRespond = "jslibs/respond.min.js";
|
||||
- // from: https://d3js.org/d3.v4.min.js
|
||||
- String jsD3V4 = "jslibs/d3.v4.min.js";
|
||||
- // from: https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.9.1/d3-tip.min.js
|
||||
- String jsD3Tip = "jslibs/d3-tip.min.js";
|
||||
- // from: https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-flamegraph.min.js
|
||||
- String jsD3FlameGraph = "jslibs/d3-flamegraph.min.js";
|
||||
-
|
||||
- String jsIeLibraries = loadLibraries(jsHtml5shiv, jsRespond);
|
||||
- String jsD3Libraries = loadLibraries(jsD3V4, jsD3Tip, jsD3FlameGraph);
|
||||
-
|
||||
- // formatter arguments for the template: %1 - CSSs, %2 - IE9 specific scripts, %3 - 3rd party scripts
|
||||
- HTML_PAGE = String.format(fileContent("page.template"),
|
||||
- fileContent(cssD3Flamegraph),
|
||||
- jsIeLibraries,
|
||||
- jsD3Libraries);
|
||||
- }
|
||||
-
|
||||
- private static final ExecutorService MODEL_EXECUTOR = Executors.newFixedThreadPool(1);
|
||||
+ private static ExecutorService MODEL_EXECUTOR = Executors.newFixedThreadPool(1);
|
||||
private FrameSeparator frameSeparator;
|
||||
|
||||
private Browser browser;
|
||||
@@ -207,6 +179,13 @@
|
||||
}, MODEL_EXECUTOR);
|
||||
}
|
||||
|
||||
+ private static Void handleModelBuildException(Throwable ex) {
|
||||
+ if (!(ex.getCause() instanceof CancellationException)) {
|
||||
+ FlightRecorderUI.getDefault().getLogger().log(Level.SEVERE, "Failed to build stacktrace view model", ex); //$NON-NLS-1$
|
||||
+ }
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
private void setModel(TraceNode root) {
|
||||
if (!browser.isDisposed() && !root.equals(currentRoot)) {
|
||||
currentRoot = root;
|
||||
@@ -215,21 +194,19 @@
|
||||
}
|
||||
|
||||
private void setViewerInput(TraceNode root) {
|
||||
- browser.setText(HTML_PAGE);
|
||||
- browser.addProgressListener(new ProgressAdapter() {
|
||||
- @Override
|
||||
- public void completed(ProgressEvent event) {
|
||||
- browser.removeProgressListener(this);
|
||||
- browser.execute(String.format("processGraph(%s);", toJSon(root)));
|
||||
- }
|
||||
- });
|
||||
- }
|
||||
-
|
||||
- private static Void handleModelBuildException(Throwable ex) {
|
||||
- if (!(ex.getCause() instanceof CancellationException)) {
|
||||
- FlightRecorderUI.getDefault().getLogger().log(Level.SEVERE, "Failed to build stacktrace view model", ex); //$NON-NLS-1$
|
||||
+ try {
|
||||
+ browser.setText(StringToolkit.readString(FlameGraphView.class.getResourceAsStream("page.html")));
|
||||
+ browser.addProgressListener(new ProgressAdapter() {
|
||||
+ @Override
|
||||
+ public void completed(ProgressEvent event) {
|
||||
+ browser.removeProgressListener(this);
|
||||
+ browser.execute(String.format("processGraph(%s);", toJSon(root)));
|
||||
+ }
|
||||
+ });
|
||||
+ } catch (IOException e) {
|
||||
+ browser.setText(e.getMessage());
|
||||
+ e.printStackTrace();
|
||||
}
|
||||
- return null;
|
||||
}
|
||||
|
||||
private static String toJSon(TraceNode root) {
|
||||
@@ -261,23 +238,4 @@
|
||||
private static String toJSonKeyValue(String key, String value) {
|
||||
return "\"" + key + "\": " + "\"" + value + "\"";
|
||||
}
|
||||
-
|
||||
- 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));
|
||||
- } catch (IOException e) {
|
||||
- FlightRecorderUI.getDefault().getLogger()
|
||||
- .log(Level.WARNING, MessageFormat
|
||||
- .format("Could not load script \"{0}\",\"{1}\"", fileName, e.getMessage())); //$NON-NLS-1$
|
||||
- return "";
|
||||
- }
|
||||
- }
|
||||
}
|
||||
diff -r 37a493c3f60b -r bbf0648beb5c application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/page.html
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/page.html Mon Nov 25 17:57:23 2019 -0500
|
||||
@@ -0,0 +1,54 @@
|
||||
+<!DOCTYPE html "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
+<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
+
|
||||
+<head>
|
||||
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
+ <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-flamegraph.css">
|
||||
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
|
||||
+ <!--[if lt IE 9]>
|
||||
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
|
||||
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
+ <![endif]-->
|
||||
+</head>
|
||||
+
|
||||
+<body onresize="resizeFlameGraph()">
|
||||
+ <div id="chart"></div>
|
||||
+
|
||||
+ <script type="text/javascript" src="https://d3js.org/d3.v4.min.js"></script>
|
||||
+ <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.9.1/d3-tip.min.js"></script>
|
||||
+ <script type="text/javascript" src="https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-flamegraph.min.js"></script>
|
||||
+ <script type="text/javascript">
|
||||
+
|
||||
+ var flameGraph;
|
||||
+ var currentJson;
|
||||
+
|
||||
+ function processGraph(jsonObj) {
|
||||
+ flameGraph = d3.flamegraph()
|
||||
+ .width(windowSize() * 0.9)
|
||||
+ .transitionDuration(500)
|
||||
+ .transitionEase(d3.easeCubic)
|
||||
+ .sort(true)
|
||||
+ .title("");
|
||||
+ currentJson = jsonObj;
|
||||
+ d3.select("#chart")
|
||||
+ .datum(currentJson)
|
||||
+ .call(flameGraph);
|
||||
+ }
|
||||
+
|
||||
+ function windowSize() {
|
||||
+ return Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
|
||||
+ }
|
||||
+
|
||||
+ function resizeFlameGraph() {
|
||||
+ if (flameGraph) {
|
||||
+ flameGraph.width(windowSize() * 0.9);
|
||||
+ d3.select("#chart")
|
||||
+ .datum(currentJson)
|
||||
+ .call(flameGraph);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ </script>
|
||||
+</body>
|
||||
+
|
||||
+</html>
|
||||
diff -r 37a493c3f60b -r bbf0648beb5c application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template
|
||||
--- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template Tue Nov 12 16:25:24 2019 +0100
|
||||
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
@@ -1,49 +0,0 @@
|
||||
-<!DOCTYPE html "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
-<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
-
|
||||
-<head>
|
||||
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
- <style type="text/css">%1$s</style>
|
||||
- <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
|
||||
- <!--[if lt IE 9]>
|
||||
- <script>%2$s</script>
|
||||
- <![endif]-->
|
||||
-</head>
|
||||
-
|
||||
-<body onresize="resizeFlameGraph()">
|
||||
- <div id="chart"></div>
|
||||
- <script type="text/javascript">%3$s</script>
|
||||
- <script type="text/javascript">
|
||||
-
|
||||
- var flameGraph;
|
||||
- var currentJson;
|
||||
-
|
||||
- function processGraph(jsonObj) {
|
||||
- flameGraph = d3.flamegraph()
|
||||
- .width(windowSize() * 0.9)
|
||||
- .transitionDuration(500)
|
||||
- .transitionEase(d3.easeCubic)
|
||||
- .sort(true)
|
||||
- .title("");
|
||||
- currentJson = jsonObj;
|
||||
- d3.select("#chart")
|
||||
- .datum(currentJson)
|
||||
- .call(flameGraph);
|
||||
- }
|
||||
-
|
||||
- function windowSize() {
|
||||
- return Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
|
||||
- }
|
||||
-
|
||||
- function resizeFlameGraph() {
|
||||
- if (flameGraph) {
|
||||
- flameGraph.width(windowSize() * 0.9);
|
||||
- d3.select("#chart")
|
||||
- .datum(currentJson)
|
||||
- .call(flameGraph);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- </script>
|
||||
-</body>
|
||||
-</html>
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
# HG changeset patch
|
||||
# Parent 58eadb7c7ac8a81f6df4a70ecd5ecd69a8b42b0a
|
||||
|
||||
diff -r 58eadb7c7ac8 -r 8992119f0f37 application/org.openjdk.jmc.rcp.product/jmc.product
|
||||
--- a/application/org.openjdk.jmc.rcp.product/jmc.product Mon Aug 31 16:04:24 2020 -0400
|
||||
+++ b/application/org.openjdk.jmc.rcp.product/jmc.product Mon Aug 31 16:05:21 2020 -0400
|
||||
@@ -56,7 +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
|
||||
+ <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,20 +0,0 @@
|
|||
diff -r 63ec7d0ee8d9 pom.xml
|
||||
--- a/pom.xml Mon Jun 08 12:37:07 2020 -0400
|
||||
+++ b/pom.xml Fri Jan 22 14:13:15 2021 -0500
|
||||
@@ -75,7 +75,7 @@
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
- <tycho.version>1.4.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.2</maven.directory.version>
|
||||
@@ -282,6 +282,7 @@
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<useProjectSettings>false</useProjectSettings>
|
||||
+ <deriveReleaseCompilerArgumentFromTargetLevel>false</deriveReleaseCompilerArgumentFromTargetLevel>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
# HG changeset patch
|
||||
# Parent f4accaf7605c6e7ed1ea968740e8c1cac0c9e8e4
|
||||
|
||||
diff -r f4accaf7605c application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
|
||||
--- a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF Fri Aug 28 12:19:55 2020 -0400
|
||||
+++ b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF Fri Aug 28 12:27:37 2020 -0400
|
||||
@@ -10,7 +10,6 @@
|
||||
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.inject;bundle-version="1.0.0";visibility:=reexport,
|
||||
org.openjdk.jmc.commands
|
||||
Bundle-ActivationPolicy: lazy
|
||||
@@ -24,7 +23,6 @@
|
||||
org.openjdk.jmc.console.ui.messages.internal;x-friends:="org.openjdk.jmc.console.uitest",
|
||||
org.openjdk.jmc.console.ui.preferences;x-friends:="org.openjdk.jmc.console.uitest"
|
||||
Bundle-ClassPath: .
|
||||
-Import-Package: javax.annotation;version="1.0.0",
|
||||
- javax.inject;version="1.0.0"
|
||||
+Import-Package: javax.inject;version="1.0.0"
|
||||
Automatic-Module-Name: org.openjdk.jmc.console.ui
|
||||
|
||||
diff -r f4accaf7605c application/org.openjdk.jmc.feature.rcp/feature.xml
|
||||
--- a/application/org.openjdk.jmc.feature.rcp/feature.xml Fri Aug 28 12:19:55 2020 -0400
|
||||
+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml Fri Aug 28 12:27:37 2020 -0400
|
||||
@@ -88,7 +88,6 @@
|
||||
<import plugin="org.eclipse.ui.intro"/>
|
||||
<import plugin="org.eclipse.ui.net"/>
|
||||
<import plugin="org.eclipse.equinox.event"/>
|
||||
- <import plugin="javax.el"/>
|
||||
<import plugin="org.eclipse.equinox.p2.director.app"/>
|
||||
</requires>
|
||||
|
||||
|
|
@ -1,141 +0,0 @@
|
|||
diff -r b0ad84913481 pom.xml
|
||||
--- a/pom.xml Mon Apr 27 14:18:01 2020 -0400
|
||||
+++ b/pom.xml Mon Apr 27 14:19:15 2020 -0400
|
||||
@@ -105,137 +105,6 @@
|
||||
<url>${snapshot.repo}</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
- <profiles>
|
||||
- <profile>
|
||||
- <id>2019-09</id>
|
||||
- <activation>
|
||||
- <activeByDefault>true</activeByDefault>
|
||||
- </activation>
|
||||
- <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-2019-09</artifactId>
|
||||
- <version>7.1.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
- </profile>
|
||||
- <profile>
|
||||
- <id>2019-06</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-2019-06</artifactId>
|
||||
- <version>7.1.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
- </profile>
|
||||
- <profile>
|
||||
- <id>2019-03</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-2019-03</artifactId>
|
||||
- <version>7.1.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
- </profile>
|
||||
- <profile>
|
||||
- <id>2018-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-2018-12</artifactId>
|
||||
- <version>7.1.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
- </profile>
|
||||
- <profile>
|
||||
- <id>2018-09</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-2018-09</artifactId>
|
||||
- <version>7.1.1-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.1.1-SNAPSHOT</version>
|
||||
- </artifact>
|
||||
- </target>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </build>
|
||||
- </profile>
|
||||
- </profiles>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
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
|
||||
@@ -51,18 +51,10 @@
|
||||
id="org.openjdk.jmc.feature.console"
|
||||
version="0.0.0"/>
|
||||
|
||||
- <includes
|
||||
- id="org.openjdk.jmc.feature.rcp.ja"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
<includes
|
||||
id="org.openjdk.jmc.feature.core"
|
||||
version="0.0.0"/>
|
||||
|
||||
- <includes
|
||||
- id="org.openjdk.jmc.feature.rcp.zh_CN"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
<includes
|
||||
id="org.openjdk.jmc.feature.flightrecorder"
|
||||
version="0.0.0"/>
|
||||
@@ -104,24 +96,6 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
- <plugin
|
||||
- id="org.openjdk.jmc.rcp.application.ja"
|
||||
- nl="ja_JP,ja"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.openjdk.jmc.rcp.application.zh_CN"
|
||||
- nl="zh_CN"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
<plugin
|
||||
id="org.openjdk.jmc.rcp.intro"
|
||||
download-size="0"
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/org.openjdk.jmc.feature.ide/feature.xml
|
||||
index cd3dc7e..128cd0b 100644
|
||||
--- a/application/org.openjdk.jmc.feature.ide/feature.xml
|
||||
+++ b/application/org.openjdk.jmc.feature.ide/feature.xml
|
||||
@@ -65,11 +65,4 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.openjdk.jmc.ide.jdt"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
</feature>
|
||||
\ No newline at end of file
|
||||
diff --git a/application/pom.xml b/application/pom.xml
|
||||
index d185d9d..89fd033 100644
|
||||
--- a/application/pom.xml
|
||||
+++ b/application/pom.xml
|
||||
@@ -77,7 +77,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>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
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 @@
|
||||
</plugins>
|
||||
<directory>../../target/</directory>
|
||||
</build>
|
||||
- <pluginRepositories>
|
||||
- <pluginRepository>
|
||||
- <id>buchen-maven-repo</id>
|
||||
- <url>http://buchen.github.io/maven-repo</url>
|
||||
- <layout>default</layout>
|
||||
- </pluginRepository>
|
||||
- </pluginRepositories>
|
||||
</project>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
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 @@ Require-Bundle: org.junit,
|
||||
org.openjdk.jmc.rjmx.services.jfr,
|
||||
org.openjdk.jmc.rjmx,
|
||||
org.openjdk.jmc.common,
|
||||
- org.openjdk.jmc.flightrecorder.configuration
|
||||
+ org.openjdk.jmc.flightrecorder.configuration,
|
||||
+ org.hamcrest.core
|
||||
Export-Package: org.openjdk.jmc.rjmx.services.jfr.test
|
||||
Automatic-Module-Name: org.openjdk.jmc.rjmx.services.jfr.test
|
||||
-Import-Package: org.openjdk.jmc.flightrecorder.jdk
|
||||
+Import-Package: org.openjdk.jmc.flightrecorder.jdk,
|
||||
+ org.hamcrest.core
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/pom.xml b/pom.xml
|
||||
index 59f292a..2985869 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -117,21 +117,11 @@
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<environments>
|
||||
- <environment>
|
||||
- <os>win32</os>
|
||||
- <ws>win32</ws>
|
||||
- <arch>x86_64</arch>
|
||||
- </environment>
|
||||
<environment>
|
||||
<os>linux</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86_64</arch>
|
||||
</environment>
|
||||
- <environment>
|
||||
- <os>macosx</os>
|
||||
- <ws>cocoa</ws>
|
||||
- <arch>x86_64</arch>
|
||||
- </environment>
|
||||
</environments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
diff -r 823b959b0e26 application/pom.xml
|
||||
--- a/application/pom.xml Mon Apr 27 14:22:34 2020 -0400
|
||||
+++ b/application/pom.xml Mon Apr 27 14:23:07 2020 -0400
|
||||
@@ -160,11 +160,6 @@
|
||||
<artifactId>flightrecorder.rules.jdk</artifactId>
|
||||
<version>7.1.1</version>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.jacoco</groupId>
|
||||
- <artifactId>jacoco-maven-plugin</artifactId>
|
||||
- <version>0.8.3</version>
|
||||
- </dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="desktop">
|
||||
<id>jmc.desktop</id>
|
||||
<metadata_license>FSAP</metadata_license>
|
||||
<project_license>UPL or BSD</project_license>
|
||||
<name>JDK Mission Control</name>
|
||||
<summary>A Profiling and Diagnostics Tool for the Hotspot JVM</summary>
|
||||
<description>
|
||||
<p>
|
||||
JDK Mission Control is a powerful profiler for HotSpot JVMs and has an
|
||||
advanced set of tools that enables efficient and detailed analysis of the
|
||||
extensive data collected by JDK Flight Recorder. The tool chain enables
|
||||
developers and administrators to collect and analyze data from Java
|
||||
applications running locally or deployed in production environments.
|
||||
</p>
|
||||
</description>
|
||||
<url type="homepage">http://openjdk.java.net/projects/jmc/</url>
|
||||
<launchable type="desktop-id">jmc.desktop</launchable>
|
||||
<developer_name>The OpenJDK Community</developer_name>
|
||||
</component>
|
||||
Loading…
Reference in New Issue