Author: brett
Date: Tue Dec 20 03:07:50 2005
New Revision: 357959
URL: http://svn.apache.org/viewcvs?rev=357959&view=rev
Log:
remove duplicated site renderer
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/AbstractMavenMultiPageReport.java
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/apache/maven/reporting/sink/SinkFactory.java
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=357959&r1=357958&r2=357959&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
Tue Dec 20 03:07:50 2005
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
<parent>
<artifactId>maven-reporting</artifactId>
<groupId>org.apache.maven.reporting</groupId>
@@ -33,6 +34,11 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
+ <version>1.0-alpha-7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
<version>1.0-alpha-7-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.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/AbstractMavenMultiPageReport.java?rev=357959&r1=357958&r2=357959&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
Tue Dec 20 03:07:50 2005
@@ -16,11 +16,12 @@
* limitations under the License.
*/
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.reporting.sink.MultiPageSink;
import org.apache.maven.reporting.sink.SinkFactory;
-import org.apache.maven.doxia.sink.Sink;
-import java.io.InputStream;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -39,16 +40,6 @@
public void setSinkFactory( SinkFactory factory )
{
this.factory = factory;
-
- if ( getFlavour() != null )
- {
- factory.setFlavour( getFlavour() );
- }
-
- if ( !useDefaultSiteDescriptor() )
- {
- factory.setSiteDescriptor( getSiteDescriptor() );
- }
}
public SinkFactory getSinkFactory()
@@ -56,16 +47,6 @@
return factory;
}
- public String getFlavour()
- {
- return null;
- }
-
- public InputStream getSiteDescriptor()
- {
- return null;
- }
-
public boolean useDefaultSiteDescriptor()
{
return true;
@@ -74,13 +55,13 @@
public abstract boolean usePageLinkBar();
private Sink getSink( String outputName )
- throws Exception
+ throws RendererException, IOException
{
return factory.getSink( outputName );
}
public MultiPageSink startPage( String outputName )
- throws Exception
+ throws RendererException, IOException
{
return new MultiPageSink( outputName, getSink( outputName ) );
}
@@ -99,8 +80,6 @@
protected void closeReport()
{
- int counter = 1;
-
if ( !sinks.isEmpty() )
{
for ( Iterator i = sinks.iterator(); i.hasNext(); )
@@ -108,21 +87,23 @@
MultiPageSink currentSink = (MultiPageSink) i.next();
currentSink.paragraph();
- for ( Iterator j = sinks.iterator(); j.hasNext(); )
+
+ for ( int counter = 1; counter <= sinks.size(); counter++ )
{
if ( counter > 1 )
{
currentSink.text( " " );
}
- MultiPageSink sink = (MultiPageSink) j.next();
+ MultiPageSink sink = (MultiPageSink) sinks.get( counter -
1 );
sink.link( sink.getOutputName() + ".html" );
- sink.text( String.valueOf( counter++ ) );
+ sink.text( String.valueOf( counter ) );
sink.link_();
-
}
currentSink.paragraph_();
currentSink.closeSink();
}
}
+
+ super.closeReport();
}
}
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=357959&r1=357958&r2=357959&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
Tue Dec 20 03:07:50 2005
@@ -16,12 +16,12 @@
* limitations under the License.
*/
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.doxia.site.renderer.SiteRenderer;
-import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.module.xhtml.XhtmlSink;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
import org.codehaus.plexus.util.StringUtils;
@@ -43,12 +43,11 @@
extends AbstractMojo
implements MavenReport
{
-
private Sink sink;
private Locale locale = Locale.ENGLISH;
- protected abstract SiteRenderer getSiteRenderer();
+ protected abstract Renderer getSiteRenderer();
protected abstract String getOutputDirectory();
@@ -66,8 +65,8 @@
{
String outputDirectory = getOutputDirectory();
- XhtmlSink sink = getSiteRenderer().createSink( new File(
outputDirectory ), getOutputName() + ".html",
- outputDirectory,
getSiteDescriptor(), "maven" );
+ SiteRendererSink sink = getSiteRenderer().createSink( new File(
outputDirectory ),
+
getOutputName() + ".html", getSiteDescriptor() );
generate( sink, Locale.ENGLISH );
Modified:
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.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/sink/SinkFactory.java?rev=357959&r1=357958&r2=357959&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
Tue Dec 20 03:07:50 2005
@@ -16,11 +16,13 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.StringInputStream;
-import org.apache.maven.doxia.site.renderer.SiteRenderer;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.doxia.siterenderer.RendererException;
+import org.codehaus.plexus.util.StringInputStream;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
/**
@@ -29,22 +31,13 @@
*/
public class SinkFactory
{
- private String outputDirectory;
-
private String siteDirectory;
- private SiteRenderer siteRenderer;
+ private Renderer siteRenderer;
private InputStream siteDescriptor;
- private String flavour;
-
- public void setOutputDirectory( String outputDirectory )
- {
- this.outputDirectory = outputDirectory;
- }
-
- public void setSiteRenderer( SiteRenderer siteRenderer )
+ public void setSiteRenderer( Renderer siteRenderer )
{
this.siteRenderer = siteRenderer;
}
@@ -54,18 +47,13 @@
this.siteDirectory = siteDirectory;
}
- public void setFlavour( String flavour )
- {
- this.flavour = flavour;
- }
-
public void setSiteDescriptor( InputStream siteDescriptor )
{
this.siteDescriptor = siteDescriptor;
}
public Sink getSink( String outputFileName )
- throws Exception
+ throws RendererException, IOException
{
InputStream descriptor = siteDescriptor;
if ( descriptor == null )
@@ -73,7 +61,6 @@
descriptor = new StringInputStream( "" );
}
- return siteRenderer.createSink( new File( siteDirectory ),
outputFileName, outputDirectory, descriptor,
- flavour );
+ return siteRenderer.createSink( new File( siteDirectory ),
outputFileName, descriptor );
}
}
