archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r441778 - in /maven/archiva/trunk/archiva-webapp/src/main: resources/xwork.xml webapp/WEB-INF/jsp/decorators/default.jsp webapp/WEB-INF/jsp/reports/reports.jsp
Date Sat, 09 Sep 2006 11:13:32 GMT
Author: brett
Date: Sat Sep  9 04:13:31 2006
New Revision: 441778

URL: http://svn.apache.org/viewvc?view=rev&rev=441778
Log:
[MRM-77] move reports to admin namespace

Modified:
    maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
    maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
    maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp

Modified: maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=441778&r1=441777&r2=441778
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml Sat Sep  9 04:13:31 2006
@@ -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>
@@ -236,6 +225,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>

Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?view=diff&rev=441778&r1=441777&r2=441778
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Sat Sep  9 04:13:31 2006
@@ -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

Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp?view=diff&rev=441778&r1=441777&r2=441778
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp Sat
Sep  9 04:13:31 2006
@@ -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>



Mime
View raw message