make sure profiler module can be compiled with JDK 1.8 - JDK 1.5 code moved to separate jar

Author: thurka

visualvm/profiler/build.xml

@@ -5,4 +5,26 @@
 <project name="org.graalvm.visualvm.profiler" default="netbeans" basedir=".">
     <description>Builds, tests, and runs the project org.graalvm.visualvm.profiler.</description>
     <import file="nbproject/build-impl.xml"/>
+    <target name="compile-lib" depends="init">
+        <mkdir dir="${build.dir}/lib-classes" />
+        <!-- NOTE: Must be built with Source Level 1.5 to work for getting info from Java 5! -->
+        <javac srcdir="libsrc" destdir="${build.dir}/lib-classes" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.5" target="1.5">
+            <classpath>
+                <pathelement path="${lib.cp}"/>
+            </classpath>
+        </javac>
+        <copy todir="${build.dir}/lib-classes">
+            <fileset dir="libsrc" excludes="${jar-excludes}" />
+        </copy>
+    </target>
+
+    <target name="jar-lib" depends="compile-lib">
+        <mkdir dir="${cluster}/modules/ext" />
+        <jar jarfile="${cluster}/modules/ext/profilerprobe.jar" manifest="libsrc/manifest.mf" compress="false">
+            <fileset dir="${build.dir}/lib-classes" />
+        </jar>
+    </target>
+
+    <target name="compile" depends="jar-lib, projectized-common.compile" />
+
 </project>

visualvm/profiler/libsrc/manifest.mf

@@ -0,0 +1,2 @@
+Main-Class: org.graalvm.visualvm.profiler.JavaSysProperies
+

visualvm/profiler/libsrc/org/graalvm/visualvm/profiler/JavaSysProperies.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.visualvm.profiler;
+
+/**
+ * NOTE: Must be built with Source Level 1.5 to work for getting info from Java 5!
+ *
+ */
+public class JavaSysProperies {
+
+    public static void main(String[] args) {
+        for (String arg : args) System.out.println(System.getProperty(arg));
+    }
+}

visualvm/profiler/nbproject/project.properties

@@ -1,4 +1,5 @@
-javac.source=1.5
+javac.source=1.8
 license.file=../startup/src/org/graalvm/visualvm/modules/startup/LICENSE.txt
 nbm.homepage=https://visualvm.github.io
+extra.module.files=modules/ext/profilerprobe.jar
 

visualvm/profiler/nbproject/project.xml

@@ -183,6 +183,15 @@
                 <friend>org.graalvm.visualvm.profiler.startup</friend>
                 <package>org.graalvm.visualvm.profiler</package>
             </friend-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/profilerprobe.jar</runtime-relative-path>
+            </class-path-extension>
+            <extra-compilation-unit>
+                <package-root>libsrc</package-root>
+                <classpath>${lib.cp}</classpath>
+                <built-to>${build.dir}/lib-classes</built-to>
+                <built-to>${cluster}/modules/ext/profilerprobe.jar</built-to>
+            </extra-compilation-unit>
         </data>
     </configuration>
 </project>

visualvm/profiler/src/org/graalvm/visualvm/profiler/JavaInfo.java

@@ -27,26 +27,20 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.graalvm.visualvm.lib.jfluid.global.Platform;
+import org.openide.modules.InstalledFileLocator;
+import org.openide.modules.ModuleInfo;
+import org.openide.modules.Modules;
 
 /**
- * NOTE: Must be built with Source Level 1.5 to work for getting info from Java 5!
  *
  * @author Jiri Sedlacek
  */
 final class JavaInfo {
 
-    public static void main(String[] args) {
-        for (String arg : args) System.out.println(System.getProperty(arg));
-    }
-    
     static String getCurrentJDKExecutable() {
         return getJDKExecutable(System.getProperty("java.home")); // NOI18N
     }
@@ -65,9 +59,8 @@ static String[] getSystemProperties(File java, String... keys) {
         try {
             List<String> list = new ArrayList();
             list.add(java.getAbsolutePath());
-            list.add("-cp"); // NOI18N
-            list.add(getCPJar());
-            list.add(JavaInfo.class.getName());
+            list.add("-jar"); // NOI18N
+            list.add(getProbeJar());
             list.addAll(Arrays.asList(keys));
 
             Process p = Runtime.getRuntime().exec(list.toArray(new String[list.size()]));
@@ -91,17 +84,16 @@ static String[] getSystemProperties(File java, String... keys) {
     }
 
 
-    private static String CP_JAR;
-    private static synchronized String getCPJar() throws MalformedURLException, URISyntaxException {
-        if (CP_JAR == null) {
-            String name = JavaInfo.class.getSimpleName() + ".class"; // NOI18N
-            URL url = JavaInfo.class.getResource(name);
-            String path = url.getFile();
-            String jar = path.substring(0, path.indexOf("!/")); // NOI18N
-            URI uri = new URL(jar).toURI();
-            CP_JAR = new File(uri).getAbsolutePath();
+    private static final String PROBE_PATH = "modules/ext/profilerprobe.jar";   // NOI18N
+    private static String PROBE_JAR;
+    private static synchronized String getProbeJar() {
+        if (PROBE_JAR == null) {
+            InstalledFileLocator loc = InstalledFileLocator.getDefault();
+            ModuleInfo info = Modules.getDefault().ownerOf(JavaInfo.class);
+            File jar = loc.locate(PROBE_PATH, info.getCodeNameBase(), false);
+            PROBE_JAR = jar.getAbsolutePath();
         }
-        return CP_JAR;
+        return PROBE_JAR;
     }
 
     private JavaInfo() {}