svn commit: r689927 - /maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

[sisbell]

Author: sisbell
Date: Thu Aug 28 11:36:37 2008
New Revision: 689927

URL: http://svn.apache.org/viewvc?rev=689927&view=rev
Log:
Fix: Wasn't passing in additional remote repo URLs from config. Fix: reset the 
active profiles. 20 additional ITs now passing.

Modified:
    
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.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=689927&r1=689926&r2=689927&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 28 11:36:37 2008
@@ -207,10 +207,12 @@
         if (project == null) {
             Model model = repositoryHelper.findModelFromRepository(artifact, 
remoteArtifactRepositories, localRepository);
 
+            List<ArtifactRepository> artifactRepositories = new 
ArrayList<ArtifactRepository>(remoteArtifactRepositories);
+            
artifactRepositories.addAll(repositoryHelper.buildArtifactRepositories(getSuperModel()));
             ProjectBuilderConfiguration config = new 
DefaultProjectBuilderConfiguration().setLocalRepository(localRepository);
+
             project = readModelFromLocalPath("unknown", artifact.getFile(), 
new PomArtifactResolver(config.getLocalRepository(),
-                    
repositoryHelper.buildArtifactRepositories(getSuperModel()), artifactResolver), 
config);
-            //TODO: Construct parent
+                    artifactRepositories, artifactResolver), config);
             project = buildInternal(project.getModel(), config, 
artifact.getFile(), project.getParentFile(),
                     false, false);
         }
@@ -269,7 +271,7 @@
         }
 
         getLogger().debug("Activated the following profiles for standalone 
super-pom: " + activeProfiles);
-        //project.setActiveProfiles(activeProfiles);
+        project.setActiveProfiles(activeProfiles);
 
         try {
             interpolateModelAndInjectDefault(project.getModel(), null, null, 
config, activeProfiles);