MRM-977 Upgrade from webwork 2 to Struts 2

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@706113 13f79535-47bb-0310-9956-ffa450edef68

diff --cc archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
index 15981a30e9ee04007dbf7c024488f24230141fc0,24c1bfaea410ac97684595f093428058d9170d7d..404d40fedcaddfa6615aeb01512ecd4fc508ab78
--- 1/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
--- 2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
@@@ -109,31 -109,31 +109,31 @@@
    <div class="connector ${rowColor}"> 
      <div class="controls">
        <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
-         <ww:url id="sortDownRepositoryUrl" action="sortDownRepositoryFromGroup">
-           <ww:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
-           <ww:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
-         </ww:url>
-         <ww:url id="sortUpRepositoryUrl" action="sortUpRepositoryFromGroup">
-           <ww:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
-           <ww:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
-         </ww:url>
-         <ww:url id="removeRepositoryUrl" action="removeRepositoryFromGroup">
-           <ww:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
-           <ww:param name="repoId" value="managedRepositories['${repository}'].id"/>
-         </ww:url>
+         <s:url id="sortDownRepositoryUrl" action="sortDownRepositoryFromGroup">
+           <s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}"/>
 -          <s:param name="targetRepo" value="managedRepositories['%{#attr.repository}'].id"/>
++          <s:param name="targetRepo" value="%{#attr.managedRepositories[#attr.repository].id}"/>
+         </s:url>
+         <s:url id="sortUpRepositoryUrl" action="sortUpRepositoryFromGroup">
+           <s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}"/>
 -          <s:param name="targetRepo" value="managedRepositories['%{#attr.repository}'].id"/>
++          <s:param name="targetRepo" value="%{#attr.managedRepositories[#attr.repository].id}"/>
+         </s:url>
+         <s:url id="removeRepositoryUrl" action="removeRepositoryFromGroup">
+           <s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}"/>
 -          <s:param name="repoId" value="managedRepositories[%{#attr.repository}].id"/>
++          <s:param name="repoId" value="%{#attr.managedRepositories[#attr.repository].id}"/>
+         </s:url>
          <c:if test="${r.count > 1}">
-           <ww:a href="%{sortUpRepositoryUrl}" cssClass="up" title="Move Repository Up">
+           <s:a href="%{sortUpRepositoryUrl}" cssClass="up" title="Move Repository Up">
              <img src="${iconUpUrl}"/>
-           </ww:a>
+           </s:a>
          </c:if>
          <c:if test="${r.count < numberOfRepos}">
-           <ww:a href="%{sortDownRepositoryUrl}" cssClass="down" title="Move Repository Down">
+           <s:a href="%{sortDownRepositoryUrl}" cssClass="down" title="Move Repository Down">
              <img src="${iconDownUrl}"/>
-           </ww:a>
+           </s:a>
          </c:if>
-         <ww:a href="%{removeRepositoryUrl}" cssClass="delete" title="Delete Repository">
+         <s:a href="%{removeRepositoryUrl}" cssClass="delete" title="Delete Repository">
            <img src="${iconDeleteUrl}"/>
-         </ww:a>
+         </s:a>
        </redback:ifAnyAuthorized>
      </div>
    

diff --cc archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Simple merge

diff --cc archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
index 6edf39a732c5c3a166d584853437a73b4a9cac04,0f0beafa24cd2218b66e908310b75f22d383791f..9bfdd35f9326bfad4e55ec864bbe574419686fd1
--- 1/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
--- 2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
@@@ -30,28 -30,30 +30,28 @@@
  
  <body>
  
 -<h1>Search</h1>
 -
  <div id="contentArea">
  <div id="searchBox">
-   <ww:form method="get" action="quickSearch" validate="true">
-     <ww:textfield label="Search for" size="50" name="q"/>
-     <ww:hidden name="completeQueryString" value="${completeQueryString}"/>        
-     <ww:submit value="Go!"/>
-   </ww:form>
+   <s:form method="get" action="quickSearch" validate="true">
+     <s:textfield label="Search for" size="50" name="q"/>
+     <s:hidden name="completeQueryString" value="%{completeQueryString}"/>        
 -    <s:submit label="Go!"/>
++    <s:submit value="Search"/>
+   </s:form>
  
    <script type="text/javascript">
      document.getElementById("quickSearch_q").focus();
    </script>
  
-   <ww:url id="filteredSearchUrl" action="advancedSearch"/>
-   <ww:a href="%{filteredSearchUrl}">
+   <s:url id="filteredSearchUrl" action="advancedSearch"/>
+   <s:a href="%{filteredSearchUrl}">
      Advanced Search
-   </ww:a>
+   </s:a>
  
    <p>
-     <ww:actionerror/>
+     <s:actionerror/>
    </p>
  </div>
 -
 +<div id="searchHint">
    <p>
      Enter your search terms. A variety of data will be searched for your keywords.<br/>
      To search for Java classes, packages or methods, use the keyword <code>bytecode:</code>

