Author: vsiveton
Date: Tue Aug 16 05:47:25 2005
New Revision: 232989
URL: http://svn.apache.org/viewcvs?rev=232989&view=rev
Log:
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.
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=232989&r1=232988&r2=232989&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
Tue Aug 16 05:47:25 2005
@@ -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 @@
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 @@
Map props = new HashMap();
+ props.put( "outputEncoding", outputEncoding );
+
if ( reports != null )
{
props.put( "reports", getReportsMenu( locale ) );
@@ -753,7 +756,9 @@
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 @@
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 @@
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 )
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml?rev=232989&r1=232988&r2=232989&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
Tue Aug 16 05:47:25 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
