svn commit: r580823 - in /maven/sandbox/trunk/archetypeng: archetypeng-common/src/main/java/org/apache/maven/archetype/common/ archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/

[jv...@apache.org]

Author: jvanzyl
Date: Sun Sep 30 19:51:15 2007
New Revision: 580823

URL: http://svn.apache.org/viewvc?rev=580823&view=rev
Log:
o we need to take the repository that is listed in the archetype descriptor and push it into the list of repositories
  that are searched. When we start from scratch any repositories in profiles will NOT be used. A serious bug in Maven 
  but this allows us to work around that and not hose people starting with a clean slate.

Modified:
    maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
    maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
    maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java

Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java?rev=580823&r1=580822&r2=580823&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java Sun Sep 30 19:51:15 2007
@@ -20,6 +20,7 @@
 package org.apache.maven.archetype.common;
 
 import org.apache.maven.archetype.registry.ArchetypeRegistry;
+import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
@@ -70,5 +71,7 @@
         throws
         IOException;
 
-    public ArchetypeRegistry getDefaultArchetypeRegistry();
+    ArchetypeRegistry getDefaultArchetypeRegistry();    
+
+    ArtifactRepository createRepository( String url, String repositoryId );
 }

Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java?rev=580823&r1=580822&r2=580823&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java Sun Sep 30 19:51:15 2007
@@ -225,7 +225,7 @@
      * Code stealed from MavenArchetypeMojo
      * (org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha4).
      */
-    private ArtifactRepository createRepository( String url,
+    public ArtifactRepository createRepository( String url,
                                                  String repositoryId )
     {
         // snapshots vs releases

Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java?rev=580823&r1=580822&r2=580823&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java Sun Sep 30 19:51:15 2007
@@ -69,7 +69,7 @@
 
     /** @plexus.requirement role="org.apache.maven.archetype.source.ArchetypeDataSource" */
     private Map archetypeSources;
-
+    
     public ArchetypeDefinition selectArchetype(
         String archetypeGroupId,
         String archetypeArtifactId,
@@ -168,6 +168,8 @@
                     archetypeDefinition.setVersion( archetype.getVersion() );
 
                     archetypeDefinition.setRepository( archetype.getRepository() );
+
+                    repositories.add( archetypeRegistryManager.createRepository( archetype.getRepository(), archetype.getArtifactId() + "-repo" ) );
 
                     String goals = StringUtils.join( archetype.getGoals().iterator(), "," );