Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slight;y better logic to look for tools.jar

Browse Source 
Favor JAVA_HOME env var over system prop.

Look both in java home and its parrent for "lib/tools.jar"
This commit is contained in:
Kris De Volder
2018-01-26 12:38:41 -08:00
parent 23ea40d89b
commit bab9f98d9b
2 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java
View File

@@ -39,7 +39,13 @@ public class SpringBootJavaLanguageServer extends STS4LanguageServerProcessStrea
commands.add("-Dlsp.completions.indentation.enable=true");
commands.add("-Xmx1024m");
commands.add("-cp");
commands.add(getToolsJAR() + File.pathSeparator + getLanguageServerJARLocation());
File toolsJar = getToolsJAR();
if (toolsJar!=null) {
commands.add(toolsJar + File.pathSeparator + getLanguageServerJARLocation());
} else {
//TODO: issue a 'missing tools.jar warning somehow depending on the platform?
commands.add(getLanguageServerJARLocation());
}
commands.add("org.springframework.boot.loader.JarLauncher");
String workingDir = getWorkingDirLocation();