svn commit: r800813 - in /maven/plugins/trunk/maven-pdf-plugin: pom.xml src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java

[vsiveton]

Author: vsiveton
Date: Tue Aug  4 14:17:59 2009
New Revision: 800813

URL: http://svn.apache.org/viewvc?rev=800813&view=rev
Log:
MPDF-24: Support Velocity files

o updated code due to r800800

Modified:
    maven/plugins/trunk/maven-pdf-plugin/pom.xml
    
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java

Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=800813&r1=800812&r2=800813&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Tue Aug  4 14:17:59 2009
@@ -73,7 +73,7 @@
   </issueManagement>
 
   <properties>
-    <doxiaVersion>1.1.1</doxiaVersion>
+    <doxiaVersion>1.1.2-SNAPSHOT</doxiaVersion>
     <mavenVersion>2.0.9</mavenVersion>
   </properties>
 

Modified: 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=800813&r1=800812&r2=800813&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
 Tue Aug  4 14:17:59 2009
@@ -29,7 +29,9 @@
 import java.util.Locale;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.doxia.docrenderer.AbstractDocumentRenderer;
 import org.apache.maven.doxia.docrenderer.DocumentRenderer;
+import org.apache.maven.doxia.docrenderer.DocumentRendererContext;
 import org.apache.maven.doxia.docrenderer.DocumentRendererException;
 import org.apache.maven.doxia.docrenderer.pdf.PdfRenderer;
 import org.apache.maven.doxia.document.DocumentModel;
@@ -45,10 +47,12 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
 
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.PathTool;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.WriterFactory;
@@ -126,6 +130,16 @@
     private MavenProject project;
 
     /**
+     * The Maven Settings.
+     *
+     * @parameter default-value="${settings}"
+     * @required
+     * @readonly
+     * @since 1.1
+     */
+    private Settings settings;
+
+    /**
      * Directory containing source for apt, fml and xdoc docs.
      *
      * @parameter default-value="${basedir}/src/site"
@@ -253,15 +267,24 @@
                 // Copy extra-resources
                 copyResources( locale );
 
+                DocumentRendererContext context = new 
DocumentRendererContext();
+                context.put( "project", project );
+                context.put( "settings", settings );
+                context.put( "PathTool", new PathTool() );
+                context.put( "FileUtils", new FileUtils() );
+                context.put( "StringUtils", new StringUtils() );
+                context.put( "i18n", i18n );
+
                 try
                 {
+                    // TODO use interface see DOXIASITETOOLS-30
                     if ( aggregate )
                     {
-                        docRenderer.render( siteDirectoryFile, workingDir, 
getDocumentModel( locale ) );
+                        ( (AbstractDocumentRenderer) docRenderer ).render( 
siteDirectoryFile, workingDir, getDocumentModel( locale ), context );
                     }
                     else
                     {
-                        docRenderer.render( siteDirectoryFile, workingDir, 
null );
+                        ( (AbstractDocumentRenderer) docRenderer ).render( 
siteDirectoryFile, workingDir, null, context );
                     }
                 }
                 catch ( DocumentRendererException e )