You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/27 08:15:05 UTC
svn commit: r225464 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven:
execution/MavenSession.java plugin/DefaultPluginManager.java
Author: brett
Date: Tue Jul 26 23:14:59 2005
New Revision: 225464
URL: http://svn.apache.org/viewcvs?rev=225464&view=rev
Log:
clean up and reformatting
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
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/execution/MavenSession.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=225464&r1=225463&r2=225464&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Tue Jul 26 23:14:59 2005
@@ -39,7 +39,7 @@
private List goals;
private EventDispatcher eventDispatcher;
-
+
private PluginMappingManager pluginMappingManager;
// TODO: make this the central one, get rid of build settings...
@@ -49,9 +49,8 @@
private final String executionRootDir;
- public MavenSession( PlexusContainer container, Settings settings,
- ArtifactRepository localRepository, EventDispatcher eventDispatcher, List sortedProjects,
- List goals, String executionRootDir )
+ public MavenSession( PlexusContainer container, Settings settings, ArtifactRepository localRepository,
+ EventDispatcher eventDispatcher, List sortedProjects, List goals, String executionRootDir )
{
this.container = container;
@@ -60,11 +59,11 @@
this.localRepository = localRepository;
this.eventDispatcher = eventDispatcher;
-
+
this.sortedProjects = sortedProjects;
this.goals = goals;
-
+
this.executionRootDir = executionRootDir;
}
@@ -120,22 +119,22 @@
{
return settings;
}
-
+
public void setPluginMappingManager( PluginMappingManager pluginMappingManager )
{
this.pluginMappingManager = pluginMappingManager;
}
-
+
public PluginMappingManager getPluginMappingManager()
{
return pluginMappingManager;
}
-
+
public List getSortedProjects()
{
return sortedProjects;
}
-
+
public String getExecutionRootDirectory()
{
return executionRootDir;
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=225464&r1=225463&r2=225464&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 Tue Jul 26 23:14:59 2005
@@ -102,6 +102,8 @@
private Log mojoLogger;
+ private Map resolvedCoreArtifactFiles = new HashMap();
+
// component requirements
protected PathTranslator pathTranslator;
@@ -174,15 +176,6 @@
ArtifactRepository localRepository )
throws ArtifactResolutionException, PluginManagerException, PluginVersionResolutionException
{
- Artifact existingPluginArtifact = (Artifact) project.getPluginArtifactMap().get( plugin.getKey() );
-
- return verifyPlugin( plugin, existingPluginArtifact, project, settings, localRepository );
- }
-
- private PluginDescriptor verifyPlugin( Plugin plugin, Artifact existingArtifact, MavenProject project, Settings settings,
- ArtifactRepository localRepository )
- throws ArtifactResolutionException, PluginManagerException, PluginVersionResolutionException
- {
// TODO: this should be possibly outside
// All version-resolution logic has been moved to DefaultPluginVersionManager.
if ( plugin.getVersion() == null )
@@ -199,7 +192,6 @@
{
VersionRange versionRange = VersionRange.createFromVersionSpec( plugin.getVersion() );
-
checkRequiredMavenVersion( plugin, localRepository, project.getPluginArtifactRepositories() );
Artifact pluginArtifact = artifactFactory.createPluginArtifact( plugin.getGroupId(),
@@ -285,9 +277,10 @@
{
artifactResolver.resolve( pluginArtifact, project.getPluginArtifactRepositories(), localRepository );
- PlexusContainer child = container.createChildContainer( plugin.getKey(), Collections
- .singletonList( pluginArtifact.getFile() ), Collections.EMPTY_MAP,
- Collections.singletonList( pluginCollector ) );
+ PlexusContainer child = container.createChildContainer( plugin.getKey(),
+ Collections.singletonList( pluginArtifact.getFile() ),
+ Collections.EMPTY_MAP,
+ Collections.singletonList( pluginCollector ) );
// this plugin's descriptor should have been discovered in the child creation, so we should be able to
// circle around and set the artifacts and class realm
@@ -398,27 +391,27 @@
ArtifactResolutionException
{
Plugin forLookup = new Plugin();
-
+
String groupId = reportPlugin.getGroupId();
String artifactId = reportPlugin.getArtifactId();
-
+
forLookup.setGroupId( groupId );
forLookup.setArtifactId( artifactId );
String version = reportPlugin.getVersion();
-
+
Artifact existingPluginArtifact = (Artifact) project.getReportArtifactMap().get( reportPlugin.getKey() );
-
- if ( existingPluginArtifact == null
- || !reportPlugin.getKey().equals( ArtifactUtils.versionlessKey( existingPluginArtifact ) )
- || version == null )
+
+ if ( existingPluginArtifact == null ||
+ !reportPlugin.getKey().equals( ArtifactUtils.versionlessKey( existingPluginArtifact ) ) || version == null )
{
- version = pluginVersionManager.resolvePluginVersion( groupId, artifactId, project, session.getSettings(), session.getLocalRepository(), true );
+ version = pluginVersionManager.resolvePluginVersion( groupId, artifactId, project, session.getSettings(),
+ session.getLocalRepository(), true );
}
-
+
forLookup.setVersion( version );
-
- PluginDescriptor pluginDescriptor = verifyPlugin( forLookup, existingPluginArtifact, project, session
+
+ PluginDescriptor pluginDescriptor = verifyPlugin( forLookup, project, session
.getSettings(), session.getLocalRepository() );
List reports = new ArrayList();
@@ -544,7 +537,7 @@
ArtifactRepository localRepository = session.getLocalRepository();
ResolutionGroup resolutionGroup = artifactMetadataSource.retrieve( pluginArtifact, localRepository,
- project.getPluginArtifactRepositories() );
+ project.getPluginArtifactRepositories() );
Set dependencies = resolutionGroup.getArtifacts();
@@ -572,7 +565,7 @@
unresolved.removeAll( resolved );
- resolveCoreArtifacts( unresolved, project.getRemoteArtifactRepositories(), localRepository );
+ resolveCoreArtifacts( unresolved, localRepository );
List allResolved = new ArrayList( resolved.size() + unresolved.size() );
@@ -596,9 +589,7 @@
}
}
- private Map resolvedCoreArtifactFiles = new HashMap();
-
- private void resolveCoreArtifacts( List unresolved, List remoteRepositories, ArtifactRepository localRepository )
+ private void resolveCoreArtifacts( List unresolved, ArtifactRepository localRepository )
throws ArtifactResolutionException
{
for ( Iterator it = unresolved.iterator(); it.hasNext(); )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org