svn commit: r1050531 - in /maven/maven-3/trunk/maven-plugin-api/src: main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java

[bentmann]

Author: bentmann
Date: Fri Dec 17 23:44:13 2010
New Revision: 1050531

URL: http://svn.apache.org/viewvc?rev=1050531&view=rev
Log:
[MNG-4941] PluginDescriptorBuilder doesn't populate expression/default-value 
fields for mojo parameters

Modified:
    
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
    
maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java

Modified: 
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java?rev=1050531&r1=1050530&r2=1050531&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
 (original)
+++ 
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
 Fri Dec 17 23:44:13 2010
@@ -255,6 +255,13 @@ public class PluginDescriptorBuilder
         }
 
         // 
----------------------------------------------------------------------
+        // Configuration
+        // 
----------------------------------------------------------------------
+
+        PlexusConfiguration mojoConfig = c.getChild( "configuration" );
+        mojo.setMojoConfiguration( mojoConfig );
+
+        // 
----------------------------------------------------------------------
         // Parameters
         // 
----------------------------------------------------------------------
 
@@ -292,6 +299,13 @@ public class PluginDescriptorBuilder
 
             parameter.setImplementation( d.getChild( "implementation" 
).getValue() );
 
+            PlexusConfiguration paramConfig = mojoConfig.getChild( 
parameter.getName(), false );
+            if ( paramConfig != null )
+            {
+                parameter.setExpression( paramConfig.getValue( null ) );
+                parameter.setDefaultValue( paramConfig.getAttribute( 
"default-value" ) );
+            }
+
             parameters.add( parameter );
         }
 
@@ -300,15 +314,6 @@ public class PluginDescriptorBuilder
         // TODO: this should not need to be handed off...
 
         // 
----------------------------------------------------------------------
-        // Configuration
-        // 
----------------------------------------------------------------------
-
-        mojo.setMojoConfiguration( c.getChild( "configuration" ) );
-
-        // TODO: Go back to this when we get the container ready to configure 
mojos...
-        //        mojo.setConfiguration( c.getChild( "configuration" ) );
-
-        // 
----------------------------------------------------------------------
         // Requirements
         // 
----------------------------------------------------------------------
 

Modified: 
maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java?rev=1050531&r1=1050530&r2=1050531&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
 (original)
+++ 
maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
 Fri Dec 17 23:44:13 2010
@@ -105,6 +105,8 @@ public class PluginDescriptorBuilderTest
         assertEquals( false, mp.isRequired() );
         assertEquals( "parameter-description", mp.getDescription() );
         assertEquals( "deprecated-parameter", mp.getDeprecated() );
+        assertEquals( "${jar.finalName}", mp.getExpression() );
+        assertEquals( "${project.build.finalName}", mp.getDefaultValue() );
 
         ComponentRequirement cr = md.getRequirements().get( 0 );