From 096d1363878bc534e5192d739c84a6b4cab7835b Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 19 Apr 2013 18:52:02 -0400
Subject: [PATCH] updated output format to accept 'ALL' to generated both HTML
 and XML reports

Former-commit-id: 7ec90c7b40b6f23dc21739a72088931b5abc4d50
---
 .../owasp/dependencycheck/reporting/ReportGenerator.java  | 5 +++--
 .../java/org/owasp/dependencycheck/utils/CliParser.java   | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java b/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java
index a057bb1c2..653053d2e 100644
--- a/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java
+++ b/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java
@@ -112,9 +112,10 @@ public class ReportGenerator {
      * reports.
      */
     public void generateReports(String outputDir, String outputFormat) throws IOException, Exception {
-        if ("XML".equalsIgnoreCase(outputFormat)) {
+        if ("XML".equalsIgnoreCase(outputFormat) || "ALL".equalsIgnoreCase(outputFormat)) {
             generateReport("XmlReport", outputDir + File.separator + "DependencyCheck-Report.xml");
-        } else {
+        }
+        if ("HTML".equalsIgnoreCase(outputFormat) || "ALL".equalsIgnoreCase(outputFormat)) {
             generateReport("HtmlReport", outputDir + File.separator + "DependencyCheck-Report.html");
         }
     }
diff --git a/src/main/java/org/owasp/dependencycheck/utils/CliParser.java b/src/main/java/org/owasp/dependencycheck/utils/CliParser.java
index 217c3515a..785e98c1d 100644
--- a/src/main/java/org/owasp/dependencycheck/utils/CliParser.java
+++ b/src/main/java/org/owasp/dependencycheck/utils/CliParser.java
@@ -108,8 +108,10 @@ public final class CliParser {
             }
             if (line.hasOption(ArgumentName.OUTPUT_FORMAT)) {
                 final String format = line.getOptionValue(ArgumentName.OUTPUT_FORMAT);
-                if (!("XML".equalsIgnoreCase(format) || "HTML".equalsIgnoreCase(format))) {
-                    throw new ParseException("Supported output formats are XML and HTML");
+                if (!("ALL".equalsIgnoreCase(format)
+                        || "XML".equalsIgnoreCase(format)
+                        || "HTML".equalsIgnoreCase(format))) {
+                    throw new ParseException("Supported output formats are XML, HTML, or ALL");
                 }
             }
         }
@@ -187,7 +189,7 @@ public final class CliParser {
                 .create(ArgumentName.OUT_SHORT);
 
         final Option outputformat = OptionBuilder.withArgName("format").hasArg().withLongOpt(ArgumentName.OUTPUT_FORMAT)
-                .withDescription("the output format to write to.")
+                .withDescription("the output format to write to (XML, HTML, ALL).")
                 .create(ArgumentName.OUTPUT_FORMAT_SHORT);
 
         //TODO add the ability to load a properties file to override the defaults...