Author: hboutemy
Date: Fri Apr 18 12:04:37 2008
New Revision: 649656
URL: http://svn.apache.org/viewvc?rev=649656&view=rev
Log:
[MSITE-314] use ${project.build.sourceEncoding} as default value for
"inputEncoding" parameter
Modified:
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/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=649656&r1=649655&r2=649656&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
Fri Apr 18 12:04:37 2008
@@ -35,6 +35,7 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.i18n.I18N;
+import org.codehaus.plexus.util.ReaderFactory;
/**
* Base class for site mojos.
@@ -109,9 +110,9 @@
/**
* Specifies the input encoding.
*
- * @parameter expression="${inputEncoding}" default-value="ISO-8859-1"
+ * @parameter expression="${encoding}"
default-value="${project.build.sourceEncoding}"
*/
- protected String inputEncoding;
+ private String inputEncoding;
/**
* Specifies the output encoding.
@@ -119,6 +120,16 @@
* @parameter expression="${outputEncoding}" default-value="ISO-8859-1"
*/
protected String outputEncoding;
+
+ /**
+ * Gets the input files encoding.
+ *
+ * @return The input files encoding, never <code>null</code>.
+ */
+ protected String getInputEncoding()
+ {
+ return ( inputEncoding == null ) ? ReaderFactory.ISO_8859_1 :
inputEncoding;
+ }
protected void populateReportItems( DecorationModel decorationModel,
Locale locale, Map reportsByOutputName )
{
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=649656&r1=649655&r2=649656&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
Fri Apr 18 12:04:37 2008
@@ -209,7 +209,7 @@
if ( attributes.get( "inputEncoding" ) == null )
{
- attributes.put( "inputEncoding", inputEncoding );
+ attributes.put( "inputEncoding", getInputEncoding() );
}
if ( attributes.get( "outputEncoding" ) == null )
@@ -223,7 +223,7 @@
DecorationModel decorationModel;
try
{
- decorationModel = siteTool.getDecorationModel( project,
reactorProjects, localRepository, repositories, toRelative(
project.getBasedir(), siteDirectory.getAbsolutePath() ), locale, inputEncoding,
outputEncoding );
+ decorationModel = siteTool.getDecorationModel( project,
reactorProjects, localRepository, repositories, toRelative(
project.getBasedir(), siteDirectory.getAbsolutePath() ), locale,
getInputEncoding(), outputEncoding );
}
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=649656&r1=649655&r2=649656&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
Fri Apr 18 12:04:37 2008
@@ -85,7 +85,7 @@
String siteDescriptorContent = FileUtils.fileRead(
descriptorFile );
siteDescriptorContent =
- siteTool.getInterpolatedSiteDescriptorContent( props,
project, siteDescriptorContent, inputEncoding, outputEncoding );
+ siteTool.getInterpolatedSiteDescriptorContent( props,
project, siteDescriptorContent, getInputEncoding(), outputEncoding );
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=649656&r1=649655&r2=649656&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
Fri Apr 18 12:04:37 2008
@@ -112,7 +112,7 @@
{
SiteRenderingContext context = createSiteRenderingContext( locale );
- context.setInputEncoding( inputEncoding );
+ context.setInputEncoding( getInputEncoding() );
context.setOutputEncoding( outputEncoding );
Map documents = locateDocuments( context, reports, locale );
