Skip to content

Commit

Permalink
Make "." be the CLI's default classpath
Browse files Browse the repository at this point in the history
Previously, the default classpath was empty. Now, in the absence of the
user providing a classpath via the -cp option, the default classpath
will be ".". If the user does specify a classpath, the classpath that's
used will be exactly what they have specified, i.e. "." will no longer
be on the classpath unless specified by the user.

The app sample integration test has been updated to verify that "." is
only the classpath by default.

Fixes #115
  • Loading branch information
wilkinsona committed Dec 4, 2013
1 parent f7f53e4 commit b0c5d32
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion spring-boot-cli/samples/app.groovy
Expand Up @@ -7,7 +7,7 @@ class Example implements CommandLineRunner {
private MyService myService

void run(String... args) {
print "Hello " + this.myService.sayWorld()
println "Hello ${this.myService.sayWorld()} From ${getClass().getClassLoader().getResource('samples/app.groovy')}"
}
}

Expand Down
Expand Up @@ -276,7 +276,7 @@ public boolean isGuessDependencies() {

@Override
public String[] getClasspath() {
return NO_CLASSPATH;
return DEFAULT_CLASSPATH;
}

@Override
Expand Down
Expand Up @@ -31,7 +31,7 @@ public interface GroovyCompilerConfiguration {
/**
* Constant to be used when there is no {@link #getClasspath() classpath}.
*/
public static final String[] NO_CLASSPATH = {};
public static final String[] DEFAULT_CLASSPATH = { "." };

/**
* Returns the scope in which the compiler operates.
Expand Down
Expand Up @@ -82,7 +82,7 @@ public String[] getClasspath() {
if (this.options.has(classpathOption)) {
return this.options.valueOf(classpathOption).split(":");
}
return NO_CLASSPATH;
return DEFAULT_CLASSPATH;
}

@Override
Expand Down
Expand Up @@ -17,6 +17,7 @@
package org.springframework.boot.cli;

import java.io.File;
import java.net.URI;

import org.codehaus.plexus.util.FileUtils;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -48,7 +49,9 @@ public static void cleanGrapes() throws Exception {
@Test
public void appSample() throws Exception {
String output = this.cli.run("app.groovy");
assertTrue("Wrong output: " + output, output.contains("Hello World"));
URI scriptUri = new File("samples/app.groovy").toURI();
assertTrue("Wrong output: " + output,
output.contains("Hello World! From " + scriptUri));
}

@Test
Expand Down

0 comments on commit b0c5d32

Please sign in to comment.