FORGE-863: Added changes from F1

forge · May 13, 2013 · 35efa82 · 35efa82
1 parent 728d7dd
commit 35efa82
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/maven/impl-projects/src/main/java/org/jboss/forge/maven/projects/MavenFacetImpl.java b/maven/impl-projects/src/main/java/org/jboss/forge/maven/projects/MavenFacetImpl.java
@@ -32,6 +32,7 @@
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingResult;
 import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Profile;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Repository;
@@ -50,6 +51,7 @@
 import org.jboss.forge.resource.DirectoryResource;
 import org.jboss.forge.resource.ResourceFactory;
 import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.sonatype.aether.util.repository.DefaultMirrorSelector;
 import org.sonatype.aether.util.repository.DefaultProxySelector;
 
 /**
@@ -103,13 +105,15 @@ public ProjectBuildingRequest getBuildingRequest(final boolean offline)
          MavenExecutionRequest executionRequest = new DefaultMavenExecutionRequest();
          plexus.lookup(MavenExecutionRequestPopulator.class).populateFromSettings(executionRequest,
                   container.getSettings());
+         plexus.lookup(MavenExecutionRequestPopulator.class).populateDefaults(executionRequest);
+
          request = executionRequest.getProjectBuildingRequest();
 
          ArtifactRepository localRepository = RepositoryUtils.toArtifactRepository("local",
                   new File(settings.getLocalRepository()).toURI().toURL().toString(), null, true, true);
          request.setLocalRepository(localRepository);
 
-         List<ArtifactRepository> settingsRepos = new ArrayList<ArtifactRepository>();
+         List<ArtifactRepository> settingsRepos = new ArrayList<ArtifactRepository>(request.getRemoteRepositories());
          List<String> activeProfiles = settings.getActiveProfiles();
 
          Map<String, Profile> profiles = settings.getProfilesAsMap();
@@ -126,13 +130,6 @@ public ProjectBuildingRequest getBuildingRequest(final boolean offline)
                }
             }
          }
-
-         if (!offline)
-         {
-            settingsRepos.add(RepositoryUtils.toArtifactRepository("CENTRAL", "http://repo1.maven.org/maven2/", null,
-                     true, false));
-         }
-
          request.setRemoteRepositories(settingsRepos);
          request.setSystemProperties(System.getProperties());
 
@@ -146,10 +143,20 @@ public ProjectBuildingRequest getBuildingRequest(final boolean offline)
          }
          repositorySession.setLocalRepositoryManager(new SimpleLocalRepositoryManager(settings.getLocalRepository()));
          repositorySession.setOffline(offline);
+         List<Mirror> mirrors = executionRequest.getMirrors();
+         if (mirrors != null)
+         {
+            DefaultMirrorSelector mirrorSelector = new DefaultMirrorSelector();
+            for (Mirror mirror : mirrors)
+            {
+               mirrorSelector.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, mirror.getMirrorOf(),
+                        mirror.getMirrorOfLayouts());
+            }
+            repositorySession.setMirrorSelector(mirrorSelector);
+         }
 
          request.setRepositorySession(repositorySession);
          request.setProcessPlugins(false);
-         // request.setPluginArtifactRepositories(Arrays.asList(localRepository));
          request.setResolveDependencies(false);
          return request;
       }
@@ -339,6 +346,7 @@ public boolean executeMaven(final List<String> parameters)
       return executeMaven(parameters.toArray(new String[] {}));
    }
 
+   @SuppressWarnings("resource")
    public boolean executeMaven(final String[] selected)
    {
       return executeMaven(new NullOutputStream(), selected);