New LS JAR layout for vscode and eclipse extensions

2024-07-26 22:17:19 -04:00
parent 32c8a86d86
commit df9fbcdc0c
21 changed files with 345 additions and 99 deletions
--- a/vscode-extensions/commons-vscode/src/launch-util.ts
+++ b/vscode-extensions/commons-vscode/src/launch-util.ts
@@ -207,7 +207,7 @@ function createServerOptionsForPortComm(options: ActivatorOptions, context: VSCo
                            jvm.mainClassLaunch(explodedLsJarData.mainClass, classpath, args, processLaunchoptions);
                        } else {
                            // Start the child java process
-                            const launcher = findServerJar(Path.resolve(context.extensionPath, 'jars'));
+                            const launcher = findServerJar(Path.resolve(context.extensionPath, 'language-server'));
                            jvm.jarLaunch(launcher, args, processLaunchoptions);
                        }
                    });
@@ -281,7 +281,7 @@ function addCpAndLauncherToJvmArgs(args: string[], options: ActivatorOptions, co
    } else {
        // Start the child java process
        args.push('-jar');
-        const launcher = findServerJar(Path.resolve(context.extensionPath, 'jars'));
+        const launcher = findServerJar(Path.resolve(context.extensionPath, 'language-server'));
        args.push(launcher);
   }
 }
