U fixed velocity templates location resolution, realtive to assetsDir property

Author: fvarrui

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

@@ -439,8 +439,8 @@ private void init() throws MojoExecutionException {
 
 		Logger.infoIndent("Initializing packager ...");
 
-		// sets assetsDir for velocity to locate custom velocity templates 
-		VelocityUtils.setFileResourceLoaderPath(assetsDir);
+		// sets assetsDir for velocity to locate custom velocity templates
+		VelocityUtils.setAssetsDir(assetsDir);
 
 		// using artifactId as name, if it's not specified
 		name = defaultIfBlank(name, env.getMavenProject().getArtifactId());

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

@@ -19,32 +19,30 @@
 
 public class VelocityUtils {
 
-	private static VelocityEngine velocityEngine;
+	private static File assetsDir = new File("assets");
+	private static VelocityEngine velocityEngine = null;
 
-	static {
-		velocityEngine = new VelocityEngine();
+	private static VelocityEngine getVelocityEngine() {
 
-		// specify resource loaders to use
-		velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file,class");
-		
-		// for the loader 'file', set the FileResourceLoader as the class to use and use 'assets' directory for templates
-		velocityEngine.setProperty("file.resource.loader.class", FileResourceLoader.class.getName());
-		velocityEngine.setProperty("file.resource.loader.path", "assets");
-		
-		// for the loader 'class', set the ClasspathResourceLoader as the class to use
-		velocityEngine.setProperty("class.resource.loader.class", ClasspathResourceLoader.class.getName());
-		
-		velocityEngine.init();
-	}
-
-	public static void render(String templatePath, File output, Object info) throws MojoExecutionException {
-		try {
-			String data = render(templatePath, info);
-			data = data.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");
-			writeStringToFile(output, data, "UTF-8");
-		} catch (IOException e) {
-			throw new MojoExecutionException(e.getMessage(), e);
+		if (velocityEngine == null) {
+			
+			velocityEngine = new VelocityEngine();
+			
+			// specify resource loaders to use
+			velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file,class");
+			
+			// for the loader 'file', set the FileResourceLoader as the class to use and use 'assets' directory for templates
+			velocityEngine.setProperty("file.resource.loader.class", FileResourceLoader.class.getName());
+			velocityEngine.setProperty("file.resource.loader.path", assetsDir.getAbsolutePath());
+			
+			// for the loader 'class', set the ClasspathResourceLoader as the class to use
+			velocityEngine.setProperty("class.resource.loader.class", ClasspathResourceLoader.class.getName());
+			
+			velocityEngine.init();
+			
 		}
+		
+		return velocityEngine;
 	}
 
 	private static String render(String templatePath, Object info) throws MojoExecutionException {
@@ -53,14 +51,24 @@ private static String render(String templatePath, Object info) throws MojoExecut
 		context.put("GUID", UUID.class);
 		context.put("StringUtils", StringUtils.class);
 		context.put("info", info);
-		Template template = velocityEngine.getTemplate(templatePath, "UTF-8");
+		Template template = getVelocityEngine().getTemplate(templatePath, "UTF-8");
 		StringBuilderWriter writer = new StringBuilderWriter();
 		template.merge(context, writer);		
 		return writer.toString();
 	}
-	
-	public static void setFileResourceLoaderPath(File assetsDir) {
-		velocityEngine.setProperty("file.resource.loader.path", assetsDir.getAbsolutePath());		
+
+	public static void setAssetsDir(File assetsDir) {
+		VelocityUtils.assetsDir = assetsDir;
+	}
+
+	public static void render(String templatePath, File output, Object info) throws MojoExecutionException {
+		try {
+			String data = render(templatePath, info);
+			data = data.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");
+			writeStringToFile(output, data, "UTF-8");
+		} catch (IOException e) {
+			throw new MojoExecutionException(e.getMessage(), e);
+		}
 	}
 
 }