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 2008/03/04 23:21:12 UTC
svn commit: r633677 -
/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
Author: rafale
Date: Tue Mar 4 14:21:09 2008
New Revision: 633677
URL: http://svn.apache.org/viewvc?rev=633677&view=rev
Log:
Fix to ARCHETYPE-139
the existence of a pom is now checked to forbid the creation of a project in an existing repository
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
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=633677&r1=633676&r2=633677&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 Tue Mar 4 14:21:09 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 () )
@@ -191,12 +191,16 @@
getLogger().debug(
"Processing complete archetype " + archetypeDescriptor.getName()
);
- if ( outputDirectoryFile.exists() )
+ if ( outputDirectoryFile.exists() && pom.exists() )
{
- throw new ProjectDirectoryExists( "The project directory already exists" );
+ throw new ProjectDirectoryExists( "A Maven 2 project already exists in the directory " + outputDirectoryFile.getPath() );
}
else
{
+ if ( outputDirectoryFile.exists() )
+ {
+ getLogger().warn( "The directory " + outputDirectoryFile.getPath() + " already exists." );
+ }
context.put( "rootArtifactId", artifactId );
processFilesetModule(