Fix "spring war" to copy resources to WEB-INF/classes

spring-boot-cli/src/it/java/org/springframework/boot/cli/WarCommandIT.java

@@ -16,24 +16,23 @@
 
 package org.springframework.boot.cli;
 
-import java.io.File;
-
 import org.junit.Test;
-
 import org.springframework.boot.cli.command.archive.WarCommand;
 import org.springframework.boot.cli.infrastructure.CommandLineInvoker;
 import org.springframework.boot.cli.infrastructure.CommandLineInvoker.Invocation;
 import org.springframework.boot.loader.tools.JavaExecutable;
 import org.springframework.util.SocketUtils;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.util.zip.ZipFile;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Integration test for {@link WarCommand}.
  *
  * @author Andrey Stolyarov
+ * @author Henri Kerola
  */
 public class WarCommandIT {
 
@@ -47,19 +46,38 @@ public void warCreation() throws Exception {
 		Invocation invocation = this.cli.invoke("war", war.getAbsolutePath(),
 				"war.groovy");
 		invocation.await();
-		assertTrue(war.exists());
+		assertThat(war.exists()).isTrue();
 		Process process = new JavaExecutable()
 				.processBuilder("-jar", war.getAbsolutePath(), "--server.port=" + port)
 				.start();
 		invocation = new Invocation(process);
 		invocation.await();
-		assertThat(invocation.getOutput(), containsString("onStart error"));
-		assertThat(invocation.getOutput(), containsString("Tomcat started"));
-		assertThat(invocation.getOutput(),
-				containsString("/WEB-INF/lib-provided/tomcat-embed-core"));
-		assertThat(invocation.getOutput(),
-				containsString("/WEB-INF/lib-provided/tomcat-embed-core"));
+		assertThat(invocation.getOutput()).contains("onStart error");
+		assertThat(invocation.getOutput()).contains("Tomcat started");
+		assertThat(invocation.getOutput())
+				.contains("/WEB-INF/lib-provided/tomcat-embed-core");
+		assertThat(invocation.getOutput())
+				.contains("/WEB-INF/lib-provided/tomcat-embed-core");
 		process.destroy();
 	}
 
+	@Test
+	public void resourcesAreCopiedToWebInfClasses() throws Exception {
+		File war = new File("target/test-app.war");
+		Invocation invocation = this.cli.invoke("war", war.getAbsolutePath(),
+				"war.groovy");
+		invocation.await();
+		assertThat(war.exists()).isTrue();
+
+		ZipFile warFile = new ZipFile(war.getAbsolutePath());
+		try {
+			assertThat(warFile.getEntry("application.properties")).isNull();
+			assertThat(warFile.getEntry("WEB-INF/classes/application.properties")).isNotNull();
+		}
+		finally {
+			warFile.close();
+		}
+
+	}
+
 }

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.cli.command.archive;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -73,6 +72,7 @@
  * @author Andy Wilkinson
  * @author Phillip Webb
  * @author Andrey Stolyarov
+ * @author Henri Kerola
  */
 abstract class ArchiveCommand extends OptionParsingCommand {
 
@@ -93,7 +93,7 @@ protected abstract static class ArchiveOptionHandler extends CompilerOptionHandl
 
 		private final String type;
 
-		private final Layout layout;
+		protected final Layout layout;
 
 		private OptionSpec<String> includeOption;
 
@@ -278,13 +278,15 @@ private List<Library> addClasspathEntries(JarWriter writer,
 					libraries.add(new Library(entry.getFile(), LibraryScope.COMPILE));
 				}
 				else {
-					writer.writeEntry(entry.getName(),
-							new FileInputStream(entry.getFile()));
+					writeClasspathEntry(writer, entry);
 				}
 			}
 			return libraries;
 		}
 
+		protected abstract void writeClasspathEntry(JarWriter writer,
+				MatchedResource entry) throws IOException;
+
 		protected abstract LibraryScope getLibraryScope(File file);
 
 	}

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/JarCommand.java

@@ -17,8 +17,11 @@
 package org.springframework.boot.cli.command.archive;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 
 import org.springframework.boot.cli.command.Command;
+import org.springframework.boot.loader.tools.JarWriter;
 import org.springframework.boot.loader.tools.Layouts;
 import org.springframework.boot.loader.tools.LibraryScope;
 
@@ -27,6 +30,7 @@
  *
  * @author Andy Wilkinson
  * @author Phillip Webb
+ * @author Henri Kerola
  */
 public class JarCommand extends ArchiveCommand {
 
@@ -46,6 +50,13 @@ protected LibraryScope getLibraryScope(File file) {
 			return LibraryScope.COMPILE;
 		}
 
+		@Override
+		protected void writeClasspathEntry(JarWriter writer,
+				ResourceMatcher.MatchedResource entry) throws IOException {
+			writer.writeEntry(entry.getName(),
+					new FileInputStream(entry.getFile()));
+		}
+
 	}
 
 }

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/WarCommand.java

@@ -17,6 +17,7 @@
 package org.springframework.boot.cli.command.archive;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 
 import org.springframework.boot.cli.command.Command;
@@ -29,6 +30,7 @@
  *
  * @author Andrey Stolyarov
  * @author Phillip Webb
+ * @author Henri Kerola
  * @since 1.3.0
  */
 public class WarCommand extends ArchiveCommand {
@@ -61,6 +63,12 @@ protected void addCliClasses(JarWriter writer) throws IOException {
 			super.addCliClasses(writer);
 		}
 
+		@Override
+		protected void writeClasspathEntry(JarWriter writer,
+				ResourceMatcher.MatchedResource entry) throws IOException {
+			writer.writeEntry(this.layout.getClassesLocation() + entry.getName(),
+					new FileInputStream(entry.getFile()));
+		}
 	}
 
 }