Author: rafale
Date: Thu Oct 4 13:55:54 2007
New Revision: 582008
URL: http://svn.apache.org/viewvc?rev=582008&view=rev
Log:
Using settings for the update process
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.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/ArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java?rev=582008&r1=582007&r2=582008&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
Thu Oct 4 13:55:54 2007
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Properties;
import org.apache.maven.archetype.catalog.Archetype;
+import org.apache.maven.settings.Settings;
/**
* Sources we can get Archetypes from. This may be the local registry, a Wiki,
or,
@@ -21,6 +22,6 @@
List getArchetypes( Properties properties )
throws ArchetypeDataSourceException;
- public void updateCatalog( Properties properties, Archetype archetype )
+ public void updateCatalog( Properties properties, Archetype archetype,
Settings settings )
throws ArchetypeDataSourceException;
}
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=582008&r1=582007&r2=582008&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 13:55:54 2007
@@ -17,6 +17,7 @@
import java.util.List;
import java.util.Properties;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
+import org.apache.maven.settings.Settings;
import org.codehaus.plexus.logging.AbstractLogEnabled;
/**
@@ -64,7 +65,7 @@
}
}
- public void updateCatalog( Properties properties, Archetype archetype )
+ public void updateCatalog( Properties properties, Archetype archetype,
Settings settings )
throws ArchetypeDataSourceException
{
String s = properties.getProperty( ARCHETYPE_CATALOG_PROPERTY );
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java?rev=582008&r1=582007&r2=582008&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
Thu Oct 4 13:55:54 2007
@@ -43,9 +43,9 @@
}
}
- public void updateCatalog( Properties properties, Archetype archetype )
+ public void updateCatalog( Properties properties, Archetype archetype,
Settings settings )
throws ArchetypeDataSourceException
{
- throw new UnsupportedOperationException( "Not supported yet." );
+ throw new ArchetypeDataSourceException( "Not supported yet." );
}
}
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java?rev=582008&r1=582007&r2=582008&view=diff
==============================================================================
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
Thu Oct 4 13:55:54 2007
@@ -12,6 +12,7 @@
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.maven.settings.Settings;
/**
* @plexus.component role-hint="wiki"
@@ -99,9 +100,9 @@
return val.replaceAll( "\\r|\\n|\\s{2,}|\\[|\\]|\\ ", "" );
}
- public void updateCatalog( Properties properties, Archetype archetype )
+ public void updateCatalog( Properties properties, Archetype archetype,
Settings settings )
throws ArchetypeDataSourceException
{
- throw new UnsupportedOperationException( "Not supported yet." );
+ throw new ArchetypeDataSourceException( "Not supported yet." );
}
}
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=582008&r1=582007&r2=582008&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 13:55:54 2007
@@ -71,7 +71,7 @@
for ( int i = 0; i < sources.length; i++ )
{
- String sourceRoleHint = sources[i];
+ String sourceRoleHint = sources[i].trim();
try
{
