jooby:run use file.pathSeparator

Author: jknack

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

@@ -155,11 +155,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
     // includes/excludes pattern
     String includes = null;
     if (this.includes != null && this.includes.size() > 0) {
-      includes = this.includes.stream().collect(Collectors.joining(":"));
+      includes = this.includes.stream().collect(Collectors.joining(File.pathSeparator));
     }
     String excludes = null;
     if (this.excludes != null && this.excludes.size() > 0) {
-      excludes = this.excludes.stream().collect(Collectors.joining(":"));
+      excludes = this.excludes.stream().collect(Collectors.joining(File.pathSeparator));
     }
     // moduleId
     String mId = mavenProject.getGroupId() + "." + mavenProject.getArtifactId();

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

@@ -40,9 +40,8 @@ public class RunForkedApp implements Command {
   private String mainClass;
 
   public RunForkedApp(final File basedir, final String debug, final List<String> vmArgs,
-      final Set<File> cp,
-      final String mId, final String mainClass, final Set<File> appcp, final String includes,
-      final String excludes) throws MojoFailureException {
+      final Set<File> cp, final String mId, final String mainClass, final Set<File> appcp,
+      final String includes, final String excludes) throws MojoFailureException {
     this.basedir = basedir;
     List<String> args = new ArrayList<String>();
     args.addAll(vmArgs(debug, vmArgs));
@@ -52,7 +51,8 @@ public RunForkedApp(final File basedir, final String debug, final List<String> v
     args.add(Main.class.getName());
     args.add(mId);
     args.add(mainClass);
-    args.add(appcp.stream().map(File::getAbsolutePath).collect(Collectors.joining(":", "deps=", ""))
+    args.add(appcp.stream().map(File::getAbsolutePath)
+        .collect(Collectors.joining(File.pathSeparator, "deps=", ""))
         .trim());
     if (includes != null) {
       args.add("includes=" + includes);

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

@@ -77,14 +77,15 @@ public Main(final String mId, final String mainClass, final File... 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() });
-    includes("**/*.class,**/*.conf,**/*.properties,*.js, src/*.js");
+    includes("**/*.class" + File.pathSeparator + "**/*.conf" + File.pathSeparator
+        + "**/*.properties" + File.pathSeparator + "*.js" + File.pathSeparator + "src/*.js");
     excludes("");
   }
 
   public static void main(final String[] args) throws Exception {
     List<File> cp = new ArrayList<File>();
-    String includes = "**/*.class,**/*.conf,**/*.properties,*.js, src/*.js";
-    String excludes = "";
+    String includes = null;
+    String excludes = null;
     for (int i = 2; i < args.length; i++) {
       String[] option = args[i].split("=");
       if (option.length < 2) {
@@ -102,7 +103,7 @@ public static void main(final String[] args) throws Exception {
           setSystemProperties(new File(option[1]));
           break;
         case "deps":
-          String[] deps = option[1].split(":");
+          String[] deps = option[1].split(File.pathSeparator);
           for (String dep : deps) {
             cp.add(new File(dep));
           }
@@ -118,9 +119,13 @@ public static void main(final String[] args) throws Exception {
       cp.add(new File(System.getProperty("user.dir")));
     }
 
-    Main launcher = new Main(args[0], args[1], cp.toArray(new File[cp.size()]))
-        .includes(includes)
-        .excludes(excludes);
+    Main launcher = new Main(args[0], args[1], cp.toArray(new File[cp.size()]));
+    if (includes != null) {
+      launcher.includes(includes);
+    }
+    if (excludes != null) {
+      launcher.excludes(excludes);
+    }
     launcher.run();
   }
 
@@ -248,7 +253,7 @@ private Path relativePath(final Path path) {
 
   private static PathMatcher pathMatcher(final String expressions) {
     List<PathMatcher> matchers = new ArrayList<PathMatcher>();
-    for (String expression : expressions.split(",")) {
+    for (String expression : expressions.split(File.pathSeparator)) {
       matchers.add(FileSystems.getDefault().getPathMatcher("glob:" + expression.trim()));
     }
     return new PathMatcher() {