You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/06 16:06:57 UTC
svn commit: r306649 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: brett
Date: Thu Oct 6 07:06:52 2005
New Revision: 306649
URL: http://svn.apache.org/viewcvs?rev=306649&view=rev
Log:
fix project reference
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=306649&r1=306648&r2=306649&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Thu Oct 6 07:06:52 2005
@@ -269,7 +269,7 @@
if ( ref.getArtifact().getDependencyConflictId().equals( pluginArtifact.getDependencyConflictId() ) )
{
// if the project artifact doesn't exist, don't use it. We haven't built that far.
- if ( project.getArtifact().getFile() != null && project.getArtifact().getFile().exists() )
+ if ( ref.getArtifact().getFile() != null && ref.getArtifact().getFile().exists() )
{
pluginArtifact = new ActiveProjectArtifact( ref, pluginArtifact );
}
@@ -584,7 +584,7 @@
PlexusConfiguration extractedMojoConfiguration = extractMojoConfiguration( mergedConfiguration,
mojoDescriptor );
- checkRequiredParameters( mojoDescriptor, extractedMojoConfiguration, expressionEvaluator, plugin );
+ checkRequiredParameters( mojoDescriptor, extractedMojoConfiguration, expressionEvaluator );
populatePluginFields( plugin, mojoDescriptor, extractedMojoConfiguration, pluginContainer,
expressionEvaluator );
@@ -746,7 +746,7 @@
}
private void checkRequiredParameters( MojoDescriptor goal, PlexusConfiguration configuration,
- ExpressionEvaluator expressionEvaluator, Mojo plugin )
+ ExpressionEvaluator expressionEvaluator )
throws PluginConfigurationException
{
// TODO: this should be built in to the configurator, as we presently double process the expressions
@@ -1082,29 +1082,6 @@
}
}
}
- }
-
- private Field findPluginField( Class clazz, String key )
- throws NoSuchFieldException
- {
- Field field = null;
-
- while ( field == null )
- {
- try
- {
- field = clazz.getDeclaredField( key );
- }
- catch ( NoSuchFieldException e )
- {
- clazz = clazz.getSuperclass();
- if ( clazz.equals( Object.class ) )
- {
- throw e;
- }
- }
- }
- return field;
}
public static String createPluginParameterRequiredMessage( MojoDescriptor mojo, Parameter parameter,