From 1982aed5f4466376d5c5aca52c9843815bfcaccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20Sta=CC=88rk?= Date: Sat, 6 Jun 2020 10:23:05 +0200 Subject: [PATCH] working on directory validation --- .../org/mustangproject/commandline/Main.java | 5 ++++ Mustang-CLI/src/main/resources/logback.xml | 29 +++++++++++++++++++ .../org/mustangproject/validator/Main.java | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 Mustang-CLI/src/main/resources/logback.xml diff --git a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java index 6cfcb9e0..3dd8c651 100755 --- a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java +++ b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java @@ -328,6 +328,11 @@ public class Main { optionsRecognized=performValidateExpect(true, directoryName); + + } else if ((action!=null)&&(action.equals("validateExpectInvalid"))) { + + optionsRecognized=performValidateExpect(false, directoryName); + } else { // no argument or argument unknown printUsage(); diff --git a/Mustang-CLI/src/main/resources/logback.xml b/Mustang-CLI/src/main/resources/logback.xml new file mode 100644 index 00000000..5c52d73c --- /dev/null +++ b/Mustang-CLI/src/main/resources/logback.xml @@ -0,0 +1,29 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + log/ZUV-%d{yyyy-MM}.log + + + 60 + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + \ No newline at end of file diff --git a/validator/src/main/java/org/mustangproject/validator/Main.java b/validator/src/main/java/org/mustangproject/validator/Main.java index 6540e495..661e95d4 100644 --- a/validator/src/main/java/org/mustangproject/validator/Main.java +++ b/validator/src/main/java/org/mustangproject/validator/Main.java @@ -80,7 +80,7 @@ public class Main { if ((!optionsRecognized) || (helpRequested != null && helpRequested.booleanValue())) { System.out.println( - "usage: --action validate -f | [-l (shows license)][--logAppend \"String to be appended to validation result log\"]"); + "usage: --action validate --source | [-l (shows license)][--logAppend \"String to be appended to validation result log\"]"); System.exit(-1); }