You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/04/29 21:03:24 UTC
svn commit: r769877 -
/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: jvanzyl
Date: Wed Apr 29 19:03:24 2009
New Revision: 769877
URL: http://svn.apache.org/viewvc?rev=769877&view=rev
Log:
o remove unrequired code
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=769877&r1=769876&r2=769877&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Wed Apr 29 19:03:24 2009
@@ -393,44 +393,6 @@
PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
- // Here we are walking throught the POM to find plugin configuraiton that we
- // need to inject into the POM. Shane will soon take care of this.
- // Merge the plugin level configuration with the execution level configuration
- // where the latter is dominant.
-
- /*
- if ( project.getBuildPlugins() != null )
- {
- for ( Plugin buildPlugin : project.getBuildPlugins() )
- {
- // The POM builder should have merged any configuration at the upper level of the plugin
- // element with the execution level configuration where our goal is.
-
- // We have our plugin
- if ( buildPlugin.getArtifactId().equals( pluginDescriptor.getArtifactId() ) )
- {
- Xpp3Dom dom = (Xpp3Dom) buildPlugin.getConfiguration();
-
- // Search through executions
- for ( PluginExecution e : buildPlugin.getExecutions() )
- {
- // Search though goals to match what's been asked for.
- for ( String g : e.getGoals() )
- {
- // This goal matches what's been asked for.
- if ( g.equals( mojoDescriptor.getGoal() ) )
- {
- dom = Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) e.getConfiguration(), dom );
- }
- }
- }
-
- mojoExecution.setConfiguration( dom );
- }
- }
- }
- */
-
String goalExecId = goalName;
if ( mojoExecution.getExecutionId() != null )
{