Author: jvanzyl
Date: Thu Mar 5 07:11:59 2009
New Revision: 750346
URL: http://svn.apache.org/viewvc?rev=750346&view=rev
Log: (empty)
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRepository.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRepository.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=750346&r1=750345&r2=750346&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 Mar 5 07:11:59 2009
@@ -152,9 +152,6 @@
private PluginManagerSupport pluginManagerSupport;
@Requirement
- private PluginRepository pluginRepository;
-
- @Requirement
private Logger logger;
public DefaultPluginManager()
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java?rev=750346&r1=750345&r2=750346&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java
Thu Mar 5 07:11:59 2009
@@ -16,8 +16,9 @@
@Component(role = PluginPrefixLoader.class)
public class DefaultPluginPrefixLoader
- implements PluginPrefixLoader, LogEnabled
+ implements PluginPrefixLoader
{
+ @Requirement
private Logger logger;
@Requirement
@@ -41,9 +42,7 @@
* and try to resolve based on that.</li>
* </ol>
*/
- public Plugin findPluginForPrefix( String prefix,
- MavenProject project,
- MavenSession session )
+ public Plugin findPluginForPrefix( String prefix, MavenProject project,
MavenSession session )
throws PluginLoaderException
{
Set descriptors = pluginCollector.getPluginDescriptorsForPrefix(
prefix );
@@ -60,8 +59,7 @@
PluginDescriptor pd = (PluginDescriptor) it.next();
Plugin projectPlugin = (Plugin) projectPluginMap.get(
pd.getPluginLookupKey() );
- if ( ( projectPlugin != null ) && ( projectPlugin.getVersion()
!= null )
- && projectPlugin.getVersion().equals( pd.getVersion() ) )
+ if ( ( projectPlugin != null ) && ( projectPlugin.getVersion()
!= null ) && projectPlugin.getVersion().equals( pd.getVersion() ) )
{
pluginDescriptor = pd;
break;
@@ -89,9 +87,7 @@
plugin = new Plugin();
plugin.setArtifactId( PluginDescriptor.getDefaultPluginArtifactId(
prefix ) );
- PluginDescriptor pluginDescriptor =
pluginManagerSupport.loadIsolatedPluginDescriptor( plugin,
-
project,
-
session );
+ PluginDescriptor pluginDescriptor =
pluginManagerSupport.loadIsolatedPluginDescriptor( plugin, project, session );
plugin = toPlugin( pluginDescriptor );
}
@@ -123,9 +119,7 @@
* Look for a plugin configured in the current project that has a prefix
matching the one
* specified. Return the {...@link PluginDescriptor} if a match is found.
*/
- private PluginDescriptor loadFromProjectForPrefixQuery( String prefix,
- MavenProject
project,
- MavenSession
session )
+ private PluginDescriptor loadFromProjectForPrefixQuery( String prefix,
MavenProject project, MavenSession session )
throws PluginLoaderException
{
PluginDescriptor result = null;
@@ -152,15 +146,10 @@
* Look for a plugin in the pluginGroups specified in the settings.xml
that has a prefix
* matching the one specified. Return the {...@link PluginDescriptor} if a
match is found.
*/
- private Plugin loadFromPrefixMapper( String prefix,
- MavenProject project,
- MavenSession session )
+ private Plugin loadFromPrefixMapper( String prefix, MavenProject project,
MavenSession session )
throws PluginLoaderException
{
- Plugin plugin = pluginMappingManager.getByPrefix( prefix,
-
session.getPluginGroups(),
-
project.getRemoteArtifactRepositories(),
-
session.getLocalRepository() );
+ Plugin plugin = pluginMappingManager.getByPrefix( prefix,
session.getPluginGroups(), project.getRemoteArtifactRepositories(),
session.getLocalRepository() );
if ( plugin != null )
{
@@ -173,10 +162,4 @@
return plugin;
}
-
- public void enableLogging( Logger logger )
- {
- this.logger = logger;
- }
-
}
