svn commit: r687888 - in /maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java builder/PomClassicDomainModel.java builder/impl/DefaultProjectBuilder.java

[sisbell]

Author: sisbell
Date: Thu Aug 21 15:47:40 2008
New Revision: 687888

URL: http://svn.apache.org/viewvc?rev=687888&view=rev
Log:
Added superModel to inteheritence chain. Now seeing performance problems.

Modified:
    
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
    
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

Modified: 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=687888&r1=687887&r2=687888&view=diff
==============================================================================
--- 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Thu Aug 21 15:47:40 2008
@@ -470,7 +470,10 @@
         }
 
         Build dynamicBuild = model.getBuild();
-        model.setBuild(ModelUtils.cloneBuild(dynamicBuild));
+        if(dynamicBuild != null) {
+            model.setBuild(ModelUtils.cloneBuild(dynamicBuild));    
+        }
+
 
         model = modelInterpolator.interpolate(model, projectDir, config, 
getLogger().isDebugEnabled());
 
@@ -666,7 +669,7 @@
         MavenProject mavenProject;
         try {
             mavenProject = projectBuilder.buildFromLocalPath(new 
FileInputStream(projectDescriptor),
-                    null, null, null, resolver,
+                    Arrays.asList(getSuperModel()), null, null, resolver,
                     projectDescriptor.getParentFile());
         } catch (IOException e) {
             e.printStackTrace();

Modified: 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=687888&r1=687887&r2=687888&view=diff
==============================================================================
--- 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
 (original)
+++ 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
 Thu Aug 21 15:47:40 2008
@@ -140,10 +140,10 @@
                     return "";
                 }
             }
-            String groupId = ( model.getGroupId() == null ) ? 
model.getParent().getGroupId() : model.getGroupId();
+            String groupId = ( model.getGroupId() == null && model.getParent() 
!= null) ? model.getParent().getGroupId() : model.getGroupId();
             String artifactId =
-                ( model.getArtifactId() == null ) ? 
model.getParent().getArtifactId() : model.getArtifactId();
-            String version = ( model.getVersion() == null ) ? 
model.getParent().getVersion() : model.getVersion();
+                ( model.getArtifactId() == null && model.getParent() != null ) 
? model.getParent().getArtifactId() : model.getArtifactId();
+            String version = ( model.getVersion() == null && model.getParent() 
!= null) ? model.getParent().getVersion() : model.getVersion();
 
             id = groupId + ":" + artifactId + ":" + version;
         }

Modified: 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=687888&r1=687887&r2=687888&view=diff
==============================================================================
--- 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
 (original)
+++ 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
 Thu Aug 21 15:47:40 2008
@@ -153,7 +153,6 @@
             }
 
             if(mavenParents.size() > 0) {
-
                 mavenParent = buildFromLocalPath( ((InputStreamDomainModel) 
mavenParents.get(0)).getInputStream(), inheritedModels,
                         importModels, interpolatorProperties, resolver, 
projectDirectory);
             }