svn commit: r1298622 - /maven/sandbox/trunk/plugins/asf-svnpubsub-plugin/src/main/java/org/apache/maven/plugins/svnpubsub/SvnpubsubPublishMojo.java

[hboutemy]

Author: hboutemy
Date: Thu Mar  8 22:24:44 2012
New Revision: 1298622

URL: http://svn.apache.org/viewvc?rev=1298622&view=rev
Log:
normalize newline to current system value

Modified:
    
maven/sandbox/trunk/plugins/asf-svnpubsub-plugin/src/main/java/org/apache/maven/plugins/svnpubsub/SvnpubsubPublishMojo.java

Modified: 
maven/sandbox/trunk/plugins/asf-svnpubsub-plugin/src/main/java/org/apache/maven/plugins/svnpubsub/SvnpubsubPublishMojo.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/asf-svnpubsub-plugin/src/main/java/org/apache/maven/plugins/svnpubsub/SvnpubsubPublishMojo.java?rev=1298622&r1=1298621&r2=1298622&view=diff
==============================================================================
--- 
maven/sandbox/trunk/plugins/asf-svnpubsub-plugin/src/main/java/org/apache/maven/plugins/svnpubsub/SvnpubsubPublishMojo.java
 (original)
+++ 
maven/sandbox/trunk/plugins/asf-svnpubsub-plugin/src/main/java/org/apache/maven/plugins/svnpubsub/SvnpubsubPublishMojo.java
 Thu Mar  8 22:24:44 2012
@@ -19,12 +19,15 @@ package org.apache.maven.plugins.svnpubs
  * under the License.
  */
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -85,27 +88,31 @@ public class SvnpubsubPublishMojo
     {
         // FIXME: only text files should be normalized, not binary
         File tmpFile = null;
-        InputStreamReader isr = null;
-        OutputStreamWriter osw = null;
+        BufferedReader in = null;
+        PrintWriter out = null;
         try
         {
             tmpFile = File.createTempFile( "asf-svnpubsub-", ".tmp" );
             FileUtils.copyFile( f, tmpFile );
-            isr = new InputStreamReader( new FileInputStream( tmpFile ), 
siteOutputEncoding );
-            osw = new OutputStreamWriter( new FileOutputStream( f ), 
siteOutputEncoding );
-            char buffer[] = new char[4096];
-            int nRead;
-            while ( ( nRead = isr.read( buffer ) ) > 0 ) 
-            {
-                String content = new String( buffer, 0, nRead );
-                content = content.replaceAll( "\r", "" ); // FIXME: normalize 
to Unix EOL? not to system EOL?
-                osw.write( content );
+            in = new BufferedReader( new InputStreamReader( new 
FileInputStream( tmpFile ), siteOutputEncoding ) );
+            out = new PrintWriter( new OutputStreamWriter( new 
FileOutputStream( f ), siteOutputEncoding ) );
+            String line;
+            while ( ( line = in.readLine() ) != null ) 
+            {
+                if ( in.ready() )
+                {
+                    out.println( line );
+                }
+                else
+                {
+                    out.print( line );
+                }
             }
         }
         finally
         {
-            IOUtils.closeQuietly( osw );
-            IOUtils.closeQuietly( isr );
+            IOUtils.closeQuietly( out );
+            IOUtils.closeQuietly( in );
             FileUtils.deleteQuietly( tmpFile );
         }
     }