Author: rafale
Date: Thu Sep 18 09:38:27 2008
New Revision: 696699
URL: http://svn.apache.org/viewvc?rev=696699&view=rev
Log:
Correct windows path
Added:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java
(props changed)
- copied unchanged from r696076,
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/ArbitraryProperty-__property-with-default-1__.java
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
(props changed)
- copied unchanged from r696076,
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
Removed:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/ArbitraryProperty-__property-with-default-1__.java
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
Propchange:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/archetype/trunk/archetype-common/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
------------------------------------------------------------------------------
svn:mergeinfo =
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=696699&r1=696698&r2=696699&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 Sep 18 09:38:27 2008
@@ -723,7 +723,8 @@
);
template =
"subproject/subsubproject/src/main/java/file/value/package/" +
-
"file-value/inner/subsubproject/innest/ArbitraryProperty-file-value.java";
+ /*"file-value/inner/subsubproject/innest/" +*/
+ "ArbitraryProperty-file-value.java";
assertTemplateContentGeneratedWithFileSetArchetype(
projectDirectory,
template,
@@ -732,7 +733,7 @@
// Test that undefined properties are safely ignored (and skipped)
template =
"subproject/subsubproject/src/main/java/file/value/package/" +
- "file-value/inner/subsubproject/innest/" +
+ /**"file-value/inner/subsubproject/innest/" +*/
"SkipsUndefinedProperty-__undefined-property__-file-value.java";
assertTemplateContentGeneratedWithFileSetArchetype(
projectDirectory,
