Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions package.json
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does jdk11 need to appear here as well?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,21 @@
"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/jdk17/64bit/bin/java",
"/QOpenSys/QIBM/ProdData/JavaVM/jdk21/64bit/bin/java"
],
"enumDescriptions": [
"Java 8 (system default)",
"Java 17",
"Java 21"
]
}
}
},
Expand Down
6 changes: 5 additions & 1 deletion src/connection/serverComponent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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`
}
}

Expand Down
17 changes: 17 additions & 0 deletions src/contributes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
},
Expand Down
Loading