Resolving: MNG-496

o Adding extraction of mojo-specific configuration from the merged config for the plugin
o Warning at the DEBUG log-level for unused plugin configuration during the extraction process above
o Added integration test it0028 to test with unused plugin configuration present.



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

maven-core-it/README.txt

@@ -84,6 +84,10 @@ it0025: Test multiple goal executions with different execution-level configs.
 it0026: Test merging of global- and user-level settings.xml files.
 
 it0027: Test @execute with a custom lifecycle, including configuration
+
+it0028: Test that unused configuration parameters from the POM don't cause the
+        mojo to fail...they will show up as warnings in the -X output instead.
+
 -------------------------------------------------------------------------------
 
 - generated sources

maven-core-it/integration-tests.txt

@@ -1,3 +1,4 @@
+it0028
 #Cannot find core-it:fork...
 #it0027
 it0026

maven-core-it/it0028/expected-results.txt

@@ -0,0 +1 @@
+target/classes/org/apache/maven/it0001/Person.class

maven-core-it/it0028/goals.txt

@@ -0,0 +1 @@
+test

maven-core-it/it0028/pom.xml

@@ -0,0 +1,29 @@
+<model>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven</groupId>
+  <artifactId>maven-core-it0028</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <type>jar</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+          <unused>something</unused>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</model>

maven-core-it/it0028/src/main/java/org/apache/maven/it0001/Person.java

@@ -0,0 +1,18 @@
+package org.apache.maven.it0001;
+
+public class Person
+{
+    private String name;
+    
+    public void setName( String name )
+    {
+        this.name = name;
+
+        assert true;
+    }
+    
+    public String getName()
+    {
+        return name;
+    }
+}

maven-core-it/it0028/src/test/java/org/apache/maven/it0001/PersonTest.java

@@ -0,0 +1,16 @@
+package org.apache.maven.it0001;
+
+import junit.framework.TestCase;
+
+public class PersonTest
+    extends TestCase
+{
+    public void testPerson()
+    {
+        Person person = new Person();
+        
+        person.setName( "foo" );
+        
+        assertEquals( "foo", person.getName() );
+    }
+}

maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

@@ -551,12 +551,41 @@ private Mojo getConfiguredMojo( PlexusContainer pluginContainer, MojoDescriptor
                                                                                           pathTranslator, getLogger(),
                                                                                           project );
 
-        checkRequiredParameters( mojoDescriptor, mergedConfiguration, expressionEvaluator, plugin );
+        PlexusConfiguration extractedMojoConfiguration = extractMojoConfiguration( mergedConfiguration, mojoDescriptor );
 
-        populatePluginFields( plugin, mojoDescriptor, mergedConfiguration, pluginContainer, expressionEvaluator );
+        checkRequiredParameters( mojoDescriptor, extractedMojoConfiguration, expressionEvaluator, plugin );
+        
+        populatePluginFields( plugin, mojoDescriptor, extractedMojoConfiguration, pluginContainer, expressionEvaluator );
         return plugin;
     }
 
+    private PlexusConfiguration extractMojoConfiguration( PlexusConfiguration mergedConfiguration, MojoDescriptor mojoDescriptor )
+    {
+        Map parameterMap = mojoDescriptor.getParameterMap();
+        
+        PlexusConfiguration[] mergedChildren = mergedConfiguration.getChildren();
+        
+        XmlPlexusConfiguration extractedConfiguration = new XmlPlexusConfiguration( "configuration" );
+        
+        for ( int i = 0; i < mergedChildren.length; i++ )
+        {
+            PlexusConfiguration child = mergedChildren[i];
+            
+            if ( parameterMap.containsKey( child.getName() ) )
+            {
+                extractedConfiguration.addChild( DefaultPluginManager.copyConfiguration( child ) );
+            }
+            else
+            {
+                // TODO: I defy anyone to find these messages in the '-X' output! Do we need a new log level?
+                // ideally, this would be elevated above the true debug output, but below the default INFO level...
+                getLogger().debug( "*** WARNING: Configuration \'" + child.getName() + "\' is not used in goal \'" + mojoDescriptor.getFullGoalName() + "; this may indicate a typo... ***");
+            }
+        }
+        
+        return extractedConfiguration;
+    }
+
     private void checkRequiredParameters( MojoDescriptor goal, PlexusConfiguration configuration,
                                           ExpressionEvaluator expressionEvaluator, Mojo plugin )
         throws PluginConfigurationException
@@ -758,6 +787,8 @@ private void populatePluginFields( Mojo plugin, MojoDescriptor mojoDescriptor, P
             String configuratorId = mojoDescriptor.getComponentConfigurator();
 
             // TODO: should this be known to the component factory instead? And if so, should configuration be part of lookup?
+            // [jc]: I don't think we can be that strict with the configurator. It makes some measure of sense that
+            // people may want different configurators for their java mojos...
             if ( StringUtils.isNotEmpty( configuratorId ) )
             {
                 configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE,