Author: steve.ebersole(a)jboss.com Date: 2007-06-13 14:19:17 -0400 (Wed, 13 Jun 2007) New Revision: 11684 Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java Log: cleanup Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java 2007-06-12 20:01:20 UTC (rev 11683) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java 2007-06-13 18:19:17 UTC (rev 11684) @@ -1,13 +1,9 @@ package org.jboss.maven.plugin.docbook.gen; import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -118,15 +114,14 @@ * mojo. * * @param formattings The fomattings configured for render - * @param resources * @throws RenderingException * @throws XSLTException */ - protected abstract void process(Formatting[] formattings, Artifact[] resources) throws RenderingException, XSLTException; + protected abstract void process(Formatting[] formattings) throws RenderingException, XSLTException; public final void execute() throws MojoExecutionException, MojoFailureException { try { - process( buildFormattings(), collectDocBookResourceDependentArtifacts() ); + process( buildFormattings() ); } catch ( XSLTException e ) { throw new MojoExecutionException( "XSLT problem", e ); @@ -143,27 +138,4 @@ } return formattings; } - - private Artifact[] collectDocBookResourceDependentArtifacts() { - List artifacts = new ArrayList(); - addDocBookResourceArtifacts( artifacts, projectArtifacts ); - addDocBookResourceArtifacts( artifacts, pluginArtifacts ); - return ( Artifact[] ) artifacts.toArray( new Artifact[ artifacts.size() ] ); - } - - private void addDocBookResourceArtifacts(Collection target, Collection source) { - Iterator itr = source.iterator(); - while ( itr.hasNext() ) { - final Artifact artifact = ( Artifact ) itr.next(); - getLog().info( "checking artifact : "+ artifact.getId() + " [" + artifact.getType() + "]" ); - if ( "docbook-xslt".equals( artifact.getType() ) || - "docbook-resources".equals( artifact.getType() ) ) { - target.add( artifact ); - } - // temp... - else if ( "docbook-xslt".equals( artifact.getArtifactId() ) ) { - target.add( artifact ); - } - } - } } Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java 2007-06-12 20:01:20 UTC (rev 11683) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java 2007-06-13 18:19:17 UTC (rev 11684) @@ -2,7 +2,6 @@ import java.io.File; -import org.apache.maven.artifact.Artifact; import org.codehaus.plexus.util.FileUtils; import org.jboss.maven.plugin.docbook.gen.render.Formatting; import org.jboss.maven.plugin.docbook.gen.render.RendererFactory; @@ -15,12 +14,13 @@ * * @goal generate * @phase compile + * @requiresDependencyResolution * * @author Steve Ebersole */ public class GenerationMojo extends AbstractDocBookMojo { - protected void process(Formatting[] formattings, Artifact[] resources) throws XSLTException, RenderingException { + protected void process(Formatting[] formattings) throws XSLTException, RenderingException { if ( !sourceDirectory.exists() ) { getLog().info( "sourceDirectory [" + sourceDirectory.getAbsolutePath() + "] did not exist" ); return; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java 2007-06-12 20:01:20 UTC (rev 11683) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java 2007-06-13 18:19:17 UTC (rev 11684) @@ -3,6 +3,10 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.Field; +import java.util.List; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; @@ -22,17 +26,39 @@ * * @goal resources * @phase process-resources + * @requiresDependencyResolution * * @author Steve Ebersole */ public class ResourceMojo extends AbstractDocBookMojo { - protected void process(Formatting[] formattings, Artifact[] resources) - throws RenderingException, XSLTException { + protected void process(Formatting[] formattings) throws RenderingException, XSLTException { processProjectResources(); - processDependencyResources( resources ); + processDependencyResources( collectDocBookResourceDependentArtifacts() ); } + private Artifact[] collectDocBookResourceDependentArtifacts() { + List artifacts = new ArrayList(); + addDocBookResourceArtifacts( artifacts, projectArtifacts ); + addDocBookResourceArtifacts( artifacts, pluginArtifacts ); + return ( Artifact[] ) artifacts.toArray( new Artifact[ artifacts.size() ] ); + } + + private void addDocBookResourceArtifacts(Collection target, Collection source) { + Iterator itr = source.iterator(); + while ( itr.hasNext() ) { + final Artifact artifact = ( Artifact ) itr.next(); + if ( "docbook-xslt".equals( artifact.getType() ) || + "docbook-resources".equals( artifact.getType() ) ) { + target.add( artifact ); + } + // temp... + else if ( "docbook-xslt".equals( artifact.getArtifactId() ) ) { + target.add( artifact ); + } + } + } + private void processProjectResources() throws RenderingException { ResourcesMojo mavenResourcesMojo = new ResourcesMojo(); injectMojoValue( mavenResourcesMojo, "outputDirectory", stagingDirectory.getAbsolutePath() ); Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java 2007-06-12 20:01:20 UTC (rev 11683) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java 2007-06-13 18:19:17 UTC (rev 11684) @@ -1,6 +1,5 @@ package org.jboss.maven.plugin.docbook.gen.render; -import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; @@ -11,6 +10,11 @@ import org.apache.fop.apps.Driver; import org.apache.maven.plugin.logging.Log; +//import org.apache.fop.apps.FOUserAgent; +//import org.apache.fop.apps.Fop; +//import org.apache.fop.apps.FopFactory; +//import org.apache.fop.apps.MimeConstants; + /** * Special handling for pdf rendering * @@ -29,6 +33,7 @@ driver.setRenderer( Driver.RENDER_PDF ); try { +// I've had issues trying to buffer this output... // OutputStream out = new BufferedOutputStream( new FileOutputStream( targetFile ) ); OutputStream out = new FileOutputStream( targetFile ); driver.setOutputStream( out );