You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2009/08/31 11:35:06 UTC
svn commit: r809521 - in
/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf:
fo/FoPdfRenderer.java itext/ITextPdfRenderer.java
Author: vsiveton
Date: Mon Aug 31 09:35:06 2009
New Revision: 809521
URL: http://svn.apache.org/viewvc?rev=809521&view=rev
Log:
o take care if extension already exists in velocity files
Modified:
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/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=809521&r1=809520&r2=809521&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 Mon Aug 31 09:35:06 2009
@@ -267,7 +267,14 @@
// Velocity file?
if ( !source.exists() )
{
- doc = href + "." + module.getExtension() + ".vm";
+ if ( href.indexOf( "." + module.getExtension() ) != -1 )
+ {
+ doc = href + ".vm";
+ }
+ else
+ {
+ doc = href + "." + module.getExtension() + ".vm";
+ }
source = new File( moduleBasedir, doc );
}
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=809521&r1=809520&r2=809521&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 Mon Aug 31 09:35:06 2009
@@ -592,7 +592,14 @@
// Velocity file?
if ( !source.exists() )
{
- doc = href + "." + module.getExtension() + ".vm";
+ if ( href.indexOf( "." + module.getExtension() ) != -1 )
+ {
+ doc = href + ".vm";
+ }
+ else
+ {
+ doc = href + "." + module.getExtension() + ".vm";
+ }
source = new File( moduleBasedir, doc );
}