fix issue: configuration change shall trigger app reload on dev mode

greenlaw110 · greenlaw110 · commit 7042540e55ac · 2016-10-21T12:05:16.000+11:00
diff --git a/src/main/java/act/app/DevModeClassLoader.java b/src/main/java/act/app/DevModeClassLoader.java
@@ -274,7 +274,7 @@ private void setupFsChangeDetectors() {
             libChangeDetector = new FsChangeDetector(lib, App.F.JAR_FILE, libChangeListener);
         }
 
-        File conf = layout.conf(appBase);
+        File conf = RuntimeDirs.conf(app());
         if (null != conf && conf.canRead()) {
             confChangeDetector = new FsChangeDetector(conf, App.F.CONF_FILE.or(App.F.ROUTES_FILE), confChangeListener);
         }
diff --git a/src/main/java/act/app/ProjectLayout.java b/src/main/java/act/app/ProjectLayout.java
@@ -8,6 +8,9 @@
 import java.io.IOException;
 import java.util.Properties;
 
+import static act.app.RuntimeDirs.CLASSES;
+import static act.app.RuntimeDirs.CONF;
+
 /**
  * Defines the project file structure supported by Act.
  * <p>Used ONLY at dev time for Act to decide where to pick up
@@ -207,11 +210,9 @@ public File target(File appBase) {
 
         @Override
         public File conf(File appBase) {
-            File file = Utils.file(resource(appBase), "app.conf");
-            if (file.exists()) {
-                return file;
-            }
-            return Utils.file(resource(appBase), "app.conf");
+            File confBase = Act.isDev() ? resource(appBase) : new File(appBase, CLASSES);
+            File file = new File(confBase, CONF);
+            return file.exists() ? file : confBase;
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ private void setupFsChangeDetectors() {`
`274`	`274`	`libChangeDetector = new FsChangeDetector(lib, App.F.JAR_FILE, libChangeListener);`
`275`	`275`	`}`
`276`	`276`
`277`		`- File conf = layout.conf(appBase);`
	`277`	`+ File conf = RuntimeDirs.conf(app());`
`278`	`278`	`if (null != conf && conf.canRead()) {`
`279`	`279`	`confChangeDetector = new FsChangeDetector(conf, App.F.CONF_FILE.or(App.F.ROUTES_FILE), confChangeListener);`
`280`	`280`	`}`