Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Vincent Siveton 2005-08-16 12:47:25 +00:00
parent b584a47541
commit 6db6fb8909
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
View File

@ -41,11 +41,11 @@ import org.codehaus.plexus.util.StringUtils;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.LineNumberReader; import java.io.LineNumberReader;
import java.io.OutputStreamWriter;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
@ -306,8 +306,9 @@ public class DoxiaMojo
outputFile.getParentFile().mkdirs(); outputFile.getParentFile().mkdirs();
} }
siteRenderer.generateDocument( new FileWriter( outputFile ), template, attributes, sink, siteRenderer.generateDocument( new OutputStreamWriter( new FileOutputStream( outputFile ),
locale ); outputEncoding ), template,
attributes, sink, locale );
} }
} }
} }
@ -663,6 +664,8 @@ subprojects...
Map props = new HashMap(); Map props = new HashMap();
props.put( "outputEncoding", outputEncoding );
if ( reports != null ) if ( reports != null )
{ {
props.put( "reports", getReportsMenu( locale ) ); props.put( "reports", getReportsMenu( locale ) );
@ -753,7 +756,9 @@ subprojects...
sink.close(); 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 ); template, attributes, sink, locale );
} }
@ -831,8 +836,10 @@ subprojects...
sink.close(); sink.close();
siteRenderer.generateDocument( new FileWriter( new File( getOuputDirectory( locale ), outputFileName ) ), File outputFile = new File( getOuputDirectory( locale ), outputFileName );
template, attributes, sink, locale );
siteRenderer.generateDocument( new OutputStreamWriter( new FileOutputStream( outputFile ) ), template,
attributes, sink, locale );
} }
private void generateProjectReportsPage( InputStream siteDescriptor, Locale locale ) private void generateProjectReportsPage( InputStream siteDescriptor, Locale locale )
@ -905,8 +912,10 @@ subprojects...
sink.body_(); sink.body_();
siteRenderer.generateDocument( new FileWriter( new File( getOuputDirectory( locale ), outputFileName ) ), File outputFile = new File( getOuputDirectory( locale ), outputFileName );
template, attributes, sink, locale );
siteRenderer.generateDocument( new OutputStreamWriter( new FileOutputStream( outputFile ) ), template,
attributes, sink, locale );
} }
private void copyResources( File outputDir ) private void copyResources( File outputDir )

2
maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="${outputEncoding}"?>
<project name="${project.name}"> <project name="${project.name}">
<bannerLeft> <bannerLeft>
<name>${project.name}</name> <name>${project.name}</name>