commit db1b0c3407adafedc069757518eec18b85716e65
author Herve Boutemy <hboutemy@apache.org> Sun Nov 02 12:35:10 2014 +0000
committer Herve Boutemy <hboutemy@apache.org> Sun Nov 02 12:35:10 2014 +0000
tree 26120d472172368d724f3af69942cedc8ce32e1e
parent b5b06c11b28ac905f1085556b367c5183f303b32

improved output: differentiate no toolchain found vs no matching toolchain

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1636122 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java

diff --git a/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java b/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
index 11d25fd..a2392b3 100644
--- a/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
+++ b/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
@@ -140,6 +140,7 @@
         throws MojoExecutionException
     {
         getLog().info( "Required toolchain: " + getToochainRequirementAsString( type, params ) );
+        boolean typeFound = false;
 
         try
         {
@@ -147,8 +148,15 @@
 
             for ( ToolchainPrivate tc : tcs )
             {
-                if ( type.equals( tc.getType() ) // useful because of MNG-5716
-                                && tc.matchesRequirements( params ) )
+                if ( !type.equals( tc.getType() ) )
+                {
+                    // useful because of MNG-5716
+                    continue;
+                }
+
+                typeFound = true;
+
+                if ( tc.matchesRequirements( params ) )
                 {
                     getLog().info( "Found matching toolchain for type " + type + ": " + tc );
 
@@ -164,7 +172,7 @@
             throw new MojoExecutionException( "Misconfigured toolchains.", ex );
         }
 
-        getLog().error( "No toolchain matched for type " + type );
+        getLog().error( "No toolchain " + ( typeFound ? "matched" : "found" ) + " for type " + type );
 
         return false;
     }