svn commit: r688113 - in /maven/archetype/trunk/archetype-common/src: main/java/org/apache/maven/archetype/creator/ main/java/org/apache/maven/archetype/generator/ test/archetypes/fileset-1.0/META-INF/maven/

[rafale]

Author: rafale
Date: Fri Aug 22 09:27:56 2008
New Revision: 688113

URL: http://svn.apache.org/viewvc?rev=688113&view=rev
Log:
Fix for ARCHETYPE-57

Modified:
    
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
    
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
    
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml

Modified: 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=688113&r1=688112&r2=688113&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
 Fri Aug 22 09:27:56 2008
@@ -161,7 +161,7 @@
 
         Model model = new Model();
         model.setModelVersion( "4.0.0" );
-        model.setGroupId( project.getGroupId() );
+        model.setGroupId( project.getGroupId() );// these values should be 
retrieve from the requst with sensible defaults
         model.setArtifactId( project.getArtifactId() );
         model.setVersion( project.getVersion() );
         model.setPackaging( "maven-archetype" );

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=688113&r1=688112&r2=688113&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
 Fri Aug 22 09:27:56 2008
@@ -813,6 +813,13 @@
             List fileSetResources =
                 archetypeFilesResolver.filterFiles( moduleOffset, fileSet, 
archetypeResources );
 
+            //This creates an empty directory, even if there is no file to 
process
+            //Fix for ARCHETYPE-57
+            getOutputFile(
+                moduleOffset, fileSet.getDirectory(), outputDirectoryFile,
+                fileSet.isPackaged(), packageName, moduleOffset ).mkdirs();
+
+
             if ( fileSet.isFiltered() )
             {
                 getLogger().debug(

Modified: 
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml?rev=688113&r1=688112&r2=688113&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml
 Fri Aug 22 09:27:56 2008
@@ -77,6 +77,12 @@
         <include>*.xml</include>
       </includes>
     </fileSet>
+    <fileSet filtered="false" packaged="false">
+      <directory>src/main/toto</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
   </fileSets>
 
   <modules>
@@ -88,6 +94,12 @@
             <include>**/*.java</include>
           </includes>
         </fileSet>
+        <fileSet filtered="true" packaged="false">
+          <directory>src/main/toto</directory>
+          <includes>
+            <include>**/*</include>
+          </includes>
+        </fileSet>
       </fileSets>
 
       <modules>