svn commit: r605095 - in /maven/components/trunk: maven-core/src/test/java/org/apache/maven/plugin/ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/main/java/org/apache/maven/project/overlay/

[jdcasey]

Author: jdcasey
Date: Mon Dec 17 21:36:03 2007
New Revision: 605095

URL: http://svn.apache.org/viewvc?rev=605095&view=rev
Log:
Removing the build overlay, as it was causing problems with path translation, 
and doesn't serve any real purpose.

Removed:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/overlay/
Modified:
    
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
    
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/MavenProject.java

Modified: 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=605095&r1=605094&r2=605095&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
 (original)
+++ 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
 Mon Dec 17 21:36:03 2007
@@ -261,7 +261,7 @@
 
         Object value = expressionEvaluator.evaluate( 
"${project.build.directory}" + FS + "${project.build.finalName}" );
 
-        assertEquals( new File( "expected-directory/expected-finalName" 
).getCanonicalPath(), value );
+        assertEquals( "expected-directory/expected-finalName", value );
     }
 
     public void testShouldExtractPluginArtifacts()

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=605095&r1=605094&r2=605095&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
 Mon Dec 17 21:36:03 2007
@@ -706,14 +706,16 @@
 
         if ( fromSourceTree )
         {
+            Build build = project.getBuild();
+
+            // NOTE: setting this script-source root before path translation, 
because
+            // the plugin tools compose basedir and scriptSourceRoot into a 
single file.
+            project.addScriptSourceRoot( build.getScriptSourceDirectory() );
+
             getLogger().debug( "Aligning project: " + project.getId() + " to 
base directory: " + projectDescriptor.getParentFile() );
             pathTranslator.alignToBaseDirectory( project.getModel(), 
projectDescriptor.getParentFile() );
 
-            Build build = project.getBuild();
-
             project.addCompileSourceRoot( build.getSourceDirectory() );
-
-            project.addScriptSourceRoot( build.getScriptSourceDirectory() );
 
             project.addTestCompileSourceRoot( build.getTestSourceDirectory() );
 

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=605095&r1=605094&r2=605095&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 Mon Dec 17 21:36:03 2007
@@ -51,7 +51,6 @@
 import org.apache.maven.project.artifact.ActiveProjectArtifact;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.project.artifact.MavenMetadataSource;
-import org.apache.maven.project.overlay.BuildOverlay;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
@@ -1038,19 +1037,12 @@
 
     public void setBuild( Build build )
     {
-        buildOverlay = new BuildOverlay( build );
-
         model.setBuild( build );
     }
 
     public Build getBuild()
     {
-        if ( buildOverlay == null )
-        {
-            buildOverlay = new BuildOverlay( getModelBuild() );
-        }
-
-        return buildOverlay;
+        return getModelBuild();
     }
 
     public List getResources()