Author: aheritier
Date: Sun Aug 14 04:36:37 2005
New Revision: 232599
URL: http://svn.apache.org/viewcvs?rev=232599&view=rev
Log:
MPPDF-31 : Can't insert the logo image described in the POM if its path begins
with /
Modified:
maven/maven-1/plugins/trunk/pdf/plugin.jelly
maven/maven-1/plugins/trunk/pdf/project.properties
maven/maven-1/plugins/trunk/pdf/project.xml
Modified: maven/maven-1/plugins/trunk/pdf/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/plugin.jelly?rev=232599&r1=232598&r2=232599&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/pdf/plugin.jelly Sun Aug 14 04:36:37 2005
@@ -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 @@
</fop>
<copy todir="${maven.xdoc.dest}"
file="${internal_pdf_workingDir}/${maven.pdf.pdfName}"/>
</goal>
-</project>
\ No newline at end of file
+</project>
Modified: maven/maven-1/plugins/trunk/pdf/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/project.properties?rev=232599&r1=232598&r2=232599&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/project.properties (original)
+++ maven/maven-1/plugins/trunk/pdf/project.properties Sun Aug 14 04:36:37 2005
@@ -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
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/pdf/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/project.xml?rev=232599&r1=232598&r2=232599&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/project.xml (original)
+++ maven/maven-1/plugins/trunk/pdf/project.xml Sun Aug 14 04:36:37 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
