Merge pull request #433 from codefori/worksofliam/issue426

Author: worksofliam

package.json

@@ -62,6 +62,23 @@
             "description": "Saved configs for",
             "default": {},
             "additionalProperties": true
+          },
+          "vscode-db2i.jobJava": {
+            "type": "string",
+            "description": "Java version for Server Component",
+            "default": "/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/bin/java",
+            "enum": [
+              "/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/bin/java",
+              "/QOpenSys/QIBM/ProdData/JavaVM/jdk11/64bit/bin/java",
+              "/QOpenSys/QIBM/ProdData/JavaVM/jdk17/64bit/bin/java",
+              "/QOpenSys/QIBM/ProdData/JavaVM/jdk21/64bit/bin/java"
+            ],
+            "enumDescriptions": [
+              "Java 8 (system default)",
+              "Java 11",
+              "Java 17",
+              "Java 21"
+            ]
           }
         }
       },

src/connection/serverComponent.ts

@@ -10,8 +10,10 @@ import { SERVER_VERSION_FILE } from "./SCVersion";
 import IBMi from "@halcyontech/vscode-ibmi-types/api/IBMi";
 import * as Crypto from 'crypto';
 import { readFileSync } from "fs";
+import Configuration from "../configuration";
 
 const ExecutablePathDir = `$HOME/.vscode/`;
+const DEFAULT_JAVA_EIGHT = `/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/bin/java`;
 
 export enum UpdateStatus {
   FAILED,
@@ -50,8 +52,10 @@ export class ServerComponent {
   static getInitCommand(): string | undefined {
     const path = this.getComponentPath();
 
+    const jvmVersion = Configuration.get<string>(`jobJava`) || DEFAULT_JAVA_EIGHT;
+
     if (path) {
-      return `/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/bin/java -Dos400.stdio.convert=N -jar ${path} --single`
+      return `${jvmVersion} -Dos400.stdio.convert=N -jar ${path} --single`
     }
   }
 

src/contributes.json

@@ -21,6 +21,23 @@
             "description": "Saved configs for",
             "default": {},
             "additionalProperties": true
+          },
+          "vscode-db2i.jobJava": {
+            "type": "string",
+            "description": "Java version for Server Component",
+            "default": "/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/bin/java",
+            "enum": [
+              "/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/bin/java",
+              "/QOpenSys/QIBM/ProdData/JavaVM/jdk11/64bit/bin/java",
+              "/QOpenSys/QIBM/ProdData/JavaVM/jdk17/64bit/bin/java",
+              "/QOpenSys/QIBM/ProdData/JavaVM/jdk21/64bit/bin/java"
+            ],
+            "enumDescriptions": [
+              "Java 8 (system default)",
+              "Java 11",
+              "Java 17",
+              "Java 21"
+            ]
           }
         }
       },