diff --cc archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
index 62c12bb38421151d9659431573387099d4b27320,afcbf1c6b8f33a222e47dc4f4f3ac14550e69e22..ee67fd3146e52fe683956a98a024c7e6be9dc148
--- 1/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
--- 2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
@@@ -37,21 -37,21 +37,21 @@@
                list="availableRepositories" doubleName="selectedRepositories"
                doubleList="selectedRepositories" size="8" doubleSize="8"/>
                
-       <ww:datepicker label="Start Date" name="startDate" id="startDate"/>
-       <ww:datepicker label="End Date" name="endDate" id="endDate"/>
-       <ww:textfield label="Row Count" name="rowCount" />
+       <s:datetimepicker label="Start Date" name="startDate" id="startDate"/>
 -      <s:datetimepicker label="End Date" name="endDate" id="endDate"/>
++      <s:datetimepicker label="End Date" name="endDate" id="endDate"  />  
+       <s:textfield label="Row Count" name="rowCount" />
                    
-     <ww:submit value="View Statistics"/>
-   </ww:form>
+     <s:submit value="View Statistics"/>
+   </s:form>
      
    <h2>Repository Health</h2>
-   <ww:form namespace="/report" action="generateReport" validate="true">  
-     <ww:textfield label="Row Count" name="rowCount" />
-     <ww:textfield label="Group ID" name="groupId"/>
-     <ww:select label="Repository ID" name="repositoryId" list="repositoryIds"/>    
+   <s:form namespace="/report" action="generateReport" validate="true">
+     <s:textfield label="Row Count" name="rowCount" />
+     <s:textfield label="Group ID" name="groupId"/>
+     <s:select label="Repository ID" name="repositoryId" list="repositoryIds"/>
    
-     <ww:submit value="Show Report"/>
-   </ww:form>
+     <s:submit value="Show Report"/>
+   </s:form>
  
  </div>
  

diff --cc archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
index 159c203ecb7d220f6518a40be3ceee784e1b229c,b209557b5df060d41203e44573c08fff2dc7cc53..57ba124dba70b48405223a42bd544fdc6c004815
--- 1/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
--- 2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
@@@ -43,25 -43,25 +43,25 @@@
  <c:url var="imgNextPageDisabledUrl" value="/images/icon_next_page_disabled.gif"/>
  
  <div id="contentArea">
 -  <div id="searchBox">
 +  <div id="searchBoxResults">
  
      <c:if test="${fromFilterSearch == true}">
-       <ww:form method="get" action="filteredSearch" validate="true">
-         <ww:textfield label="Row Count" size="50" name="rowCount"/>
-         <ww:textfield label="Group Id" size="50" name="groupId"/>
-         <ww:textfield label="Artifact Id" size="50" name="artifactId"/>
-         <ww:textfield label="Version" size="50" name="version"/>
-         <ww:textfield label="Class / Package" size="50" name="className"/>
-         <ww:select name="repositoryId" label="Repository ID" list="managedRepositoryList"/>
-         <ww:hidden name="completeQueryString" value="${completeQueryString}"/>
-         <ww:hidden name="fromFilterSearch" value="${fromFilterSearch}"/>
-         <ww:submit label="Go!"/>
-       </ww:form>
+       <s:form method="get" action="filteredSearch" validate="true">
+         <s:textfield label="Row Count" size="50" name="rowCount"/>
+         <s:textfield label="Group Id" size="50" name="groupId"/>
+         <s:textfield label="Artifact Id" size="50" name="artifactId"/>
+         <s:textfield label="Version" size="50" name="version"/>
+         <s:textfield label="Class / Package" size="50" name="className"/>
+         <s:select name="repositoryId" label="Repository ID" list="managedRepositoryList"/>
+         <s:hidden name="completeQueryString" value="%{#attr.completeQueryString}"/>
+         <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}"/>
+         <s:submit label="Go!"/>
+       </s:form>
    
-       <ww:url id="indexUrl" action="index"/>
-       <ww:a href="%{indexUrl}">
+       <s:url id="indexUrl" action="index"/>
+       <s:a href="%{indexUrl}">
          Quick Search Page
-       </ww:a>
+       </s:a>
        <script type="text/javascript">
          document.getElementById("filteredSearch_groupId").focus();
        </script>

diff --cc archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
index e029ca583e2031fc5302fd1abe88aa8b2964e604,e029ca583e2031fc5302fd1abe88aa8b2964e604..5e1b006975d64f8546ddc6936b2877de791c6efc
--- 1/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
--- 2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
@@@ -40,8 -40,8 +40,8 @@@ import org.codehaus.plexus.redback.auth
  import org.codehaus.plexus.redback.authorization.UnauthorizedException;
  import org.codehaus.plexus.redback.system.DefaultSecuritySession;
  import org.codehaus.plexus.redback.system.SecuritySession;
--import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator;
--import org.codehaus.plexus.redback.xwork.filter.authentication.basic.HttpBasicAuthentication;
++import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator;
++import org.codehaus.plexus.redback.struts2.filter.authentication.basic.HttpBasicAuthentication;
  import org.codehaus.plexus.spring.PlexusInSpringTestCase;
  import org.easymock.MockControl;
  import org.easymock.classextension.MockClassControl;