MPPDF-31 : Can't insert the logo image described in the POM if its path begins with /

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@232599 13f79535-47bb-0310-9956-ffa450edef68

pdf/plugin.jelly

@@ -39,19 +39,19 @@
         pattern="${maven.xdoc.date.format}"
         locale="${maven.xdoc.date.locale}"/>
     </tstamp>    
-    <j:if test="not ${maven.pdf.projectLogo.startsWith('http://')}">
-      <maven:makeAbsolutePath 
-        var="maven.pdf.projectLogo" 
-        basedir="${maven.xdoc.src}" 
-        path="${maven.pdf.projectLogo}" 
-        trim="true"/>
+    <j:set var="image" value="${maven.pdf.projectLogo}"/>
+    <j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
+      <j:if test="${image.startsWith('/')}" trim="yes">
+        <j:set var="image" value="${image.substring(1)}"/>
+      </j:if>
+      <j:set var="maven.pdf.projectLogo" value="${image}"/>
     </j:if>
-    <j:if test="not ${maven.pdf.companyLogo.startsWith('http://')}">
-      <maven:makeAbsolutePath 
-        var="maven.pdf.companyLogo" 
-        basedir="${maven.xdoc.src}" 
-        path="${maven.pdf.companyLogo}" 
-        trim="true"/>
+    <j:set var="image" value="${maven.pdf.companyLogo}"/>
+    <j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
+      <j:if test="${image.startsWith('/')}" trim="yes">
+        <j:set var="image" value="${image.substring(1)}"/>
+      </j:if>
+      <j:set var="maven.pdf.companyLogo" value="${image}"/>
     </j:if>
 
     <!-- internal variables -->
@@ -227,4 +227,4 @@ internal_pdf_workingDir         = [${internal_pdf_workingDir}]
    </fop>
     <copy todir="${maven.xdoc.dest}" file="${internal_pdf_workingDir}/${maven.pdf.pdfName}"/>
   </goal>
-</project>
+</project>

pdf/project.properties

@@ -17,5 +17,3 @@
 # -------------------------------------------------------------------
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
-maven.pdf.projectLogo=${maven.docs.src}/images/maven.gif
-maven.pdf.companyLogo=${maven.docs.src}/images/asf_logo_wide_clear.gif

pdf/project.xml

@@ -21,6 +21,12 @@
   <artifactId>maven-pdf-plugin</artifactId>
   <name>Maven PDF Plug-in</name>
   <currentVersion>2.3.1-SNAPSHOT</currentVersion>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>/images/asf_logo_wide_clear.gif</logo>
+  </organization>
+  <logo>/images/maven.gif</logo>
   <description>PDF Documentation generator</description>
   <shortDescription>Generator of project documentation in PDF Format.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pdf/</url>