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 2016/02/08 23:55:55 UTC
svn commit: r1729288 - in /maven/doxia/doxia-sitetools/trunk:
doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
doxia-skin-model/src/main/mdo/skin.mdo
Author: hboutemy
Date: Mon Feb 8 22:55:55 2016
New Revision: 1729288
URL: http://svn.apache.org/viewvc?rev=1729288&view=rev
Log:
[DOXIASITETOOLS-154] added encoding to skin descriptor to define the encoding of site.vm
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1729288&r1=1729287&r2=1729288&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Mon Feb 8 22:55:55 2016
@@ -691,7 +691,11 @@ public class DefaultSiteRenderer
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 )
{
Modified: maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo?rev=1729288&r1=1729287&r2=1729288&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo Mon Feb 8 22:55:55 2016
@@ -52,7 +52,7 @@ under the License.
<!-- 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 @@ under the License.
<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>