You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/09/04 23:39:02 UTC
svn commit: r692259 - in /maven/plugins/trunk/maven-site-plugin/src:
it/MSITE-265/ it/MSITE-265/src/site/apt/
main/java/org/apache/maven/plugins/site/
Author: hboutemy
Date: Thu Sep 4 14:39:01 2008
New Revision: 692259
URL: http://svn.apache.org/viewvc?rev=692259&view=rev
Log:
[MSITE-340] use ${project.reporting.outputEncoding} as default value for "outputEncoding" parameter and default to UTF-8
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm?rev=692259&r1=692258&r2=692259&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm Thu Sep 4 14:39:01 2008
@@ -27,3 +27,10 @@
Download Maven ${currentVersion}
+ Encoding support test:
+
+ * source file encoding is configured in <<<pom.xml>>>: <<<UTF-8>>>
+
+ * using default reporting output files encoding: <<<UTF-8>>>
+
+ * demo character: ⬠(euro)
\ No newline at end of file
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh?rev=692259&r1=692258&r2=692259&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh Thu Sep 4 14:39:01 2008
@@ -65,11 +65,21 @@
return false;
}
FileInputStream fis = new FileInputStream ( download );
- String downloadContent = IOUtil.toString ( fis );
+ String downloadContent = IOUtil.toString ( fis, "UTF-8" );
int indexOf = downloadContent.indexOf( "Download Maven 2.0.7" );
if ( indexOf < 0)
{
- System.err.println( "download.html doesn't contains Download Maven 2.0.7" );
+ System.err.println( "download.html doesn't contain Download Maven 2.0.7" );
+ return false;
+ }
+ if ( downloadContent.indexOf( "charset=UTF-8" ) < 0)
+ {
+ System.err.println( "download.html doesn't contain 'charset=UTF-8' directive" );
+ return false;
+ }
+ if ( downloadContent.indexOf( " \u20AC (euro)" ) < 0)
+ {
+ System.err.println( "download.html doesn't contain euro symbol" );
return false;
}
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=692259&r1=692258&r2=692259&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Thu Sep 4 14:39:01 2008
@@ -117,9 +117,9 @@
/**
* Specifies the output encoding.
*
- * @parameter expression="${outputEncoding}" default-value="ISO-8859-1"
+ * @parameter expression="${outputEncoding}" default-value="${project.reporting.outputEncoding}"
*/
- protected String outputEncoding;
+ private String outputEncoding;
/**
* Gets the input files encoding.
@@ -131,6 +131,16 @@
return ( inputEncoding == null ) ? ReaderFactory.ISO_8859_1 : inputEncoding;
}
+ /**
+ * Gets the effective reporting output files encoding.
+ *
+ * @return The effective reporting output file encoding, never <code>null</code>.
+ */
+ protected String getOutputEncoding()
+ {
+ return ( outputEncoding == null ) ? ReaderFactory.UTF_8 : outputEncoding;
+ }
+
protected void populateReportItems( DecorationModel decorationModel, Locale locale, Map reportsByOutputName )
{
for ( Iterator i = decorationModel.getMenus().iterator(); i.hasNext(); )
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=692259&r1=692258&r2=692259&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 Thu Sep 4 14:39:01 2008
@@ -214,7 +214,7 @@
if ( attributes.get( "outputEncoding" ) == null )
{
- attributes.put( "outputEncoding", outputEncoding );
+ attributes.put( "outputEncoding", getOutputEncoding() );
}
// Put any of the properties in directly into the Velocity context
@@ -226,7 +226,7 @@
decorationModel = siteTool.getDecorationModel( project, reactorProjects, localRepository, repositories,
toRelative( project.getBasedir(),
siteDirectory.getAbsolutePath() ),
- locale, getInputEncoding(), outputEncoding );
+ locale, getInputEncoding(), getOutputEncoding() );
}
catch ( SiteToolException e )
{
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=692259&r1=692258&r2=692259&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Thu Sep 4 14:39:01 2008
@@ -89,7 +89,7 @@
siteDescriptorContent =
siteTool.getInterpolatedSiteDescriptorContent( props, project, siteDescriptorContent,
- getInputEncoding(), outputEncoding );
+ getInputEncoding(), getOutputEncoding() );
decoration = new DecorationXpp3Reader().read( new StringReader( siteDescriptorContent ) );
}
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=692259&r1=692258&r2=692259&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Thu Sep 4 14:39:01 2008
@@ -117,7 +117,7 @@
SiteRenderingContext context = createSiteRenderingContext( locale );
context.setInputEncoding( getInputEncoding() );
- context.setOutputEncoding( outputEncoding );
+ context.setOutputEncoding( getOutputEncoding() );
Map documents = locateDocuments( context, reports, locale );