Integrate shared jvm-utils into atom-extensions

atom-extensions/atom-spring-boot/DEVELOPER-NOTES.md

@@ -35,9 +35,9 @@ Open Atom or execute `Refresh Window` in the opened instance (Packages -> Comman
 
 **Client Side Debugging**: Open Atom's `Developer Tools` view - View -> Developer -> Toggle Developer Tools
 
-**Server Side Debugging**:  Change `launchVmArgs(version)` implementation in `lib/main.js` to be:
+**Server Side Debugging**:  Change `launchVmArgs(jvm)` implementation in `lib/main.js` to be:
 ```
-    launchVmArgs(version) {
+    launchVmArgs(jvm) {
         return Promise.resolve([
             '-Xdebug',
             '-agentlib:jdwp=transport=dt_socket,server=y,address=7999,suspend=n',

atom-extensions/atom-spring-boot/build.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+set -x
+workdir=`pwd`
+cd ../atom-commons
+npm install
+cd $workdir
+npm install
+apm link .

atom-extensions/atom-spring-boot/lib/main.js

@@ -47,35 +47,32 @@ class SpringBootLanguageClient extends JavaProcessLanguageClient {
     }
 
     getOrInstallLauncher() {
-        return Promise.resolve('org.springframework.boot.loader.JarLauncher');
+        return 'org.springframework.boot.loader.JarLauncher';
     }
 
-    launchVmArgs(version) {
-        return super.getOrInstallLauncher().then(lsJar => {
-            const toolsJar = this.findJavaFile('lib', 'tools.jar');
-            if (version < 9 && !toolsJar) {
-                // Notify the user that tool.jar is not found
-                const notification = atom.notifications.addWarning(`"Boot-Java" Package Functionality Limited`, {
-                    dismissable: true,
-                    detail: 'No tools.jar found',
-                    description: 'JAVA_HOME environment variable points either to JRE or JDK missing "lib/tools.jar" hence Boot Hints are unavailable',
-                    buttons: [{
-                        text: 'OK',
-                        onDidClick: () => {
-                            notification.dismiss()
-                        },
-                    }],
-                });
-            }
-            return [
-                // '-Xdebug',
-                // '-agentlib:jdwp=transport=dt_socket,server=y,address=7999,suspend=n',
-                '-Dorg.slf4j.simpleLogger.logFile=boot-java.log',
-                '-Dorg.slf4j.simpleLogger.defaultLogLevel=debug',
-                '-cp',
-                `${toolsJar ? `${toolsJar}${path.delimiter}` : ''}${lsJar}`
-            ];
-        });
+    preferJdk() {
+        return true;
+    }
+
+    launchVmArgs(jvm) {
+        let vmargs = [
+            // '-Xdebug',
+            // '-agentlib:jdwp=transport=dt_socket,server=y,address=7999,suspend=n',
+            '-Dorg.slf4j.simpleLogger.logFile=boot-java.log',
+            '-Dorg.slf4j.simpleLogger.defaultLogLevel=debug',
+        ];
+        if (!jvm.isJdk()) {
+            this.showErrorMessage(
+                '"Boot-Java" Package Functionality Limited', 
+                'JAVA_HOME or PATH environment variable seems to point to a JRE. A JDK is required, hence Boot Hints are unavailable.'
+            );
+        }
+        let toolsJar = jvm.getToolsJar();
+        vmargs.push(
+            "-cp",
+            `${toolsJar ? `${toolsJar}${path.delimiter}` : ''}${this.getServerJar()}`
+        );
+        return Promise.resolve(vmargs);
     }
 
     createStsAdapter() {

atom-extensions/atom-spring-boot/package.json

@@ -25,9 +25,10 @@
     }
   },
   "dependencies": {
+    "atom-languageclient": "0.8.0",
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.19"
+    "@pivotal-tools/atom-languageclient-commons": "0.0.1"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"