svn commit: r800781 - in /maven/doxia/doxia/trunk: doxia-maven-plugin/pom.xml pom.xml

2009-08-04 Thread vsiveton 
Author: vsiveton
Date: Tue Aug  4 13:42:57 2009
New Revision: 800781

URL: http://svn.apache.org/viewvc?rev=800781&view=rev
Log:
o updated comparisonVersion to 1.1.1 for clirr

Modified:
maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
maven/doxia/doxia/trunk/pom.xml

Modified: maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml?rev=800781&r1=800780&r2=800781&view=diff
==
--- maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml Tue Aug  4 13:42:57 2009
@@ -151,7 +151,7 @@
 org.codehaus.mojo
 clirr-maven-plugin
 
-  1.1
+  1.1.1
   
 
 org/apache/maven/doxia/logging/**

Modified: maven/doxia/doxia/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=800781&r1=800780&r2=800781&view=diff
==
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Tue Aug  4 13:42:57 2009
@@ -294,7 +294,7 @@
   clirr-maven-plugin
   2.2.2
   
-1.1
+1.1.1

svn commit: r800782 - /maven/doxia/doxia-sitetools/trunk/pom.xml

2009-08-04 Thread vsiveton 
Author: vsiveton
Date: Tue Aug  4 13:43:20 2009
New Revision: 800782

URL: http://svn.apache.org/viewvc?rev=800782&view=rev
Log:
o updated comparisonVersion to 1.1.1 for clirr

Modified:
maven/doxia/doxia-sitetools/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=800782&r1=800781&r2=800782&view=diff
==
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Tue Aug  4 13:43:20 2009
@@ -241,7 +241,7 @@
   clirr-maven-plugin
   2.2.2
   
-1.1
+1.1.1

svn commit: r800783 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer: pom.xml src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

2009-08-04 Thread vsiveton 
Author: vsiveton
Date: Tue Aug  4 13:43:57 2009
New Revision: 800783

URL: http://svn.apache.org/viewvc?rev=800783&view=rev
Log:
o formatting

Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml

maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?rev=800783&r1=800782&r2=800783&view=diff
==
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Tue Aug  4 
13:43:57 2009
@@ -129,12 +129,6 @@
   1.5
 
 
-  htmlunit
-  htmlunit
-  1.13
-  test
-
-
   commons-collections
   commons-collections
   3.2
@@ -148,6 +142,12 @@
   test-jar
   test
 
+
+  htmlunit
+  htmlunit
+  1.13
+  test
+
   
 
   

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=800783&r1=800782&r2=800783&view=diff
==
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 Tue Aug  4 13:43:57 2009
@@ -99,9 +99,7 @@
 // Requirements
 // --
 
-/**
- * @plexus.requirement
- */
+/** @plexus.requirement */
 private VelocityComponent velocity;
 
 /**
@@ -109,14 +107,10 @@
  */
 private SiteModuleManager siteModuleManager;
 
-/**
- * @plexus.requirement
- */
+/** @plexus.requirement */
 private Doxia doxia;
 
-/**
- * @plexus.requirement
- */
+/** @plexus.requirement */
 private I18N i18n;
 
 private static final String RESOURCE_DIR = 
"org/apache/maven/doxia/siterenderer/resources";

svn commit: r800784 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java

2009-08-04 Thread vsiveton 
Author: vsiveton
Date: Tue Aug  4 13:45:19 2009
New Revision: 800784

URL: http://svn.apache.org/viewvc?rev=800784&view=rev
Log:
o using Reader/WriterFactory#UTF_8 instead of static field

Modified:

maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java?rev=800784&r1=800783&r2=800784&view=diff
==
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
 Tue Aug  4 13:45:19 2009
