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

Fix class loading problems when CLI extensions are installed

Browse Source 
Previously, CLI extensions where installed into the CLI's lib
directory which meant that they were on the class path of the app
class loader. Following the change to an executable jar's packaging,
this meant that they could not see classes in the CLI and a
ClassNotFoundException would result.

This commit updates the CLI to install extensions into lib/ext and
load commands using a new ClassLoader that has all of the jars in
lib/ext on its class path and that uses the launch class loader as
its parent.

Closes gh-6615
This commit is contained in:
Andy Wilkinson
2016-08-11 16:01:18 +01:00
parent b2420be886
commit 270530c4fd
5 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/InstallerTests.java
View File

@@ -66,7 +66,7 @@ public class InstallerTests {
File foo = createTemporaryFile("foo.jar");
given(this.resolver.resolve(Arrays.asList("foo"))).willReturn(Arrays.asList(foo));
this.installer.install(Arrays.asList("foo"));
assertThat(getNamesOfFilesInLib()).containsOnly("foo.jar", ".installed");
assertThat(getNamesOfFilesInLibExt()).containsOnly("foo.jar", ".installed");
}
@Test
@@ -75,7 +75,7 @@ public class InstallerTests {
given(this.resolver.resolve(Arrays.asList("foo"))).willReturn(Arrays.asList(foo));
this.installer.install(Arrays.asList("foo"));
this.installer.uninstall(Arrays.asList("foo"));
assertThat(getNamesOfFilesInLib()).contains(".installed");
assertThat(getNamesOfFilesInLibExt()).contains(".installed");
}
@Test
@@ -88,16 +88,16 @@ public class InstallerTests {
given(this.resolver.resolve(Arrays.asList("charlie")))
.willReturn(Arrays.asList(charlie, alpha));
this.installer.install(Arrays.asList("bravo"));
assertThat(getNamesOfFilesInLib()).containsOnly("alpha.jar", "bravo.jar",
assertThat(getNamesOfFilesInLibExt()).containsOnly("alpha.jar", "bravo.jar",
".installed");
this.installer.install(Arrays.asList("charlie"));
assertThat(getNamesOfFilesInLib()).containsOnly("alpha.jar", "bravo.jar",
assertThat(getNamesOfFilesInLibExt()).containsOnly("alpha.jar", "bravo.jar",
"charlie.jar", ".installed");
this.installer.uninstall(Arrays.asList("bravo"));
assertThat(getNamesOfFilesInLib()).containsOnly("alpha.jar", "charlie.jar",
assertThat(getNamesOfFilesInLibExt()).containsOnly("alpha.jar", "charlie.jar",
".installed");
this.installer.uninstall(Arrays.asList("charlie"));
assertThat(getNamesOfFilesInLib()).containsOnly(".installed");
assertThat(getNamesOfFilesInLibExt()).containsOnly(".installed");
}
@Test
@@ -111,15 +111,15 @@ public class InstallerTests {
.willReturn(Arrays.asList(charlie, alpha));
this.installer.install(Arrays.asList("bravo"));
this.installer.install(Arrays.asList("charlie"));
assertThat(getNamesOfFilesInLib()).containsOnly("alpha.jar", "bravo.jar",
assertThat(getNamesOfFilesInLibExt()).containsOnly("alpha.jar", "bravo.jar",
"charlie.jar", ".installed");
this.installer.uninstallAll();
assertThat(getNamesOfFilesInLib()).containsOnly(".installed");
assertThat(getNamesOfFilesInLibExt()).containsOnly(".installed");
}
private Set<String> getNamesOfFilesInLib() {
private Set<String> getNamesOfFilesInLibExt() {
Set<String> names = new HashSet<String>();
for (File file : new File("target/lib").listFiles()) {
for (File file : new File("target/lib/ext").listFiles()) {
names.add(file.getName());
}
return names;