Commit 44826812 authored by Andy Wilkinson's avatar Andy Wilkinson

Add templates/** to list of default includes for CLI jars

Boot promotes the use of a templates directory for housing view
templates. Include this directory by default when building a jar file
from a CLI app.

Fixes #455
parent cb6739b4
...@@ -74,6 +74,9 @@ public class JarCommandIT { ...@@ -74,6 +74,9 @@ public class JarCommandIT {
assertThat(invocation.getErrorOutput(), equalTo("")); assertThat(invocation.getErrorOutput(), equalTo(""));
assertThat(invocation.getStandardOutput(), containsString("Hello World!")); assertThat(invocation.getStandardOutput(), containsString("Hello World!"));
assertThat(invocation.getStandardOutput(), containsString("/static/test.txt")); assertThat(invocation.getStandardOutput(), containsString("/public/public.txt"));
assertThat(invocation.getStandardOutput(), containsString("/resources/resource.txt"));
assertThat(invocation.getStandardOutput(), containsString("/static/static.txt"));
assertThat(invocation.getStandardOutput(), containsString("/templates/template.txt"));
} }
} }
...@@ -8,7 +8,10 @@ class Example implements CommandLineRunner { ...@@ -8,7 +8,10 @@ class Example implements CommandLineRunner {
void run(String... args) { void run(String... args) {
println "Hello ${this.myService.sayWorld()}" println "Hello ${this.myService.sayWorld()}"
println getClass().getResource('/static/test.txt') println getClass().getResource('/public/public.txt')
println getClass().getResource('/resources/resource.txt')
println getClass().getResource('/static/static.txt')
println getClass().getResource('/templates/template.txt')
} }
} }
......
...@@ -65,8 +65,8 @@ import org.springframework.util.Assert; ...@@ -65,8 +65,8 @@ import org.springframework.util.Assert;
*/ */
public class JarCommand extends OptionParsingCommand { public class JarCommand extends OptionParsingCommand {
private static final String[] DEFAULT_INCLUDES = { "public/**", "static/**", private static final String[] DEFAULT_INCLUDES = { "public/**", "resources/**",
"resources/**", "META-INF/**", "*" }; "static/**", "templates/**", "META-INF/**", "*" };
private static final String[] DEFAULT_EXCLUDES = { ".*", "repository/**", "build/**", private static final String[] DEFAULT_EXCLUDES = { ".*", "repository/**", "build/**",
"target/**", "**/*.jar", "**/*.groovy" }; "target/**", "**/*.jar", "**/*.groovy" };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment