svn commit: r774335 - /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

[jvanzyl]

Author: jvanzyl
Date: Wed May 13 13:18:59 2009
New Revision: 774335

URL: http://svn.apache.org/viewvc?rev=774335&view=rev
Log:
o use the one way of creating an artifact resolution request.

Modified:
    
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=774335&r1=774334&r2=774335&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Wed May 13 13:18:59 2009
@@ -188,8 +188,6 @@
             throw new ProjectBuildingException( "", e.getMessage(), e );
         }
 
-        //project.setActiveProfiles( projectProfiles );
-
         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.
@@ -198,7 +196,7 @@
         project.addTestCompileSourceRoot( build.getTestSourceDirectory() );
         project.setFile( pomFile );
         project.setActiveProfiles( projectProfiles );
-
+                
         projectCache.put( pomFile.getAbsolutePath(), project );
                 
         return project;
@@ -212,7 +210,11 @@
             artifact = repositorySystem.createProjectArtifact( 
artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
         }
 
-        ArtifactResolutionRequest request = new ArtifactResolutionRequest( 
artifact, configuration.getLocalRepository(), 
configuration.getRemoteRepositories() );
+        ArtifactResolutionRequest request = new ArtifactResolutionRequest()
+            .setArtifact( artifact )
+            .setLocalRepository( configuration.getLocalRepository() )
+            .setRemoteRepostories( configuration.getRemoteRepositories() );
+        
         ArtifactResolutionResult result = repositorySystem.resolve( request );
 
         try
@@ -296,6 +298,7 @@
         }
 
         project.setArtifacts( result.getArtifacts() );
+        
         project.getArtifacts().remove( artifact );
 
         return new MavenProjectBuildingResult( project, result );
@@ -531,7 +534,11 @@
 
         Artifact artifactParent = repositorySystem.createProjectArtifact( 
domainModel.getParentGroupId(), domainModel.getParentArtifactId(), 
domainModel.getParentVersion() );
 
-        ArtifactResolutionRequest request = new ArtifactResolutionRequest( 
artifactParent, localRepository, remoteRepositories );
+        ArtifactResolutionRequest request = new ArtifactResolutionRequest()
+            .setArtifact( artifactParent )
+            .setLocalRepository( localRepository )
+            .setRemoteRepostories( remoteRepositories );
+        
         ArtifactResolutionResult result;
         try
         {