[DOXIASITETOOLS-154] added encoding to skin descriptor to define the encoding of site.vm
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk@1729288 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index d5bdfcb..228535b 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -691,7 +691,11 @@
try
{
- template = velocity.getEngine().getTemplate( templateName );
+ SkinModel skinModel = siteRenderingContext.getSkinModel();
+ String encoding = ( skinModel == null ) ? null : skinModel.getEncoding();
+
+ template = ( encoding == null ) ? velocity.getEngine().getTemplate( templateName )
+ : velocity.getEngine().getTemplate( templateName, encoding );
}
catch ( Exception e )
{
diff --git a/doxia-skin-model/src/main/mdo/skin.mdo b/doxia-skin-model/src/main/mdo/skin.mdo
index c177046..f11e15a 100644
--- a/doxia-skin-model/src/main/mdo/skin.mdo
+++ b/doxia-skin-model/src/main/mdo/skin.mdo
@@ -52,7 +52,7 @@
<!-- Build prerequisites -->
<!-- ====================================================================== -->
- <field xdoc.separator="blank">
+ <field>
<name>prerequisites</name>
<version>1.7.0+</version>
<description>Describes the prerequisites in the build environment for using this skin.</description>
@@ -60,6 +60,13 @@
<type>Prerequisites</type>
</association>
</field>
+ <field xdoc.separator="blank">
+ <name>encoding</name>
+ <version>1.7.0+</version>
+ <description>Encoding of text content, like the Velocity template itself.</description>
+ <type>String</type>
+ <required>false</required>
+ </field>
</fields>
<codeSegments>
<codeSegment>
