A new assetsDir property

Author: fvarrui

README.md

@@ -81,6 +81,7 @@ And by default it will generate next artifacts in `target ` folder:
 | `additionalModules`        | :x:                | `[]`                                                         | Additional modules to the ones identified by `jdeps` or the specified with `modules` property. |
 | `additionalResources`      | :x:                | `[]`                                                         | Additional files and folders to include in the bundled app.  |
 | `administratorRequired`    | :x:                | `false`                                                      | App will run as administrator (with elevated privileges).    |
+| `assetsDir`                | :x:                | `${basedir}/assets`                                          | Assets location.                                             |
 | `bundleJre`                | :x:                | `false`                                                      | Embeds a customized JRE with the app.                        |
 | `copyDependencies`         | :x:                | `true`                                                       | Bundles all dependencies (JAR files) with the app.           |
 | `createTarball`            | :x:                | `false`                                                      | Bundles app folder in tarball.                               |
@@ -122,23 +123,23 @@ And by default it will generate next artifacts in `target ` folder:
 
 ### Plugin assets
 
-Some assets, such as application icons and Velocity templates, could be placed in `assets` folder organized by platform.
+Some assets, such as application icons and Velocity templates, could be placed in `${assetsDir}` folder organized by platform.
 
 ```
 <project>/
-└── assets/
+└── ${assetsDir}/
 	├── linux/
 	├── mac/
 	└── windows/
 ```
 
 #### Icons
 
-If icons are located in `assets` folders, it would not be necessary to specify the `iconFile` property:
+If icons are located in `${assetsDir}` folders, it would not be necessary to specify the `iconFile` property:
 
 ```
 <project>/
-└── assets/
+└── ${assetsDir}/
 	├── linux/
 	│   ├── ${name}.png     # on GNU/Linux it has to be a PNG file for DEB package
 	│   └── ${name}.xpm     # and XPM file for RPM package
@@ -159,7 +160,7 @@ It is possible to use your own customized templates. You just have to put one of
 
 ```
 <project>/
-└── assets/
+└── ${assetsDir}/
 	├── linux/
 	|   ├── control.vtl                         # DEB control template
 	|   ├── desktop.vtl                         # Desktop template
@@ -170,7 +171,8 @@ It is possible to use your own customized templates. You just have to put one of
 	│   └── startup.vtl                         # Startup script template
 	├── windows/
 	|   ├── exe.manifest.vtl                    # exe.manifest template
