Author: brett
Date: Sat Feb 1 23:33:48 2014
New Revision: 1563510
URL: http://svn.apache.org/r1563510
Log:
update repository scanning to remove DMI after Struts upgrade
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=1563510&r1=1563509&r2=1563510&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
Sat Feb 1 23:33:48 2014
@@ -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>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp?rev=1563510&r1=1563509&r2=1563510&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
Sat Feb 1 23:33:48 2014
@@ -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">
