update repository scanning to remove DMI after Struts upgrade

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@1563510 13f79535-47bb-0310-9956-ffa450edef68

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 03f275cc242ab02ee67c22b81f2d46dcf2f929ea..61619b203e641946895974d526d4b3fc8ec3c0ce 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
@@ -511,43 +511,13 @@
       <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
     </action>
 
-    <action name="repositoryScanning_addFiletypePattern" class="repositoryScanningAction" method="addFiletypePattern">
+    <action name="repositoryScanning_*" class="repositoryScanningAction" method="{1}">
       <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
       <result name="success" type="redirectAction">
         <param name="actionName">repositoryScanning</param>
       </result>
       <interceptor-ref name="configuredArchivaStack">
-        <param name="tokenSession.includeMethods">addFiletypePattern</param>
-      </interceptor-ref>
-    </action>
-
-    <action name="repositoryScanning_removeFiletypePattern" class="repositoryScanningAction" method="removeFiletypePattern">
-      <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
-      <result name="success" type="redirectAction">
-        <param name="actionName">repositoryScanning</param>
-      </result>
-      <interceptor-ref name="configuredArchivaStack">
-        <param name="tokenSession.includeMethods">removeFiletypePattern</param>
-      </interceptor-ref>
-    </action>
-
-    <action name="repositoryScanning_updateKnownConsumers" class="repositoryScanningAction" method="updateKnownConsumers">
-      <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
-      <result name="success" type="redirectAction">
-        <param name="actionName">repositoryScanning</param>
-      </result>
-      <interceptor-ref name="configuredArchivaStack">
-        <param name="tokenSession.includeMethods">updateKnownConsumers</param>
-      </interceptor-ref>
-    </action>
-
-    <action name="repositoryScanning_updateInvalidConsumers" class="repositoryScanningAction" method="updateInvalidConsumers">
-      <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
-      <result name="success" type="redirectAction">
-        <param name="actionName">repositoryScanning</param>
-      </result>
-      <interceptor-ref name="configuredArchivaStack">
-        <param name="tokenSession.includeMethods">updateInvalidConsumers</param>
+        <param name="tokenSession.includeMethods">{1}</param>
       </interceptor-ref>
     </action>
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
index a64a4da2f41ee40a6126887cdb21b0769724ade8..6bb0733b46834ed1b156eedcffc8956ec6b729f4 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
@@ -211,7 +211,7 @@
   <c:otherwise>
     <%-- Display the consumers. --%>
 
-    <s:form method="post" action="repositoryScanning!updateInvalidConsumers" 
+    <s:form method="post" action="repositoryScanning_updateInvalidConsumers"
              namespace="/admin" validate="false" theme="simple">
     <s:token/>         
     <table class="consumers">