U packager fully decoupled from maven

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java

@@ -311,12 +311,13 @@ public void execute() throws MojoExecutionException {
 						.vmArgs(vmArgs)
 						.winConfig(winConfig);
 
+			// sets Maven specific functions
 			packager.setCreateRunnableJar(new CreateRunnableJar());
+			packager.setResolveLicenseFunction(new ResolveLicenseFromPOM());
 
+			// generate app, installers and bundles
 			packager.createApp();
-			
 			packager.generateInstallers();
-			
 			packager.createBundles();
 
 		} catch (Exception e) {

src/main/java/io/github/fvarrui/javapackager/maven/ResolveLicenseFromPOM.java

@@ -0,0 +1,51 @@
+package io.github.fvarrui.javapackager.maven;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.function.Function;
+
+import org.apache.maven.model.License;
+
+import io.github.fvarrui.javapackager.packagers.Packager;
+import io.github.fvarrui.javapackager.utils.FileUtils;
+import io.github.fvarrui.javapackager.utils.Logger;
+
+/**
+ * Creates a runnable jar file from sources
+ */
+public class ResolveLicenseFromPOM implements Function<Packager, File> {
+	
+	@Override
+	public File apply(Packager packager) {
+		Logger.infoIndent("Resolving license from POM ...");
+		
+		File licenseFile = packager.getLicenseFile();
+		List<License> licenses = MavenContext.getEnv().getMavenProject().getLicenses();
+		File assetsFolder = packager.getAssetsFolder();
+		
+		// if license not specified, gets from pom
+		if (licenseFile == null && !licenses.isEmpty()) {
+			String urlStr = null; 
+			try {
+				urlStr = licenses.get(0).getUrl(); 
+				URL licenseUrl = new URL(urlStr);
+				licenseFile = new File(assetsFolder, "LICENSE");
+				FileUtils.downloadFromUrl(licenseUrl, licenseFile);
+			} catch (MalformedURLException e) {
+				Logger.error("Invalid license URL specified: " + urlStr);
+				licenseFile = null;
+			} catch (IOException e) {
+				Logger.error("Cannot download license from " + urlStr);
+				licenseFile = null;
+			}
+		}
+
+		Logger.infoUnindent("License resolved " + licenseFile + "!");
+		
+		return licenseFile;
+	}
+	
+}

src/main/java/io/github/fvarrui/javapackager/packagers/LinuxPackager.java

@@ -129,7 +129,6 @@ private File generateRpmPackage() throws Exception {
 				),
 				goal("rpm"), 
 				configuration(
-						element("license", getLicenseName()),
 						element("packager", organizationName),
 						element("group", "Application"),
 						element("icon", xpmIcon.getAbsolutePath()),

src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java

@@ -11,9 +11,6 @@
 import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
 
 import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -24,7 +21,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
-import org.apache.maven.model.License;
 
 import io.github.fvarrui.javapackager.maven.MavenContext;
 import io.github.fvarrui.javapackager.model.Platform;
@@ -85,6 +81,18 @@ public File createRunnableJar() {
 		return createRunnableJarFunction.apply(this);
 	}
 
+	// resolve license
+	
+	protected Function<Packager, File> resolveLicenseFunction;
+
+	public Function<Packager, File> getResolveLicenseFunction() {
+		return resolveLicenseFunction;
+	}
+
+	public void setResolveLicenseFunction(Function<Packager, File> resolveLicenseFunction) {
+		this.resolveLicenseFunction = resolveLicenseFunction;
+	}
+	
 	// ===============================================
 
 	public Packager() {
@@ -154,7 +162,7 @@ public void resolveResources() throws Exception {
 		Logger.infoIndent("Resolving resources ...");
 
 		// locates license file
-		licenseFile = resolveLicense(licenseFile, MavenContext.getEnv().getMavenProject().getLicenses());
+		licenseFile = resolveLicense(licenseFile);
 
 		// locates icon file
 		iconFile = resolveIcon(iconFile, name, assetsFolder);
@@ -169,11 +177,6 @@ public void resolveResources() throws Exception {
 		Logger.infoUnindent("Resources resolved!");
 
 	}
-	
-	protected String getLicenseName() {
-		List<License> licenses = MavenContext.getEnv().getMavenProject().getLicenses();
-		return licenses != null && !licenses.isEmpty() && licenses.get(0) != null ? licenses.get(0).getName() : "";
-	}
 
 	/**
 	 * Copies all dependencies to app folder
@@ -468,35 +471,21 @@ protected String getRequiredModules(File libsFolder, boolean customizedJre, File
 	/**
 	 * Locates license file
 	 * @param licenseFile Specified license file
-	 * @param licenses Licenses list from POM
 	 * @return Resolved license file
 	 */
-	protected File resolveLicense(File licenseFile, List<License> licenses) {
+	protected File resolveLicense(File licenseFile) {
 
-		// if default license file doesn't exist and there's a license specified in
-		// pom.xml file, gets this last one
+		// if default license file doesn't exist 
 		if (licenseFile != null && !licenseFile.exists()) {
 			Logger.warn("Specified license file doesn't exist: " + licenseFile.getAbsolutePath());
 			licenseFile = null;
 		}
-		// if license not specified, gets from pom
-		if (licenseFile == null && !licenses.isEmpty()) {
-			
-			String urlStr = null; 
-			try {
-				urlStr = licenses.get(0).getUrl(); 
-				URL licenseUrl = new URL(urlStr);
-				licenseFile = new File(assetsFolder, "LICENSE");
-				FileUtils.downloadFromUrl(licenseUrl, licenseFile);
-			} catch (MalformedURLException e) {
-				Logger.error("Invalid license URL specified: " + urlStr);
-				licenseFile = null;
-			} catch (IOException e) {
-				Logger.error("Cannot download license from " + urlStr);
-				licenseFile = null;
-			}
-			
+		
+		// invokes custom license resolver if exists
+		if (resolveLicenseFunction != null) {
+			licenseFile = resolveLicenseFunction.apply(this);
 		}
+		
 		// if license is still null, looks for LICENSE file
 		if (licenseFile == null || !licenseFile.exists()) {
 			licenseFile = new File(MavenContext.getEnv().getMavenProject().getBasedir(), "LICENSE");
@@ -521,13 +510,23 @@ protected File resolveLicense(File licenseFile, List<License> licenses) {
 	 * @throws Exception Process failed
 	 */
 	protected File resolveIcon(File iconFile, String name, File assetsFolder) throws Exception {
+
+		// searchs for specific icons 
+		switch (platform) {
+		case linux: 	iconFile = FileUtils.exists(linuxConfig.getPngFile())	? linuxConfig.getPngFile() 	: null; break; 
+		case mac: 		iconFile = FileUtils.exists(macConfig.getIcnsFile())	? macConfig.getIcnsFile() 	: null; break; 
+		case windows: 	iconFile = FileUtils.exists(winConfig.getIcoFile())		? winConfig.getIcoFile() 	: null; break; 
+		default:
+		}
 
-		String iconExtension = IconUtils.getIconFileExtensionByPlatform(platform);
+		String iconExtension = IconUtils.getIconFileExtensionByPlatform(platform);		
 
+		// if not specific icon specified for target platform, searchs for an icon in "${assetsDir}" folder  
 		if (iconFile == null) {
 			iconFile = new File(assetsDir, platform + "/" + name + iconExtension);
 		}
 
+		// if there's no icon yet, uses default one
 		if (!iconFile.exists()) {
 			iconFile = new File(assetsFolder, iconFile.getName());
 			FileUtils.copyResourceToFile("/" + platform + "/default-icon" + iconExtension, iconFile);
@@ -538,7 +537,6 @@ protected File resolveIcon(File iconFile, String name, File assetsFolder) throws
 		return iconFile;
 	}
 
-	
 	/**
 	 * Bundling app folder in tarball and/or zipball 
 	 * @throws Exception Process failed

src/main/java/io/github/fvarrui/javapackager/utils/FileUtils.java

@@ -208,5 +208,9 @@ public static void downloadFromUrl(URL url, File file) throws IOException {
 		org.apache.commons.io.FileUtils.copyURLToFile(url, file);
 		Logger.info("File downloaded from [" + url + "] to [" + file.getAbsolutePath() + "]");
 	}
+	
+	public static boolean exists(File file) {
+		return file != null && file.exists();
+	}
 
 }