Author: rafale
Date: Thu Nov 13 12:19:56 2008
New Revision: 713809
URL: http://svn.apache.org/viewvc?rev=713809&view=rev
Log:
Test for ARCHETYPE-158. This was already fixed some times ago.
Added:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
(with props)
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
(with props)
Modified:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
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=713809&r1=713808&r2=713809&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
Thu Nov 13 12:19:56 2008
@@ -55,6 +55,7 @@
<directory>src/main/resources</directory>
<includes>
<include>**/*.properties</include>
+ <include>**/*.txt</include>
</includes>
</fileSet>
<fileSet filtered="false" packaged="false">
Added:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt?rev=713809&view=auto
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
(added)
+++
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
Thu Nov 13 12:19:56 2008
@@ -0,0 +1,13 @@
+groupId=${groupId}
+artifactId=${artifactId}
+version=${version}
+package=${package}
+packageInPathFormat=${packageInPathFormat}
+property-without-default-1=${property-without-default-1}
+property-without-default-2=${property-without-default-2}
+property-without-default-3=${property-without-default-3}
+property-without-default-4=${property-without-default-4}
+property-with-default-1=${property-with-default-1}
+property-with-default-2=${property-with-default-2}
+property-with-default-3=${property-with-default-3}
+property-with-default-4=${property-with-default-4}
\ No newline at end of file
Propchange:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt?rev=713809&view=auto
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
(added)
+++
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
Thu Nov 13 12:19:56 2008
@@ -0,0 +1,13 @@
+groupId=${groupId}
+artifactId=${artifactId}
+version=${version}
+package=${package}
+packageInPathFormat=${packageInPathFormat}
+property-without-default-1=${property-without-default-1}
+property-without-default-2=${property-without-default-2}
+property-without-default-3=${property-without-default-3}
+property-without-default-4=${property-without-default-4}
+property-with-default-1=${property-with-default-1}
+property-with-default-2=${property-with-default-2}
+property-with-default-3=${property-with-default-3}
+property-with-default-4=${property-with-default-4}
\ No newline at end of file
Propchange:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java?rev=713809&r1=713808&r2=713809&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
Thu Nov 13 12:19:56 2008
@@ -652,6 +652,18 @@
template,
"file-value"
);
+ template = "src/main/resources/file-value/touch.txt";
+ assertTemplateContentGeneratedWithFileSetArchetype(
+ projectDirectory,
+ template,
+ "file-value"
+ );
+ template = "src/main/resources/file-value/touch_root.txt";
+ assertTemplateContentGeneratedWithFileSetArchetype(
+ projectDirectory,
+ template,
+ "file-value"
+ );
template = "src/main/resources/some-dir/App.png";
assertTemplateCopiedWithFileSetArchetype( projectDirectory, template );
