svn commit: r757927 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java processor/ProcessorContext.java

[bentmann]

Author: bentmann
Date: Tue Mar 24 18:02:05 2009
New Revision: 757927

URL: http://svn.apache.org/viewvc?rev=757927&view=rev
Log:
o Added missing processors

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=757927&r1=757926&r2=757927&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Tue Mar 24 18:02:05 2009
@@ -337,20 +337,11 @@
 
         try
         {
-            // TODO: Review why this blows up the tests when we inject all the 
profiles in one go
-            for ( Iterator<Profile> it = projectProfiles.iterator(); 
it.hasNext(); )
-            {
-                Profile profile = it.next();
-                PomClassicDomainModel dm =
-                    ProcessorContext.mergeProfilesIntoModel( Arrays.asList( 
profile ), model, false );
-                if ( !it.hasNext() )
-                {
-                    ProcessorContext.interpolateModelProperties( 
dm.getModelProperties(),
-                                                                 new 
ArrayList<InterpolatorProperty>(), dm );
-                    dm = new PomClassicDomainModel( dm.getModelProperties(), 
false );
-                }
-                model = dm.getModel();
-            }
+            PomClassicDomainModel dm = 
ProcessorContext.mergeProfilesIntoModel( projectProfiles, model, false );
+            ProcessorContext.interpolateModelProperties( 
dm.getModelProperties(),
+                                                         new 
ArrayList<InterpolatorProperty>(), dm );
+            dm = new PomClassicDomainModel( dm.getModelProperties(), false );
+            model = dm.getModel();
         }
         catch ( IOException e )
         {

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java?rev=757927&r1=757926&r2=757927&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
 Tue Mar 24 18:02:05 2009
@@ -82,11 +82,14 @@
         Collections.reverse( profileModels );
         profileModels.add( 0, model );
         List<Processor> processors =
-            Arrays.asList( (Processor) new BuildProcessor( new 
ArrayList<Processor>() ),
-                           (Processor) new ProfilesModuleProcessor(), new 
ProfilePropertiesProcessor(), new ParentProcessor(),
-                           new OrganizationProcessor(), new 
MailingListProcessor(), new IssueManagementProcessor(),
-                           new CiManagementProcessor(), new 
ReportingProcessor(), new RepositoriesProcessor(), 
-                           new DistributionManagementProcessor());
+            Arrays.<Processor> asList( new BuildProcessor( new 
ArrayList<Processor>() ), new ProfilesModuleProcessor(),
+                                       new ProfilePropertiesProcessor(), new 
ParentProcessor(),
+                                       new OrganizationProcessor(), new 
MailingListProcessor(),
+                                       new IssueManagementProcessor(), new 
CiManagementProcessor(),
+                                       new ReportingProcessor(), new 
RepositoriesProcessor(),
+                                       new DistributionManagementProcessor(), 
new LicensesProcessor(),
+                                       new ScmProcessor(), new 
PrerequisitesProcessor(), new ContributorsProcessor(),
+                                       new DevelopersProcessor() );
         
         Model target = processModelsForInheritance(profileModels, processors, 
false);