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

o Continued work on model merging 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773012 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-08 14:40:47 +00:00
parent 49f72c75e4
commit 6e2798f2e9
1 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
View File

@ -96,7 +96,8 @@ public class MavenModelMerger
} }
/* /*
* TODO: Whether the merge continues recursively into an existing node or not could be an option for the generated merger * TODO: Whether the merge continues recursively into an existing node or not could be an option for the generated
* merger
*/ */
@Override @Override
protected void mergeModel_Organization( Model target, Model source, boolean sourceDominant, protected void mergeModel_Organization( Model target, Model source, boolean sourceDominant,
@ -240,6 +241,26 @@ public class MavenModelMerger
} }
} }
@Override
protected void mergeBuildBase_Resources( BuildBase target, BuildBase source, boolean sourceDominant,
Map<Object, Object> context )
{
if ( sourceDominant || target.getResources().isEmpty() )
{
super.mergeBuildBase_Resources( target, source, sourceDominant, context );
}
}
@Override
protected void mergeBuildBase_TestResources( BuildBase target, BuildBase source, boolean sourceDominant,
Map<Object, Object> context )
{
if ( sourceDominant || target.getTestResources().isEmpty() )
{
super.mergeBuildBase_TestResources( target, source, sourceDominant, context );
}
}
@Override @Override
protected void mergeDistributionManagement_Repository( DistributionManagement target, protected void mergeDistributionManagement_Repository( DistributionManagement target,
DistributionManagement source, boolean sourceDominant, DistributionManagement source, boolean sourceDominant,
@ -436,6 +457,65 @@ public class MavenModelMerger
} }
} }
@Override
protected void mergePlugin_Executions( Plugin target, Plugin source, boolean sourceDominant,
Map<Object, Object> context )
{
List<PluginExecution> src = source.getExecutions();
if ( !src.isEmpty() )
{
List<PluginExecution> tgt = target.getExecutions();
Map<Object, PluginExecution> merged =
new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 );
for ( Iterator<PluginExecution> it = tgt.iterator(); it.hasNext(); )
{
PluginExecution element = it.next();
Object key = getPluginExecutionKey( element );
merged.put( key, element );
}
for ( Iterator<PluginExecution> it = src.iterator(); it.hasNext(); )
{
PluginExecution element = it.next();
Object key = getPluginExecutionKey( element );
PluginExecution existing = merged.get( key );
if ( existing != null )
{
mergePluginExecution( existing, element, sourceDominant, context );
}
else
{
merged.put( key, element );
}
}
target.setExecutions( new ArrayList<PluginExecution>( merged.values() ) );
}
}
@Override
protected void mergePluginExecution_Goals( PluginExecution target, PluginExecution source, boolean sourceDominant,
Map<Object, Object> context )
{
List<String> src = source.getGoals();
if ( !src.isEmpty() )
{
List<String> tgt = target.getGoals();
Set<String> excludes = new LinkedHashSet<String>( tgt );
List<String> merged = new ArrayList<String>( tgt.size() + src.size() );
merged.addAll( tgt );
for ( String s : src )
{
if ( !excludes.contains( s ) )
{
merged.add( s );
}
}
target.setGoals( merged );
}
}
@Override @Override
protected Object getDependencyKey( Dependency dependency ) protected Object getDependencyKey( Dependency dependency )
{ {