svn commit: r232336 - in /maven/components/trunk: maven-model/maven.mdo maven-project/src/main/java/org/apache/maven/project/ModelUtils.java maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

[jdcasey]

Author: jdcasey
Date: Fri Aug 12 10:06:38 2005
New Revision: 232336

URL: http://svn.apache.org/viewcvs?rev=232336&view=rev
Log:
Resolving: MNG-686...Moving <directory/> specification from Build to BuildBase 
to allow profiles inline within the POM to change this setting.

Modified:
    maven/components/trunk/maven-model/maven.mdo
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

Modified: maven/components/trunk/maven-model/maven.mdo
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=232336&r1=232335&r2=232336&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Fri Aug 12 10:06:38 2005
@@ -825,6 +825,14 @@
           </association>
         </field>
         <field>
+          <name>directory</name>
+          <version>4.0.0</version>
+          <description><![CDATA[
+            The directory where all files generated by the build is placed.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field>
           <name>finalName</name>
           <version>4.0.0</version>
           <description><![CDATA[
@@ -956,14 +964,6 @@
           <association>
             <type>UnitTest</type>
           </association>
-        </field>
-        <field>
-          <name>directory</name>
-          <version>4.0.0</version>
-          <description><![CDATA[
-            The directory where all files generated by the build is placed.
-          ]]></description>
-          <type>String</type>
         </field>
         <field>
           <name>outputDirectory</name>

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=232336&r1=232335&r2=232336&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
 Fri Aug 12 10:06:38 2005
@@ -619,6 +619,11 @@
         // if the parent build is null, obviously we cannot inherit from it...
         if ( recessive != null )
         {
+            if ( dominant.getDirectory() == null )
+            {
+                dominant.setDirectory( recessive.getDirectory() );
+            }
+
             if ( dominant.getDefaultGoal() == null )
             {
                 dominant.setDefaultGoal( recessive.getDefaultGoal() );

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=232336&r1=232335&r2=232336&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 Fri Aug 12 10:06:38 2005
@@ -160,11 +160,6 @@
             // The build has been set but we want to step in here and fill in
             // values that have not been set by the child.
 
-            if ( childBuild.getDirectory() == null )
-            {
-                childBuild.setDirectory( parentBuild.getDirectory() );
-            }
-
             if ( childBuild.getSourceDirectory() == null )
             {
                 childBuild.setSourceDirectory( 
parentBuild.getSourceDirectory() );



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]