From 6db6fb89094bb92c9fa57bc6f83a6fdd7e037c41 Mon Sep 17 00:00:00 2001
From: Vincent Siveton <vsiveton@apache.org>
Date: Tue, 16 Aug 2005 12:47:25 +0000
Subject: [PATCH] MNG-722: Applied changes proposed by Incze Lajos, ie using
 OutputStreamWriter(FileOutputStream(...), outputEncoding) instead of
 FileWriter(...). Added also the outputEncoding parameter in the
 default-site.xml.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232989 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/maven/doxia/DoxiaMojo.java     | 25 +++++++++++++------
 .../src/main/resources/default-site.xml       |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
index a69e2b6e22..063822bb3a 100644
--- a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
+++ b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
@@ -41,11 +41,11 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.io.OutputStreamWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -306,8 +306,9 @@ public void execute()
                                 outputFile.getParentFile().mkdirs();
                             }
 
-                            siteRenderer.generateDocument( new FileWriter( outputFile ), template, attributes, sink,
-                                                           locale );
+                            siteRenderer.generateDocument( new OutputStreamWriter( new FileOutputStream( outputFile ),
+                                                                                   outputEncoding ), template,
+                                                           attributes, sink, locale );
                         }
                     }
                 }
@@ -663,6 +664,8 @@ private InputStream getSiteDescriptor( List reports, Locale locale )
 
         Map props = new HashMap();
 
+        props.put( "outputEncoding", outputEncoding );
+
         if ( reports != null )
         {
             props.put( "reports", getReportsMenu( locale ) );
@@ -753,7 +756,9 @@ private void generateIndexPage( InputStream siteDescriptor, Locale locale )
 
         sink.close();
 
-        siteRenderer.generateDocument( new FileWriter( new File( getOuputDirectory( locale ), outputFileName ) ),
+        File outputFile = new File( getOuputDirectory( locale ), outputFileName );
+        
+        siteRenderer.generateDocument( new OutputStreamWriter( new FileOutputStream( outputFile ), outputEncoding ),
                                        template, attributes, sink, locale );
     }
 
@@ -831,8 +836,10 @@ private void generateProjectInfoPage( InputStream siteDescriptor, Locale locale
 
         sink.close();
 
-        siteRenderer.generateDocument( new FileWriter( new File( getOuputDirectory( locale ), outputFileName ) ),
-                                       template, attributes, sink, locale );
+        File outputFile = new File( getOuputDirectory( locale ), outputFileName );
+
+        siteRenderer.generateDocument( new OutputStreamWriter( new FileOutputStream( outputFile ) ), template,
+                                       attributes, sink, locale );
     }
 
     private void generateProjectReportsPage( InputStream siteDescriptor, Locale locale )
@@ -905,8 +912,10 @@ private void generateProjectReportsPage( InputStream siteDescriptor, Locale loca
 
         sink.body_();
 
-        siteRenderer.generateDocument( new FileWriter( new File( getOuputDirectory( locale ), outputFileName ) ),
-                                       template, attributes, sink, locale );
+        File outputFile = new File( getOuputDirectory( locale ), outputFileName );
+
+        siteRenderer.generateDocument( new OutputStreamWriter( new FileOutputStream( outputFile ) ), template,
+                                       attributes, sink, locale );
     }
 
     private void copyResources( File outputDir )
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml b/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
index 1451edd565..0187fca333 100644
--- a/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
+++ b/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="${outputEncoding}"?>
 <project name="${project.name}">
   <bannerLeft>
     <name>${project.name}</name>