Repackager: pluggable layouts. Support overriding launcher class.

Repackager: pluggable layouts. Support overriding launcher class.

Author: patrikbeno

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy

@@ -38,7 +38,12 @@ import org.springframework.boot.loader.tools.Layouts
  */
 public class SpringBootPluginExtension {
 
-	/**
+    /**
+     * Launcher class, replaces the default specified by layout. Optional.
+     */
+    String launcherClass;
+
+    /**
 	 * The main class that should be run. Instead of setting this explicitly you can use the
 	 * 'mainClassName' of the project or the 'main' of the 'run' task. If not specified the
 	 * value from the MANIFEST will be used, or if no manifest entry is the archive will be

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java

@@ -166,6 +166,7 @@ private void repackage(File file) {
 			}
 			Repackager repackager = new LoggingRepackager(file);
 			setMainClass(repackager);
+			repackager.setLauncherClass(this.extension.getLauncherClass());
 			repackager.setLayout(this.extension.convertLayout());
 			repackager.setBackupSource(this.extension.isBackupSource());
 			try {

spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java

@@ -42,6 +42,8 @@ public class Repackager {
 
 	private static final byte[] ZIP_FILE_HEADER = new byte[] { 'P', 'K', 3, 4 };
 
+	private String launcherClass;
+
 	private String mainClass;
 
 	private boolean backupSource = true;
@@ -58,6 +60,10 @@ public Repackager(File source) {
 		this.layout = Layouts.forFile(source);
 	}
 
+	public void setLauncherClass(String launcherClass) {
+		this.launcherClass = launcherClass;
+	}
+
 	/**
 	 * Sets the main class that should be run. If not specified the value from the
 	 * MANIFEST will be used, or if no manifest entry is found the archive will be
@@ -229,7 +235,9 @@ private Manifest buildManifest(JarFile source) throws IOException {
 		if (startClass == null) {
 			startClass = findMainMethod(source);
 		}
-		String launcherClassName = this.layout.getLauncherClassName();
+		String launcherClassName = (launcherClass != null)
+				? launcherClass
+				: layout.getLauncherClassName();
 		if (launcherClassName != null) {
 			manifest.getMainAttributes()
 					.putValue(MAIN_CLASS_ATTRIBUTE, launcherClassName);

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

@@ -99,6 +99,12 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 	@Parameter
 	private String classifier;
 
+	/**
+	 * Name of the launcher class; overrides the one specified by layout.
+	 */
+	@Parameter
+	private String launcherClass;
+
 	/**
 	 * The name of the main class. If not specified the first compiled class found that
 	 * contains a 'main' method will be used.
@@ -155,6 +161,7 @@ protected String findMainMethod(JarFile source) throws IOException {
 			}
 		};
 		repackager.setMainClass(this.mainClass);
+		repackager.setLauncherClass(this.launcherClass);
 
 		getLog().info("Layout: " + this.layout);
 		repackager.setLayout(Layouts.resolve(this.layout));