From 3fc7f23def30399a5c7502ac8a33e9afead8bf78 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Sat, 26 Aug 2006 18:22:23 +0000
Subject: [PATCH] [MRM-131] fix url rendering bugs

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@437201 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/WEB-INF/jsp/browse.jsp    | 12 +++---
 .../webapp/WEB-INF/jsp/browseArtifact.jsp     |  1 +
 .../main/webapp/WEB-INF/jsp/browseGroup.jsp   | 37 +++++++++++--------
 3 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
index da6c69ecc..313946fb5 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
@@ -20,7 +20,7 @@
 <html>
 <head>
   <title>Browse Repository</title>
-  <ww:head />
+  <ww:head/>
 </head>
 
 <body>
@@ -31,11 +31,13 @@
   <div id="nameColumn">
     <h2>Groups</h2>
     <ul>
-      <ww:set name="groups" value="groups" />
+      <ww:set name="groups" value="groups"/>
       <c:forEach items="${groups}" var="groupId">
-        <ww:url id="url" action="browseGroup" namespace="/">
-          <ww:param name="groupId" value="%{'${groupId}'}" />
-        </ww:url>
+        <c:set var="url">
+          <ww:url action="browseGroup" namespace="/">
+            <ww:param name="groupId" value="%{'${groupId}'}"/>
+          </ww:url>
+        </c:set>
         <li><a href="${url}">${groupId}/</a></li>
       </c:forEach>
     </ul>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
index 5270423f5..889f1a2b9 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
@@ -30,6 +30,7 @@
 <div id="contentArea">
   <div id="nameColumn">
     <p>
+      <c:set var="cumulativeGroup" value=""/>
       <c:forTokens items="${groupId}" delims="./" var="part">
         <c:choose>
           <c:when test="${empty(cumulativeGroup)}">
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
index fb352b5ad..c195fbf13 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
@@ -20,7 +20,7 @@
 <html>
 <head>
   <title>Browse Repository</title>
-  <ww:head />
+  <ww:head/>
 </head>
 
 <body>
@@ -30,13 +30,14 @@
 <div id="contentArea">
   <div id="nameColumn">
     <p>
+      <c:set var="cumulativeGroup" value=""/>
       <c:forTokens items="${groupId}" delims="." var="part" varStatus="status">
         <c:choose>
           <c:when test="${empty(cumulativeGroup)}">
-            <c:set var="cumulativeGroup" value="${part}" />
+            <c:set var="cumulativeGroup" value="${part}"/>
           </c:when>
           <c:otherwise>
-            <c:set var="cumulativeGroup" value="${cumulativeGroup}.${part}" />
+            <c:set var="cumulativeGroup" value="${cumulativeGroup}.${part}"/>
           </c:otherwise>
         </c:choose>
         <c:choose>
@@ -44,37 +45,43 @@
             <strong>${part}</strong>
           </c:when>
           <c:otherwise>
-            <ww:url id="url" action="browseGroup" namespace="/">
-              <ww:param name="groupId" value="%{'${cumulativeGroup}'}" />
-            </ww:url>
+            <c:set var="url">
+              <ww:url action="browseGroup" namespace="/">
+                <ww:param name="groupId" value="%{'${cumulativeGroup}'}"/>
+              </ww:url>
+            </c:set>
             <a href="${url}">${part}</a> /
           </c:otherwise>
         </c:choose>
       </c:forTokens>
     </p>
 
-    <ww:set name="groups" value="groups" />
+    <ww:set name="groups" value="groups"/>
     <c:if test="${!empty(groups)}">
       <h2>Group / Artifact</h2>
       <ul>
         <c:forEach items="${groups}" var="groupId">
-          <ww:url id="url" action="browseGroup" namespace="/">
-            <ww:param name="groupId" value="%{'${groupId}'}" />
-          </ww:url>
+          <c:set var="url">
+            <ww:url action="browseGroup" namespace="/">
+              <ww:param name="groupId" value="%{'${groupId}'}"/>
+            </ww:url>
+          </c:set>
           <li><a href="${url}">${groupId}/</a></li>
         </c:forEach>
       </ul>
     </c:if>
 
-    <ww:set name="artifactIds" value="artifactIds" />
+    <ww:set name="artifactIds" value="artifactIds"/>
     <c:if test="${!empty(artifactIds)}">
       <h2>Artifacts</h2>
       <ul>
         <c:forEach items="${artifactIds}" var="artifactId">
-          <ww:url id="url" action="browseArtifact" namespace="/">
-            <ww:param name="groupId" value="%{'${groupId}'}" />
-            <ww:param name="artifactId" value="%{'${artifactId}'}" />
-          </ww:url>
+          <c:set var="url">
+            <ww:url action="browseArtifact" namespace="/">
+              <ww:param name="groupId" value="%{'${groupId}'}"/>
+              <ww:param name="artifactId" value="%{'${artifactId}'}"/>
+            </ww:url>
+          </c:set>
           <li><a href="${url}">${artifactId}/</a></li>
         </c:forEach>
       </ul>