-	│   └── iss.vtl                             # Inno Setup Script template
+	|   ├── iss.vtl                             # Inno Setup Script template
+	│   └── wxs.vtl                             # WiX Toolset WXS template
 	└── assembly.xml.vtl                        # template for maven-assembly-plugin
 ```
 

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

@@ -226,6 +226,12 @@ public class PackageMojo extends ParentMojo {
 	 */
 	@Parameter(defaultValue = "true", property = "useResourcesAsWorkingDir", required = false)
 	private boolean useResourcesAsWorkingDir;
+	
+	/**
+	 * Assets directory
+	 */
+	@Parameter(defaultValue = "${project.basedir}/assets", property = "assetsDir", required = false)
+	private File assetsDir;
 
 	public void execute() throws MojoExecutionException {
 
@@ -236,6 +242,7 @@ public void execute() throws MojoExecutionException {
 						.additionalResources(additionalResources)
 						.administratorRequired(administratorRequired)
 						.appVersion(version)
+						.assetsDir(assetsDir)
 						.bundleJre(bundleJre)
 						.copyDependencies(copyDependencies)
 						.createTarball(createTarball)

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

@@ -88,6 +88,7 @@ public abstract class Packager {
 	protected Boolean createZipball;
 	protected Map<String, String> extra;
 	protected boolean useResourcesAsWorkingDir;
+	protected File assetsDir;
 
 	public File getAppFolder() {
 		return appFolder;
@@ -241,6 +242,10 @@ public boolean isUseResourcesAsWorkingDir() {
 		return useResourcesAsWorkingDir;
 	}
 
+	public File getAssetsDir() {
+		return assetsDir;
+	}
+	
 	// fluent api
 
 	public Packager env(ExecutionEnvironment env) {
@@ -418,6 +423,11 @@ public Packager appFolder(File appFolder) {
 		return this;
 	}
 
+	public Packager assetsDir(File assetsDir) {
+		this.assetsDir = assetsDir;
+		return this;
+	}
+	
 	// ===============================================
 
 	public Packager() {
@@ -428,6 +438,9 @@ public Packager() {
 	private void init() throws MojoExecutionException {
 
 		Logger.infoIndent("Initializing packager ...");
+		
+		// sets assetsDir for velocity to locate custom velocity templates 
+		VelocityUtils.setFileResourceLoaderPath(assetsDir);
 
 		// using artifactId as name, if it's not specified
 		name = defaultIfBlank(name, env.getMavenProject().getArtifactId());
@@ -451,6 +464,14 @@ private void init() throws MojoExecutionException {
 
 		doInit();
 
+		// removes not necessary platform specific configs 
+		switch (platform) {
+		case linux: macConfig = null; winConfig = null; break;
+		case mac: winConfig = null; linuxConfig = null; break;
+		case windows: linuxConfig = null; macConfig = null; break;
+		default:
+		}
+		
 		Logger.info("Effective packager configuration " + this);		
 
 		Logger.infoUnindent("Packager initialized!");
@@ -785,7 +806,7 @@ protected File resolveLicense(File licenseFile, List<License> licenses) {
 		}
 		// if license is still null, looks for LICENSE file
 		if (licenseFile == null || !licenseFile.exists()) {
-			licenseFile = new File("LICENSE");
+			licenseFile = new File(this.getEnv().getMavenProject().getBasedir(), "LICENSE");
 			if (!licenseFile.exists()) licenseFile = null;
 		}
 
@@ -809,7 +830,7 @@ protected File resolveIcon(File iconFile, String name, File assetsFolder) throws
 		String iconExtension = IconUtils.getIconFileExtensionByPlatform(platform);
 
 		if (iconFile == null) {
-			iconFile = new File("assets/" + platform + "/", name + iconExtension);
+			iconFile = new File(assetsDir, platform + "/" + name + iconExtension);
 		}
 
 		if (!iconFile.exists()) {
@@ -950,19 +971,21 @@ public List<File> generateInstallers() throws MojoExecutionException {
 	@Override
 	public String toString() {
 		return "[appFolder=" + appFolder + ", assetsFolder=" + assetsFolder + ", executable=" + executable
-				+ ", jarFile=" + jarFile + ", outputDirectory=" + outputDirectory + ", licenseFile=" + licenseFile
-				+ ", iconFile=" + iconFile + ", generateInstaller=" + generateInstaller + ", mainClass=" + mainClass
-				+ ", name=" + name + ", displayName=" + displayName + ", version=" + version + ", description="
-				+ description + ", url=" + url + ", administratorRequired=" + administratorRequired
-				+ ", organizationName=" + organizationName + ", organizationUrl=" + organizationUrl
-				+ ", organizationEmail=" + organizationEmail + ", bundleJre=" + bundleJre + ", customizedJre="
-				+ customizedJre + ", jrePath=" + jrePath + ", additionalResources=" + additionalResources + ", modules="
-				+ modules + ", additionalModules=" + additionalModules + ", platform=" + platform + ", envPath="
-				+ envPath + ", vmArgs=" + vmArgs + ", runnableJar=" + runnableJar + ", copyDependencies="
-				+ copyDependencies + ", jreDirectoryName=" + jreDirectoryName + ", winConfig=" + winConfig
-				+ ", linuxConfig=" + linuxConfig + ", macConfig=" + macConfig + ", createTarball=" + createTarball
-				+ ", createZipball=" + createZipball + ", extra=" + extra + ", useResourcesAsWorkingDir="
-				+ useResourcesAsWorkingDir + "]";
+				+ ", jarFile=" + jarFile + ", executableDestinationFolder=" + executableDestinationFolder
+				+ ", jarFileDestinationFolder=" + jarFileDestinationFolder + ", jreDestinationFolder="
+				+ jreDestinationFolder + ", resourcesDestinationFolder=" + resourcesDestinationFolder + ", env=" + env
+				+ ", outputDirectory=" + outputDirectory + ", licenseFile=" + licenseFile + ", iconFile=" + iconFile
+				+ ", generateInstaller=" + generateInstaller + ", mainClass=" + mainClass + ", name=" + name
+				+ ", displayName=" + displayName + ", version=" + version + ", description=" + description + ", url="
+				+ url + ", administratorRequired=" + administratorRequired + ", organizationName=" + organizationName
+				+ ", organizationUrl=" + organizationUrl + ", organizationEmail=" + organizationEmail + ", bundleJre="
+				+ bundleJre + ", customizedJre=" + customizedJre + ", jrePath=" + jrePath + ", additionalResources="
+				+ additionalResources + ", modules=" + modules + ", additionalModules=" + additionalModules
+				+ ", platform=" + platform + ", envPath=" + envPath + ", vmArgs=" + vmArgs + ", runnableJar="
+				+ runnableJar + ", copyDependencies=" + copyDependencies + ", jreDirectoryName=" + jreDirectoryName
+				+ ", winConfig=" + winConfig + ", linuxConfig=" + linuxConfig + ", macConfig=" + macConfig
+				+ ", createTarball=" + createTarball + ", createZipball=" + createZipball + ", extra=" + extra
+				+ ", useResourcesAsWorkingDir=" + useResourcesAsWorkingDir + ", assetsDir=" + assetsDir + "]";
 	}
 
 	protected abstract void doCreateAppStructure() throws MojoExecutionException; 

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

@@ -59,4 +59,8 @@ private static String render(String templatePath, Object info) throws MojoExecut
 		return writer.toString();
 	}
 
+	public static void setFileResourceLoaderPath(File assetsDir) {
+		velocityEngine.setProperty("file.resource.loader.path", assetsDir.getAbsolutePath());		
+	}
+	
 }