Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 23977 invoked from network); 14 Jan 2011 22:33:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Jan 2011 22:33:57 -0000 Received: (qmail 20658 invoked by uid 500); 14 Jan 2011 22:33:57 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 20557 invoked by uid 500); 14 Jan 2011 22:33:56 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 20550 invoked by uid 99); 14 Jan 2011 22:33:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jan 2011 22:33:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jan 2011 22:33:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A309723888FE; Fri, 14 Jan 2011 22:33:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1059189 - in /maven/maven-3/trunk/maven-model/src/main: java/org/apache/maven/model/merge/ModelMerger.java mdo/maven.mdo Date: Fri, 14 Jan 2011 22:33:29 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110114223329.A309723888FE@eris.apache.org> Author: bentmann Date: Fri Jan 14 22:33:29 2011 New Revision: 1059189 URL: http://svn.apache.org/viewvc?rev=1059189&view=rev Log: o Unified inheritance hierarchy of POM model classes Modified: maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo Modified: maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=1059189&r1=1059188&r2=1059189&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java (original) +++ maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java Fri Jan 14 22:33:29 2011 @@ -1320,8 +1320,7 @@ public class ModelMerger protected void mergeReportPlugin( ReportPlugin target, ReportPlugin source, boolean sourceDominant, Map context ) { - mergeReportPlugin_Inherited( target, source, sourceDominant, context ); - mergeReportPlugin_Configuration( target, source, sourceDominant, context ); + mergeConfigurationContainer( target, source, sourceDominant, context ); mergeReportPlugin_GroupId( target, source, sourceDominant, context ); mergeReportPlugin_ArtifactId( target, source, sourceDominant, context ); mergeReportPlugin_Version( target, source, sourceDominant, context ); @@ -1370,39 +1369,6 @@ public class ModelMerger } } - protected void mergeReportPlugin_Inherited( ReportPlugin target, ReportPlugin source, boolean sourceDominant, - Map context ) - { - String src = source.getInherited(); - if ( src != null ) - { - if ( sourceDominant || target.getInherited() == null ) - { - target.setInherited( src ); - target.setLocation( "inherited", source.getLocation( "inherited" ) ); - } - } - } - - protected void mergeReportPlugin_Configuration( ReportPlugin target, ReportPlugin source, boolean sourceDominant, - Map context ) - { - Xpp3Dom src = (Xpp3Dom) source.getConfiguration(); - if ( src != null ) - { - Xpp3Dom tgt = (Xpp3Dom) target.getConfiguration(); - if ( sourceDominant || tgt == null ) - { - tgt = Xpp3Dom.mergeXpp3Dom( new Xpp3Dom( src ), tgt ); - } - else - { - tgt = Xpp3Dom.mergeXpp3Dom( tgt, src ); - } - target.setConfiguration( tgt ); - } - } - protected void mergeReportPlugin_ReportSets( ReportPlugin target, ReportPlugin source, boolean sourceDominant, Map context ) { @@ -1431,6 +1397,42 @@ public class ModelMerger } } + protected void mergeReportSet( ReportSet target, ReportSet source, boolean sourceDominant, + Map context ) + { + mergeConfigurationContainer( target, source, sourceDominant, context ); + mergeReportSet_Id( target, source, sourceDominant, context ); + mergeReportSet_Reports( target, source, sourceDominant, context ); + } + + protected void mergeReportSet_Id( ReportSet target, ReportSet source, boolean sourceDominant, + Map context ) + { + String src = source.getId(); + if ( src != null ) + { + if ( sourceDominant || target.getId() == null ) + { + target.setId( src ); + target.setLocation( "id", source.getLocation( "id" ) ); + } + } + } + + protected void mergeReportSet_Reports( ReportSet target, ReportSet source, boolean sourceDominant, + Map context ) + { + List src = source.getReports(); + if ( !src.isEmpty() ) + { + List tgt = target.getReports(); + List merged = new ArrayList( tgt.size() + src.size() ); + merged.addAll( tgt ); + merged.addAll( src ); + target.setReports( merged ); + } + } + protected void mergeDependencyManagement( DependencyManagement target, DependencyManagement source, boolean sourceDominant, Map context ) { Modified: maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo?rev=1059189&r1=1059188&r2=1059189&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo (original) +++ maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo Fri Jan 14 22:33:29 2011 @@ -3261,6 +3261,7 @@ ReportPlugin 4.0.0 + ConfigurationContainer <plugin> element contains informations required for a report plugin. @@ -3289,25 +3290,6 @@ String - inherited - 4.0.0 - String - - String - for technical reasons, the semantic type is actually Boolean. - Default value is true. - ]]> - - - - configuration - 4.0.0 - DOM - The configuration of the reporting plugin. - - reportSets 4.0.0 @@ -3376,28 +3358,6 @@ { return groupId + ":" + artifactId; } - - public boolean isInherited() - { - return ( inherited != null ) ? Boolean.parseBoolean( inherited ) : true; - } - - public void setInherited( boolean inherited ) - { - this.inherited = String.valueOf( inherited ); - } - - private boolean inheritanceApplied = true; - - public void unsetInheritanceApplied() - { - this.inheritanceApplied = false; - } - - public boolean isInheritanceApplied() - { - return inheritanceApplied; - } ]]> @@ -3406,6 +3366,7 @@ ReportSet 4.0.0 + ConfigurationContainer Represents a set of reports and configuration to be used to generate them. @@ -3418,18 +3379,6 @@ default - configuration - 4.0.0 - Configuration of the report to be used when generating this set. - DOM - - - inherited - 4.0.0 - String - Whether any configuration should be propagated to child POMs. - - reports 4.0.0 true @@ -3445,18 +3394,6 @@ 4.0.0