svn commit: r568295 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

[handyande]

Author: handyande
Date: Tue Aug 21 14:36:37 2007
New Revision: 568295

URL: http://svn.apache.org/viewvc?rev=568295&view=rev
Log:
MSITE-239 encoding declaration in site.xml is ignored
Submitted by Herve Boutemy

Modified:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=568295&r1=568294&r2=568295&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 Tue Aug 21 14:36:37 2007
@@ -40,12 +40,13 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReport;
-import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.Reader;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -210,7 +211,8 @@
             if ( siteDescriptor != null && siteDescriptor.exists() )
             {
                 getLog().debug( "Reading site descriptor from " + 
siteDescriptor );
-                siteDescriptorContent = FileUtils.fileRead( siteDescriptor );
+                Reader siteDescriptorReader = ReaderFactory.newXmlReader( 
siteDescriptor );
+                siteDescriptorContent = IOUtil.toString( siteDescriptorReader 
);
             }
         }
         catch ( IOException e )