diff options
| author | Brett Porter <brett@apache.org> | 2014-08-01 15:05:02 +1000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2014-08-01 15:05:02 +1000 |
| commit | 2e7c9b9857446dd358a7129e26c887ec64a1b775 (patch) | |
| tree | 96db0dc55642fa03884413d014bae6e6453916a0 | |
| parent | 908493ca57c0a3e06018d8f389b9344f4f6749d4 (diff) | |
| download | archiva-1.3.x.tar.gz archiva-1.3.x.zip | |
[MRM-1857] RSS feeds not workingarchiva-1.3.x
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.
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml | 2 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml index 1b3edf20b..000283e0b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml @@ -22,7 +22,7 @@ "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> - <constant name="struts.action.excludePattern" value="^/$,^/repository/.*" /> + <constant name="struts.action.excludePattern" value="^/$,^/repository/.*,^/xmlrpc$,^/feeds/.*" /> <!-- Include plexus-security xwork configurations. --> <include file="struts-security.xml"/> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp index 3a2d7726b..072a6d27e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp @@ -118,7 +118,8 @@ </s:a> </redback:ifAnyAuthorized> <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}" /> </a> </div> |