From f7882ba7392c4e4c1ef00b7821c7c68b3e8e75e7 Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 4 Sep 2003 10:12:36 +0000
Subject: [PATCH] Fix url generation when pom.repository.url isn't empty.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113952 13f79535-47bb-0310-9956-ffa450edef68
---
 .../maven-file-activity-plugin.jsl              | 17 +++++++++++++++--
 file-activity/xdocs/changes.xml                 |  3 +++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl b/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
index 64b71a9b..099f1ad7 100644
--- a/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
+++ b/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
@@ -35,8 +35,21 @@
                 <tr>
                   <td>
                     <j:choose>
-                      <j:when test="${pom.repository.url != ''})">
-                        <a href="${pom.repository.url.toString().trim()}${name}">${name}</a>
+                      <j:when test="${pom.repository.url != ''}">
+                        <j:set var="repositoryUrl" value="${pom.repository.url}"/>
+                        <j:choose>
+                          <j:when test="${repositoryUrl.indexOf('?')>0}">
+                            <j:set var="repository" value="${repositoryUrl.substring(0, repositoryUrl.indexOf('?'))}"/>
+                            <j:set var="tmpMultiRepoParam" value="${repositoryUrl.substring(repository.length())}"/>
+                            <j:set var="oneRepoParam" value="?${tmpMultiRepoParam.substring(1)}"/>
+                          </j:when>
+                          <j:otherwise>
+                            <j:set var="repository" value="${repositoryUrl}"/>
+                            <j:set var="oneRepoParam" value=""/>
+                          </j:otherwise>
+                        </j:choose>
+                        <j:set var="urlFile" value="${repository.trim()}${name.trim()}${oneRepoParam.trim()}"/>
+                        <a href="${urlFile}">${name}</a>
                       </j:when>
                       <j:otherwise>
                         ${name}
diff --git a/file-activity/xdocs/changes.xml b/file-activity/xdocs/changes.xml
index 2c1cf4d6..f4b0e410 100644
--- a/file-activity/xdocs/changes.xml
+++ b/file-activity/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
 	<release version="1.3" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Fix url generation when pom.repository.url isn't empty.
+      </action>          
       <action dev="evenisse" type="fix">
         Add xml declaration to generated report. Fixed for character encoding.
       </action>