Author: brett
Date: Mon Mar 13 06:28:10 2006
New Revision: 385559
URL: http://svn.apache.org/viewcvs?rev=385559&view=rev
Log:
[MSITE-80] refactored site renderer API and pushed duplicate checking and
determination of files into the site renderer
Added:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ModuleReference.java
(with props)
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java?rev=385559&r1=385558&r2=385559&view=diff
==
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
Mon Mar 13 06:28:10 2006
@@ -26,20 +26,32 @@
*/
public class RenderingContext
{
-private File basedir;
+private final File basedir;
-private String relativePath;
+private final String inputName;
-private String outputName;
+private final String outputName;
+
+private final String parserId;
+
+private final String relativePath;
public RenderingContext( File basedir, String document )
{
+this( basedir, document, null );
+}
+
+public RenderingContext( File basedir, String document, String parserId )
+{
this.basedir = basedir;
-// For site comparisons we'll prepend a "/"
-this.outputName = "/" + document.substring( 0, document.lastIndexOf(
"." ) + 1 ) + "html";
+this.outputName = document.substring( 0, document.lastIndexOf( "." ) )
+ ".html";
+
+this.relativePath = PathTool.getRelativePath( basedir.getPath(), new
File( basedir, document ).getPath() );
-relativePath = PathTool.getRelativePath( basedir.getPath(), new File(
basedir, document ).getPath() );
+this.inputName = document;
+
+this.parserId = parserId;
}
public File getBasedir()
@@ -47,9 +59,9 @@
return basedir;
}
-public String getRelativePath()
+public String getInputName()
{
-return relativePath;
+return inputName;
}
public String getOutputName()
@@ -57,4 +69,13 @@
return outputName;
}
+public String getParserId()
+{
+return parserId;
+}
+
+public String getRelativePath()
+{
+return relativePath;
+}
}
Modified:
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?rev=385559&r1=385558&r2=385559&view=diff
==
---
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
(original)
+++
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Mon Mar 13 06:28:10 2006
@@ -16,11 +16,9 @@
* limitations under the License.
*/
-import org.apache.maven.doxia.module.xhtml.SinkDescriptorReader;
-import org.apache.maven.doxia.module.xhtml.XhtmlSink;
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
-import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.AbstractSinkTestCase;
+import org.apache.maven.doxia.sink.Sink;
import java.io.File;
import java.io.FileReader;
@@ -43,10 +41,10 @@
protected Sink createSink()
throws Exception
{
-String xdoc = "test.apt";
+String apt = "test.apt";
RenderingContext renderingContext =
-new RenderingContext( getBasedirFile(), new File(
getBasedirFile(), xdoc ).getPath() );
+new RenderingContext( getBasedirFile(), new File(
getBasedirFile(), apt ).getPath(), "apt" );
FileReader reader = new FileRead
