Author: bentmann
Date: Thu Apr 2 17:48:00 2009
New Revision: 761356
URL: http://svn.apache.org/viewvc?rev=761356&view=rev
Log:
o Fixed path normalization/alignment
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java?rev=761356&r1=761355&r2=761356&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
Thu Apr 2 17:48:00 2009
@@ -480,12 +480,6 @@
} );
ModelTransformerContext.interpolateModelProperties( modelProperties,
ips2 );
-
- if ( dm.getProjectDirectory() != null )
- {
- modelProperties = alignPaths( modelProperties,
dm.getProjectDirectory() );
- }
-
}
private static boolean containsProjectVersion( List<InterpolatorProperty>
interpolatorProperties )
@@ -510,7 +504,7 @@
* @param basedir The project directory, must not be {...@code null}.
* @return The updated model properties, never {...@code null}.
*/
- private static List<ModelProperty> alignPaths( Collection<ModelProperty>
modelProperties, File basedir )
+ public static List<ModelProperty> alignPaths( Collection<ModelProperty>
modelProperties, File basedir )
{
List<ModelProperty> mps = new ArrayList<ModelProperty>(
modelProperties.size() );
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=761356&r1=761355&r2=761356&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
Thu Apr 2 17:48:00 2009
@@ -59,6 +59,7 @@
import org.apache.maven.shared.model.DomainModel;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.shared.model.ModelEventListener;
+import org.apache.maven.shared.model.ModelProperty;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -325,20 +326,25 @@
{
interpolatorProperties.add( new InterpolatorProperty(
"${build.timestamp}", new SimpleDateFormat( "yyyyMMdd-hhmm" ).format(
config.getBuildStartTime() ),
PomInterpolatorTag.PROJECT_PROPERTIES.name() ) );
- }
- try
+ }
+
+ try
+ {
+ PomClassicDomainModel dm =
ProcessorContext.mergeProfilesIntoModel( projectProfiles, domainModel );
+ List<ModelProperty> mps = dm.getModelProperties();
+ ProcessorContext.interpolateModelProperties( mps,
interpolatorProperties, dm );
+ if ( dm.getProjectDirectory() != null )
{
- PomClassicDomainModel dm =
ProcessorContext.mergeProfilesIntoModel( projectProfiles, domainModel );
- ProcessorContext.interpolateModelProperties(
dm.getModelProperties(),
-
interpolatorProperties, dm );
- dm = new PomClassicDomainModel( dm.getModelProperties(), false
);
- model = dm.getModel();
+ mps = ProcessorContext.alignPaths( mps,
dm.getProjectDirectory() );
}
- catch ( IOException e )
- {
+ dm = new PomClassicDomainModel( mps, false );
+ model = dm.getModel();
+ }
+ catch ( IOException e )
+ {
- throw new ProjectBuildingException(projectId, "",
projectDescriptor, e);
- }
+ throw new ProjectBuildingException( projectId, "",
projectDescriptor, e );
+ }
MavenProject project;
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=761356&r1=761355&r2=761356&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Thu Apr 2 17:48:00 2009
@@ -69,7 +69,7 @@
public void testEmptyUrl()
throws Exception
{
- buildPom( "empty-distMng-repo-url", null );
+ buildPom( "empty-distMng-repo-url" );
}
/**
@@ -188,7 +188,7 @@
public void testParentInterpolation()
throws Exception
{
- PomTestWrapper pom = buildPom( "parent-interpolation/sub", null );
+ PomTestWrapper pom = buildPom( "parent-interpolation/sub" );
pom = new PomTestWrapper(pom.getMavenProject().getParent());
assertEquals( "1.3.0-SNAPSHOT", pom.getValue(
"build/plugins[1]/version" ) );
}
@@ -229,7 +229,7 @@
public void testReportingInterpolation()
throws Exception
{
- PomTestWrapper pom = buildPom( "reporting-interpolation", null );
+ PomTestWrapper pom = buildPom( "reporting-interpolation" );
pom = new PomTestWrapper(pom.getMavenProject());
assertEquals( createPath(Arrays.asList(System.getProperty("user.dir"),
"src", "test", "resources-project-builder",
"reporting-interpolation", "target", "site")),
@@ -876,7 +876,7 @@
}
/** MNG-4027*/
- /*
+ /* FIXME
public void testProfileInjectedDependencies()
throws Exception
{
@@ -888,7 +888,7 @@
assertEquals( "b", pom.getValue( "dependencies[3]/artifactId" ) );
assertEquals( "d", pom.getValue( "dependencies[4]/artifactId" ) );
}
-*/
+//*/
/** MNG-4034 */
public void testManagedProfileDependency()
throws Exception
@@ -1284,7 +1284,7 @@
assertEquals( "CHILD", pom.getValue( "properties/interpolated" ) );
}
- /* MNG-1995
+ /* FIXME: MNG-1995
public void testBooleanInterpolation()
throws Exception
{
