You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2014/08/01 07:07:45 UTC
git commit: [MRM-1857] RSS feeds not working
Repository: archiva
Updated Branches:
refs/heads/archiva-1.3.x 908493ca5 -> 2e7c9b985
[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.
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/2e7c9b98
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/2e7c9b98
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/2e7c9b98
Branch: refs/heads/archiva-1.3.x
Commit: 2e7c9b9857446dd358a7129e26c887ec64a1b775
Parents: 908493c
Author: Brett Porter <br...@apache.org>
Authored: Fri Aug 1 15:05:02 2014 +1000
Committer: Brett Porter <br...@apache.org>
Committed: Fri Aug 1 15:05:02 2014 +1000
----------------------------------------------------------------------
.../archiva-web/archiva-webapp/src/main/resources/struts.xml | 2 +-
.../src/main/webapp/WEB-INF/jsp/admin/repositories.jsp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/2e7c9b98/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
----------------------------------------------------------------------
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 1b3edf2..000283e 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"/>
http://git-wip-us.apache.org/repos/asf/archiva/blob/2e7c9b98/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
----------------------------------------------------------------------
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 3a2d772..072a6d2 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>