cleanup unneeded tags and config for csrf check

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

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 5617d5c8f9c6dd1a9a41715b97def1a38c9482f8..ff768c6f6591e1535f5eaa9d7762ee8d5ff89f6b 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
@@ -46,25 +46,23 @@
    
 <script type="text/javascript">
 <!--
-  function removeFiletypePattern(filetypeId, pattern, token)
+  function removeFiletypePattern(filetypeId, pattern)
   {
      var f = document.getElementById('filetypeForm');
      
      f.action = "${removeFiletypePatternUrl}";
      f['pattern'].value = pattern;
      f['fileTypeId'].value = filetypeId;
-     f.elements['struts2Token'].value = token;
      f.submit();
   }
   
-  function addFiletypePattern(filetypeId, newPatternId, token)
+  function addFiletypePattern(filetypeId, newPatternId)
   {
      var f = document.forms['filetypeForm'];
           
      f.action = "${addFiletypePatternUrl}";     
      f.elements['pattern'].value = document.getElementById(newPatternId).value;
      f.elements['fileTypeId'].value = filetypeId;
-     f.elements['struts2Token'].value = token;     
      f.submit();
   }
 //-->
@@ -87,15 +85,8 @@
       <s:token/>
       <input type="hidden" name="pattern" />
       <input type="hidden" name="fileTypeId" />
-      <input type="hidden" name="struts2Token"/>
     </s:form>
-
-    <%-- DUPLICATE? IS THIS STILL NEEDED? --%>
-    <s:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" >
-      <s:param name="struts.token.name">struts.token</s:param>
-      <s:param name="struts.token"><s:property value="struts.token"/></s:param>
-    </s:url>
-
+    
     <c:forEach items="${fileTypeIds}" var="filetypeId" varStatus="j">
 
       <div class="filetype">
@@ -105,7 +96,6 @@
       <h3 class="filetype">${filetypeId}</h3>
 
       <table>
-        <s:token id="struts2TokenUd"/>
         <c:forEach items="${fileTypeMap[filetypeId].patterns}" var="pattern" varStatus="i">
           <c:choose>
             <c:when test='${(i.index)%2 eq 0}'>
@@ -124,7 +114,7 @@
             </td>
             <td class="controls ${bgcolor}">
               <s:a href="#" title="Remove [%{#attr.escapedPattern}] Pattern from [%{#attr.filetypeId}]"
-                    onclick="removeFiletypePattern( '%{#attr.filetypeId}', '%{#attr.escapedPattern}', '%{#attr.struts2TokenId}' )" 
+                    onclick="removeFiletypePattern( '%{#attr.filetypeId}', '%{#attr.escapedPattern}' )"
                     theme="simple">
                 <img src="${iconDeleteUrl}" />
               </s:a>
@@ -140,7 +130,7 @@
           <td>
             <s:a href="#" 
                   title="Add Pattern to [%{#attr.filetypeId}]"
-                  onclick="addFiletypePattern( '%{#attr.filetypeId}', 'newpattern_%{#attr.j.index}', '%{#attr.struts2TokenId}' )"
+                  onclick="addFiletypePattern( '%{#attr.filetypeId}', 'newpattern_%{#attr.j.index}' )"
                   theme="simple">
               <img src="${iconCreateUrl}" />
             </s:a>