Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up and reformatting 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225464 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-07-27 06:14:59 +00:00
parent 8b01ca10f7
commit 740f7ad838
2 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
View File

@ -39,7 +39,7 @@ public class MavenSession
private List goals;
private EventDispatcher eventDispatcher;
private PluginMappingManager pluginMappingManager;
// TODO: make this the central one, get rid of build settings...
@ -49,9 +49,8 @@ public class MavenSession
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 @@ public class MavenSession
this.localRepository = localRepository;
this.eventDispatcher = eventDispatcher;
this.sortedProjects = sortedProjects;
this.goals = goals;
this.executionRootDir = executionRootDir;
}
@ -120,22 +119,22 @@ public class MavenSession
{
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;

49
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -102,6 +102,8 @@ public class DefaultPluginManager
private Log mojoLogger;
private Map resolvedCoreArtifactFiles = new HashMap();
// component requirements
protected PathTranslator pathTranslator;
@ -173,15 +175,6 @@ public class DefaultPluginManager
public PluginDescriptor verifyPlugin( Plugin plugin, MavenProject project, Settings settings,
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.
@ -199,7 +192,6 @@ public class DefaultPluginManager
{
VersionRange versionRange = VersionRange.createFromVersionSpec( plugin.getVersion() );
checkRequiredMavenVersion( plugin, localRepository, project.getPluginArtifactRepositories() );
Artifact pluginArtifact = artifactFactory.createPluginArtifact( plugin.getGroupId(),
@ -285,9 +277,10 @@ public class DefaultPluginManager
{
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 @@ public class DefaultPluginManager
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 @@ public class DefaultPluginManager
ArtifactRepository localRepository = session.getLocalRepository();
ResolutionGroup resolutionGroup = artifactMetadataSource.retrieve( pluginArtifact, localRepository,
project.getPluginArtifactRepositories() );
project.getPluginArtifactRepositories() );
Set dependencies = resolutionGroup.getArtifacts();
@ -572,7 +565,7 @@ public class DefaultPluginManager
unresolved.removeAll( resolved );
resolveCoreArtifacts( unresolved, project.getRemoteArtifactRepositories(), localRepository );
resolveCoreArtifacts( unresolved, localRepository );
List allResolved = new ArrayList( resolved.size() + unresolved.size() );
@ -596,9 +589,7 @@ public class DefaultPluginManager
}
}
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(); )