evenisse    2004/01/27 06:49:02

  Modified:    pdf      plugin.jelly
  Log:
  From Arnaud Heritier : Add possibility to use relative path for logo
  
  Revision  Changes    Path
  1.14      +24 -4     maven-plugins/pdf/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/pdf/plugin.jelly,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- plugin.jelly      27 Jan 2004 13:11:18 -0000      1.13
  +++ plugin.jelly      27 Jan 2004 14:48:59 -0000      1.14
  @@ -1,5 +1,9 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<project xmlns:j="jelly:core">
  +<project
  +    xmlns:j="jelly:core"
  +    xmlns:u="jelly:util"
  +    xmlns:ant="jelly:ant"
  +    xmlns:maven="jelly:maven">
       <goal name="pdf:init" prereqs="xdoc:init">
           <j:set var="docsXdocSrc" 
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
           <j:set var="docsDest" 
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
  @@ -18,9 +22,25 @@
           <j:set var="coverDate" 
value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.cover.date')}"/>
           <tstamp>
               <format property="coverDate" pattern="${maven.xdoc.date.format}" 
locale="${maven.xdoc.date.locale}"/>
  -        </tstamp>      
  -        <j:set var="projectLogo" 
value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.projectLogo')}"/>
  -        <j:set var="companyLogo" 
value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.companyLogo')}"/>
  +        </tstamp>
  +        <j:choose>
  +            <j:when 
test="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.projectLogo').startsWith('http://')}">
  +                <j:set var="projectLogo" 
value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.projectLogo')}"/>
  +            </j:when>
  +            <j:otherwise>
  +                <j:set var="maven.bin.script" value="${maven.home}/bin/maven"/>
  +                <maven:makeAbsolutePath var="projectLogo" 
basedir="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}" 
path="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.projectLogo')}"
 trim="true" />
  +            </j:otherwise>
  +        </j:choose>
  +        <j:choose>
  +            <j:when 
test="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.companyLogo').startsWith('http://')}">
  +                <j:set var="companyLogo" 
value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.companyLogo')}"/>
  +            </j:when>
  +            <j:otherwise>
  +                <j:set var="maven.bin.script" value="${maven.home}/bin/maven"/>
  +                <maven:makeAbsolutePath var="companyLogo" 
basedir="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}" 
path="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.companyLogo')}"
 trim="true" />
  +            </j:otherwise>
  +        </j:choose>
           <j:set var="imageDpi" 
value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.imageDpi')}"/>
           <j:set var="debug" 
value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.debug')}"/>
           <j:set var="pdfName" 
value="${pom.getPluginContext('maven-pdf-plugin').getVariable('maven.pdf.pdfName')}"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to