Stricter but customizable configuration file names.

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

@@ -130,6 +130,7 @@ public static synchronized boolean micro() {
 
 	public static synchronized void reset() {
 		ROOT.clear();
+		ROOT.filenameBase("config");
 		args = new String[0];
 	}
 
@@ -138,9 +139,7 @@ public static synchronized Config section(String name) {
 	}
 
 	private static Config createSection(String name) {
-		Config config = ROOT.sub(name);
-		ConfigUtil.load(filename(config.keys()), config, false);
-		return config;
+		return ROOT.sub(name);
 	}
 
 	public static synchronized Config section(Class<?> clazz) {
@@ -161,22 +160,20 @@ public static synchronized void reload() {
 
 		ROOT.clear();
 
-		ConfigUtil.load(Msc.path("default", "config.y?ml"), ROOT, true);
+		String filenameBase = U.or(ROOT.filenameBase(), "config");
+		String configFilenamePattern = filenameBase + ".y?ml";
+		String configProfilePattern = filenameBase + "-%s.y?ml";
+
+		ConfigUtil.load(Msc.path("default", configFilenamePattern), ROOT, true);
 
 		for (String profile : Env.profiles()) {
-			ConfigUtil.load(Msc.path("default", U.frmt("profile-%s.y?ml", profile)), ROOT, true);
+			ConfigUtil.load(Msc.path("default", U.frmt(configProfilePattern, profile)), ROOT, true);
 		}
 
-		ConfigUtil.load(Msc.path(path, "application.y?ml"), ROOT, false);
-		ConfigUtil.load(Msc.path(path, "config.y?ml"), ROOT, false);
+		ConfigUtil.load(Msc.path(path, configFilenamePattern), ROOT, false);
 
 		for (String profile : Env.profiles()) {
-			ConfigUtil.load(Msc.path(path, U.frmt("application-%s.y?ml", profile)), ROOT, false);
-			ConfigUtil.load(Msc.path(path, U.frmt("profile-%s.y?ml", profile)), ROOT, false);
-		}
-
-		for (Config sub : SECTIONS.values()) {
-			ConfigUtil.load(filename(sub.keys()), sub, false);
+			ConfigUtil.load(Msc.path(path, U.frmt(configProfilePattern, profile)), ROOT, false);
 		}
 
 		for (List<String> keys : detached) {

rapidoid-commons/src/main/java/org/rapidoid/config/Config.java

@@ -7,6 +7,7 @@
 import org.rapidoid.commons.Arr;
 import org.rapidoid.commons.Coll;
 import org.rapidoid.lambda.ToMap;
+import org.rapidoid.log.Log;
 import org.rapidoid.u.U;
 import org.rapidoid.value.Value;
 import org.rapidoid.value.Values;
@@ -45,6 +46,8 @@ public class Config extends RapidoidThing implements ToMap<String, Object> {
 
 	private final boolean isRoot;
 
+	private volatile String filenameBase = "config";
+
 	private Config(Map<String, Object> properties, List<String> baseKeys, Config root) {
 		this.properties = properties;
 		this.root = root;
@@ -274,12 +277,21 @@ public String toString() {
 	public void args(String... args) {
 		if (U.notEmpty(args)) {
 			for (String arg : args) {
-				String[] parts = arg.split("=", 2);
+				if (!arg.contains("->")) {
+					String[] parts = arg.split("=", 2);
+					String name = parts[0];
 
-				if (parts.length > 1) {
-					setNested(parts[0], parts[1]);
-				} else {
-					setNested(parts[0], true);
+					if (parts.length > 1) {
+						String value = parts[1];
+
+						if (name.equals("config")) {
+							filenameBase(value);
+						}
+
+						setNested(name, value);
+					} else {
+						setNested(name, true);
+					}
 				}
 			}
 		}
@@ -338,4 +350,17 @@ public Properties toProperties() {
 	public ConfigAlternatives or(Config alternative) {
 		return new ConfigAlternatives(this, alternative);
 	}
+
+	public String filenameBase() {
+		return filenameBase;
+	}
+
+	public synchronized Config filenameBase(String filenameBase) {
+		if (U.neq(this.filenameBase, filenameBase)) {
+			Log.info("Changing configuration filename base", "!from", this.filenameBase, "!to", filenameBase);
+		}
+
+		this.filenameBase = filenameBase;
+		return this;
+	}
 }

rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOptions.java

@@ -36,6 +36,7 @@ public class ConfigOptions extends RapidoidThing {
 	private static List<ConfigOption> configOptions() {
 		List<ConfigOption> opts = U.list();
 
+		opts.add(opt("config", "configuration filename prefix", "config"));
 		opts.add(opt("dev", "configure DEV mode", "auto-detected"));
 		opts.add(opt("production", "configure PRODUCTION mode", "auto-detected"));
 		opts.add(opt("secret=<SECRET>", "configure app-specific secret for encryption", "(random)"));

rapidoid-commons/src/test/resources/DataPermissionsTest/config.yml

@@ -0,0 +1,21 @@
+users:
+  adm1:
+    roles: administrator
+
+  adm2:
+    roles: administrator
+
+  mng1:
+    roles: manager
+
+  mod1:
+    roles: moderator
+
+  mod2:
+    roles: moderator
+
+  abc:
+    roles: abc
+
+  other:
+    roles: other_role

rapidoid-commons/src/test/resources/MethodSecurityTest/config.yaml

@@ -0,0 +1,24 @@
+users:
+  adm1:
+    roles: ["administrator"]
+
+  adm2:
+    roles: ["administrator"]
+
+  mng1:
+    roles: ["manager"]
+
+  mod1:
+    roles: ["moderator"]
+
+  mod2:
+    roles: ["moderator"]
+
+  abc1:
+    roles: abc
+
+  abc2:
+    roles: abc
+
+  xyz1:
+    roles: xyz

rapidoid-commons/src/test/resources/RoleBasedSecurityTest/config.yaml

@@ -0,0 +1,18 @@
+users:
+  adm1:
+    roles: ["administrator"]
+
+  adm2:
+    roles: ["administrator"]
+
+  mng1:
+    roles: ["manager"]
+
+  mod1:
+    roles: ["moderator"]
+
+  mod2:
+    roles: ["moderator"]
+
+  abc:
+    roles: abc

rapidoid-commons/src/test/resources/RolesTest/config.yaml

@@ -0,0 +1,16 @@
+users:
+  niko:
+    email: niko@rapidoid.org.abcde
+    password: easy
+    roles:
+      - owner
+      - administrator
+      - moderator
+
+  chuck:
+    password: chuck
+    roles: ["moderator", "restarter"]
+
+  abc:
+    password: abc
+    roles:    guest   , foo , bar

rapidoid-integration-tests/src/test/resources/DynamicClientTest/config.yml

@@ -0,0 +1,20 @@
+MyClient:
+  abc:
+    GET: http://localhost:8888/test-abc
+
+  numbers:
+    GET: http://localhost:8888/nums
+
+  sizeOf:
+    GET: http://localhost:8888/size?s=%s
+
+  asyncSizeOf:
+    GET: http://localhost:8888/size?s=%s
+
+  theBean:
+    POST: http://localhost:8888/echo?aa=%s&bb=%s&cc=%s
+
+  asyncBean:
+    POST: http://localhost:8888/echo?aa=%s&bb=%s&cc=%s
+    data:
+      aa: not-implemented

rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidServerLoop.java

@@ -123,7 +123,7 @@ private void openSocket() throws IOException {
 
 			ServerSocket socket = serverSocketChannel.socket();
 
-			Log.debug("Opening port to listen", "port", port);
+			Log.info("!Starting server", "!address", address, "!port", port, "I/O workers", workers, "accept", blockingInfo);
 
 			InetSocketAddress addr = new InetSocketAddress(address, port);
 
@@ -138,8 +138,6 @@ private void openSocket() throws IOException {
 				serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);
 			}
 
-			Log.info("!Server started", "!address", address, "!port", port, "I/O workers", workers, "accept", blockingInfo);
-
 			initWorkers();
 
 		} else {