o MAVEN-320: Resolve nav generation problems

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

xdoc/plugin.jelly

@@ -159,21 +159,12 @@
     </define:tag>
 
     <define:tag name="itemLink">
-      <j:set var="leaveLinkAlone" value="${(link.indexOf(':') >= 0) or link.startsWith('/')}"/>
-      <j:if test="${leaveLinkAlone}">
-        <a href="${link}">${name}</a>
-      </j:if>
-      <j:if test="${!leaveLinkAlone}">
-        <j:if test='${relativePath.equals(".")}'>
-          <a href="${link}">${name}</a>
-	</j:if>        
-        <j:if test="${relativePath.endsWith('/')}">
-          <a href="${relativePath}${link}">${name}</a>
-	</j:if>
-        <j:if test='${!relativePath.endsWith("/") and !relativePath.equals(".")}'>
-          <a href="${relativePath}/${link}">${name}</a>
-	</j:if>	
-      </j:if>
+    	<!--
+    		@link
+    		@relativePath
+    		@name
+    	  -->
+    	<a href="${pathTool.calculateLink(link,relativePath)}">${name}</a>
     </define:tag>
     
     <define:tag name="text-xdoc">