Simplify maven plugin and hotswap

* remove dcevm (it is nice but hotswap need to be more clever)

Author: jknack

jooby-hotreload/TODO

@@ -0,0 +1,8 @@
+compile on the fly?
+http://search.maven.org/#artifactdetails%7Corg.eclipse.jdt.core.compiler%7Cecj%7C4.4.2%7Cjar
+
+how do I detect a hotswap? and only then bounce the app?
+
+ideal implementation?
++ bounce when hotswap fail
++ find a way that a module could say bounce the app when this annotation, param, method, etc... changes on this type of class.

jooby-hotreload/pom.xml

@@ -29,6 +29,22 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Premain-Class>org.jooby.Hotswap</Premain-Class>
+              <Can-Redefine-Classes>true</Can-Redefine-Classes>
+              <Can-Retransform-Classes>true</Can-Retransform-Classes>
+              <Can-Set-Native-Method-Prefix>true</Can-Set-Native-Method-Prefix>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 

jooby-hotreload/src/main/java/org/jooby/Hotswap.java

@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.instrument.Instrumentation;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -34,20 +35,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-/**
- * Start a target app with a custom classloader. The classloader is responsible for loading
- * resources from:
- *
- * 1. public and config directories (probably src/main/resources too)
- * 2. target/classes, current app (*.class)
- *
- * The parent classloader must load 1) and all the *.jars files.
- *
- * On changes ONLY the custom classloader (App classlaoder) is bounced it.
- *
- * @author edgar
- *
- */
+
 public class Hotswap {
 
   private URLClassLoader loader;
@@ -68,7 +56,7 @@ public class Hotswap {
 
   private PathMatcher excludes;
 
-  private boolean dcevm;
+  // OFF private boolean dcevm;
 
   private List<File> dirs;
 
@@ -84,7 +72,11 @@ public Hotswap(final String mainClass, final File[] cp) throws IOException {
     this.paths = toPath(dirs.toArray(new File[dirs.size()]));
     this.executor = Executors.newSingleThreadExecutor();
     this.scanner = new Watcher(this::onChange, paths);
-    dcevm = System.getProperty("java.vm.version").toLowerCase().contains("dcevm");
+    // OFF dcevm = System.getProperty("java.vm.version").toLowerCase().contains("dcevm");
+  }
+
+  public static void premain(final String args, final Instrumentation inst) throws Exception {
+   // TODO:
   }
 
   public static void main(final String[] args) throws Exception {
@@ -141,9 +133,9 @@ private Hotswap excludes(final String excludes) {
 
   public void run() {
     System.out.printf("Hotswap available on: %s\n", dirs);
-    System.out.printf("  unlimited runtime class redefinition: %s\n", dcevm
-        ? "yes"
-        : "no (see https://github.com/dcevm/dcevm)");
+    // System.out.printf("  unlimited runtime class redefinition: %s\n", dcevm
+    // ? "yes"
+    // : "no (see https://github.com/dcevm/dcevm)");
     System.out.printf("  includes: %s\n", includes);
     System.out.printf("  excludes: %s\n", excludes);
 
@@ -273,4 +265,5 @@ public String toString() {
       }
     };
   }
+
 }

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

@@ -29,7 +29,7 @@ public class Command {
 
   private String name;
 
-  private List<String> arguments;
+  private List<String> args;
 
   private File workdir;
 
@@ -42,7 +42,7 @@ public class Command {
   public Command(final String alias, final String name, final List<String> args) {
     this.alias = alias;
     this.name = name;
-    this.arguments = new ArrayList<String>(args);
+    this.args = new ArrayList<String>(args);
   }
 
   public Command() {
@@ -74,12 +74,12 @@ public void setName(final String name) {
     this.name = name;
   }
 
-  public List<String> getArguments() {
-    return arguments;
+  public List<String> getArgs() {
+    return args;
   }
 
-  public void setArguments(final List<String> arguments) {
-    this.arguments = arguments;
+  public void setArgs(final List<String> arguments) {
+    this.args = arguments;
   }
 
   public void stop() throws InterruptedException {
@@ -95,7 +95,7 @@ public void stop() throws InterruptedException {
   public void execute() throws IOException, InterruptedException {
     List<String> cmd = new ArrayList<String>();
     cmd.add(name);
-    cmd.addAll(arguments);
+    cmd.addAll(args);
     process = new ProcessBuilder(cmd)
         .directory(workdir)
         .redirectErrorStream(true)
@@ -113,7 +113,7 @@ public String toString() {
     StringBuilder str = new StringBuilder();
     if (alias == null) {
       str.append(name);
-      for (String arg : arguments) {
+      for (String arg : args) {
         str.append(" ").append(arg);
       }
     } else {
@@ -122,10 +122,20 @@ public String toString() {
     return str.toString();
   }
 
+  public void set(final String cmd) {
+    String[] cmdline = cmd.split("\\s+");
+    setName(cmdline[0].trim());
+    List<String> args = new ArrayList<String>();
+    for (int i = 1; i < cmdline.length; i++) {
+      args.add(cmdline[i].trim());
+    }
+    setArgs(args);
+  }
+
   public String debug() {
     StringBuilder str = new StringBuilder();
     str.append(name);
-    for (String arg : arguments) {
+    for (String arg : args) {
       str.append(" ").append(arg);
     }
     return str.toString();

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

@@ -65,6 +65,9 @@ public class JoobyMojo extends AbstractMojo {
   @Parameter(property = "jooby.excludes")
   private List<String> excludes;
 
+  @Parameter(property = "application.debug", defaultValue = "true")
+  private String debug;
+
   @Parameter(defaultValue = "${plugin.artifacts}")
   private List<org.apache.maven.artifact.Artifact> pluginArtifacts;
 
@@ -84,8 +87,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
     Set<String> classpath = new LinkedHashSet<String>();
 
-    Optional<Artifact> hotreload = hotreload(pluginArtifacts);
-    classpath.add(hotreload.get().getFile().getAbsolutePath());
+    String hotreload = hotreload(pluginArtifacts).get().getFile().getAbsolutePath();
+    classpath.add(hotreload);
 
     for (Artifact artifact : artifacts) {
       String scope = artifact.getScope();
@@ -101,7 +104,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
       cmds.addAll(0, this.commands);
     }
     List<String> args = new ArrayList<String>();
-    args.addAll(vmArgs(vmArgs));
+    args.addAll(vmArgs(hotreload, vmArgs));
     args.add("-cp");
     args.add(cp);
     args.add("org.jooby.Hotswap");
@@ -147,11 +150,27 @@ private String join(final List<String> includes) {
     return buff.toString();
   }
 
-  private List<String> vmArgs(final List<String> vmArgs) {
+  private List<String> vmArgs(final String agentpath, final List<String> vmArgs) {
     List<String> results = new ArrayList<String>();
     if (vmArgs != null) {
       results.addAll(vmArgs);
     }
+    results.add("-javaagent:" + agentpath);
+    if (!"false".equals(debug)) {
+      // true, number, debug line
+      if ("true".equals(debug)) {
+        // default debug
+        results.add("-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n");
+      } else {
+        try {
+          int port = Integer.parseInt(debug);
+          results.add("-agentlib:jdwp=transport=dt_socket,address=" + port + ",server=y,suspend=n");
+        } catch (NumberFormatException ex) {
+          // assume it is a debug line
+          results.add(debug);
+        }
+      }
+    }
     // logback
     File[] logbackFiles = {localFile("config", "logback-test.xml"),
         localFile("config", "logback.xml") };
@@ -161,19 +180,20 @@ private List<String> vmArgs(final List<String> vmArgs) {
         break;
       }
     }
-    // dcevm?
-    String altjvm = null;
-    for (String boot : System.getProperty("sun.boot.library.path", "").split(File.pathSeparator)) {
-      File dcevm = new File(boot, "dcevm");
-      if (dcevm.exists()) {
-        altjvm = dcevm.getName();
-      }
-    }
-    if (altjvm == null) {
-      getLog().warn("dcevm not found, we recommend to install it: https://github.com/dcevm/dcevm");
-    } else {
-      results.add("-XXaltjvm=" + altjvm);
-    }
+    // dcevm? OFF
+    // String altjvm = null;
+    // for (String boot : System.getProperty("sun.boot.library.path", "").split(File.pathSeparator))
+    // {
+    // File dcevm = new File(boot, "dcevm");
+    // if (dcevm.exists()) {
+    // altjvm = dcevm.getName();
+    // }
+    // }
+    // if (altjvm == null) {
+    // getLog().warn("dcevm not found, we recommend to install it: https://github.com/dcevm/dcevm");
+    // } else {
+    // results.add("-XXaltjvm=" + altjvm);
+    // }
     return results;
   }