maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r628061 - in /maven/doxia/doxia-sitetools/trunk: ./ doxia-doc-renderer/ doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/ doxia-site-renderer/ doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/
Date Fri, 15 Feb 2008 13:26:17 GMT
Author: vsiveton
Date: Fri Feb 15 05:26:16 2008
New Revision: 628061

URL: http://svn.apache.org/viewvc?rev=628061&view=rev
Log:
DOXIA-145: Adding logger feature

o based on lukas's work
o collaborative work after good discussions on IRC

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-site-renderer/pom.xml
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
    maven/doxia/doxia-sitetools/trunk/pom.xml

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=628061&r1=628060&r2=628061&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml Fri Feb 15 05:26:16 2008
@@ -21,11 +21,13 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>doxia-sitetools</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
     <version>1.0-beta-1-SNAPSHOT</version>
   </parent>
+
   <artifactId>doxia-doc-renderer</artifactId>
   <name>Doxia Document Renderer Component</name>
   <description>The Document Renderer handles the rendering of documents, in formats
like PDF and RTF.</description>
@@ -42,10 +44,15 @@
       <timezone>-5</timezone>
     </developer>
   </developers>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-logging-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>

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=628061&r1=628060&r2=628061&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
Fri Feb 15 05:26:16 2008
@@ -34,6 +34,7 @@
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
+import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
 import org.apache.maven.doxia.module.site.SiteModule;
 import org.apache.maven.doxia.module.site.manager.SiteModuleManager;
 
@@ -53,14 +54,10 @@
     extends AbstractLogEnabled
     implements DocumentRenderer
 {
-    /**
-     * @plexus.requirement
-     */
+    /** @plexus.requirement */
     protected SiteModuleManager siteModuleManager;
 
-    /**
-     * @plexus.requirement
-     */
+    /** @plexus.requirement */
     protected Doxia doxia;
 
     /**
@@ -305,6 +302,8 @@
         {
             FileReader reader = new FileReader( fullDocPath );
 
+            sink.enableLogging( new PlexusLoggerWrapper( getLogger() ) );
+
             doxia.parse( reader, parserId, sink );
         }
         catch ( ParserNotFoundException e )
@@ -321,5 +320,4 @@
             sink.flush();
         }
     }
-
 }

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=628061&r1=628060&r2=628061&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Fri Feb 15 05:26:16 2008
@@ -21,14 +21,17 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>doxia-sitetools</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
     <version>1.0-beta-1-SNAPSHOT</version>
   </parent>
+
   <artifactId>doxia-site-renderer</artifactId>
   <name>Doxia Site Renderer Component</name>
   <description>The Site Renderer handles the rendering of sites.</description>
+
   <contributors>
     <contributor>
       <name>Vincent Siveton</name>
@@ -40,10 +43,15 @@
       <timezone>-5</timezone>
     </contributor>
   </contributors>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-logging-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>

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=628061&r1=628060&r2=628061&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
Fri Feb 15 05:26:16 2008
@@ -20,6 +20,7 @@
  */
 
 import org.apache.maven.doxia.Doxia;
+import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
 import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.Parser;
@@ -340,7 +341,7 @@
                         reader = ReaderFactory.newReader( doc, context.getInputEncoding()
);
                 }
             }
-
+            sink.enableLogging( new PlexusLoggerWrapper( getLogger() ) );
             doxia.parse( reader, renderingContext.getParserId(), sink );
 
             generateDocument( writer, sink, context );

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=628061&r1=628060&r2=628061&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Fri Feb 15 05:26:16 2008
@@ -21,6 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
@@ -116,6 +117,11 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-logging-api</artifactId>
+        <version>${doxiaVersion}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven.doxia</groupId>
         <artifactId>doxia-sink-api</artifactId>



Mime
View raw message