changeset 226:21e25b096933 7.1.0-gac

JMC-6629: jmc.product merge failure during jmc 7.1.0 branching Reviewed-by: hirt
author ghb <guru.hb@oracle.com>
date Mon, 11 Nov 2019 23:03:49 +0530
parents 3b3210cd4bab
children 51dd51da8175
files application/org.openjdk.jmc.rcp.product/jmc.product
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/application/org.openjdk.jmc.rcp.product/jmc.product	Mon Nov 11 12:47:17 2019 +0100
+++ b/application/org.openjdk.jmc.rcp.product/jmc.product	Mon Nov 11 23:03:49 2019 +0530
@@ -46,13 +46,15 @@
    </configIni>
 
    <launcherArgs>
+      <!-- Note: if embedding a JDK, remember to override the -vm option on the various platforms to 
+           point to the relative path of your embedded JDK. e.g.
+           <programArgsMac>-ws cocoa -vm ../jdk/Contents/Home/bin/</programArgsMac> -->
       <programArgs>--launcher.appendVmargs
       </programArgs>
-      <!-- use default Java from PATH on Linux -->
       <programArgsLin></programArgsLin>
-      <programArgsMac>-ws cocoa -vm ../jdk/Contents/Home/bin/
+      <programArgsMac>-ws cocoa
       </programArgsMac>
-      <programArgsWin>-vm ./
+      <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>