More configurable app folder layout.

rapidoid-app/src/main/java/org/rapidoid/app/AppHandler.java

@@ -27,6 +27,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.config.Conf;
 import org.rapidoid.dispatch.DispatchResult;
 import org.rapidoid.dispatch.PojoDispatchException;
 import org.rapidoid.dispatch.PojoDispatcher;
@@ -208,12 +209,11 @@ private DispatchResult doDispatch(PojoDispatcher dispatcher, PojoRequest req) {
 	}
 
 	public boolean serveDynamicPage(HttpExchangeImpl x, Object result, boolean hasEvent, Map<String, Object> config) {
-		String filename = "dynamic/" + x.resourceName() + ".html";
-		Res resource = Res.from(filename);
+		Res resource = Res.from(Conf.templatesPath() + "/" + x.resourceName() + ".html");
 
 		Map<String, Object> model;
 		if (resource.exists()) {
-			model = pageModel(filename, result, resource);
+			model = pageModel(result, resource);
 		} else if (result != null) {
 			model = U.map("result", result, "content", result, "navbar", true);
 		} else {
@@ -250,7 +250,7 @@ private void serveEventResponse(HttpExchangeImpl x, String html) {
 		}
 	}
 
-	private static Map<String, Object> pageModel(String filename, Object result, Res resource) {
+	private static Map<String, Object> pageModel(Object result, Res resource) {
 		String template = U.safe(resource.getContent());
 
 		Map<String, Object> model = U.map("result", result);

rapidoid-config/src/main/java/org/rapidoid/config/Conf.java

@@ -168,13 +168,30 @@ public static void set(String key, Object value) {
 		ROOT.put(key, value);
 	}
 
-	public static String path() {
-		String path = option("path", "rapidoid");
+	public static String rootPath() {
+		return cleanPath(option("root", "rapidoid"));
+	}
+
+	public static String configPath() {
+		return cleanPath(option("config", rootPath()));
+	}
+
+	public static String staticPath() {
+		return cleanPath(option("static", rootPath() + "/static"));
+	}
 
+	public static String dynamicPath() {
+		return cleanPath(option("dynamic", rootPath() + "/dynamic"));
+	}
+
+	public static String templatesPath() {
+		return cleanPath(option("templates", rootPath() + "/templates"));
+	}
+
+	private static String cleanPath(String path) {
 		if (path.endsWith("/") || path.endsWith("\\")) {
 			path = path.substring(0, path.length() - 1);
 		}
-
 		return path;
 	}
 

rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java

@@ -937,19 +937,19 @@ public synchronized HttpExchange authorize(Class<?> clazz) {
 
 	@Override
 	public synchronized boolean serveStaticFile() {
-		if (serveStaticFile("static/" + resourceName())) {
+		if (serveStaticFile(resourceName())) {
 			return true;
 		}
 
-		return !resourceNameHasExtension() && serveStaticFile("static/" + resourceName() + ".html");
+		return !resourceNameHasExtension() && serveStaticFile(resourceName() + ".html");
 	}
 
 	@Override
 	public synchronized boolean serveStaticFile(String filename) {
-		Res resource = Res.from(filename);
+		Res res = Res.from(Conf.staticPath() + "/" + filename);
 
-		if (resource.exists()) {
-			sendFile(resource);
+		if (res.exists()) {
+			sendFile(res);
 			return true;
 		} else {
 			return false;

rapidoid-io/src/main/java/org/rapidoid/io/IO.java

@@ -59,7 +59,7 @@ public static ClassLoader classLoader() {
 	}
 
 	public static String name(String resourceName) {
-		int urlPos = resourceName.indexOf("://");
+		int urlPos = resourceName.indexOf(":/");
 		if (urlPos > 0) {
 			return resourceName;
 		} else {

rapidoid-io/src/main/java/org/rapidoid/io/Res.java

@@ -95,8 +95,10 @@ protected void loadResource() {
 				byte[] res = load(name);
 
 				if (res == null) {
+					String defaultFilename = IO.getDefaultFilename(name);
+					Log.debug("Trying to load the default resource", "name", defaultFilename);
 					// if the resource doesn't exist, try loading the default resource
-					res = load(IO.getDefaultFilename(name));
+					res = load(defaultFilename);
 				}
 
 				this.bytes = res;
@@ -117,28 +119,28 @@ protected void loadResource() {
 	}
 
 	protected byte[] load(String filename) {
-		File file = IO.file(name);
+		File file = IO.file(filename);
 
 		if (file.exists()) {
 
 			// a normal file on the file system
-			Log.debug("File exists", "name", name);
+			Log.debug("File exists", "file", file);
 
-			if (file.lastModified() > this.lastModified || !name.equals(cachedFileName)) {
-				Log.debug("Reloading file", "name", name);
+			if (file.lastModified() > this.lastModified || !filename.equals(cachedFileName)) {
+				Log.debug("Reloading file", "file", file);
 				this.lastModified = file.lastModified();
-				this.cachedFileName = name;
-				return IO.loadBytes(name);
+				this.cachedFileName = filename;
+				return IO.loadBytes(filename);
 			} else {
-				Log.debug("File not modified", "name", name);
+				Log.debug("File not modified", "file", file);
 				return bytes;
 			}
 		} else {
-
 			// it might not exist or it might be on the classpath or compressed in a JAR
-			Log.debug("Reloading classpath resource", "name", name);
-			this.cachedFileName = null;
-			return IO.loadBytes(name);
+			Log.debug("Trying to load classpath resource", "file", file);
+			byte[] res = IO.loadBytes(filename);
+			this.cachedFileName = (res != null) ? filename : null;
+			return res;
 		}
 	}
 

rapidoid-main/src/main/java/org/rapidoid/main/Rapidoid.java

@@ -60,7 +60,7 @@ public static synchronized void run(WebApp app, String[] args, Object... config)
 			app = WebAppGroup.root();
 			app.getRouter().generic(new AppHandler());
 
-			final Res menuRes = Res.from("menu.yaml").trackChanges();
+			final Res menuRes = Res.from(Conf.configPath() + "/menu.yaml").trackChanges();
 
 			final WebApp rootApp = app;
 			menuRes.getChangeListeners().add(new Runnable() {
@@ -74,7 +74,7 @@ public void run() {
 				}
 			});
 
-			final Res confRes = Res.from("app.yaml").trackChanges();
+			final Res confRes = Res.from(Conf.configPath() + "/app.yaml").trackChanges();
 
 			confRes.getChangeListeners().add(new Runnable() {
 				@Override

rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/RapidoidMustacheFactory.java

@@ -26,6 +26,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.config.Conf;
 import org.rapidoid.io.IO;
 import org.rapidoid.io.Res;
 import org.rapidoid.log.Log;
@@ -113,8 +114,7 @@ public void invalidateCache() {
 
 	@Override
 	public Reader getReader(String resourceName) {
-		Res res = Res.from(resourceName);
-		return res.getReader();
+		return Res.from(Conf.templatesPath() + "/" + resourceName).getReader();
 	}
 
 }