Author: ltheussl
Date: Mon Apr 13 11:14:36 2009
New Revision: 764409
URL: http://svn.apache.org/viewvc?rev=764409&view=rev
Log:
[DOXIASITETOOLS-19] SiteRendererSink ignores meta info in head
Added:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
(with props)
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/head.xml
(with props)
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/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/default-site.vm
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=764409&r1=764408&r2=764409&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 Apr 13 11:14:36 2009
@@ -449,6 +449,8 @@
context.put( "title", title );
+context.put( "headContent", sink.getHead() );
+
context.put( "bodyContent", sink.getBody() );
context.put( "decoration", siteRenderingContext.getDecoration() );
@@ -553,7 +555,7 @@
}
catch ( Exception e )
{
-throw new RendererException( "Could not find the template '" +
templateName );
+throw new RendererException( "Could not find the template '" +
templateName, e );
}
try
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java?rev=764409&r1=764408&r2=764409&view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
Mon Apr 13 11:14:36 2009
@@ -50,6 +50,8 @@
private List authors = new ArrayList();
+private final StringWriter headWriter;
+
private boolean sectionHasID;
private final Writer writer;
@@ -77,6 +79,7 @@
super( writer );
this.writer = writer;
+this.headWriter = new StringWriter();
this.renderingContext = renderingContext;
}
@@ -186,6 +189,18 @@
return writer.toString();
}
+/**
+ * getHead
+ *
+ * @return a {...@link java.lang.String} object.
+ *
+ * @since 1.1.1
+ */
+public String getHead()
+{
+return headWriter.toString();
+}
+
/** {...@inheritdoc} */
public void head_()
{
@@ -311,6 +326,13 @@
/** {...@inheritdoc} */
protected void write( String text )
{
+if ( isHeadFlag() )
+{
+headWriter.write( unifyEOLs( text ) );
+
+return;
+}
+
if ( renderingContext != null )
{
String relativePathToBasedir = renderingContext.getRelativePath();
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm?rev=764409&r1=764408&r2=764409&view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Mon Apr 13 11:14:36 2009
@@ -342,6 +342,7 @@
#end
#end
#end
+$h
