Author: hboutemy
Date: Mon Oct 3 20:28:14 2011
New Revision: 1178556
URL: http://svn.apache.org/viewvc?rev=1178556&view=rev
Log:
[ARCHETYPE-386] use plexus java 5 annotations instead of old-style javadoc
annotations
Modified:
maven/archetype/trunk/archetype-common/pom.xml
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
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/WikiArchetypeDataSource.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
maven/archetype/trunk/pom.xml
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Mon Oct 3 20:28:14 2011
@@ -57,6 +57,11 @@ under the License.
<artifactId>jchardet</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
Mon Oct 3 20:28:14 2011
@@ -26,6 +26,8 @@ import org.apache.maven.archetype.genera
import org.apache.maven.archetype.source.ArchetypeDataSource;
import org.apache.maven.archetype.source.ArchetypeDataSourceException;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
@@ -40,25 +42,19 @@ import java.util.zip.ZipOutputStream;
/**
* @author Jason van Zyl
- * @plexus.component
*/
+@Component( role = ArchetypeManager.class )
public class DefaultArchetypeManager
extends AbstractLogEnabled
implements ArchetypeManager
{
- /**
- * @plexus.requirement role-hint="fileset"
- */
+ @Requirement( hint = "fileset" )
private ArchetypeCreator creator;
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArchetypeGenerator generator;
- /**
- * @plexus.requirement
role="org.apache.maven.archetype.source.ArchetypeDataSource"
- */
+ @Requirement( role = ArchetypeDataSource.class )
private Map<String, ArchetypeDataSource> archetypeSources;
public ArchetypeCreationResult createArchetypeFromProject(
ArchetypeCreationRequest request )
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
Mon Oct 3 20:28:14 2011
@@ -29,6 +29,8 @@ import org.apache.maven.archetype.old.de
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -52,21 +54,15 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-/**
- * @plexus.component
- */
+@Component( role = ArchetypeArtifactManager.class )
public class DefaultArchetypeArtifactManager
extends AbstractLogEnabled
implements ArchetypeArtifactManager
{
- /**
- * @plexus.requirement
- */
+ @Requirement
private Downloader downloader;
- /**
- * @plexus.requirement
- */
+ @Requirement
private PomManager pomManager;
private Map<String, File> archetypeCache = new TreeMap<String, File>();
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
Mon Oct 3 20:28:14 2011
@@ -22,6 +22,7 @@ package org.apache.maven.archetype.commo
import org.apache.maven.archetype.common.util.ListScanner;
import org.apache.maven.archetype.common.util.PathUtils;
import org.apache.maven.archetype.metadata.FileSet;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -34,7 +35,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-/** @plexus.component */
+@Component( role = ArchetypeFilesResolver.class )
public class DefaultArchetypeFilesResolver
extends AbstractLogEnabled
implements ArchetypeFilesResolver
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
Mon Oct 3 20:28:14 2011
@@ -26,6 +26,8 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -41,23 +43,21 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-/** @plexus.component */
+@Component( role = ArchetypeRegistryManager.class )
public class DefaultArchetypeRegistryManager
extends AbstractLogEnabled
implements ArchetypeRegistryManager
{
/**
* Used to create ArtifactRepository objects given the urls of the remote
repositories.
- *
- * @plexus.requirement
*/
+ @Requirement
private ArtifactRepositoryFactory artifactRepositoryFactory;
/**
* Determines whether the layout is legacy or not.
- *
- * @plexus.requirement roleHint="default"
*/
+ @Requirement
private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
public List<String> getFilteredExtensions( String
archetypeFilteredExtentions, File archetypeRegistryFile )
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
Mon Oct 3 20:28:14 2011
@@ -33,6 +33,7 @@ import org.apache.maven.model.Reporting;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Plugin;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -66,7 +67,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-/** @plexus.component */
+@Component( role = PomManager.class )
public class DefaultPomManager
extends AbstractLogEnabled
implements PomManager
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
Mon Oct 3 20:28:14 2011
@@ -49,6 +49,8 @@ import org.apache.maven.shared.invoker.D
import org.apache.maven.shared.invoker.DefaultInvoker;
import org.apache.maven.shared.invoker.InvocationRequest;
import org.apache.maven.shared.invoker.Invoker;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
@@ -81,9 +83,8 @@ import java.util.Set;
/**
* Create a 2.x Archetype project from a project. Since 2.0-alpha-5, an
integration-test named "basic" is created along
* the archetype itself to provide immediate test when building the archetype.
- *
- * @plexus.component role-hint="fileset"
*/
+@Component( role = ArchetypeCreator.class, hint = "fileset" )
public class FilesetArchetypeCreator
extends AbstractLogEnabled
implements ArchetypeCreator
@@ -91,13 +92,13 @@ public class FilesetArchetypeCreator
private static final String DEFAULT_OUTPUT_DIRECTORY = "target" +
File.separator + "generated-sources"
+ File.separator + "archetype";
- /** @plexus.requirement */
+ @Requirement
private ArchetypeFilesResolver archetypeFilesResolver;
- /** @plexus.requirement */
+ @Requirement
private PomManager pomManager;
- /** @plexus.requirement */
+ @Requirement
private MavenProjectBuilder projectBuilder;
public void createArchetype( ArchetypeCreationRequest request,
ArchetypeCreationResult result )
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
Mon Oct 3 20:28:14 2011
@@ -25,6 +25,8 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import java.io.File;
import java.util.ArrayList;
@@ -32,19 +34,15 @@ import java.util.List;
/**
* @author Jason van Zyl
- * @plexus.component
*/
+@Component( role = Downloader.class )
public class DefaultDownloader
implements Downloader
{
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArtifactResolver artifactResolver;
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArtifactFactory artifactFactory;
public File download( String groupId, String artifactId, String version,
ArtifactRepository archetypeRepository,
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
Mon Oct 3 20:28:14 2011
@@ -29,6 +29,8 @@ import org.apache.maven.archetype.except
import org.apache.maven.archetype.exception.ArchetypeNotDefined;
import org.apache.maven.archetype.exception.UnknownArchetype;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -39,21 +41,21 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-/** @plexus.component */
+@Component( role = ArchetypeGenerator.class )
public class DefaultArchetypeGenerator
extends AbstractLogEnabled
implements ArchetypeGenerator
{
- /** @plexus.requirement */
+ @Requirement
private ArchetypeRegistryManager archetypeRegistryManager;
- /** @plexus.requirement */
+ @Requirement
private ArchetypeArtifactManager archetypeArtifactManager;
- /** @plexus.requirement */
+ @Requirement
private FilesetArchetypeGenerator filesetGenerator;
- /** @plexus.requirement */
+ @Requirement
private OldArchetype oldArchetype;
private File getArchetypeFile( ArchetypeGenerationRequest request,
ArtifactRepository localRepository )
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
Mon Oct 3 20:28:14 2011
@@ -36,6 +36,8 @@ import org.apache.maven.archetype.metada
import org.apache.maven.archetype.metadata.ModuleDescriptor;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -62,21 +64,21 @@ import java.util.zip.ZipFile;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.metadata.RequiredProperty;
-/** @plexus.component */
+@Component( role = FilesetArchetypeGenerator.class )
public class DefaultFilesetArchetypeGenerator
extends AbstractLogEnabled
implements FilesetArchetypeGenerator
{
- /** @plexus.requirement */
+ @Requirement
private ArchetypeArtifactManager archetypeArtifactManager;
- /** @plexus.requirement */
+ @Requirement
private ArchetypeFilesResolver archetypeFilesResolver;
- /** @plexus.requirement */
+ @Requirement
private PomManager pomManager;
- /** @plexus.requirement */
+ @Requirement
private VelocityComponent velocity;
/**
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
Mon Oct 3 20:28:14 2011
@@ -35,6 +35,8 @@ import org.apache.maven.model.io.xpp3.Ma
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -67,10 +69,10 @@ import java.util.Iterator;
import java.util.Map;
/**
- * @plexus.component
* @author <a href="mailto:[email protected]";>Jason van Zyl</a>
* @version $Id$
*/
+@Component( role = OldArchetype.class )
public class DefaultOldArchetype
extends AbstractLogEnabled
implements OldArchetype
@@ -87,12 +89,10 @@ public class DefaultOldArchetype
// Components
// ----------------------------------------------------------------------
- /**
- * @plexus.requirement
- */
+ @Requirement
private VelocityComponent velocity;
- /** @plexus.requirement */
+ @Requirement
private ArchetypeArtifactManager archetypeArtifactManager;
// ----------------------------------------------------------------------
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
Mon Oct 3 20:28:14 2011
@@ -28,6 +28,8 @@ import org.apache.maven.archetype.common
import org.apache.maven.archetype.exception.UnknownArchetype;
import org.apache.maven.model.Model;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -42,15 +44,13 @@ import java.util.Iterator;
/**
* @author rafale
- * @plexus.component
*/
+@Component( role = RepositoryCrawler.class )
public class DefaultRepositoryCrawler
extends AbstractLogEnabled
implements RepositoryCrawler
{
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArchetypeArtifactManager archetypeArtifactManager;
public ArchetypeCatalog crawl( File repository )
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
Mon Oct 3 20:28:14 2011
@@ -23,6 +23,7 @@ import org.apache.maven.archetype.catalo
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Reader;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -40,8 +41,8 @@ import java.util.Properties;
/**
* @author Jason van Zyl
- * @plexus.component role-hint="catalog"
*/
+@Component( role = ArchetypeDataSource.class, hint = "catalog" )
public class CatalogArchetypeDataSource
extends AbstractLogEnabled
implements ArchetypeDataSource
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java
Mon Oct 3 20:28:14 2011
@@ -20,6 +20,7 @@ package org.apache.maven.archetype.sourc
*/
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.ReaderFactory;
import java.io.IOException;
@@ -29,8 +30,8 @@ import java.util.Properties;
/**
* @author Jason van Zyl
- * @plexus.component role-hint="internal-catalog"
*/
+@Component( role = ArchetypeDataSource.class, hint = "internal-catalog" )
public class InternalCatalogArchetypeDataSource
extends CatalogArchetypeDataSource
{
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
Mon Oct 3 20:28:14 2011
@@ -27,6 +27,8 @@ import org.apache.maven.wagon.WagonExcep
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.ReaderFactory;
import java.io.File;
@@ -34,13 +36,13 @@ import java.io.IOException;
import java.util.Properties;
/**
- * @plexus.component role-hint="remote-catalog"
* @author Jason van Zyl
*/
+@Component( role = ArchetypeDataSource.class, hint = "remote-catalog" )
public class RemoteCatalogArchetypeDataSource
extends CatalogArchetypeDataSource
{
- /** @plexus.requirement */
+ @Requirement
private WagonManager wagonManager;
public static final String REPOSITORY_PROPERTY = "repository";
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=1178556&r1=1178555&r2=1178556&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
Mon Oct 3 20:28:14 2011
@@ -38,23 +38,20 @@ public class ArchetypeCatalogsTest
public void testRemoteCatalog()
throws Exception
{
-
ArchetypeManager archetype = (ArchetypeManager) lookup(
ArchetypeManager.class.getName() );
ArchetypeCatalog result = archetype.getRemoteCatalog(
"http://localhost:"; + port + "/repo/" );
assertEquals( 1, result.getArchetypes().size() );
- 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:"; + port + "/repo/",
- ( (Archetype) result.getArchetypes().get( 0 )
).getRepository() );
+ assertEquals( "groupId", result.getArchetypes().get( 0 ).getGroupId()
);
+ assertEquals( "artifactId", result.getArchetypes().get( 0
).getArtifactId() );
+ assertEquals( "1", result.getArchetypes().get( 0 ).getVersion() );
+ assertEquals( "http://localhost:"; + port + "/repo/",
result.getArchetypes().get( 0 ).getRepository() );
}
public void testLocalCatalog()
throws Exception
{
-
ArchetypeManager archetype = (ArchetypeManager) lookup(
ArchetypeManager.class.getName() );
ArchetypeCatalog result =
@@ -62,11 +59,10 @@ public class ArchetypeCatalogsTest
getAbsolutePath() );
assertEquals( 1, result.getArchetypes().size() );
- 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:"; + port + "/repo/",
- ( (Archetype) result.getArchetypes().get( 0 )
).getRepository() );
+ assertEquals( "groupId", result.getArchetypes().get( 0 ).getGroupId()
);
+ assertEquals( "artifactId", result.getArchetypes().get( 0
).getArtifactId() );
+ assertEquals( "1", result.getArchetypes().get( 0 ).getVersion() );
+ assertEquals( "http://localhost:"; + port + "/repo/",
result.getArchetypes().get( 0 ).getRepository() );
}
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
Mon Oct 3 20:28:14 2011
@@ -23,6 +23,7 @@ import org.apache.maven.archetype.catalo
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.source.ArchetypeDataSource;
import org.apache.maven.archetype.source.ArchetypeDataSourceException;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import java.io.IOException;
@@ -42,8 +43,8 @@ import java.util.regex.Pattern;
* is used.
*
* @author Jason van Zyl
- * @plexus.component role-hint="wiki"
*/
+@Component( role = ArchetypeDataSource.class, hint = "wiki" )
public class WikiArchetypeDataSource
implements ArchetypeDataSource
{
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
Mon Oct 3 20:28:14 2011
@@ -19,6 +19,8 @@ package org.apache.maven.archetype.ui;
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.InputHandler;
import org.codehaus.plexus.components.interactivity.OutputHandler;
import org.codehaus.plexus.components.interactivity.Prompter;
@@ -30,20 +32,16 @@ import java.util.List;
/**
* @author raphaelpieroni
- * @plexus.component role-hint="archetype"
*/
+@Component( role = Prompter.class, hint = "archetype" )
public class ArchetypePrompter
implements Prompter
{
- /**
- * @plexus.requirement
- */
+ @Requirement
private OutputHandler outputHandler;
- /**
- * @plexus.requirement
- */
+ @Requirement
private InputHandler inputHandler;
public String prompt( String message )
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
Mon Oct 3 20:28:14 2011
@@ -23,14 +23,13 @@ import org.apache.maven.archetype.common
import org.apache.maven.archetype.metadata.RequiredProperty;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.Iterator;
import java.util.Properties;
-/**
- * @plexus.component
- */
+@Component( role = ArchetypeFactory.class )
public class DefaultArchetypeFactory
extends AbstractLogEnabled
implements ArchetypeFactory
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java
Mon Oct 3 20:28:14 2011
@@ -28,6 +28,8 @@ import org.apache.maven.archetype.ui.Arc
import org.apache.maven.archetype.ui.ArchetypeDefinition;
import org.apache.maven.archetype.ui.ArchetypeFactory;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
@@ -45,18 +47,18 @@ import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-/** @plexus.component */
+@Component( role = ArchetypeCreationConfigurator.class )
public class DefaultArchetypeCreationConfigurator
extends AbstractLogEnabled
implements ArchetypeCreationConfigurator
{
- /** @plexus.requirement */
+ @Requirement
private ArchetypeCreationQueryer archetypeCreationQueryer;
- /** @plexus.requirement */
+ @Requirement
private ArchetypeFactory archetypeFactory;
- /** @plexus.requirement */
+ @Requirement
private ArchetypeFilesResolver archetypeFilesResolver;
public Properties configureArchetypeCreation( MavenProject project,
Boolean interactiveMode,
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java
Mon Oct 3 20:28:14 2011
@@ -21,18 +21,20 @@ package org.apache.maven.archetype.ui.cr
import org.apache.maven.archetype.common.Constants;
import org.apache.maven.archetype.ui.ArchetypeConfiguration;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.Iterator;
-/** @plexus.component */
+@Component( role = ArchetypeCreationQueryer.class )
public class DefaultArchetypeCreationQueryer
extends AbstractLogEnabled
implements ArchetypeCreationQueryer
{
- /** @plexus.requirement */
+ @Requirement
private Prompter prompter;
public String getArchetypeArtifactId( String defaultValue )
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
Mon Oct 3 20:28:14 2011
@@ -33,6 +33,8 @@ import org.apache.maven.archetype.ui.Arc
import org.apache.maven.archetype.ui.ArchetypeFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
@@ -46,36 +48,24 @@ import java.util.List;
import java.util.Properties;
// TODO: this seems to have more responsibilities than just a configurator
-/**
- * @plexus.component
- */
+@Component( role = ArchetypeGenerationConfigurator.class )
public class DefaultArchetypeGenerationConfigurator
extends AbstractLogEnabled
implements ArchetypeGenerationConfigurator
{
- /**
- * @plexus.requirement
- */
+ @Requirement
OldArchetype oldArchetype;
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArchetypeArtifactManager archetypeArtifactManager;
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArchetypeFactory archetypeFactory;
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArchetypeGenerationQueryer archetypeGenerationQueryer;
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArchetypeRegistryManager archetypeRegistryManager;
public void setArchetypeArtifactManager( ArchetypeArtifactManager
archetypeArtifactManager )
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java
Mon Oct 3 20:28:14 2011
@@ -20,16 +20,18 @@ package org.apache.maven.archetype.ui.ge
*/
import org.apache.maven.archetype.ui.ArchetypeConfiguration;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-/** @plexus.component */
+@Component( role = ArchetypeGenerationQueryer.class )
public class DefaultArchetypeGenerationQueryer
extends AbstractLogEnabled
implements ArchetypeGenerationQueryer
{
- /** @plexus.requirement */
+ @Requirement
private Prompter prompter;
public boolean confirmConfiguration( ArchetypeConfiguration
archetypeConfiguration )
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java
Mon Oct 3 20:28:14 2011
@@ -24,6 +24,8 @@ import org.apache.maven.archetype.catalo
import org.apache.maven.archetype.ui.ArchetypeDefinition;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -38,16 +40,12 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
-/**
- * @plexus.component
- */
+@Component( role = ArchetypeSelectionQueryer.class )
public class DefaultArchetypeSelectionQueryer
extends AbstractLogEnabled
implements ArchetypeSelectionQueryer
{
- /**
- * @plexus.requirement role-hint="archetype"
- */
+ @Requirement( hint = "archetype" )
private Prompter prompter;
public boolean confirmSelection( ArchetypeDefinition archetypeDefinition )
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
Mon Oct 3 20:28:14 2011
@@ -28,6 +28,8 @@ import org.apache.maven.archetype.except
import org.apache.maven.archetype.exception.UnknownArchetype;
import org.apache.maven.archetype.exception.UnknownGroup;
import org.apache.maven.archetype.ui.ArchetypeDefinition;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -37,9 +39,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-/**
- * @plexus.component
- */
+@Component( role = ArchetypeSelector.class )
public class DefaultArchetypeSelector
extends AbstractLogEnabled
implements ArchetypeSelector
@@ -50,14 +50,10 @@ public class DefaultArchetypeSelector
static final String DEFAULT_ARCHETYPE_ARTIFACTID =
"maven-archetype-quickstart";
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArchetypeSelectionQueryer archetypeSelectionQueryer;
- /**
- * @plexus.requirement
- */
+ @Requirement
private ArchetypeManager archetypeManager;
public void selectArchetype( ArchetypeGenerationRequest request, Boolean
interactiveMode, String catalogs )
Modified: maven/archetype/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=1178556&r1=1178555&r2=1178556&view=diff
==============================================================================
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Mon Oct 3 20:28:14 2011
@@ -340,11 +340,11 @@ under the License.
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
