svn commit: r662853 - /maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java

[rafale]

Author: rafale
Date: Tue Jun  3 11:15:03 2008
New Revision: 662853

URL: http://svn.apache.org/viewvc?rev=662853&view=rev
Log:
Fix ARCHETYPE-178
use 'groupId' value as default default for 'package'

Modified:
    
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java

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=662853&r1=662852&r2=662853&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
 Tue Jun  3 11:15:03 2008
@@ -177,17 +177,30 @@
 
                         if( !archetypeConfiguration.isConfigured( 
requiredProperty ) )
                         {
-                            archetypeConfiguration.setProperty( 
requiredProperty,
-                                archetypeGenerationQueryer.getPropertyValue( 
requiredProperty,
-                                    archetypeConfiguration.getDefaultValue( 
requiredProperty ) ) );
+                            if( "package".equals(requiredProperty) ) {
+                                // if the asked property is 'package', then
+                                // use its default and if not defined,
+                                // use the 'groupId' property value.
+                                String packageDefault = 
archetypeConfiguration.getDefaultValue( requiredProperty );
+                                packageDefault = (null == packageDefault || 
"".equals(packageDefault))?
+                                    archetypeConfiguration.getProperty( 
"groupId" ):
+                                    archetypeConfiguration.getDefaultValue( 
requiredProperty );
+                                
+                                archetypeConfiguration.setProperty( 
requiredProperty,
+                                    
archetypeGenerationQueryer.getPropertyValue( requiredProperty,
+                                        packageDefault ) );
+                            } else {
+                                archetypeConfiguration.setProperty( 
requiredProperty,
+                                    
archetypeGenerationQueryer.getPropertyValue( requiredProperty,
+                                        
archetypeConfiguration.getDefaultValue( requiredProperty ) ) );
+                            }
                         }
                     }
                 }
 
                 if( !archetypeConfiguration.isConfigured() )
                 {
-                    throw new ArchetypeGenerationConfigurationFailure(
-                        "The archetype generation must be configured here" );
+                    getLogger().warn( "Archetype is not fully configured" );
                 }
                 else if( !archetypeGenerationQueryer.confirmConfiguration( 
archetypeConfiguration ) )
                 {