You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/03/04 19:40:34 UTC

svn commit: r750098 - in /maven/components/trunk: ./ apache-maven/src/conf/ maven-embedder/src/main/java/org/apache/maven/embedder/ maven-embedder/src/main/java/org/apache/maven/embedder/execution/

Author: bentmann
Date: Wed Mar  4 18:40:33 2009
New Revision: 750098

URL: http://svn.apache.org/viewvc?rev=750098&view=rev
Log:
o Reverted r750083 which is a bad approach with respect to embedding, instead just programmatically injected the central repo if not already given/overriden in the settings

Modified:
    maven/components/trunk/apache-maven/src/conf/settings.xml
    maven/components/trunk/build.xml
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java

Modified: maven/components/trunk/apache-maven/src/conf/settings.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/conf/settings.xml?rev=750098&r1=750097&r2=750098&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/src/conf/settings.xml (original)
+++ maven/components/trunk/apache-maven/src/conf/settings.xml Wed Mar  4 18:40:33 2009
@@ -244,37 +244,6 @@
       </properties>
     </profile>
     -->
-    <profile>
-      <id>maven-central-repository</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <repositories>
-        <repository>
-          <id>central</id>
-          <name>Maven Repository Switchboard</name>
-          <layout>default</layout>
-          <url>http://repo1.maven.org/maven2</url>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>central</id>
-          <name>Maven Plugin Repository</name>
-          <url>http://repo1.maven.org/maven2</url>
-          <layout>default</layout>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <releases>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
   </profiles>
 
   <!-- activeProfiles

Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=750098&r1=750097&r2=750098&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Wed Mar  4 18:40:33 2009
@@ -208,8 +208,6 @@
       <arg value="install"/>
       <arg value="-Dmaven.repo.local=${maven.repo.local}"/>
       <arg value="-Dsurefire.useFile=${surefire.useFile}"/>
-      <arg value="--global-settings"/>
-      <arg file="apache-maven/src/conf/settings.xml"/>
     </java>
   </target>
 

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=750098&r1=750097&r2=750098&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Mar  4 18:40:33 2009
@@ -31,7 +31,6 @@
 import java.util.List;
 
 import org.apache.maven.Maven;
-import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=750098&r1=750097&r2=750098&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Wed Mar  4 18:40:33 2009
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -35,6 +36,7 @@
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Repository;
+import org.apache.maven.model.RepositoryPolicy;
 import org.apache.maven.monitor.event.DefaultEventMonitor;
 import org.apache.maven.monitor.event.EventMonitor;
 import org.apache.maven.profiles.DefaultProfileManager;
@@ -224,9 +226,44 @@
             }
         }
 
+        injectDefaultRepositories( request );
+
         processRepositoriesInSettings( request, configuration );
     }
 
+    private void injectDefaultRepositories( MavenExecutionRequest request )
+        throws MavenEmbedderException
+    {
+        Set<String> definedRepositories = new HashSet<String>();
+        if ( request.getRemoteRepositories() != null )
+        {
+            for ( ArtifactRepository repository : request.getRemoteRepositories() )
+            {
+                definedRepositories.add( repository.getId() );
+            }
+        }
+
+        if ( !definedRepositories.contains( "central" ) )
+        {
+            Repository repo = new Repository();
+            repo.setId( "central" );
+            repo.setUrl( "http://repo1.maven.org/maven2" );
+            repo.setName( "Maven Repository Switchboard" );
+            RepositoryPolicy snapshotPolicy = new RepositoryPolicy();
+            snapshotPolicy.setEnabled( false );
+            repo.setSnapshots( snapshotPolicy );
+            try
+            {
+                ArtifactRepository ar = repositorySystem.buildArtifactRepository( repo );
+                request.addRemoteRepository( ar );
+            }
+            catch ( InvalidRepositoryException e )
+            {
+                throw new MavenEmbedderException( "Cannot create remote repository " + repo.getId(), e );
+            }
+        }
+    }
+
     private void processRepositoriesInSettings( MavenExecutionRequest request, Configuration configuration )
         throws MavenEmbedderException
     {