Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-77] move reports to admin namespace 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@441778 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2006-09-09 11:13:31 +00:00
parent 5e188c6041
commit b340526e56
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archiva-webapp/src/main/resources/xwork.xml
View File

@ -107,17 +107,6 @@
<result>/WEB-INF/jsp/showArtifact.jsp</result> <result>/WEB-INF/jsp/showArtifact.jsp</result>
</action> </action>
<action name="reports" class="reportsAction">
<result>/WEB-INF/jsp/reports/reports.jsp</result>
</action>
<action name="runReport" class="reportsAction" method="runReport">
<interceptor-ref name="configuredStack"/>
<interceptor-ref name="execAndWait"/>
<result name="wait" type="redirect-action">reports</result>
<result name="success" type="redirect-action">reports</result>
</action>
<action name="showArtifactDependencies" class="showArtifactAction" method="dependencies"> <action name="showArtifactDependencies" class="showArtifactAction" method="dependencies">
<result>/WEB-INF/jsp/showArtifact.jsp</result> <result>/WEB-INF/jsp/showArtifact.jsp</result>
</action> </action>
@ -237,6 +226,17 @@
<action name="runIndexer" class="runRepositoryTaskAction" method="runIndexer"> <action name="runIndexer" class="runRepositoryTaskAction" method="runIndexer">
<result type="redirect-action">index</result> <result type="redirect-action">index</result>
</action> </action>
<action name="reports" class="reportsAction">
<result>/WEB-INF/jsp/reports/reports.jsp</result>
</action>
<action name="runReport" class="reportsAction" method="runReport">
<interceptor-ref name="configuredStack"/>
<interceptor-ref name="execAndWait"/>
<result name="wait" type="redirect-action">reports</result>
<result name="success" type="redirect-action">reports</result>
</action>
</package> </package>
</xwork> </xwork>

2
archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
View File

@ -105,7 +105,7 @@
<h5>Manage</h5> <h5>Manage</h5>
<ul> <ul>
<li class="none"> <li class="none">
<my:currentWWUrl action="reports" namespace="/">Reports</my:currentWWUrl> <my:currentWWUrl action="reports" namespace="/admin">Reports</my:currentWWUrl>
</li> </li>
<%-- TODO <%-- TODO

2
archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp
View File

@ -43,7 +43,7 @@
<c:choose> <c:choose>
<c:when test="${!database.inProgress}"> <c:when test="${!database.inProgress}">
<c:set var="url"> <c:set var="url">
<ww:url action="runReport" namespace="/"> <ww:url action="runReport" namespace="/admin">
<ww:param name="repositoryId" value="%{'${database.repository.id}'}"/> <ww:param name="repositoryId" value="%{'${database.repository.id}'}"/>
</ww:url> </ww:url>
</c:set> </c:set>