fix some bugs on jooby:run rewrite #337

Author: jknack

jooby-maven-plugin/src/main/java/org/jooby/JoobyMojo.java

@@ -122,11 +122,6 @@ public void run() {
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException {
 
-    boolean js = new File("app.js").exists();
-    if (js) {
-      mainClass = "org.jooby.Jooby";
-    }
-
     Set<File> appcp = new LinkedHashSet<File>();
 
     // public / config, etc..

jooby-run/src/main/java/org/jooby/run/AppModuleLoader.java

@@ -63,20 +63,17 @@ public void unload(final Module module) {
    * Build a flat jboss module, with some minor exceptions (like j2v8).
    *
    * @param name module name.
-   * @param mainClass
    * @param cp
    * @return
    * @throws Exception
    */
-  public static AppModuleLoader build(final String name, final String mainClass, final File... cp)
-      throws Exception {
-    Map<ModuleIdentifier, ModuleSpec> modules = newModule(name, mainClass, 0, "", cp);
+  public static AppModuleLoader build(final String name, final File... cp) throws Exception {
+    Map<ModuleIdentifier, ModuleSpec> modules = newModule(name, 0, "", cp);
     return new AppModuleLoader(modules);
   }
 
   private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
-      final String mainClass, final int level, final String prefix, final File... cp)
-      throws Exception {
+      final int level, final String prefix, final File... cp) throws Exception {
     Map<ModuleIdentifier, ModuleSpec> modules = new HashMap<>();
 
     String mId = name.replace(".jar", "");
@@ -87,7 +84,7 @@ private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
     for (File file : cp) {
       String fname = "└── " + file.getAbsolutePath();
       if (file.getName().startsWith("j2v8") && !name.equals(file.getName())) {
-        ModuleSpec dependency = newModule(file.getName(), null, level + 2, "└── ", file)
+        ModuleSpec dependency = newModule(file.getName(), level + 2, "└── ", file)
             .values()
             .iterator()
             .next();
@@ -115,10 +112,6 @@ private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
     builder.addDependency(DependencySpec.createSystemDependencySpec(sysPaths));
     builder.addDependency(DependencySpec.createLocalDependencySpec());
 
-    if (mainClass != null) {
-      builder.setMainClass(mainClass);
-    }
-
     ModuleSpec module = builder.create();
     modules.put(module.getModuleIdentifier(), builder.create());
     return modules;

jooby-run/src/main/java/org/jooby/run/Main.java

@@ -29,10 +29,13 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
+import java.nio.file.Paths;
 import java.nio.file.WatchEvent.Kind;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -70,7 +73,7 @@ public class Main {
   public Main(final String mId, final String mainClass, final File... cp)
       throws Exception {
     this.mainClass = mainClass;
-    loader = AppModuleLoader.build(mId, mainClass, cp);
+    loader = AppModuleLoader.build(mId, cp);
     this.mId = ModuleIdentifier.create(mId);
     this.executor = Executors.newSingleThreadExecutor(task -> new Thread(task, "HotSwap"));
     this.scanner = new Watcher(this::onChange, new Path[]{basedir.toPath() });
@@ -160,19 +163,18 @@ private void startApp() {
 
         Thread.currentThread().setContextClassLoader(mcloader);
 
-        Class<?> joobyClass = mcloader.loadClass("org.jooby.Jooby");
-        if (mainClass.equals(joobyClass.getName())) {
+        if (mainClass.endsWith(".js")) {
           // js version
           Object js = mcloader.loadClass("org.jooby.internal.js.JsJooby")
               .newInstance();
           Method runjs = js.getClass().getDeclaredMethod("run", File.class);
-          this.app = ((Supplier) runjs.invoke(js, new File("app.js"))).get();
+          this.app = ((Supplier) runjs.invoke(js, new File(mainClass))).get();
         } else {
-          this.app = joobyClass
+          this.app = mcloader.loadClass(mainClass)
               .getDeclaredConstructors()[0].newInstance();
         }
         debug("starting: %s", mainClass);
-        Method joobyRun = joobyClass.getMethod("start");
+        Method joobyRun = app.getClass().getMethod("start");
         joobyRun.invoke(this.app);
       } catch (Throwable ex) {
         Throwable cause = ex;
@@ -357,6 +359,18 @@ public void classDefineFailed(final Throwable throwable, final String className,
         }
       });
     }
+
+    // set logback
+    String logback = Optional.ofNullable(System.getProperty("logback.configurationFile"))
+        .orElseGet(() -> Arrays
+            .asList(Paths.get("conf", "logback-test.xml"), Paths.get("conf", "logback.xml"))
+            .stream()
+            .filter(p -> p.toFile().exists())
+            .map(Path::toString)
+            .findFirst()
+            .orElse(Paths.get("conf", "logback.xml").toString()));
+    debug("logback: %s", logback);
+    System.setProperty("logback.configurationFile", logback);
   }
 
   public static void info(final String message, final Object... args) {