You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/08/21 11:59:57 UTC
svn commit: r1159957 - in /maven/archetype/trunk:
archetype-common/src/main/java/org/apache/maven/archetype/generator/
maven-archetype-plugin/src/it/build-archetype/
maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/
maven...
Author: hboutemy
Date: Sun Aug 21 09:59:56 2011
New Revision: 1159957
URL: http://svn.apache.org/viewvc?rev=1159957&view=rev
Log:
[ARCHETYPE-289] added empty directory support for filtered filesets
Added:
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__artifactId__-empty-directory/
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh
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=1159957&r1=1159956&r2=1159957&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 Sun Aug 21 09:59:56 2011
@@ -671,6 +671,15 @@ public class DefaultFilesetArchetypeGene
return false;
}
+ if ( templateFileName.endsWith( "/" ) )
+ {
+ getLogger().debug( "Creating directory " + outFile );
+
+ outFile.mkdirs();
+
+ return true;
+ }
+
if ( !outFile.getParentFile().exists() )
{
outFile.getParentFile().mkdirs();
Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1159957&r1=1159956&r2=1159957&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Sun Aug 21 09:59:56 2011
@@ -41,6 +41,7 @@ under the License.
<directory>src/main/resources</directory>
<includes>
<include>**/*.properties</include>
+ <include>**/__*/</include>
</includes>
</fileSet>
<fileSet filtered="false" packaged="false" encoding="UTF-8">
Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh?rev=1159957&r1=1159956&r2=1159957&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh (original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh Sun Aug 21 09:59:56 2011
@@ -43,10 +43,15 @@ if ( !packageInPathFormat.isFile() )
}
// ARCHETYPE-289 check empty directory creation
-File artifactId = new File( main, "resources/empty-directory" );
-if ( !artifactId.isDirectory() )
+File empty = new File( main, "resources/empty-directory" );
+if ( !empty.isDirectory() )
{
- throw new Exception( artifactId + " directory is missing or not a directory." );
+ throw new Exception( empty + " directory is missing or not a directory." );
+}
+File filteredEmpty = new File( main, "resources/basic-empty-directory" );
+if ( !filteredEmpty.isDirectory() )
+{
+ throw new Exception( filteredEmpty + " directory is missing or not a directory." );
}
return true;