svn commit: r997184 - in /maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype: generator/DefaultFilesetArchetypeGenerator.java old/DefaultOldArchetype.java

[hboutemy]

Author: hboutemy
Date: Wed Sep 15 04:18:14 2010
New Revision: 997184

URL: http://svn.apache.org/viewvc?rev=997184&view=rev
Log:
[ARCHETYPE-286] unify line separators to platform one when filtering resources

Modified:
    
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
    
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java

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=997184&r1=997183&r2=997184&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
 Wed Sep 15 04:18:14 2010
@@ -51,6 +51,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -649,9 +650,13 @@ public class DefaultFilesetArchetypeGene
 
             try
             {
+                StringWriter stringWriter = new StringWriter();
+
+                velocity.getEngine().mergeTemplate( templateFileName, 
encoding, context, stringWriter );
+
                 writer = new OutputStreamWriter( new FileOutputStream( outFile 
), encoding );
 
-                velocity.getEngine().mergeTemplate( templateFileName, 
encoding, context, writer );
+                writer.write( StringUtils.unifyLineSeparators( 
stringWriter.toString() ) );
 
                 writer.flush();
             }

Modified: 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java?rev=997184&r1=997183&r2=997184&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
 Wed Sep 15 04:18:14 2010
@@ -866,11 +866,15 @@ public class DefaultOldArchetype
             Writer writer = null;
             try
             {
-                writer = new OutputStreamWriter( new FileOutputStream( f ), 
descriptor.getEncoding() );
+                StringWriter stringWriter = new StringWriter();
 
                 template = ARCHETYPE_RESOURCES + "/" + template;
 
-                velocity.getEngine().mergeTemplate( template, 
descriptor.getEncoding(), context, writer );
+                velocity.getEngine().mergeTemplate( template, 
descriptor.getEncoding(), context, stringWriter );
+
+                writer = new OutputStreamWriter( new FileOutputStream( f ), 
descriptor.getEncoding() );
+
+                writer.write( StringUtils.unifyLineSeparators( 
stringWriter.toString() ) );
 
                 writer.flush();
             }