Fix packaging for Layout.NONE

Dave Syer · Dave Syer · commit f39b044cf78b · 2013-12-02T14:10:56.000Z
Fixes spring-projectsgh-139
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
@@ -145,7 +145,9 @@ public void library(File file, LibraryScope scope) throws IOException {
 					}
 				}
 			});
-			writer.writeLoaderClasses();
+			if (!(this.layout instanceof Layouts.None)) {
+				writer.writeLoaderClasses();
+			}
 		}
 		finally {
 			try {
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
@@ -148,6 +148,7 @@ public void noMainClassAndLayoutIsNone() throws Exception {
 		Manifest actualManifest = getManifest(file);
 		assertThat(actualManifest.getMainAttributes().getValue("Main-Class"),
 				equalTo("a.b.C"));
+		assertThat(hasLauncherClasses(file), equalTo(false));
 	}
 
 	@Test
@@ -160,6 +161,7 @@ public void noMainClassAndLayoutIsNoneWithNoMain() throws Exception {
 		Manifest actualManifest = getManifest(file);
 		assertThat(actualManifest.getMainAttributes().getValue("Main-Class"),
 				equalTo(null));
+		assertThat(hasLauncherClasses(file), equalTo(false));
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,9 @@ public void library(File file, LibraryScope scope) throws IOException {`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`	`});`
`148`		`- writer.writeLoaderClasses();`
	`148`	`+ if (!(this.layout instanceof Layouts.None)) {`
	`149`	`+ writer.writeLoaderClasses();`
	`150`	`+ }`
`149`	`151`	`}`
`150`	`152`	`finally {`
`151`	`153`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ public void noMainClassAndLayoutIsNone() throws Exception {`
`148`	`148`	`Manifest actualManifest = getManifest(file);`
`149`	`149`	`assertThat(actualManifest.getMainAttributes().getValue("Main-Class"),`
`150`	`150`	`equalTo("a.b.C"));`
	`151`	`+ assertThat(hasLauncherClasses(file), equalTo(false));`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`@Test`
`@@ -160,6 +161,7 @@ public void noMainClassAndLayoutIsNoneWithNoMain() throws Exception {`
`160`	`161`	`Manifest actualManifest = getManifest(file);`
`161`	`162`	`assertThat(actualManifest.getMainAttributes().getValue("Main-Class"),`
`162`	`163`	`equalTo(null));`
	`164`	`+ assertThat(hasLauncherClasses(file), equalTo(false));`
`163`	`165`	`}`
`164`	`166`
`165`	`167`	`@Test`