Merge pull request #709 from jooby-project/698

Forking JVM does not work with jooby:run fix #698

Author: jknack

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

@@ -18,16 +18,6 @@
  */
 package org.jooby.run;
 
-import org.jboss.modules.DependencySpec;
-import org.jboss.modules.Module;
-import org.jboss.modules.ModuleIdentifier;
-import org.jboss.modules.ModuleLoadException;
-import org.jboss.modules.ModuleLoader;
-import org.jboss.modules.ModuleSpec;
-import org.jboss.modules.ResourceLoaderSpec;
-import org.jboss.modules.ResourceLoaders;
-import org.jooby.internal.run__.JoobyRef;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -44,6 +34,15 @@
 import java.util.Set;
 import java.util.jar.JarFile;
 
+import org.jboss.modules.DependencySpec;
+import org.jboss.modules.Module;
+import org.jboss.modules.ModuleIdentifier;
+import org.jboss.modules.ModuleLoadException;
+import org.jboss.modules.ModuleLoader;
+import org.jboss.modules.ModuleSpec;
+import org.jboss.modules.ResourceLoaderSpec;
+import org.jboss.modules.ResourceLoaders;
+
 public class AppModuleLoader extends ModuleLoader {
 
   private Map<ModuleIdentifier, ModuleSpec> modules;
@@ -82,7 +81,8 @@ private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
     String mId = name.replace(".jar", "");
     ModuleSpec.Builder builder = ModuleSpec.build(ModuleIdentifier.fromString(mId));
     if (level == 0) {
-      String classurl = JoobyRef.class.getResource(JoobyRef.class.getSimpleName() + ".class")
+      String classurl = AppModuleLoader.class
+          .getResource("/" + Main.JOOBY_REF.replace(".", "/") + ".class")
           .toString();
       String jartoken = ".jar!";
       File jar = new File(URI
@@ -140,7 +140,7 @@ private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
     return modules;
   }
 
-  @SuppressWarnings({"rawtypes", "unchecked"})
+  @SuppressWarnings({"rawtypes", "unchecked" })
   private static Set<String> jdkPaths() throws Exception {
     Class jdkPath = AppModuleLoader.class.getClassLoader().loadClass("org.jboss.modules.JDKPaths");
     Field field = jdkPath.getDeclaredField("JDK");
@@ -168,12 +168,12 @@ private static Set<String> pkgs(final File file) throws IOException {
     if (file.exists()) {
       return pkgs(new FileReader(file));
     }
-    return new LinkedHashSet<String>();
+    return new LinkedHashSet<>();
   }
 
   private static Set<String> pkgs(final Reader reader) throws IOException {
     try (BufferedReader in = new BufferedReader(reader)) {
-      Set<String> pkgs = new LinkedHashSet<String>();
+      Set<String> pkgs = new LinkedHashSet<>();
       String line = in.readLine();
       while (line != null) {
         pkgs.add(line.trim());
@@ -183,7 +183,7 @@ private static Set<String> pkgs(final Reader reader) throws IOException {
     }
   }
 
-  public static void main(String[] args) throws MalformedURLException {
+  public static void main(final String[] args) throws MalformedURLException {
     URI jaruri = URI.create(
         "jar:file:/Users/edgar/.m2/repository/org/jooby/jooby-run/1.0.4-SNAPSHOT/jooby-run-1.0.4-SNAPSHOT.jar!/org/jooby/internal/run__/JoobyRef.class");
     System.out.println(jaruri.toURL().toExternalForm());

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

@@ -52,10 +52,11 @@
 import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoader;
 import org.jboss.modules.log.ModuleLogger;
-import org.jooby.internal.run__.JoobyRef;
 
 public class Main {
 
+  static final String JOOBY_REF = "org.jooby.internal.run__.JoobyRef";
+
   private static boolean DEBUG;
 
   private static boolean TRACE;
@@ -191,7 +192,7 @@ public void run(final boolean block, final String... args) {
     this.scanner.start();
     this.args = new ArrayList<>(Arrays.asList(args));
     this.args.add("server.join=false");
-    this.args.add("jooby.internal.onStart=" + JoobyRef.class.getName());
+    this.args.add("jooby.internal.onStart=" + JOOBY_REF);
     this.startApp(this.args);
 
     if (block) {
@@ -230,7 +231,7 @@ private void startApp(final List<String> args) {
         Thread.currentThread().setContextClassLoader(mcloader);
 
         debug("starting: %s", runclass);
-        Class appref = mcloader.loadClass(JoobyRef.class.getName());
+        Class appref = mcloader.loadClass(JOOBY_REF);
         debug("loaded: %s", appref);
         Class appclass = mcloader.loadClass(runclass);
         debug("loaded: %s", appclass);

jooby-run/src/test/java/org/jooby/run/JoobyRefClassNameTest.java

@@ -0,0 +1,14 @@
+package org.jooby.run;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jooby.internal.run__.JoobyRef;
+import org.junit.Test;
+
+public class JoobyRefClassNameTest {
+
+  @Test
+  public void classNameShouldBeEq() {
+    assertEquals(JoobyRef.class.getName(), Main.JOOBY_REF);
+  }
+}