svn commit: r787084 - in /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli: CLIReportingUtils.java MavenCli.java

[bentmann]

Author: bentmann
Date: Sun Jun 21 20:10:52 2009
New Revision: 787084

URL: http://svn.apache.org/viewvc?rev=787084&view=rev
Log:
o Fixed missing error reporting for bad settings

Modified:
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java

Modified: 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java?rev=787084&r1=787083&r2=787084&view=diff
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
 Sun Jun 21 20:10:52 2009
@@ -166,5 +166,25 @@
 
         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() );
+            }
+        }
+    }
+
 }

Modified: 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=787084&r1=787083&r2=787084&view=diff
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
 Sun Jun 21 20:10:52 2009
@@ -131,14 +131,14 @@
 
         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 @@
         }
         catch ( MavenEmbedderException e )
         {
-            //TODO: CLIReportingUtils.showError( "Unable to start the 
embedder: ", e, showErrors );
+            CLIReportingUtils.showError( "Unable to start the embedder: ", e, 
showErrors );
 
             return 1;
         }