Author: ltheussl
Date: Mon Jun 12 16:28:01 2006
New Revision: 413765
URL: http://svn.apache.org/viewvc?rev=413765&view=rev
Log:
Workaround for bugged empty() function in jelly (m1.0 compatibility).
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/downloads.jelly
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly?rev=413765&r1=413764&r2=413765&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly
(original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly Mon
Jun 12 16:28:01 2006
@@ -35,7 +35,7 @@
<!-- Only display a "Downloads" menu link if the
maven.xdoc.distributionUrl has been defined -->
- <j:if
test="${!empty(context.getVariable('maven.xdoc.distributionUrl'))}">
+ <j:if
test="${context.getVariable('maven.xdoc.distributionUrl') != null and
context.getVariable('maven.xdoc.distributionUrl') != ''}">
<item key="navigation.menu.item.downloads"
bundle="plugin-resources.templates.templates"
name="Downloads" href="/downloads.html" />
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/downloads.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/downloads.jelly?rev=413765&r1=413764&r2=413765&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/downloads.jelly
(original)
+++
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/downloads.jelly
Mon Jun 12 16:28:01 2006
@@ -45,7 +45,7 @@
property is not defined -->
<j:choose>
- <j:when
test="${empty(context.getVariable('maven.xdoc.distributionUrl'))}">
+ <j:when test="${context.getVariable('maven.xdoc.distributionUrl') !=
null and context.getVariable('maven.xdoc.distributionUrl') != ''}">
<p>
<message key="template.downloads.section.no_distURL1"
bundle="plugin-resources.templates.templates" />
