Author: rafale
Date: Sat Mar 29 15:24:49 2008
New Revision: 642628
URL: http://svn.apache.org/viewvc?rev=642628&view=rev
Log:
Fix for ARCHETYPE-150, ARCHETYPE-149, ARCHETYPE-144, ARCHETYPE-137
Modified:
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/downloader/Downloader.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-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
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=642628&r1=642627&r2=642628&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
Sat Mar 29 15:24:49 2008
@@ -77,28 +77,28 @@
return artifact.getFile();
}
-// public File downloadOld( String groupId,
-// String artifactId,
-// String version,
-// ArtifactRepository archetypeRepository,
-// ArtifactRepository localRepository,
-// List remoteRepositories )
-// throws DownloadException, DownloadNotFoundException
-// {
-// Artifact artifact = artifactFactory.createArtifact( groupId,
artifactId, version, Artifact.SCOPE_RUNTIME, "jar" );
-// try
-// {
-// artifactResolver.resolveAlways( artifact, remoteRepositories,
localRepository );
-// }
-// catch ( ArtifactResolutionException e )
-// {
-// throw new DownloadException( "Error downloading.", e );
-// }
-// catch ( ArtifactNotFoundException e )
-// {
-// throw new DownloadNotFoundException( "Requested download does
not exist.", e );
-// }
-//
-// return artifact.getFile();
-// }
+ public File downloadOld( String groupId,
+ String artifactId,
+ String version,
+ ArtifactRepository archetypeRepository,
+ ArtifactRepository localRepository,
+ List remoteRepositories )
+ throws DownloadException, DownloadNotFoundException
+ {
+ Artifact artifact = artifactFactory.createArtifact( groupId,
artifactId, version, Artifact.SCOPE_RUNTIME, "jar" );
+ try
+ {
+ artifactResolver.resolveAlways( artifact, remoteRepositories,
localRepository );
+ }
+ catch ( ArtifactResolutionException e )
+ {
+ throw new DownloadException( "Error downloading.", e );
+ }
+ catch ( ArtifactNotFoundException e )
+ {
+ throw new DownloadNotFoundException( "Requested download does not
exist.", e );
+ }
+
+ return artifact.getFile();
+ }
}
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java?rev=642628&r1=642627&r2=642628&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java
Sat Mar 29 15:24:49 2008
@@ -20,11 +20,11 @@
List remoteRepositories )
throws DownloadException, DownloadNotFoundException;
-// public File downloadOld( String groupId,
-// String artifactId,
-// String version,
-// ArtifactRepository archetypeRepository,
-// ArtifactRepository localRepository,
-// List remoteRepositories )
-// throws DownloadException, DownloadNotFoundException;
+ public File downloadOld( String groupId,
+ String artifactId,
+ String version,
+ ArtifactRepository archetypeRepository,
+ ArtifactRepository localRepository,
+ List remoteRepositories )
+ throws DownloadException, DownloadNotFoundException;
}
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=642628&r1=642627&r2=642628&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
Sat Mar 29 15:24:49 2008
@@ -92,7 +92,7 @@
{
ArchetypeDescriptor archetypeDescriptor =
archetypeArtifactManager.getFileSetArchetypeDescriptor(
archetypeFile );
-// TODO archetype-137 is to be fixed from here.
+
if ( !isArchetypeConfigured( archetypeDescriptor, request ) )
{
if ( request.isInteractiveMode () )
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=642628&r1=642627&r2=642628&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
Sat Mar 29 15:24:49 2008
@@ -119,7 +119,7 @@
try
{
- archetype = downloader.download( archetypeGroupId,
archetypeArtifactId, archetypeVersion, archetypeRepository, localRepository,
+ archetype = downloader.downloadOld( archetypeGroupId,
archetypeArtifactId, archetypeVersion, archetypeRepository, localRepository,
remoteRepositories );
}
catch ( DownloadException e )
Modified:
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java?rev=642628&r1=642627&r2=642628&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
(original)
+++
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
Sat Mar 29 15:24:49 2008
@@ -167,6 +167,7 @@
public void execute()
throws MojoExecutionException
{
+ getLog().warn( "This goal is deprecated. Please use mvn
archetype:generate instead" );
// TODO: prompt for missing values
// TODO: configurable license
Modified:
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java?rev=642628&r1=642627&r2=642628&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
(original)
+++
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
Sat Mar 29 15:24:49 2008
@@ -229,14 +229,6 @@
properties = archetypeConfiguration.getProperties();
- properties.remove( Constants.GROUP_ID );
-
- properties.remove( Constants.ARTIFACT_ID );
-
- properties.remove( Constants.VERSION );
-
- properties.remove( Constants.PACKAGE );
-
request.setProperties( properties );
}
