[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

diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index ea61ccb8636603230d4787c7b16e8fba679c6c07..4bea0e16539929e14f403af6cd2241c65c47a0fe 100644 (file)
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -107,17 +107,6 @@
       <result>/WEB-INF/jsp/showArtifact.jsp</result>
     </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">
       <result>/WEB-INF/jsp/showArtifact.jsp</result>
     </action>
@@ -237,6 +226,17 @@
     <action name="runIndexer" class="runRepositoryTaskAction" method="runIndexer">
       <result type="redirect-action">index</result>
     </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>
 </xwork>
 

diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 4ee4b35f8ab97e80acfc09112a07e92c91787710..a530643383ae18093191ff0b0c79bdfb5ca49c63 100644 (file)
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -105,7 +105,7 @@
     <h5>Manage</h5>
     <ul>
       <li class="none">
-        <my:currentWWUrl action="reports" namespace="/">Reports</my:currentWWUrl>
+        <my:currentWWUrl action="reports" namespace="/admin">Reports</my:currentWWUrl>
       </li>
 
       <%-- TODO

diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp
index 523f05b9611c23c8f951c6a2584fe82958a3de2e..b5372cd2bc98608f0c61dc38937151d0ab6ff173 100644 (file)
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp
@@ -43,7 +43,7 @@
   <c:choose>
     <c:when test="${!database.inProgress}">
       <c:set var="url">
-        <ww:url action="runReport" namespace="/">
+        <ww:url action="runReport" namespace="/admin">
           <ww:param name="repositoryId" value="%{'${database.repository.id}'}"/>
         </ww:url>
       </c:set>