You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/03/02 23:21:21 UTC
svn commit: r1451951 - in
/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src:
main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
site/apt/index.apt
test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Author: olamy
Date: Sat Mar 2 22:21:20 2013
New Revision: 1451951
URL: http://svn.apache.org/r1451951
Log:
[DOXIASITETOOLS-81] Make dateFormat use default format from site.xml
Submitted by Michael Osipov.
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-site-renderer/src/site/apt/index.apt
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
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=1451951&r1=1451950&r2=1451951&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 Sat Mar 2 22:21:20 2013
@@ -490,11 +490,23 @@ public class DefaultSiteRenderer
context.put( "dateRevision", sdf.format( new Date() ) );
context.put( "currentDate", new Date() );
-
+
context.put( "publishDate", siteRenderingContext.getPublishDate() );
Locale locale = siteRenderingContext.getLocale();
- context.put( "dateFormat", DateFormat.getDateInstance( DateFormat.DEFAULT, locale ) );
+
+ DateFormat dateFormat = DateFormat.getDateInstance( DateFormat.DEFAULT, locale );
+
+ if ( siteRenderingContext.getDecoration().getPublishDate() != null )
+ {
+ if ( StringUtils.isNotBlank( siteRenderingContext.getDecoration().getPublishDate().getFormat() ) )
+ {
+ dateFormat =
+ new SimpleDateFormat( siteRenderingContext.getDecoration().getPublishDate().getFormat(), locale );
+ }
+ }
+
+ context.put( "dateFormat", dateFormat );
String currentFileName = renderingContext.getOutputName().replace( '\\', '/' );
context.put( "currentFileName", currentFileName );
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt?rev=1451951&r1=1451950&r2=1451951&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt Sat Mar 2 22:21:20 2013
@@ -4,7 +4,7 @@
Hervé Boutemy
Dennis Lundberg
------
- 2012-04-07
+ 2013-03-02
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@
Doxia Site Tools - Site Renderer
- The Site Renderer handles the rendering of sites, assembling a common site decoration with a collection of documents.
+ The Site Renderer handles the rendering of sites, assembling a common site decoration with a collection of documents.
A default site decoration is included (see <<<default-site.vm>>>), but other decorations can be used at will, either
as a standalone template or packaged in a <<skin>> artifact (containing a <<<META-INF/maven/site.vm>>> template).
@@ -69,7 +69,7 @@ Doxia Site Tools - Site Renderer
*---------------------------------+----------------------+-------------------------------+
| <<<dateCreation>>> | <<<String>>> | The date specified in the source document, in the format "yyyyMMdd" |
*---------------------------------+----------------------+-------------------------------+
-| <<<dateFormat>>> | <<<DateFormat>>> | An instance of the default date format for the locale of the document being rendered |
+| <<<dateFormat>>> | <<<DateFormat>>> | An instance of the date format as defined in site.xml/publishDate/@format (default: An instance of the default date format for the locale of the document being rendered |
*---------------------------------+----------------------+-------------------------------+
| <<<dateRevision>>> | <<<String>>> | The date when the site is rendered, in the format "yyyyMMdd" |
*---------------------------------+----------------------+-------------------------------+
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=1451951&r1=1451950&r2=1451951&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java Sat Mar 2 22:21:20 2013
@@ -114,7 +114,7 @@ public class DefaultSiteRendererTest
IOUtil.close( skinIS );
IOUtil.close( jarOS );
}
-
+
oldLocale = Locale.getDefault();
Locale.setDefault( Locale.ENGLISH );
}
@@ -175,24 +175,25 @@ public class DefaultSiteRendererTest
// ----------------------------------------------------------------------
validatePages();
}
-
+
public void testVelocityToolManager()
throws Exception
{
StringWriter writer = new StringWriter();
SiteRenderingContext siteRenderingContext = new SiteRenderingContext();
+ siteRenderingContext.setDecoration(new DecorationModel());
siteRenderingContext.setTemplateName( "org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm" );
RenderingContext context = new RenderingContext( new File( "" ), "document.html" );
SiteRendererSink sink = new SiteRendererSink( context );
renderer.generateDocument( writer, sink, siteRenderingContext );
-
+
String renderResult = writer.toString();
String expectedResult = IOUtils.toString( getClass().getResourceAsStream( "velocity-toolmanager.expected.txt" ) );
assertEquals( expectedResult, renderResult );
}
-
- public void testVelocityToolManagerForTemplate() throws Exception
+
+ public void testVelocityToolManagerForTemplate() throws Exception
{
StringWriter writer = new StringWriter();
@@ -203,12 +204,12 @@ public class DefaultSiteRendererTest
RenderingContext context = new RenderingContext( new File( "" ), "document.html" );
SiteRendererSink sink = new SiteRendererSink( context );
renderer.generateDocument( writer, sink, siteRenderingContext );
-
+
String renderResult = writer.toString();
String expectedResult = IOUtils.toString( getClass().getResourceAsStream( "velocity-toolmanager.expected.txt" ) );
assertEquals( expectedResult, renderResult );
}
-
+
public void testVelocityToolManagerForSkin() throws Exception
{
StringWriter writer = new StringWriter();
@@ -219,12 +220,12 @@ public class DefaultSiteRendererTest
RenderingContext context = new RenderingContext( new File( "" ), "document.html" );
SiteRendererSink sink = new SiteRendererSink( context );
renderer.generateDocument( writer, sink, siteRenderingContext );
-
+
String renderResult = writer.toString();
String expectedResult = IOUtils.toString( getClass().getResourceAsStream( "velocity-toolmanager.expected.txt" ) );
assertEquals( expectedResult, renderResult );
}
-
+
private SiteRenderingContext getSiteRenderingContext( DecorationModel decoration, String siteDir, boolean validate )
{
SiteRenderingContext ctxt = new SiteRenderingContext();