From 44826812db601f11da405fed655c962da32f265b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 10 Mar 2014 10:28:50 +0000 Subject: [PATCH] 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 --- .../it/java/org/springframework/boot/cli/JarCommandIT.java | 5 ++++- spring-boot-cli/src/it/resources/jar-command/jar.groovy | 5 ++++- .../jar-command/{static/test.txt => public/public.txt} | 0 .../src/it/resources/jar-command/resources/resource.txt | 0 .../src/it/resources/jar-command/static/static.txt | 0 .../src/it/resources/jar-command/templates/template.txt | 0 .../org/springframework/boot/cli/command/jar/JarCommand.java | 4 ++-- 7 files changed, 10 insertions(+), 4 deletions(-) rename spring-boot-cli/src/it/resources/jar-command/{static/test.txt => public/public.txt} (100%) create mode 100644 spring-boot-cli/src/it/resources/jar-command/resources/resource.txt create mode 100644 spring-boot-cli/src/it/resources/jar-command/static/static.txt create mode 100644 spring-boot-cli/src/it/resources/jar-command/templates/template.txt diff --git a/spring-boot-cli/src/it/java/org/springframework/boot/cli/JarCommandIT.java b/spring-boot-cli/src/it/java/org/springframework/boot/cli/JarCommandIT.java index 0c1b2bd152e..c6c49550e06 100644 --- a/spring-boot-cli/src/it/java/org/springframework/boot/cli/JarCommandIT.java +++ b/spring-boot-cli/src/it/java/org/springframework/boot/cli/JarCommandIT.java @@ -74,6 +74,9 @@ public class JarCommandIT { assertThat(invocation.getErrorOutput(), equalTo("")); 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")); } } diff --git a/spring-boot-cli/src/it/resources/jar-command/jar.groovy b/spring-boot-cli/src/it/resources/jar-command/jar.groovy index e022c572a37..7d68a5f4704 100644 --- a/spring-boot-cli/src/it/resources/jar-command/jar.groovy +++ b/spring-boot-cli/src/it/resources/jar-command/jar.groovy @@ -8,7 +8,10 @@ class Example implements CommandLineRunner { void run(String... args) { 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') } } diff --git a/spring-boot-cli/src/it/resources/jar-command/static/test.txt b/spring-boot-cli/src/it/resources/jar-command/public/public.txt similarity index 100% rename from spring-boot-cli/src/it/resources/jar-command/static/test.txt rename to spring-boot-cli/src/it/resources/jar-command/public/public.txt diff --git a/spring-boot-cli/src/it/resources/jar-command/resources/resource.txt b/spring-boot-cli/src/it/resources/jar-command/resources/resource.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/spring-boot-cli/src/it/resources/jar-command/static/static.txt b/spring-boot-cli/src/it/resources/jar-command/static/static.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/spring-boot-cli/src/it/resources/jar-command/templates/template.txt b/spring-boot-cli/src/it/resources/jar-command/templates/template.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java index a2e895e1dd3..51f3be65f80 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java @@ -65,8 +65,8 @@ import org.springframework.util.Assert; */ public class JarCommand extends OptionParsingCommand { - private static final String[] DEFAULT_INCLUDES = { "public/**", "static/**", - "resources/**", "META-INF/**", "*" }; + private static final String[] DEFAULT_INCLUDES = { "public/**", "resources/**", + "static/**", "templates/**", "META-INF/**", "*" }; private static final String[] DEFAULT_EXCLUDES = { ".*", "repository/**", "build/**", "target/**", "**/*.jar", "**/*.groovy" };