You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ra...@apache.org on 2007/10/04 21:11:31 UTC
svn commit: r581989 - in /maven/sandbox/trunk/archetypeng:
archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/updateLocalCatalogMojo.java
Author: rafale
Date: Thu Oct 4 12:11:30 2007
New Revision: 581989
URL: http://svn.apache.org/viewvc?rev=581989&view=rev
Log:
fixed javadoc annotation
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/updateLocalCatalogMojo.java
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java?rev=581989&r1=581988&r2=581989&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java Thu Oct 4 12:11:30 2007
@@ -97,7 +97,7 @@
Iterator archetypes = catalog.getArchetypes( ).iterator( );
boolean found = false;
- Archetype newArchetype = null;
+ Archetype newArchetype = archetype;
while ( !found && archetypes.hasNext( ) )
{
Archetype a = (Archetype) archetypes.next();
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/updateLocalCatalogMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/updateLocalCatalogMojo.java?rev=581989&r1=581988&r2=581989&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/updateLocalCatalogMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/updateLocalCatalogMojo.java Thu Oct 4 12:11:30 2007
@@ -27,7 +27,7 @@
extends AbstractMojo
implements ContextEnabled
{
- /** @plexus.requirement role="org.apache.maven.archetype.source.ArchetypeDataSource" */
+ /** @component role="org.apache.maven.archetype.source.ArchetypeDataSource" */
private Map archetypeSources;
/**
@@ -51,45 +51,49 @@
public void execute( )
throws MojoExecutionException
{
- try
- {
- Archetype archetype = new Archetype( );
- archetype.setGroupId( project.getGroupId( ) );
- archetype.setArtifactId( project.getArtifactId( ) );
- archetype.setVersion( project.getVersion( ) );
- archetype.setDescription( project.getName( ) );
- archetype.setRepository( localRepository.toString( ) );
+ Archetype archetype = new Archetype( );
+ archetype.setGroupId( project.getGroupId( ) );
+ archetype.setArtifactId( project.getArtifactId( ) );
+ archetype.setVersion( project.getVersion( ) );
+ archetype.setDescription( project.getName( ) );
+ archetype.setRepository( localRepository.toString( ) );
// archetype.setGoals(project.get);
// archetype.setProperties(project.get);
- File archetypeCatalogPropertiesFile = new File( System.getProperty( "user.home" ), ".m2/archetype-catalog.properties" );
+ File archetypeCatalogPropertiesFile = new File( System.getProperty( "user.home" ), ".m2/archetype-catalog.properties" );
- if ( archetypeCatalogPropertiesFile.exists( ) )
- {
- Properties archetypeCatalogProperties = PropertyUtils.loadProperties( archetypeCatalogPropertiesFile );
+ if ( archetypeCatalogPropertiesFile.exists( ) )
+ {
+ Properties archetypeCatalogProperties = PropertyUtils.loadProperties( archetypeCatalogPropertiesFile );
- getLog( ).debug( "Updating catalogs " + archetypeCatalogProperties );
+ getLog( ).debug( "Updating catalogs " + archetypeCatalogProperties );
- String[] sources = StringUtils.split( archetypeCatalogProperties.getProperty( "sources" ), "," );
+ String[] sources = StringUtils.split( archetypeCatalogProperties.getProperty( "sources" ), "," );
- for ( int i = 0; i < sources.length; i++ )
- {
- String sourceRoleHint = sources[i];
+ for ( int i = 0; i < sources.length; i++ )
+ {
+ String sourceRoleHint = sources[i];
+ try
+ {
getLog( ).debug( "Updating catalog " + sourceRoleHint );
ArchetypeDataSource source = (ArchetypeDataSource) archetypeSources.get( sourceRoleHint );
source.updateCatalog( getArchetypeSourceProperties( sourceRoleHint, archetypeCatalogProperties ), archetype );
+
+ getLog( ).
+ info( "Updated " + sourceRoleHint + " using repository " + localRepository.toString( ) );
+ }
+ catch ( ArchetypeDataSourceException ex )
+ {
+ getLog( ).
+ warn( "Can't update " + sourceRoleHint + " using repository " + localRepository.toString( ) );
}
- }
- else
- {
- getLog( ).debug( "Not updating wiki catalog" );
}
}
- catch ( ArchetypeDataSourceException ex )
+ else
{
- throw new MojoExecutionException( ex.getMessage( ), ex );
+ getLog( ).debug( "Not updating wiki catalog" );
}
}