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

[brett]

Author: brett
Date: Thu Apr  6 18:10:30 2006
New Revision: 392145

URL: http://svn.apache.org/viewcvs?rev=392145&view=rev
Log:
[MSITE-104] accept different input encodings
Submitted by: Trustin Lee

Modified:
    
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/SiteMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=392145&r1=392144&r2=392145&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 Apr  6 18:10:30 2006
@@ -80,6 +80,13 @@
     protected Map moduleExcludes;
 
     /**
+     * Specifies the input encoding.
+     *
+     * @parameter expression="${inputEncoding}" default-value="ISO-8859-1"
+     */
+    protected String inputEncoding;
+
+    /**
      * Specifies the output encoding.
      *
      * @parameter expression="${outputEncoding}" default-value="ISO-8859-1"
@@ -244,6 +251,7 @@
                 "The site descriptor cannot be resolved from the repository: " 
+ e.getMessage(), e );
         }
 
+        props.put( "inputEncoding", inputEncoding );
         props.put( "outputEncoding", outputEncoding );
 
         // TODO: interpolate ${project.*} in general
@@ -541,6 +549,11 @@
         if ( attributes.get( "project" ) == null )
         {
             attributes.put( "project", project );
+        }
+
+        if ( attributes.get( "inputEncoding" ) == null )
+        {
+            attributes.put( "inputEncoding", inputEncoding );
         }
 
         if ( attributes.get( "outputEncoding" ) == null )

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=392145&r1=392144&r2=392145&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 Apr  6 18:10:30 2006
@@ -107,6 +107,9 @@
     {
         SiteRenderingContext context = createSiteRenderingContext( locale );
 
+        context.setInputEncoding( inputEncoding );
+        context.setOutputEncoding( outputEncoding );
+
         Map documents = locateDocuments( context, reports, locale );
 
         File outputDirectory = getOutputDirectory( locale );
@@ -118,7 +121,7 @@
             report.setReportOutputDirectory( outputDirectory );
         }
 
-        siteRenderer.render( documents.values(), context, outputDirectory, 
outputEncoding );
+        siteRenderer.render( documents.values(), context, outputDirectory );
     }
 
     private File getOutputDirectory( Locale locale )