[MRM-1857] RSS feeds not working

Make sure Struts ignores the paths mapped to other servlets, including feeds
and xmlrpc. Also fix a context path issue for the feed on the repositories
page.
This commit is contained in:
Brett Porter 2014-08-01 15:05:02 +10:00
parent 908493ca57
commit 2e7c9b9857
2 changed files with 3 additions and 2 deletions

View File

@ -22,7 +22,7 @@
"http://struts.apache.org/dtds/struts-2.0.dtd"> "http://struts.apache.org/dtds/struts-2.0.dtd">
<struts> <struts>
<constant name="struts.action.excludePattern" value="^/$,^/repository/.*" /> <constant name="struts.action.excludePattern" value="^/$,^/repository/.*,^/xmlrpc$,^/feeds/.*" />
<!-- Include plexus-security xwork configurations. --> <!-- Include plexus-security xwork configurations. -->
<include file="struts-security.xml"/> <include file="struts-security.xml"/>

View File

@ -118,7 +118,8 @@
</s:a> </s:a>
</redback:ifAnyAuthorized> </redback:ifAnyAuthorized>
<c:url var="rssFeedIconUrl" value="/images/icons/rss-feed.png"/> <c:url var="rssFeedIconUrl" value="/images/icons/rss-feed.png"/>
<a href='/archiva/feeds/<c:out value="${repository.id}" />'> <c:url var="rssFeedUrl" value="/feeds/${repository.id}" />
<a href="${rssFeedUrl}">
<img src="${rssFeedIconUrl}" /> <img src="${rssFeedIconUrl}" />
</a> </a>
</div> </div>