You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2005/12/15 22:14:16 UTC
svn commit: r357071 - in
/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl:
./ src/main/java/org/apache/maven/reporting/
src/main/java/org/codehaus/doxia/module/xhtml/
src/main/java/org/codehaus/doxia/site/renderer/ src/main/j...
Author: jdcasey
Date: Thu Dec 15 13:14:06 2005
New Revision: 357071
URL: http://svn.apache.org/viewcvs?rev=357071&view=rev
Log:
PR: MNG-1834
Fixing the compatibility layer to masquerade as the appropriate DefaultSiteRenderer...whew, this is a bit confusing! doxia-site-renderer isn't in play at all in this setup, yet it has similarly named classes...
Removed:
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/Renderer.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/RendererException.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/sink/
Modified:
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/module/xhtml/XhtmlSink.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/DefaultSiteRenderer.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/SiteRenderer.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml?rev=357071&r1=357070&r2=357071&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml Thu Dec 15 13:14:06 2005
@@ -46,11 +46,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-site-renderer</artifactId>
- <version>1.0-alpha-6</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0.1</version>
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=357071&r1=357070&r2=357071&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java Thu Dec 15 13:14:06 2005
@@ -66,8 +66,8 @@
{
String outputDirectory = getOutputDirectory();
- XhtmlSink sink = new XhtmlSink( getSiteRenderer().createSink( new File( outputDirectory ), getOutputName() + ".html",
- outputDirectory, getSiteDescriptor(), "maven" ) );
+ XhtmlSink sink = getSiteRenderer().createSink( new File( outputDirectory ), getOutputName() + ".html",
+ outputDirectory, getSiteDescriptor(), "maven" );
generate( sink, Locale.ENGLISH );
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/module/xhtml/XhtmlSink.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/module/xhtml/XhtmlSink.java?rev=357071&r1=357070&r2=357071&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/module/xhtml/XhtmlSink.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/module/xhtml/XhtmlSink.java Thu Dec 15 13:14:06 2005
@@ -2,6 +2,9 @@
import org.codehaus.doxia.sink.Sink;
+/**
+ * @deprecated Use org.apache.maven.doxia.module.xhtml.XhtmlSink instead.
+ */
public class XhtmlSink
implements Sink
{
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/DefaultSiteRenderer.java?rev=357071&r1=357070&r2=357071&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/DefaultSiteRenderer.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/DefaultSiteRenderer.java Thu Dec 15 13:14:06 2005
@@ -1,14 +1,10 @@
package org.codehaus.doxia.site.renderer;
-import org.apache.maven.doxia.siterenderer.RendererException;
-import org.codehaus.doxia.site.renderer.sink.SiteRendererSink;
+import org.apache.maven.doxia.site.renderer.SiteRenderer;
+import org.codehaus.doxia.module.xhtml.XhtmlSink;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
-import java.io.Writer;
-import java.util.Locale;
-import java.util.Map;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -30,245 +26,68 @@
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id:DefaultSiteRenderer.java 348612 2005-11-24 12:54:19 +1100 (Thu, 24 Nov 2005) brett $
- * @plexus.component role="org.apache.maven.doxia.siterenderer.Renderer"
+ *
+ * @deprecated Use org.apache.maven.doxia.site.renderer.DefaultSiteRenderer instead.
*/
public class DefaultSiteRenderer
- extends org.apache.maven.doxia.siterenderer.DefaultSiteRenderer
- implements Renderer
+ implements org.codehaus.doxia.site.renderer.SiteRenderer
{
- public void render( File siteDirectory, File outputDirectory, File siteDescriptor, String templateName,
- Map templateProperties )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
- {
- try
- {
- super.render( siteDirectory, outputDirectory, siteDescriptor, templateName, templateProperties );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
-
- public void render( File siteDirectory, File outputDirectory, InputStream siteDescriptor, String templateName,
- Map templateProperties )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
- {
- try
- {
- super.render( siteDirectory, outputDirectory, siteDescriptor, templateName, templateProperties );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
-
- public void render( File siteDirectory, File outputDirectory, String siteDescriptor, String templateName,
- Map templateProperties )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
- {
- try
- {
- super.render( siteDirectory, outputDirectory, siteDescriptor, templateName, templateProperties );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
-
- public void render( File siteDirectory, File outputDirectory, File siteDescriptor, String templateName,
- Map templateProperties, Locale locale )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
- {
- try
- {
- super.render( siteDirectory, outputDirectory, siteDescriptor, templateName, templateProperties, locale );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
-
- public void render( File siteDirectory, File outputDirectory, InputStream siteDescriptor, String templateName,
- Map templateProperties, Locale locale )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
- {
- try
- {
- super.render( siteDirectory, outputDirectory, siteDescriptor, templateName, templateProperties, locale );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
+ private SiteRenderer siteRenderer;
- public void render( File siteDirectory, File outputDirectory, String siteDescriptor, String templateName,
- Map templateProperties, Locale locale )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
+ public XhtmlSink createSink( File moduleBasedir, String doc,
+ String outputDirectory, File siteDescriptor,
+ String flavour )
+ throws Exception
{
- try
- {
- super.render( siteDirectory, outputDirectory, siteDescriptor, templateName, templateProperties, locale );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
+ return new org.codehaus.doxia.module.xhtml.XhtmlSink( siteRenderer.createSink( moduleBasedir, doc,
+ outputDirectory, siteDescriptor,
+ flavour ) );
}
- public void render( File siteDirectory, File outputDirectory, InputStream siteDescriptor, String templateName,
- Map templateProperties, Locale locale, String outputEncoding )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
+ public void render( String siteDirectory, String generatedSiteDirectory, String outputDirectory,
+ File resourcesDirectory )
+ throws Exception
{
- try
- {
- super.render( siteDirectory, outputDirectory, siteDescriptor, templateName, templateProperties, locale,
- outputEncoding );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
+ siteRenderer.render( siteDirectory, generatedSiteDirectory, outputDirectory, resourcesDirectory );
}
- public void render( File siteDirectory, File outputDirectory, String module, String moduleExtension,
- String moduleParserId, String siteDescriptor, String templateName, Map templateProperties,
- Locale locale, String outputEncoding )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
+ public void render( String siteDirectory, String generatedSiteDirectory, String outputDirectory, String flavour,
+ File resourcesDirectory )
+ throws Exception
{
- try
- {
- super.render( siteDirectory, outputDirectory, module, moduleExtension, moduleParserId, siteDescriptor,
- templateName, templateProperties, locale, outputEncoding );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
+ siteRenderer.render( siteDirectory, generatedSiteDirectory, outputDirectory, flavour, resourcesDirectory );
}
- public void render( File siteDirectory, File outputDirectory, String module, String moduleExtension,
- String moduleParserId, InputStream siteDescriptor, String templateName, Map templateProperties,
- Locale locale, String outputEncoding )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
+ public void render( String siteDirectory, String generatedSiteDirectory, String outputDirectory, String flavour,
+ String siteDescriptorName, File resourcesDirectory )
+ throws Exception
{
- try
- {
- super.render( siteDirectory, outputDirectory, module, moduleExtension, moduleParserId, siteDescriptor,
- templateName, templateProperties, locale, outputEncoding );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
+ siteRenderer.render( siteDirectory, generatedSiteDirectory, outputDirectory, flavour, siteDescriptorName,
+ resourcesDirectory );
}
- public void generateDocument( Writer writer, String templateName, Map templateProperties,
- org.apache.maven.doxia.siterenderer.sink.SiteRendererSink sink )
- throws org.codehaus.doxia.site.renderer.RendererException
+ public void render( String siteDirectory, String generatedSiteDirectory, String outputDirectory, String flavour,
+ InputStream siteDescriptor, File resourcesDirectory )
+ throws Exception
{
- try
- {
- super.generateDocument( writer, templateName, templateProperties, sink );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
+ siteRenderer.render( siteDirectory, generatedSiteDirectory, outputDirectory, flavour, siteDescriptor,
+ resourcesDirectory );
}
- public void generateDocument( Writer writer, String templateName, Map templateProperties,
- org.apache.maven.doxia.siterenderer.sink.SiteRendererSink sink, Locale locale )
- throws org.codehaus.doxia.site.renderer.RendererException
+ public XhtmlSink createSink( File moduleBasedir, String doc,
+ String outputDirectory, InputStream siteDescriptor,
+ String flavour )
+ throws Exception
{
- try
- {
- super.generateDocument( writer, templateName, templateProperties, sink, locale );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
+ return new org.codehaus.doxia.module.xhtml.XhtmlSink( siteRenderer.createSink( moduleBasedir, doc,
+ outputDirectory, siteDescriptor,
+ flavour ) );
}
- public void generateDocument( Writer writer, String templateName, Map templateProperties, SiteRendererSink sink )
- throws org.codehaus.doxia.site.renderer.RendererException
+ public void copyResources( String outputDirectory, String flavour )
+ throws Exception
{
- try
- {
- super.generateDocument( writer, templateName, templateProperties, sink.getSinkDelegate() );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
+ siteRenderer.copyResources( outputDirectory, flavour );
}
-
- public void generateDocument( Writer writer, String templateName, Map templateProperties, SiteRendererSink sink,
- Locale locale )
- throws org.codehaus.doxia.site.renderer.RendererException
- {
- try
- {
- super.generateDocument( writer, templateName, templateProperties, sink.getSinkDelegate(), locale );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
-
- public org.apache.maven.doxia.siterenderer.sink.SiteRendererSink createSink( File moduleBaseDir, String document,
- File siteDescriptor )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
- {
- try
- {
- return new org.codehaus.doxia.site.renderer.sink.SiteRendererSink( super.createSink( moduleBaseDir,
- document,
- siteDescriptor ) );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
-
- public org.apache.maven.doxia.siterenderer.sink.SiteRendererSink createSink( File moduleBaseDir, String document,
- String siteDescriptor )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
- {
- try
- {
- return new org.codehaus.doxia.site.renderer.sink.SiteRendererSink( super.createSink( moduleBaseDir,
- document,
- siteDescriptor ) );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
-
- public org.apache.maven.doxia.siterenderer.sink.SiteRendererSink createSink( File moduleBaseDir, String document,
- InputStream siteDescriptor )
- throws org.codehaus.doxia.site.renderer.RendererException, IOException
- {
- try
- {
- return new org.codehaus.doxia.site.renderer.sink.SiteRendererSink( super.createSink( moduleBaseDir,
- document,
- siteDescriptor ) );
- }
- catch ( RendererException e )
- {
- throw new org.codehaus.doxia.site.renderer.RendererException( e );
- }
- }
-
}
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/SiteRenderer.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/SiteRenderer.java?rev=357071&r1=357070&r2=357071&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/SiteRenderer.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/doxia/site/renderer/SiteRenderer.java Thu Dec 15 13:14:06 2005
@@ -1,8 +1,40 @@
package org.codehaus.doxia.site.renderer;
+import org.codehaus.doxia.module.xhtml.XhtmlSink;
+import java.io.File;
+import java.io.InputStream;
+
+
+/**
+ * @deprecated Use org.apache.maven.doxia.site.renderer.SiteRenderer instead.
+ */
public interface SiteRenderer
- extends org.apache.maven.doxia.site.renderer.SiteRenderer
{
+ String ROLE = SiteRenderer.class.getName();
+
+ void render( String siteDirectory, String generatedSiteDirectory, String outputDirectory, File resourcesDirectory )
+ throws Exception;
+
+ void render( String siteDirectory, String generatedSiteDirectory, String outputDirectory, String flavour,
+ File resourcesDirectory )
+ throws Exception;
+
+ void render( String siteDirectory, String generatedSiteDirectory, String outputDirectory, String flavour,
+ String siteDescriptorName, File resourcesDirectory )
+ throws Exception;
+
+ void render( String siteDirectory, String generatedSiteDirectory, String outputDirectory, String flavour,
+ InputStream siteDescriptor, File resourcesDirectory )
+ throws Exception;
+
+ XhtmlSink createSink( File moduleBasedir, String doc, String outputDirectory, File siteDescriptor, String flavour )
+ throws Exception;
+
+ XhtmlSink createSink( File moduleBasedir, String doc, String outputDirectory, InputStream siteDescriptor,
+ String flavour )
+ throws Exception;
+ void copyResources( String outputDirectory, String flavour )
+ throws Exception;
}
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/resources/META-INF/plexus/components.xml?rev=357071&r1=357070&r2=357071&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/resources/META-INF/plexus/components.xml Thu Dec 15 13:14:06 2005
@@ -4,6 +4,11 @@
<component>
<role>org.codehaus.doxia.site.renderer.SiteRenderer</role>
<implementation>org.codehaus.doxia.site.renderer.DefaultSiteRenderer</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.site.renderer.SiteRenderer</role>
+ </requirement>
+ </requirements>
</component>
</components>