You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/04/06 19:46:42 UTC
svn commit: r931242 - in /maven/archetype/trunk:
archetype-common/src/main/java/org/apache/maven/archetype/
archetype-common/src/test/java/org/apache/maven/archetype/
archetype-common/src/test/java/org/apache/maven/archetype/source/
archetype-common/sr...
Author: hboutemy
Date: Tue Apr 6 17:46:41 2010
New Revision: 931242
URL: http://svn.apache.org/viewvc?rev=931242&view=rev
Log:
renamed org.apache.maven.archetype.Archetype to ArchetypeManager to avoid name collision with org.apache.maven.archetype.catalog.Archetype
Added:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
- copied, changed from r931225, maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
- copied, changed from r931225, maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
Removed:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
Copied: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java (from r931225, maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java)
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java?p2=maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java&p1=maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java&r1=931225&r2=931242&rev=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java Tue Apr 6 17:46:41 2010
@@ -19,16 +19,17 @@ package org.apache.maven.archetype;
* under the License.
*/
+import org.apache.maven.archetype.catalog.Archetype;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
/** @author Jason van Zyl */
-public interface Archetype
+public interface ArchetypeManager
{
- String ROLE = Archetype.class.getName();
+ String ROLE = ArchetypeManager.class.getName();
/**
* A command to create an OldArchetype from an existing Maven project given the suppled
@@ -97,7 +98,7 @@ public interface Archetype
File archiveArchetype( File archetypeDirectory, File outputDirectory, String finalName )
throws DependencyResolutionRequiredException, IOException;
- void updateLocalCatalog( org.apache.maven.archetype.catalog.Archetype archetype, String path );
+ void updateLocalCatalog( Archetype archetype, String path );
- void updateLocalCatalog( org.apache.maven.archetype.catalog.Archetype archetype );
+ void updateLocalCatalog( Archetype archetype );
}
Copied: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java (from r931225, maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java)
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java?p2=maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java&p1=maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java&r1=931225&r2=931242&rev=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java Tue Apr 6 17:46:41 2010
@@ -19,6 +19,7 @@ package org.apache.maven.archetype;
* under the License.
*/
+import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.creator.ArchetypeCreator;
import org.apache.maven.archetype.generator.ArchetypeGenerator;
@@ -41,9 +42,9 @@ import java.util.zip.ZipOutputStream;
* @author Jason van Zyl
* @plexus.component
*/
-public class DefaultArchetype
+public class DefaultArchetypeManager
extends AbstractLogEnabled
- implements Archetype
+ implements ArchetypeManager
{
/** @plexus.requirement role-hint="fileset" */
private ArchetypeCreator creator;
@@ -199,12 +200,12 @@ public class DefaultArchetype
}
}
- public void updateLocalCatalog( org.apache.maven.archetype.catalog.Archetype archetype )
+ public void updateLocalCatalog( Archetype archetype )
{
updateLocalCatalog( archetype, "${user.home}/.m2/archetype-catalog.xml" );
}
- public void updateLocalCatalog( org.apache.maven.archetype.catalog.Archetype archetype, String path )
+ public void updateLocalCatalog( Archetype archetype, String path )
{
try
{
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java Tue Apr 6 17:46:41 2010
@@ -19,10 +19,10 @@ package org.apache.maven.archetype;
import java.io.File;
import java.io.FileWriter;
-import java.io.IOException;
import java.io.Writer;
import java.net.URL;
import org.apache.commons.io.IOUtils;
+import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
import org.codehaus.cargo.container.deployable.DeployableType;
@@ -48,39 +48,31 @@ public class ArchetypeCatalogsTest
throws Exception
{
- Archetype archetype = (Archetype) lookup( Archetype.class.getName() );
+ ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.class.getName() );
ArchetypeCatalog result = archetype.getRemoteCatalog( "http://localhost:18881/repo/" );
assertEquals( 1, result.getArchetypes().size() );
- assertEquals( "groupId", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
- get( 0 )).getGroupId() );
- assertEquals( "artifactId", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
- get( 0 )).getArtifactId() );
- assertEquals( "1", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
- get( 0 )).getVersion() );
- assertEquals( "http://localhost:18881/repo/", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
- get( 0 )).getRepository() );
+ assertEquals( "groupId", ( (Archetype) result.getArchetypes().get( 0 ) ).getGroupId() );
+ assertEquals( "artifactId", ( (Archetype) result.getArchetypes().get( 0 ) ).getArtifactId() );
+ assertEquals( "1", ( (Archetype) result.getArchetypes().get( 0 ) ).getVersion() );
+ assertEquals( "http://localhost:18881/repo/", ( (Archetype) result.getArchetypes().get( 0 ) ).getRepository() );
}
public void testLocalCatalog()
throws Exception
{
- Archetype archetype = (Archetype) lookup( Archetype.class.getName() );
+ ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.class.getName() );
ArchetypeCatalog result = archetype.getLocalCatalog( getTestFile( "target/test-classes/repositories/test-catalog" ).
getAbsolutePath() );
assertEquals( 1, result.getArchetypes().size() );
- assertEquals( "groupId", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
- get( 0 )).getGroupId() );
- assertEquals( "artifactId", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
- get( 0 )).getArtifactId() );
- assertEquals( "1", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
- get( 0 )).getVersion() );
- assertEquals( "http://localhost:18881/repo/", ((org.apache.maven.archetype.catalog.Archetype) result.getArchetypes().
- get( 0 )).getRepository() );
+ assertEquals( "groupId", ( (Archetype) result.getArchetypes().get( 0 ) ).getGroupId() );
+ assertEquals( "artifactId", ( (Archetype) result.getArchetypes().get( 0 ) ).getArtifactId() );
+ assertEquals( "1", ( (Archetype) result.getArchetypes().get( 0 ) ).getVersion() );
+ assertEquals( "http://localhost:18881/repo/", ( (Archetype) result.getArchetypes().get( 0 ) ).getRepository() );
}
private Jetty6xEmbeddedLocalContainer cargo;
@@ -97,7 +89,7 @@ public class ArchetypeCatalogsTest
getTestFile( "target/test-classes/repositories/test-catalog/dummy" ).createNewFile();
ArchetypeCatalog catalog = new ArchetypeCatalog();
- org.apache.maven.archetype.catalog.Archetype generatedArchetype = new org.apache.maven.archetype.catalog.Archetype();
+ Archetype generatedArchetype = new Archetype();
generatedArchetype.setGroupId( "groupId" );
generatedArchetype.setArtifactId( "artifactId" );
generatedArchetype.setVersion( "1" );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java Tue Apr 6 17:46:41 2010
@@ -4,7 +4,7 @@ import org.codehaus.plexus.PlexusTestCas
import java.util.List;
import java.util.Properties;
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
/** @author Jason van Zyl */
public class WikiArchetypeDataSourceTest
@@ -19,8 +19,8 @@ public class WikiArchetypeDataSourceTest
assertEquals( 47, archetypes.size() );
- Archetype a = (Archetype) lookup(Archetype.class.getName());
- archetypes=a.getInternalCatalog().getArchetypes();
+ ArchetypeManager a = (ArchetypeManager) lookup( ArchetypeManager.class.getName() );
+ archetypes = a.getInternalCatalog().getArchetypes();
assertEquals( 47, archetypes.size() );
}
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java Tue Apr 6 17:46:41 2010
@@ -21,13 +21,15 @@ package org.apache.maven.archetype.test;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
import java.util.Properties;
+
+import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.codehaus.plexus.util.FileUtils;
@@ -38,7 +40,7 @@ public class ArchetypeGenerationTest
public void testProjectGenerationFromAnArchetype()
throws Exception
{
- Archetype archetype = (Archetype) lookup( Archetype.ROLE );
+ ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
// In the embedder the localRepository will be retrieved from the embedder itself and users won't
// have to go through this muck.
@@ -57,8 +59,7 @@ public class ArchetypeGenerationTest
// Here I am just grabbing a OldArchetype but in a UI you would take the OldArchetype objects and present
// them to the user.
- org.apache.maven.archetype.catalog.Archetype selection = (org.apache.maven.archetype.catalog.Archetype)
- catalog.getArchetypes().get( catalog.getArchetypes().size() - 1 );
+ Archetype selection = (Archetype) catalog.getArchetypes().get( catalog.getArchetypes().size() - 1 );
System.err.println( "Selected OldArchetype = " + selection );
// Now you will present a dialog, or whatever, and grab the following values.
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java Tue Apr 6 17:46:41 2010
@@ -24,7 +24,8 @@ import org.apache.maven.archetype.Archet
import org.apache.maven.archetype.ArchetypeCreationResult;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
+import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
@@ -61,7 +62,7 @@ public class ArchetyperRoundtripTest
throws Exception
{
- Archetype archetype = (Archetype) lookup( Archetype.ROLE );
+ ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
@@ -147,7 +148,7 @@ public class ArchetyperRoundtripTest
// (4) create our own archetype catalog describing the archetype we just created
ArchetypeCatalog catalog = new ArchetypeCatalog();
- org.apache.maven.archetype.catalog.Archetype generatedArchetype = new org.apache.maven.archetype.catalog.Archetype();
+ Archetype generatedArchetype = new Archetype();
generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId() );
generatedArchetype.setArtifactId( generatedArchetypeProject.getArtifactId() );
generatedArchetype.setVersion( generatedArchetypeProject.getVersion() );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java Tue Apr 6 17:46:41 2010
@@ -24,10 +24,12 @@ import org.apache.maven.archetype.Archet
import org.apache.maven.archetype.ArchetypeCreationResult;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
+import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
+import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
@@ -52,7 +54,6 @@ import java.io.OutputStream;
import java.io.Writer;
import java.net.URL;
import java.util.Properties;
-import org.apache.maven.artifact.manager.WagonManager;
/** @author Jason van Zyl */
public class ArchetyperRoundtripWithProxyTest
@@ -64,7 +65,7 @@ public class ArchetyperRoundtripWithProx
public void testArchetyper()
throws Exception
{
- Archetype archetype = (Archetype) lookup( Archetype.ROLE );
+ ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
@@ -157,7 +158,7 @@ public class ArchetyperRoundtripWithProx
// (4) create our own archetype catalog describing the archetype we just created
ArchetypeCatalog catalog = new ArchetypeCatalog();
- org.apache.maven.archetype.catalog.Archetype generatedArchetype = new org.apache.maven.archetype.catalog.Archetype();
+ Archetype generatedArchetype = new Archetype();
generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId() );
generatedArchetype.setArtifactId( generatedArchetypeProject.getArtifactId() );
generatedArchetype.setVersion( generatedArchetypeProject.getVersion() );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java Tue Apr 6 17:46:41 2010
@@ -23,9 +23,10 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
+import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
@@ -52,7 +53,7 @@ public class InternalCatalogArchetypesVe
File outputDirectory = new File( getBasedir(), "target/internal-archetypes-projects" );
outputDirectory.mkdirs();
- Archetype archetype = (Archetype) lookup( Archetype.class.getName() );
+ ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.class.getName() );
ArchetypeCatalog result = archetype.getInternalCatalog();
@@ -62,8 +63,8 @@ public class InternalCatalogArchetypesVe
int count = 1;
while ( archetypes.hasNext() )
{
- org.apache.maven.archetype.catalog.Archetype a = (org.apache.maven.archetype.catalog.Archetype) archetypes.next();
- org.apache.maven.archetype.catalog.Archetype ar = new org.apache.maven.archetype.catalog.Archetype();
+ Archetype a = (Archetype) archetypes.next();
+ Archetype ar = new Archetype();
ar.setGroupId( a.getGroupId() );
ar.setArtifactId( a.getArtifactId() );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java Tue Apr 6 17:46:41 2010
@@ -19,6 +19,7 @@ package org.apache.maven.archetype.test;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
@@ -58,7 +59,7 @@ public class InternalCatalogFromWiki
private ArchetypeRegistryManager arm;
- private org.apache.maven.archetype.Archetype plexusarchetype;
+ private ArchetypeManager plexusarchetype;
private File outputDirectory;
@@ -282,7 +283,7 @@ public class InternalCatalogFromWiki
arm = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.class.getName() );
plexusarchetype =
- (org.apache.maven.archetype.Archetype) lookup( org.apache.maven.archetype.Archetype.class.getName() );
+ (org.apache.maven.archetype.ArchetypeManager) lookup( org.apache.maven.archetype.ArchetypeManager.class.getName() );
outputDirectory = new File( getBasedir(), "target/internal-archetypes-projects" );
outputDirectory.mkdirs();
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java Tue Apr 6 17:46:41 2010
@@ -24,7 +24,8 @@ import org.apache.maven.archetype.Archet
import org.apache.maven.archetype.ArchetypeCreationResult;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
+import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
@@ -65,7 +66,7 @@ public class RoundtripMultiModuleTest
throws Exception
{
- Archetype archetype = (Archetype) lookup( Archetype.ROLE );
+ ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
@@ -163,7 +164,7 @@ public class RoundtripMultiModuleTest
// (4) create our own archetype catalog describing the archetype we just created
ArchetypeCatalog catalog = new ArchetypeCatalog();
- org.apache.maven.archetype.catalog.Archetype generatedArchetype = new org.apache.maven.archetype.catalog.Archetype();
+ Archetype generatedArchetype = new Archetype();
generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId() );
generatedArchetype.setArtifactId( generatedArchetypeProject.getArtifactId() );
generatedArchetype.setVersion( generatedArchetypeProject.getVersion() );
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java Tue Apr 6 17:46:41 2010
@@ -21,7 +21,7 @@ package org.apache.maven.archetype.mojos
import org.apache.maven.archetype.ArchetypeCreationRequest;
import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.archetype.common.Constants;
import org.apache.maven.archetype.ui.ArchetypeCreationConfigurator;
@@ -67,7 +67,7 @@ public class CreateArchetypeFromProjectM
ArchetypeRegistryManager archetypeRegistryManager;
/** @component */
- Archetype archetype;
+ ArchetypeManager archetype;
/**
* File extensions which are checked for project's text files (vs binary files).
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java Tue Apr 6 17:46:41 2010
@@ -19,7 +19,7 @@ package org.apache.maven.archetype.mojos
* under the License.
*/
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
import org.apache.maven.archetype.generator.ArchetypeGenerator;
@@ -55,7 +55,7 @@ public class CreateProjectFromArchetypeM
implements ContextEnabled
{
/** @component */
- private Archetype archetype;
+ private ArchetypeManager archetype;
/** @component */
private ArchetypeSelector selector;
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java Tue Apr 6 17:46:41 2010
@@ -19,7 +19,7 @@ package org.apache.maven.archetype.mojos
* under the License.
*/
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -76,7 +76,7 @@ public class JarMojo
*
* @component
*/
- private Archetype archetype;
+ private ArchetypeManager archetype;
public void execute( )
throws MojoExecutionException, MojoFailureException
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java Tue Apr 6 17:46:41 2010
@@ -19,6 +19,7 @@ package org.apache.maven.archetype.mojos
* under the License.
*/
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.ContextEnabled;
@@ -46,7 +47,7 @@ public class UpdateLocalCatalogMojo
implements ContextEnabled
{
/** @component */
- private org.apache.maven.archetype.Archetype archetyper;
+ private ArchetypeManager archetyper;
/** @component role="org.apache.maven.archetype.source.ArchetypeDataSource" */
private Map archetypeSources;
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelectionQueryer.java Tue Apr 6 17:46:41 2010
@@ -64,8 +64,7 @@ public class DefaultArchetypeSelectionQu
for ( Iterator archetypeIterator = archetypes.iterator(); archetypeIterator.hasNext(); )
{
- org.apache.maven.archetype.catalog.Archetype archetype =
- (org.apache.maven.archetype.catalog.Archetype) archetypeIterator.next();
+ Archetype archetype = (Archetype) archetypeIterator.next();
answerMap.put( "" + counter, archetype );
query +=
@@ -79,7 +78,7 @@ public class DefaultArchetypeSelectionQu
String answer = prompter.prompt( query, answers );
- return (org.apache.maven.archetype.catalog.Archetype) answerMap.get( answer );
+ return (Archetype) answerMap.get( answer );
}
public Archetype selectArchetype( Map catalogs )
@@ -106,8 +105,7 @@ public class DefaultArchetypeSelectionQu
for ( Iterator archetypeIterator = ( (List) catalogs.get( catalog ) ).iterator();
archetypeIterator.hasNext(); )
{
- org.apache.maven.archetype.catalog.Archetype archetype =
- (org.apache.maven.archetype.catalog.Archetype) archetypeIterator.next();
+ Archetype archetype = (Archetype) archetypeIterator.next();
String mapKey = "" + counter;
String archetypeKey = archetype.getGroupId() + ":" + archetype.getArtifactId();
@@ -156,7 +154,7 @@ public class DefaultArchetypeSelectionQu
if ( archetypeVersions.size() == 1 )
{
- return (org.apache.maven.archetype.catalog.Archetype) archetypeVersions.get( 0 );
+ return (Archetype) archetypeVersions.get( 0 );
}
else
{
@@ -164,7 +162,7 @@ public class DefaultArchetypeSelectionQu
}
}
- private org.apache.maven.archetype.catalog.Archetype selectVersion( List archetypes )
+ private Archetype selectVersion( List archetypes )
throws PrompterException
{
String query = "Choose version: \n";
@@ -175,8 +173,8 @@ public class DefaultArchetypeSelectionQu
{
public int compare( Object o1, Object o2 )
{
- org.apache.maven.archetype.catalog.Archetype a1 = (org.apache.maven.archetype.catalog.Archetype) o1;
- org.apache.maven.archetype.catalog.Archetype a2 = (org.apache.maven.archetype.catalog.Archetype) o2;
+ Archetype a1 = (Archetype) o1;
+ Archetype a2 = (Archetype) o2;
return a1.getVersion().compareTo( a2.getVersion() );
}
} );
@@ -184,8 +182,7 @@ public class DefaultArchetypeSelectionQu
int counter = 1;
for ( Iterator archetypeVersionsKeys = archetypes.iterator(); archetypeVersionsKeys.hasNext(); )
{
- org.apache.maven.archetype.catalog.Archetype archetype =
- (org.apache.maven.archetype.catalog.Archetype) archetypeVersionsKeys.next();
+ Archetype archetype = (Archetype) archetypeVersionsKeys.next();
String archetypeVersion = archetype.getVersion();
answerMap.put( "" + counter, archetype );
Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java?rev=931242&r1=931241&r2=931242&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java Tue Apr 6 17:46:41 2010
@@ -21,6 +21,7 @@ package org.apache.maven.archetype.ui;
import org.apache.commons.collections.iterators.ArrayIterator;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.common.ArchetypeDefinition;
import org.apache.maven.archetype.exception.ArchetypeNotDefined;
@@ -52,7 +53,7 @@ public class DefaultArchetypeSelector
/** @plexus.requirement */
private ArchetypeSelectionQueryer archetypeSelectionQueryer;
/** @plexus.requirement */
- private org.apache.maven.archetype.Archetype archetype;
+ private ArchetypeManager archetype;
public void selectArchetype( ArchetypeGenerationRequest request, Boolean interactiveMode, String catalogs )
throws ArchetypeNotDefined, UnknownArchetype, UnknownGroup, IOException, PrompterException,