svn commit: r694118 - in /maven/components/trunk: maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderEventingTest.java maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

[si...@apache.org]

Author: sisbell
Date: Wed Sep 10 21:55:50 2008
New Revision: 694118

URL: http://svn.apache.org/viewvc?rev=694118&view=rev
Log:
Removed a unit test related to aspect eventing. Added back in direct setting of compile/script directories.

Removed:
    maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderEventingTest.java
Modified:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.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=694118&r1=694117&r2=694118&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 Sep 10 21:55:50 2008
@@ -184,6 +184,13 @@
 
             project.setFile( projectDescriptor );
             project = buildInternal( project.getModel(), config, projectDescriptor, project.getParentFile(), true );
+
+            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() );
+            project.addCompileSourceRoot( build.getSourceDirectory() );
+            project.addTestCompileSourceRoot( build.getTestSourceDirectory() );
             project.setFile( projectDescriptor );
 
             setBuildOutputDirectoryOnParent( project );