From doxia-commits-return-754-apmail-maven-doxia-commits-archive=maven.apache.org@maven.apache.org Fri Feb 15 13:26:41 2008 Return-Path: Delivered-To: apmail-maven-doxia-commits-archive@www.apache.org Received: (qmail 87386 invoked from network); 15 Feb 2008 13:26:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Feb 2008 13:26:41 -0000 Received: (qmail 16347 invoked by uid 500); 15 Feb 2008 13:26:35 -0000 Delivered-To: apmail-maven-doxia-commits-archive@maven.apache.org Received: (qmail 16310 invoked by uid 500); 15 Feb 2008 13:26:35 -0000 Mailing-List: contact doxia-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: doxia-dev@maven.apache.org Delivered-To: mailing list doxia-commits@maven.apache.org Received: (qmail 16299 invoked by uid 99); 15 Feb 2008 13:26:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 05:26:35 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2008 13:26:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6B8661A9832; Fri, 15 Feb 2008 05:26:20 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: doxia-commits@maven.apache.org From: vsiveton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080215132620.6B8661A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ 4.0.0 + doxia-sitetools org.apache.maven.doxia 1.0-beta-1-SNAPSHOT + doxia-doc-renderer Doxia Document Renderer Component The Document Renderer handles the rendering of documents, in formats like PDF and RTF. @@ -42,10 +44,15 @@ -5 + org.apache.maven.doxia doxia-core + + + org.apache.maven.doxia + doxia-logging-api org.apache.maven.doxia 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 @@ 4.0.0 + doxia-sitetools org.apache.maven.doxia 1.0-beta-1-SNAPSHOT + doxia-site-renderer Doxia Site Renderer Component The Site Renderer handles the rendering of sites. + Vincent Siveton @@ -40,10 +43,15 @@ -5 + org.apache.maven.doxia doxia-core + + + org.apache.maven.doxia + doxia-logging-api org.apache.maven.doxia 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 @@ 4.0.0 + org.apache.maven maven-parent @@ -116,6 +117,11 @@ + + org.apache.maven.doxia + doxia-logging-api + ${doxiaVersion} + org.apache.maven.doxia doxia-sink-api