svn commit: r1095497 - in /maven/plugins/trunk/maven-changes-plugin: pom.xml src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java

[dennisl]

Author: dennisl
Date: Wed Apr 20 20:02:55 2011
New Revision: 1095497

URL: http://svn.apache.org/viewvc?rev=1095497&view=rev
Log:
[MCHANGES-236] Configured outputEncoding not used for writing 
changes-report.html file
Submitted by: Oliver Schmitz-Hennemann
Reviewed by: Dennis Lundberg

- Patch applied with modifications

Modified:
    maven/plugins/trunk/maven-changes-plugin/pom.xml
    
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java

Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1095497&r1=1095496&r2=1095497&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Wed Apr 20 20:02:55 2011
@@ -216,6 +216,11 @@ under the License.
       <version>3.0.1</version>
     </dependency>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.1</version>

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java?rev=1095497&r1=1095496&r2=1095497&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
 Wed Apr 20 20:02:55 2011
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.changes;
  * under the License.
  */
 
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -43,7 +44,8 @@ import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.ReaderFactory;
 
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.HashMap;
@@ -167,6 +169,7 @@ public abstract class AbstractChangesRep
         }
 
         // TODO: push to a helper? Could still be improved by taking more of 
the site information from the site plugin
+        FileOutputStream fileOutputStream = null;
         try
         {
             DecorationModel model = new DecorationModel();
@@ -185,7 +188,9 @@ public abstract class AbstractChangesRep
 
             outputDirectory.mkdirs();
 
-            Writer writer = new FileWriter( new File( outputDirectory, 
getOutputName() + ".html" ) );
+            File file = new File( outputDirectory, getOutputName() + ".html" );
+            fileOutputStream = new FileOutputStream( file ) ;
+            Writer writer = new OutputStreamWriter( fileOutputStream, 
getOutputEncoding() );
 
             siteRenderer.generateDocument( writer, sink, siteContext );
 
@@ -207,6 +212,9 @@ public abstract class AbstractChangesRep
             throw new MojoExecutionException(
                 "An error has occurred in " + getName( Locale.ENGLISH ) + " 
report generation.", e );
         }
+        finally {
+            IOUtils.closeQuietly( fileOutputStream );
+        }
     }
 
     /**