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

o Extended model merger 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-11 20:53:25 +00:00
parent e3e5cfcf12
commit 129bcf0e1d
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
View File

@ -1966,7 +1966,10 @@ public class ModelMerger
mergeNotifier_Type( target, source, sourceDominant, context ); mergeNotifier_Type( target, source, sourceDominant, context );
mergeNotifier_Address( target, source, sourceDominant, context ); mergeNotifier_Address( target, source, sourceDominant, context );
mergeNotifier_Configuration( target, source, sourceDominant, context ); mergeNotifier_Configuration( target, source, sourceDominant, context );
// TODO mergeNotifier_SendOnError( target, source, sourceDominant, context );
mergeNotifier_SendOnFailure( target, source, sourceDominant, context );
mergeNotifier_SendOnSuccess( target, source, sourceDominant, context );
mergeNotifier_SendOnWarning( target, source, sourceDominant, context );
} }
protected void mergeNotifier_Type( Notifier target, Notifier source, boolean sourceDominant, protected void mergeNotifier_Type( Notifier target, Notifier source, boolean sourceDominant,
@ -2012,6 +2015,42 @@ public class ModelMerger
target.setConfiguration( merged ); target.setConfiguration( merged );
} }
protected void mergeNotifier_SendOnError( Notifier target, Notifier source, boolean sourceDominant,
Map<Object, Object> context )
{
if ( sourceDominant )
{
target.setSendOnError( source.isSendOnError() );
}
}
protected void mergeNotifier_SendOnFailure( Notifier target, Notifier source, boolean sourceDominant,
Map<Object, Object> context )
{
if ( sourceDominant )
{
target.setSendOnFailure( source.isSendOnFailure() );
}
}
protected void mergeNotifier_SendOnSuccess( Notifier target, Notifier source, boolean sourceDominant,
Map<Object, Object> context )
{
if ( sourceDominant )
{
target.setSendOnSuccess( source.isSendOnSuccess() );
}
}
protected void mergeNotifier_SendOnWarning( Notifier target, Notifier source, boolean sourceDominant,
Map<Object, Object> context )
{
if ( sourceDominant )
{
target.setSendOnWarning( source.isSendOnWarning() );
}
}
protected void mergePrerequisites( Prerequisites target, Prerequisites source, boolean sourceDominant, protected void mergePrerequisites( Prerequisites target, Prerequisites source, boolean sourceDominant,
Map<Object, Object> context ) Map<Object, Object> context )
{ {