@@ -27,6 +27,8 @@
 import java.util.Map;
 
 import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.WriterFactory;
 
 /**
  * SiteRenderingContext class.
@@ -36,13 +38,9 @@
  */
 public class SiteRenderingContext
 {
-private static final String DEFAULT_INPUT_ENCODING = "UTF-8";
+private String inputEncoding = ReaderFactory.UTF_8;
 
-private static final String DEFAULT_OUTPUT_ENCODING = "UTF-8";
-
-private String inputEncoding = DEFAULT_INPUT_ENCODING;
-
-private String outputEncoding = DEFAULT_OUTPUT_ENCODING;
+private String outputEncoding = WriterFactory.UTF_8;
 
 private String templateName;

svn commit: r800800 - in /maven/doxia: doxia-sitetools/trunk/pom.xml doxia/trunk/doxia-maven-plugin/pom.xml doxia/trunk/pom.xml

2009-08-04 Thread vsiveton 
Author: vsiveton
Date: Tue Aug  4 14:00:21 2009
New Revision: 800800

URL: http://svn.apache.org/viewvc?rev=800800&view=rev
Log:
o revert comparaisonversion changes

Modified:
maven/doxia/doxia-sitetools/trunk/pom.xml
maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
maven/doxia/doxia/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=800800&r1=800799&r2=800800&view=diff
==
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Tue Aug  4 14:00:21 2009
@@ -241,7 +241,7 @@
   clirr-maven-plugin
   2.2.2
   
-1.1.1
+1.1
   
 
 

Modified: maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml?rev=800800&r1=800799&r2=800800&view=diff
==
--- maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-maven-plugin/pom.xml Tue Aug  4 14:00:21 2009
@@ -151,7 +151,7 @@
 org.codehaus.mojo
 clirr-maven-plugin
 
-  1.1.1
+  1.1
   
 
 org/apache/maven/doxia/logging/**

Modified: maven/doxia/doxia/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=800800&r1=800799&r2=800800&view=diff
==
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Tue Aug  4 14:00:21 2009
@@ -294,7 +294,7 @@
   clirr-maven-plugin
   2.2.2
   
-1.1.1
+1.1

svn commit: r800802 - in /maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer: ./ src/main/java/org/apache/maven/doxia/docrenderer/ src/main/java/org/apache/maven/doxia/docrenderer/pdf/ src/main/java

2009-08-04 Thread vsiveton 
Author: vsiveton
Date: Tue Aug  4 14:02:47 2009
New Revision: 800802

URL: http://svn.apache.org/viewvc?rev=800802&view=rev
Log:
DOXIASITETOOLS-21: Add Velocity support to DocRenderer

o added velocity 1.6.2
o added DocumentRendererContext Object
o updated code to handle vm files
o TODO we need to improve interface in 1.2

Added:

maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocumentRendererContext.java
   (with props)
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml

maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java

maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocumentRenderer.java

maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/AbstractPdfRenderer.java

maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java

maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml?rev=800802&r1=800801&r2=800802&view=diff
==
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml Tue Aug  4 
14:02:47 2009
@@ -99,6 +99,37 @@
   org.codehaus.plexus
   plexus-utils
 
+
+  org.codehaus.plexus
+  plexus-velocity
+  1.1.7
+  
+
+  commons-collections
+  commons-collections
+
+
+  org.codehaus.plexus
+  plexus-component-api
+
+
+  velocity
+  velocity
+
+  
+
+
+
+
+  org.apache.velocity
+  velocity
+  1.6.2
+
+
+  commons-collections
+  commons-collections
+  3.2.1
+
 
 
 

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java?rev=800802&r1=800801&r2=800802&view=diff
==
--- 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
 Tue Aug  4 14:02:47 2009
@@ -22,6 +22,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -42,6 +44,8 @@
 import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
 import org.apache.maven.doxia.module.site.SiteModule;
 import org.apache.maven.doxia.module.site.manager.SiteModuleManager;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.context.Context;
 
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
@@ -49,7 +53,10 @@
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.codehaus.plexus.velocity.SiteResourceLoader;
+import org.codehaus.plexus.velocity.VelocityComponent;
 
 /**
  * Abstract document renderer.
@@ -69,6 +76,9 @@
 /** @plexus.requirement */
 protected Doxia doxia;
 
+/** @plexus.requirement */
+private VelocityComponent velocity;
+
 /**
  * The common base directory of source files.
  */
@@ -87,6 +97,7 @@
  * @param documentModel the document model, containing all the metadata, 
etc.
  * @throws org.apache.maven.doxia.docrenderer.DocumentRendererException if 
any
  * @throws java.io.IOException if any
+ * @deprecated since 1.1.2, use {...@link #render(Map, File, 
DocumentModel, DocumentRendererContext)}
  */
 public abstract void render( Map filesToProcess, File outputDirectory, 
DocumentModel documentModel )
 throws DocumentRendererException, IOException;
@@ -99,14 +110,54 @@
 public void render( Collection files, File outputDirectory, DocumentModel 
documentModel )
 throws DocumentRendererException, IOException
 {
-render( getFilesToProcess( files ), outputDirectory, documentModel );
+