svn commit: r279587 - /maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java

[brett]

Author: brett
Date: Thu Sep  8 10:17:50 2005
New Revision: 279587

URL: http://svn.apache.org/viewcvs?rev=279587&view=rev
Log:
more id compatibility

Modified:
    maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java

Modified: 
maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java?rev=279587&r1=279586&r2=279587&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java 
(original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java Thu 
Sep  8 10:17:50 2005
@@ -99,6 +99,8 @@
 
     private final Model model;
 
+    private String originalGroupId;
+
     /**
      * Default constructor.
      */
@@ -798,7 +800,7 @@
         if ( model.getGroupId() == null )
         {
             // Don't inherit if it was from an id element
-            if ( model.getId() == null || parent.model.getId() == null || 
!parent.model.getGroupId().equals( parent.model.getId() ) )
+            if ( parent.originalGroupId != null || model.getId() == null )
             {
                 model.setGroupId( parent.model.getGroupId() );
             }
@@ -1363,6 +1365,7 @@
      */
     public void resolveIds()
     {
+        originalGroupId = model.getGroupId();
         if ( model.getId() != null )
         {
             if ( model.getGroupId() == null )
@@ -1482,5 +1485,4 @@
     {
         return getId().hashCode();
     }
-
 }



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