Author: brett
Date: Tue Apr 12 14:57:09 2011
New Revision: 1091440
URL: http://svn.apache.org/viewvc?rev=1091440&view=rev
Log:
[MRM-1111] accommodate that Struts no longer populates the parameters from the
action mapping
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp?rev=1091440&r1=1091439&r2=1091440&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
Tue Apr 12 14:57:09 2011
@@ -94,7 +94,7 @@
<s:param name="version" value="%{version}"/>
</s:url>
</c:set>
- <my:currentWWUrl url="${url}">Info</my:currentWWUrl>
+ <my:currentWWUrl url="${url}" useParams="true">Info</my:currentWWUrl>
<c:set var="url">
<s:url action="showArtifactDependencies">
<s:param name="groupId" value="%{groupId}"/>
@@ -102,7 +102,7 @@
<s:param name="version" value="%{version}"/>
</s:url>
</c:set>
- <my:currentWWUrl url="${url}">Dependencies</my:currentWWUrl>
+ <my:currentWWUrl url="${url}"
useParams="true">Dependencies</my:currentWWUrl>
<c:set var="url">
<s:url action="showArtifactDependencyTree">
<s:param name="groupId" value="%{groupId}"/>
@@ -110,7 +110,7 @@
<s:param name="version" value="%{version}"/>
</s:url>
</c:set>
- <my:currentWWUrl url="${url}">Dependency Tree</my:currentWWUrl>
+ <my:currentWWUrl url="${url}" useParams="true">Dependency
Tree</my:currentWWUrl>
<c:set var="url">
<s:url action="showArtifactDependees">
<s:param name="groupId" value="%{groupId}"/>
@@ -118,7 +118,7 @@
<s:param name="version" value="%{version}"/>
</s:url>
</c:set>
- <my:currentWWUrl url="${url}">Used By</my:currentWWUrl>
+ <my:currentWWUrl url="${url}" useParams="true">Used By</my:currentWWUrl>
<c:set var="url">
<s:url action="showArtifactMailingLists">
<s:param name="groupId" value="%{groupId}"/>
@@ -126,7 +126,7 @@
<s:param name="version" value="%{version}"/>
</s:url>
</c:set>
- <my:currentWWUrl url="${url}">Mailing Lists</my:currentWWUrl>
+ <my:currentWWUrl url="${url}" useParams="true">Mailing
Lists</my:currentWWUrl>
<c:set var="url">
<s:url action="showProjectMetadata">
<s:param name="groupId" value="%{groupId}"/>
@@ -134,7 +134,7 @@
<s:param name="version" value="%{version}"/>
</s:url>
</c:set>
- <my:currentWWUrl url="${url}">Metadata</my:currentWWUrl>
+ <my:currentWWUrl url="${url}" useParams="true">Metadata</my:currentWWUrl>
<%-- TODO
<redback:ifAnyAuthorized permissions="archiva-access-reports">
<c:set var="url">
@@ -144,7 +144,7 @@
<s:param name="version" value="%{version}"/>
</s:url>
</c:set>
- <my:currentWWUrl url="${url}">Reports</my:currentWWUrl>
+ <my:currentWWUrl url="${url}"
useParams="true">Reports</my:currentWWUrl>
</redback:ifAnyAuthorized>
--%>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag?rev=1091440&r1=1091439&r2=1091440&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
Tue Apr 12 14:57:09 2011
@@ -22,9 +22,16 @@
<%@ attribute name="action" %>
<%@ attribute name="namespace" %>
<%@ attribute name="url" %>
+<%@ attribute name="useParams" required="false" %>
<c:set var="currentUrl">
- <s:url/>
+ <s:url>
+ <c:if test="${useParams}">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </c:if>
+ </s:url>
</c:set>
<c:if test="${!empty (action) && !empty (namespace)}">
<c:set var="url">
@@ -34,6 +41,8 @@
<c:set var="text">
<jsp:doBody/>
</c:set>
+<!--URL: <c:out value="${url}"/>
+Current URL: <c:out value="${currentUrl}"/> -->
<c:choose>
<c:when test="${currentUrl == url}">
<b>