--- a/vscode-extensions/vscode-bosh/lib/Main.ts
+++ b/vscode-extensions/vscode-bosh/lib/Main.ts
@@ -28,11 +28,6 @@ export function activate(context: VSCode.ExtensionContext) {
        extensionId: 'vscode-bosh',
        jvmHeap: "48m",
        workspaceOptions: VSCode.workspace.getConfiguration("bosh.ls"),
-        explodedLsJarData: {
-            lsLocation: 'language-server',
-            mainClass: 'org.springframework.ide.vscode.bosh.BoshLanguageServerBootApp',
-            configFileName: 'application.properties'
-        },
        clientOptions: {
            documentSelector: [
                {
--- a/vscode-extensions/vscode-bosh/package.json
+++ b/vscode-extensions/vscode-bosh/package.json
@@ -135,7 +135,7 @@
  "devDependencies": {
    "@types/node": "^18.8.0",
    "@types/vscode": "1.75.0",
-    "typescript": "^4.8.0",
-    "@vscode/vsce": "^2.22.0"
+    "@vscode/vsce": "^2.22.0",
+    "typescript": "^4.8.0"
  }
 }
--- a/vscode-extensions/vscode-bosh/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-bosh/scripts/preinstall.sh
@@ -15,8 +15,8 @@ cd ../../headless-services/bosh-language-server
 rm -fr ${workdir}/language-server
 mkdir -p ${workdir}/language-server

-# Explode LS JAR
-cd ${workdir}/language-server
-server_jar_file=$(find ${workdir}/../../headless-services/bosh-language-server/target -name '*-exec.jar');
-jar -xvf ${server_jar_file}
+# Extract LS JAR
+cd ${workdir}/../../headless-services/bosh-language-server/target
+server_jar_file=$(find . -name '*-exec.jar');
+java -Djarmode=tools -jar $server_jar_file extract --destination ${workdir}/language-server

--- a/vscode-extensions/vscode-concourse/lib/Main.ts
+++ b/vscode-extensions/vscode-concourse/lib/Main.ts
@@ -31,11 +31,6 @@ export function activate(context: VSCode.ExtensionContext) {
        extensionId: 'vscode-concourse',
        jvmHeap: "48m",
        workspaceOptions: VSCode.workspace.getConfiguration("concourse.ls"),
-        explodedLsJarData: {
-            lsLocation: 'language-server',
-            mainClass: 'org.springframework.ide.vscode.concourse.ConcourseLanguageServerBootApp',
-            configFileName: 'application.properties'
-        },
        clientOptions: {
            documentSelector: [
                {
--- a/vscode-extensions/vscode-concourse/package.json
+++ b/vscode-extensions/vscode-concourse/package.json
@@ -135,7 +135,7 @@
  "devDependencies": {
    "@types/node": "^18.8.0",
    "@types/vscode": "1.75.0",
-    "typescript": "^4.8.0",
-    "@vscode/vsce": "^2.22.0"
+    "@vscode/vsce": "^2.22.0",
+    "typescript": "^4.8.0"
  }
 }
--- a/vscode-extensions/vscode-concourse/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-concourse/scripts/preinstall.sh
@@ -15,7 +15,7 @@ cd ../../headless-services/concourse-language-server
 rm -fr ${workdir}/language-server
 mkdir -p ${workdir}/language-server

-# Explode LS JAR
-cd ${workdir}/language-server
-server_jar_file=$(find ${workdir}/../../headless-services/concourse-language-server/target -name '*-exec.jar');
-jar -xvf ${server_jar_file}
+# Extract LS JAR
+cd ${workdir}/../../headless-services/concourse-language-server/target
+server_jar_file=$(find . -name '*-exec.jar');
+java -Djarmode=tools -jar $server_jar_file extract --destination ${workdir}/language-server
--- a/vscode-extensions/vscode-manifest-yaml/lib/Main.ts
+++ b/vscode-extensions/vscode-manifest-yaml/lib/Main.ts
@@ -28,11 +28,6 @@ export function activate(context: VSCode.ExtensionContext) {
        extensionId: 'vscode-manifest-yaml',
        workspaceOptions: VSCode.workspace.getConfiguration("cloudfoundry-manifest.ls"),
        jvmHeap: '64m',
-        explodedLsJarData: {
-            lsLocation: 'language-server',
-            mainClass: 'org.springframework.ide.vscode.manifest.yaml.ManifestYamlLanguageServerBootApp',
-            configFileName: 'application.properties'
-        },
        clientOptions: {
            documentSelector: [
                {
--- a/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh
@@ -15,9 +15,9 @@ cd ../../headless-services/manifest-yaml-language-server
 rm -fr ${workdir}/language-server
 mkdir -p ${workdir}/language-server

-# Explode LS JAR
-cd ${workdir}/language-server
-server_jar_file=$(find ${workdir}/../../headless-services/manifest-yaml-language-server/target -name '*-exec.jar');
-jar -xvf ${server_jar_file}
+# Extract LS JAR
+cd ${workdir}/../../headless-services/manifest-yaml-language-server/target
+server_jar_file=$(find . -name '*-exec.jar');
+java -Djarmode=tools -jar $server_jar_file extract --destination ${workdir}/language-server


--- a/vscode-extensions/vscode-spring-boot/lib/Main.ts
+++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts
@@ -60,11 +60,6 @@ export function activate(context: ExtensionContext): Thenable<ExtensionAPI> {
                );
            }
        },
-        explodedLsJarData: {
-            lsLocation: 'language-server',
-            mainClass: 'org.springframework.ide.vscode.boot.app.BootLanguageServerBootApp',
-            configFileName: 'application.properties'
-        },
        workspaceOptions: workspace.getConfiguration("spring-boot.ls"),
        clientOptions: {
            markdown: {
--- a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
@@ -19,10 +19,10 @@ mkdir -p ${workdir}/language-server
 cd ${workdir}/../../headless-services/spring-boot-language-server
 ./build.sh

-# Explode LS JAR
-cd ${workdir}/language-server
-server_jar_file=$(find ${workdir}/../../headless-services/spring-boot-language-server/target -name '*-exec.jar');
-jar -xvf ${server_jar_file}
+# Extract LS JAR
+cd ${workdir}/../../headless-services/spring-boot-language-server/target
+server_jar_file=$(find . -name '*-exec.jar');
+java -Djarmode=tools -jar $server_jar_file extract --destination ${workdir}/language-server

 # JDT LS Extension
 cd ${workdir}/../../headless-services/jdt-ls-extension