svn commit: r755754 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/ main/java/org/apache/maven/project/processor/ test/java/org/apache/maven/project/processor/

[bentmann]

Author: bentmann
Date: Wed Mar 18 22:13:23 2009
New Revision: 755754

URL: http://svn.apache.org/viewvc?rev=755754&view=rev
Log:
o Fixed interpolation of system properties and env vars

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
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.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=755754&r1=755753&r2=755754&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
 Wed Mar 18 22:13:23 2009
@@ -459,7 +459,6 @@
         return buildModel( pom, interpolatorProperties, null, null, 
localRepository, remoteRepositories );
     }
 
-    @SuppressWarnings("unchecked")
     private PomClassicDomainModel buildModel( File pom, 
Collection<InterpolatorProperty> interpolatorProperties, Collection<String> 
activeProfileIds, Collection<String> inactiveProfileIds,
                                               ArtifactRepository 
localRepository, List<ArtifactRepository> remoteRepositories )
         throws IOException
@@ -541,7 +540,7 @@
             }       
         }
 
-        PomClassicDomainModel transformedDomainModel = ProcessorContext.build( 
profileModels );
+        PomClassicDomainModel transformedDomainModel = ProcessorContext.build( 
profileModels, properties );
         // Lineage count is inclusive to add the POM read in itself.
         transformedDomainModel.setLineageCount( lineageCount + 1 );
         transformedDomainModel.setParentFile( parentFile );

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=755754&r1=755753&r2=755754&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
 Wed Mar 18 22:13:23 2009
@@ -134,7 +134,8 @@
      * @return
      * @throws IOException
      */
-    public static PomClassicDomainModel build( List<DomainModel> domainModels )
+    public static PomClassicDomainModel build( List<DomainModel> domainModels,
+                                               List<InterpolatorProperty> 
interpolationProperties )
         throws IOException
     {  
         PomClassicDomainModel child = null;
@@ -159,7 +160,7 @@
         Model target = 
processModelsForInheritance(convertDomainModelsToMavenModels(domainModels), 
processors, true);
         
         PomClassicDomainModel model = convertToDomainModel( target, false );
-        interpolateModelProperties( model.getModelProperties(), new 
ArrayList<InterpolatorProperty>(), child );
+        interpolateModelProperties( model.getModelProperties(), 
interpolationProperties, child );
         List<ModelProperty> modelProperties;
         if ( child.getProjectDirectory() != null )
         {

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java?rev=755754&r1=755753&r2=755754&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java
 Wed Mar 18 22:13:23 2009
@@ -19,6 +19,7 @@
 import org.apache.maven.project.harness.PomTestWrapper;
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.shared.model.DomainModel;
+import org.apache.maven.shared.model.InterpolatorProperty;
 import org.codehaus.plexus.PlexusTestCase;
 
 public class ProcessorContextTest extends PlexusTestCase
@@ -57,7 +58,7 @@
         DomainModel pdmParent = new PomClassicDomainModel(parent);
         
         DomainModel pdmChild = new PomClassicDomainModel(child, true);         
-        ProcessorContext.build( Arrays.asList(pdmChild, pdmParent));    
+        ProcessorContext.build( Arrays.asList( pdmChild, pdmParent ), new 
ArrayList<InterpolatorProperty>() );    
         
         assertEquals("pom", child.getPackaging());
     }
@@ -89,7 +90,8 @@
         
         DomainModel child = new PomClassicDomainModel(new Model(), true);
      
-        PomClassicDomainModel m = ProcessorContext.build( Arrays.asList(child, 
pdm)) ;
+        PomClassicDomainModel m =
+            ProcessorContext.build( Arrays.asList( child, pdm ), new 
ArrayList<InterpolatorProperty>() );
         
         assertEquals(1, 
m.getModel().getBuild().getPluginManagement().getPlugins().size());
     }       
@@ -151,8 +153,8 @@
             }
         }
 
-        ProcessorContext.build( domainModels );
+        ProcessorContext.build( domainModels, new 
ArrayList<InterpolatorProperty>() );
         
-        return new PomTestWrapper( ProcessorContext.build( domainModels ) );
+        return new PomTestWrapper( ProcessorContext.build( domainModels, new 
ArrayList<InterpolatorProperty>() ) );
     }
 }