Author: vsiveton
Date: Wed Oct 29 05:34:42 2008
New Revision: 708891
URL: http://svn.apache.org/viewvc?rev=708891&view=rev
Log:
o improved logging calls
Modified:
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/itext/AbstractITextRender.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultPdfRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultRtfRenderer.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/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=708891&r1=708890&r2=708891&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
Wed Oct 29 05:34:42 2008
@@ -145,7 +145,10 @@
{
if ( ( documentDescriptor == null ) || ( !documentDescriptor.exists()
) )
{
- getLogger().warn( "No documentDescriptor found: using default
settings!" );
+ if ( getLogger().isWarnEnabled() )
+ {
+ getLogger().warn( "No documentDescriptor found: using default
settings!" );
+ }
render( baseDirectory, outputDirectory );
}
@@ -169,7 +172,10 @@
{
if ( !baseDirectory.isDirectory() )
{
- getLogger().warn( "No files found to process!" );
+ if ( getLogger().isWarnEnabled() )
+ {
+ getLogger().warn( "No files found to process!" );
+ }
return new HashMap();
}
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java?rev=708891&r1=708890&r2=708891&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
Wed Oct 29 05:34:42 2008
@@ -147,7 +147,10 @@
{
if ( ( documentDescriptor == null ) || ( !documentDescriptor.exists()
) )
{
- getLogger().info( "No documentDescriptor is found. Generate all
documents." );
+ if ( getLogger().isInfoEnabled() )
+ {
+ getLogger().info( "No documentDescriptor is found. Generate
all documents." );
+ }
render( siteDirectory, outputDirectory );
return;
}
@@ -174,13 +177,19 @@
if ( documentModel.getOutputName() == null )
{
- getLogger().info( "No outputName is defined in the document
descriptor. Using 'generated_itext'" );
+ if ( getLogger().isInfoEnabled() )
+ {
+ getLogger().info( "No outputName is defined in the document
descriptor. Using 'generated_itext'" );
+ }
documentModel.setOutputName( "generated_itext" );
}
if ( ( documentModel.getToc() == null ) || (
documentModel.getToc().getItems() == null ) )
{
- getLogger().info( "No TOC is defined in the document descriptor.
Merging all documents." );
+ if ( getLogger().isInfoEnabled() )
+ {
+ getLogger().info( "No TOC is defined in the document
descriptor. Merging all documents." );
+ }
}
List iTextFiles = new LinkedList();
@@ -221,7 +230,10 @@
if ( tocItem.getRef() == null )
{
- getLogger().info( "No ref defined for an
tocItem in the document descriptor." );
+ if ( getLogger().isInfoEnabled() )
+ {
+ getLogger().info( "No ref defined for an
tocItem in the document descriptor." );
+ }
continue;
}
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultPdfRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultPdfRenderer.java?rev=708891&r1=708890&r2=708891&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultPdfRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultPdfRenderer.java
Wed Oct 29 05:34:42 2008
@@ -48,7 +48,10 @@
public void generateOutput( File iTextFile, File iTextOutput )
throws DocumentRendererException, IOException
{
- getLogger().debug( "Writing : " + iTextOutput );
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "Writing : " + iTextOutput );
+ }
try
{
ITextUtil.writePdf( new FileInputStream( iTextFile ), new
FileOutputStream( iTextOutput ) );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultRtfRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultRtfRenderer.java?rev=708891&r1=708890&r2=708891&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultRtfRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/DefaultRtfRenderer.java
Wed Oct 29 05:34:42 2008
@@ -48,7 +48,10 @@
public void generateOutput( File iTextFile, File iTextOutput )
throws DocumentRendererException, IOException
{
- getLogger().debug( "Writing : " + iTextOutput );
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "Writing : " + iTextOutput );
+ }
try
{
ITextUtil.writeRtf( new FileInputStream( iTextFile ), new
FileOutputStream( iTextOutput ) );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java?rev=708891&r1=708890&r2=708891&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
Wed Oct 29 05:34:42 2008
@@ -55,7 +55,10 @@
public void generatePdf( File foFile, File pdfFile )
throws DocumentRendererException
{
- getLogger().debug( "Generating: " + pdfFile );
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "Generating: " + pdfFile );
+ }
try
{
@@ -87,7 +90,10 @@
if ( outputName == null )
{
- getLogger().info( "No outputName is defined in the document
descriptor. Using 'target.pdf'" );
+ if ( getLogger().isInfoEnabled() )
+ {
+ getLogger().info( "No outputName is defined in the document
descriptor. Using 'target.pdf'" );
+ }
documentModel.setOutputName( "target" );
}
@@ -129,7 +135,10 @@
if ( ( documentModel.getToc() == null ) || (
documentModel.getToc().getItems() == null ) )
{
- getLogger().info( "No TOC is defined in the document
descriptor. Merging all documents." );
+ if ( getLogger().isInfoEnabled() )
+ {
+ getLogger().info( "No TOC is defined in the document
descriptor. Merging all documents." );
+ }
for ( Iterator j = filesToProcess.keySet().iterator();
j.hasNext(); )
{
@@ -159,7 +168,10 @@
if ( tocItem.getRef() == null )
{
- getLogger().info( "No ref defined for tocItem " +
tocItem.getName() );
+ if ( getLogger().isInfoEnabled() )
+ {
+ getLogger().info( "No ref defined for tocItem " +
tocItem.getName() );
+ }
continue;
}
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java?rev=708891&r1=708890&r2=708891&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
Wed Oct 29 05:34:42 2008
@@ -86,7 +86,10 @@
public void generatePdf( File iTextFile, File pdfFile )
throws DocumentRendererException
{
- getLogger().debug( "Generating : " + pdfFile );
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "Generating : " + pdfFile );
+ }
try
{
@@ -110,7 +113,10 @@
if ( outputName == null )
{
- getLogger().info( "No outputName is defined in the document
descriptor. Using 'target.pdf'" );
+ if ( getLogger().isInfoEnabled() )
+ {
+ getLogger().info( "No outputName is defined in the document
descriptor. Using 'target.pdf'" );
+ }
documentModel.setOutputName( "target" );
}
