karatelabs
diff --git a/‎karate-core/src/main/java/com/intuit/karate/Main.java‎
Lines changed: 11 additions & 8 deletions b/‎karate-core/src/main/java/com/intuit/karate/Main.java‎
Lines changed: 11 additions & 8 deletions
diff --git a/‎karate-core/src/main/java/com/intuit/karate/core/ScenarioEngine.java‎
Lines changed: 6 additions & 1 deletion b/‎karate-core/src/main/java/com/intuit/karate/core/ScenarioEngine.java‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎karate-core/src/main/java/com/intuit/karate/debug/Breakpoint.java‎
Lines changed: 0 additions & 98 deletions b/‎karate-core/src/main/java/com/intuit/karate/debug/Breakpoint.java‎
Lines changed: 0 additions & 98 deletions
diff --git a/‎karate-core/src/main/java/com/intuit/karate/debug/DapClient.java‎
Lines changed: 0 additions & 60 deletions b/‎karate-core/src/main/java/com/intuit/karate/debug/DapClient.java‎
Lines changed: 0 additions & 60 deletions
diff --git a/‎karate-core/src/main/java/com/intuit/karate/debug/DapClientHandler.java‎
Lines changed: 0 additions & 53 deletions b/‎karate-core/src/main/java/com/intuit/karate/debug/DapClientHandler.java‎
Lines changed: 0 additions & 53 deletions
diff --git a/‎karate-core/src/main/java/com/intuit/karate/debug/DapDecoder.java‎
Lines changed: 0 additions & 94 deletions b/‎karate-core/src/main/java/com/intuit/karate/debug/DapDecoder.java‎
Lines changed: 0 additions & 94 deletions
@@ -25,7 +25,6 @@
 
 import com.intuit.karate.core.MockServer;
 import com.intuit.karate.core.RuntimeHookFactory;
-import com.intuit.karate.debug.DapServer;
 import com.intuit.karate.http.HttpServer;
 import com.intuit.karate.http.RequestHandler;
 import com.intuit.karate.http.ServerConfig;
@@ -126,9 +125,6 @@ public class Main implements Callable<Void> {
             description = "debug mode (optional port else dynamically chosen)")
     int debugPort;
 
-    @Option(names = {"--debug-keepalive"}, defaultValue = "false", arity = "0..1", fallbackValue = "true", description = "keep debug server open for connections after disconnect")
-    boolean keepDebugServerAlive;
-
     @Option(names = {"-D", "--dryrun"}, description = "dry run, generate html reports only")
     boolean dryRun;
 
@@ -200,10 +196,10 @@ public static Main parseKarateOptions(String line) {
         String[] args = Command.tokenize(line);
         return CommandLine.populateCommand(new Main(), args);
     }
-    
+
     public static Main parseKarateArgs(List<String> args) {
         return CommandLine.populateCommand(new Main(), args.toArray(new String[args.size()]));
-    }    
+    }
 
     // matches ( -X XXX )* (XXX)
     private static final Pattern CLI_ARGS = Pattern.compile("(\\s*-{1,2}\\w\\s\\S*\\s*)*(.*)$");
@@ -322,8 +318,15 @@ public Void call() throws Exception {
             logger.info("deleted directory: {}", output);
         }
         if (debugPort != -1) {
-            DapServer server = new DapServer(debugPort, !keepDebugServerAlive);
-            server.waitSync();
+            try {
+                Class clazz = Class.forName("io.karatelabs.debug.Main");
+                Method method = clazz.getMethod("main", String[].class);
+                String[] params = new String[]{debugPort + ""};
+                method.invoke(null, (Object) params);
+            } catch (Exception e) {
+                String message = "error: debug server failed, is 'karate-debugserver' added as a dependency ?";
+                System.out.println(message);
+            }
             return null;
         }
         if (paths != null) {
 
@@ -760,7 +760,12 @@ private Channel channel(String type) {
         } catch (KarateException ke) {
             throw ke;
         } catch (Exception e) {
-            String message = "cannot instantiate " + type + ", is 'karate-" + type + "' included as a maven / gradle dependency ? " + e.getMessage();
+            String message;
+            if (e instanceof ClassNotFoundException) {
+                message = "cannot instantiate [" + type + "], is 'karate-" + type + "' included as a maven / gradle dependency ?";
+            } else {
+                message = e.getMessage();
+            }
             logger.error(message);
             throw new RuntimeException(message, e);
         }