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

Fixes for merging in plugin config. Needed to do copy of plugins and config. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770395 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-04-30 18:55:26 +00:00
parent 36e43b2951
commit 12ffdd1277
4 changed files with 133 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -42,10 +42,12 @@ import org.apache.maven.model.DomainModel;
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.Interpolator;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.processors.PluginProcessor;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileActivationException;
import org.apache.maven.profiles.ProfileManager;
@ -61,6 +63,7 @@ import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* @version $Id$
@ -117,6 +120,7 @@ public class DefaultMavenProjectBuilder
try
{
domainModel = build( "unknown", pomFile, configuration );
}
catch (IOException e)
{
@ -156,6 +160,7 @@ public class DefaultMavenProjectBuilder
domainModel = ProcessorContext.mergeProfilesIntoModel( externalProfiles, domainModel );
}
catch ( IOException e )
{
@ -167,15 +172,59 @@ public class DefaultMavenProjectBuilder
try
{
Model model = interpolateDomainModel( domainModel, configuration, pomFile );
List<Plugin> plns = new ArrayList<Plugin>();
Set<Plugin> plugins = lifecycle.getPluginsBoundByDefaultToAllLifecycles(model.getPackaging());
ProcessorContext.addPluginsToModel(model, plugins);
addPluginsToModel(model, plugins);
ProcessorContext.processManagementNodes(model);
project = this.fromDomainModelToMavenProject(model, domainModel.getParentFile(), configuration, pomFile);
plugins = lifecycle.populateDefaultConfigurationForPlugins(new HashSet<Plugin>(model.getBuild().getPlugins()),
project, configuration.getLocalRepository());
ArrayList<Plugin> pln = new ArrayList<Plugin>();
for(Plugin p : project.getModel().getBuild().getPlugins())
{
Plugin copy = new Plugin();
PluginProcessor.copy2(p, copy, true);
pln.add(copy);
}
project.getModel().getBuild().setPlugins(new ArrayList<Plugin>(plugins));
Set<Plugin> pl = lifecycle.populateDefaultConfigurationForPlugins(new HashSet<Plugin>(pln),
project, configuration.getLocalRepository());
/*
if(model.getArtifactId() != null &&
model.getArtifactId().equals("maven-model"))
{
System.out.println(new DomainModel(project.getModel()).asString());
}
*/
for (Plugin buildPlugin : pl) {
Xpp3Dom dom = (Xpp3Dom) buildPlugin.getConfiguration();
Plugin x = containsPlugin(buildPlugin, project.getModel()
.getBuild().getPlugins());
for (PluginExecution e : buildPlugin.getExecutions()) {
for (String g : e.getGoals()) {
if (x != null) {
PluginExecution pe = contains(g, x.getExecutions());
if (pe != null) {
Xpp3Dom dom1 = Xpp3Dom.mergeXpp3Dom(
(Xpp3Dom) pe.getConfiguration(),
(Xpp3Dom) e.getConfiguration());
e.setConfiguration(dom1);
}
}
Xpp3Dom dom1 = Xpp3Dom.mergeXpp3Dom((Xpp3Dom) e
.getConfiguration(), dom);
e.setConfiguration(dom1);
}
}
}
project.getModel().getBuild().setPlugins(new ArrayList<Plugin>(pl));
}
catch (IOException e)
{
@ -186,7 +235,6 @@ public class DefaultMavenProjectBuilder
e.printStackTrace();
throw new ProjectBuildingException("",e.getMessage());
}
project.setActiveProfiles( projectProfiles );
Build build = project.getBuild();
@ -204,6 +252,56 @@ public class DefaultMavenProjectBuilder
return project;
}
private static PluginExecution contains(String goal, List<PluginExecution> plugins)
{
for(PluginExecution pe : plugins)
{
if(pe.getGoals().contains(goal))
{
return pe;
}
}
return null;
}
public static void addPluginsToModel(Model target, Set<Plugin> plugins)
{
List<Plugin> mPlugins = new ArrayList<Plugin>(target.getBuild().getPlugins());
List<Plugin> lifecyclePlugins = new ArrayList<Plugin>();
for( Plugin p : plugins )
{
Plugin mPlugin = containsPlugin( p, mPlugins);
if( mPlugin == null)
{
lifecyclePlugins.add(p);
}
else if(p.getConfiguration() != null)
{
System.out.println(Xpp3Dom.mergeXpp3Dom((Xpp3Dom) p.getConfiguration(), (Xpp3Dom) mPlugin.getConfiguration()));
}
}
mPlugins.addAll(lifecyclePlugins);
target.getBuild().setPlugins(mPlugins);
}
private static Plugin containsPlugin(Plugin plugin, List<Plugin> plugins)
{
for(Plugin p : plugins)
{
if( p.getGroupId().equals(plugin.getGroupId()) && p.getArtifactId().equals(plugin.getArtifactId()))
{
return p;
}
}
return null;
}
public MavenProject buildFromRepository(Artifact artifact, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException
{
@ -618,7 +716,17 @@ public class DefaultMavenProjectBuilder
Artifact artifactParent = repositorySystem.createProjectArtifact( domainModel.getParentGroupId(), domainModel.getParentArtifactId(), domainModel.getParentVersion() );
ArtifactResolutionRequest request = new ArtifactResolutionRequest( artifactParent, localRepository, remoteRepositories );
ArtifactResolutionResult result = repositorySystem.resolve( request );
ArtifactResolutionResult result;
try
{
result = repositorySystem.resolve( request );
}
catch (Exception e)
{
throw (IOException) new IOException( "The parent POM " + artifactParent
+ " could not be retrieved from any repository" ).initCause( e );
}
try
{
resolutionErrorHandler.throwErrors( request, result );

6
maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
View File

@ -1435,6 +1435,12 @@ public class PomConstructionTest
PomTestWrapper pom = buildPom( "dependency-management-with-interpolation/sub" );
}
public void testMaven()
throws Exception
{
PomTestWrapper pom = buildPom( "maven/sub" );
System.out.println(pom.getDomainModel().asString());
}
private void assertPathSuffixEquals( String expected, Object actual )
{

31
maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
View File

@ -256,37 +256,6 @@ public class ProcessorContext
build.addPlugin(p1);
}
public static void addPluginsToModel(Model target, Set<Plugin> plugins)
{
List<Plugin> mPlugins = target.getBuild().getPlugins();
List<Plugin> lifecyclePlugins = new ArrayList<Plugin>();
for( Plugin p : plugins )
{
if( !containsPlugin( p, mPlugins) )
{
lifecyclePlugins.add(p);
}
}
target.getBuild().getPlugins().addAll(lifecyclePlugins);
}
private static boolean containsPlugin(Plugin plugin, List<Plugin> plugins)
{
for(Plugin p : plugins)
{
if( p.getGroupId().equals(plugin.getGroupId()) && p.getArtifactId().equals(plugin.getArtifactId()))
{
return true;
}
}
return false;
}
public static Model processManagementNodes(Model target)
throws IOException
{

15
maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
View File

@ -26,6 +26,7 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomUtils;
public class PluginProcessor
extends BaseProcessor
@ -175,7 +176,7 @@ public class PluginProcessor
* @param target
* @param isChild
*/
private static void copy2(Plugin source, Plugin target, boolean isChild)
public static void copy2(Plugin source, Plugin target, boolean isChild)
{
if(!isChild && source.getInherited() != null && !source.getInherited().equalsIgnoreCase( "true" ))
{
@ -223,11 +224,11 @@ public class PluginProcessor
//TODO: Not copying
if(target.getConfiguration() != null)
{
target.setConfiguration( Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) source.getConfiguration(), (Xpp3Dom) target.getConfiguration() ));
target.setConfiguration( new Xpp3Dom(Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) source.getConfiguration(), (Xpp3Dom) target.getConfiguration() )));
}
else
{
target.setConfiguration( source.getConfiguration() );
target.setConfiguration( new Xpp3Dom((Xpp3Dom) source.getConfiguration() ) );
}
}
@ -283,11 +284,11 @@ public class PluginProcessor
//TODO: Not copying
if(target.getConfiguration() != null)
{
target.setConfiguration( Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) source.getConfiguration(), (Xpp3Dom) target.getConfiguration() ));
target.setConfiguration( new Xpp3Dom(Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) source.getConfiguration(), (Xpp3Dom) target.getConfiguration() ) ));
}
else
{
target.setConfiguration( source.getConfiguration() );
target.setConfiguration( new Xpp3Dom((Xpp3Dom) source.getConfiguration() ) );
}
}
@ -347,11 +348,11 @@ public class PluginProcessor
{
if(target.getConfiguration() != null)
{
target.setConfiguration( Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) source.getConfiguration(), (Xpp3Dom) target.getConfiguration() ));
target.setConfiguration( new Xpp3Dom(Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) source.getConfiguration(), (Xpp3Dom) target.getConfiguration() )));
}
else
{
target.setConfiguration( source.getConfiguration() );
target.setConfiguration( new Xpp3Dom( (Xpp3Dom) source.getConfiguration()) );
}
}