From 5672ae45e8bf78f4db509b343d41c6a6cf4ad61a Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 21 Jun 2009 20:10:52 +0000 Subject: [PATCH] o Fixed missing error reporting for bad settings git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@787084 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/cli/CLIReportingUtils.java | 22 ++++++++++++++++++- .../java/org/apache/maven/cli/MavenCli.java | 6 ++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java index 5a9da1f651..9d80faed04 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java @@ -166,5 +166,25 @@ static Properties getBuildProperties() return properties; } - + + public static void showError( String message, Exception e, boolean showStackTrace ) + { + System.err.println( message ); + + if ( showStackTrace ) + { + e.printStackTrace(); + } + else + { + System.err.println( e.getMessage() ); + + for ( Throwable cause = e.getCause(); cause != null; cause = cause.getCause() ) + { + System.err.print( "Caused by: " ); + System.err.println( cause.getMessage() ); + } + } + } + } diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 3378edd36a..b08d06910b 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -131,14 +131,14 @@ else if ( debug || commandLine.hasOption( CLIManager.SHOW_VERSION ) ) if ( cvr.isUserSettingsFilePresent() && !cvr.isUserSettingsFileParses() ) { - //TODO: CLIReportingUtils.showError( "Error reading user settings: ", cvr.getUserSettingsException(), showErrors ); + CLIReportingUtils.showError( "Error reading user settings: ", cvr.getUserSettingsException(), showErrors ); return 1; } if ( cvr.isGlobalSettingsFilePresent() && !cvr.isGlobalSettingsFileParses() ) { - //TODO: CLIReportingUtils.showError( "Error reading global settings: ", cvr.getGlobalSettingsException(), showErrors ); + CLIReportingUtils.showError( "Error reading global settings: ", cvr.getGlobalSettingsException(), showErrors ); return 1; } @@ -159,7 +159,7 @@ else if ( debug || commandLine.hasOption( CLIManager.SHOW_VERSION ) ) } catch ( MavenEmbedderException e ) { - //TODO: CLIReportingUtils.showError( "Unable to start the embedder: ", e, showErrors ); + CLIReportingUtils.showError( "Unable to start the embedder: ", e, showErrors ); return 1; }