archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdu...@apache.org
Subject svn commit: r700721 [3/4] - in /archiva/branches/archiva-struts2: ./ archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ archiva-modules/archiva-web/archiva-webapp/sr...
Date Wed, 01 Oct 2008 09:11:09 GMT
Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp Wed Oct  1 02:11:06 2008
@@ -17,7 +17,7 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
@@ -26,7 +26,7 @@
 <html>
 <head>
   <title>Administration - Repository Groups</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -41,16 +41,16 @@
 
 <div id="contentArea">
 
-<ww:actionerror/>
-<ww:actionmessage/>
+<s:actionerror/>
+<s:actionmessage/>
 
 <div align="right">
   <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
-    <ww:form action="addRepositoryGroup" namespace="/admin">
+    <s:form action="addRepositoryGroup" namespace="/admin">
       <span class="label">Identifier<span style="color:red">*</span>:</span> 
-      <ww:textfield size="10" label="Identifier" theme="simple" name="repositoryGroup.id"/>
-      <ww:submit value="Add Group" theme="simple" cssClass="button"/>
-    </ww:form>
+      <s:textfield size="10" label="Identifier" theme="simple" name="repositoryGroup.id"/>
+      <s:submit value="Add Group" theme="simple" cssClass="button"/>
+    </s:form>
   </redback:ifAnyAuthorized>
 </div>
 
@@ -70,12 +70,12 @@
   <div class="managedRepo">
     
     <div style="float:right">
-      <ww:url id="deleteRepositoryGroupUrl" action="confirmDeleteRepositoryGroup">
-        <ww:param name="repoGroupId" value="%{'${repositoryGroup.key}'}" />
-      </ww:url>
-      <ww:a href="%{deleteRepositoryGroupUrl}" cssClass="delete">
+      <s:url id="deleteRepositoryGroupUrl" action="confirmDeleteRepositoryGroup">
+        <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}" />
+      </s:url>
+      <s:a href="%{deleteRepositoryGroupUrl}" cssClass="delete">
         <img src="${iconDeleteUrl}"/>
-      </ww:a>
+      </s:a>
     </div>
     
     <img src="<c:url value="/images/archiva-splat-32.gif"/>"/>
@@ -85,11 +85,11 @@
 
   <c:if test="${!empty (groupToRepositoryMap[repositoryGroup.key])}">
   <div class="repos">
-    <ww:form name="form${i}" action="addRepositoryToGroup" namespace="/admin" validate="true">
-      <ww:hidden name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
-      <ww:select list="groupToRepositoryMap['${repositoryGroup.key}']" name="repoId" theme="simple"/>
-      <ww:submit value="Add Repository" theme="simple" cssClass="button"/>
-    </ww:form>
+    <s:form name="form${i}" action="addRepositoryToGroup" namespace="/admin" validate="true">
+      <s:hidden name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
+      <s:select list="groupToRepositoryMap['${repositoryGroup.key}']" name="repoId" theme="simple"/>
+      <s:submit value="Add Repository" theme="simple" cssClass="button"/>
+    </s:form>
   </div>
   </c:if>
   
@@ -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="%{'${repositoryGroup.key}'}"/>
+          <s:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
+        </s:url>
+        <s:url id="sortUpRepositoryUrl" action="sortUpRepositoryFromGroup">
+          <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
+          <s:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
+        </s:url>
+        <s:url id="removeRepositoryUrl" action="removeRepositoryFromGroup">
+          <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
+          <s:param name="repoId" value="managedRepositories['${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>
   

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp Wed Oct  1 02:11:06 2008
@@ -17,7 +17,7 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
@@ -26,7 +26,7 @@
 <html>
 <head>
 <title>Administration - Repository Scanning</title>
-<ww:head />
+<s:head />
 </head>
 
 <body>
@@ -35,13 +35,13 @@
 
 <div id="contentArea">
 
-<ww:actionerror /> 
-<ww:actionmessage /> 
+<s:actionerror /> 
+<s:actionmessage /> 
 
 <c:url var="iconDeleteUrl" value="/images/icons/delete.gif" /> 
 <c:url var="iconCreateUrl" value="/images/icons/create.png" /> 
-<ww:url id="removeFiletypePatternUrl" action="repositoryScanning" method="removeFiletypePattern" /> 
-<ww:url id="addFiletypePatternUrl"    action="repositoryScanning" method="addFiletypePattern" /> 
+<s:url id="removeFiletypePatternUrl" action="repositoryScanning" method="removeFiletypePattern" /> 
+<s:url id="addFiletypePatternUrl"    action="repositoryScanning" method="addFiletypePattern" /> 
    
 <script type="text/javascript">
 <!--
@@ -78,14 +78,14 @@
   <c:otherwise>
     <%-- Display the filetypes. --%>
 
-    <ww:form method="post" action="repositoryScanning" 
+    <s:form method="post" action="repositoryScanning" 
              namespace="/admin" validate="false" 
              id="filetypeForm" theme="simple">
       <input type="hidden" name="pattern" />
       <input type="hidden" name="fileTypeId" />
-    </ww:form>
+    </s:form>
 
-    <ww:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
+    <s:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
 
     <c:forEach items="${fileTypeIds}" var="filetypeId" varStatus="j">
 
@@ -113,27 +113,27 @@
               <code>${escapedPattern}</code>
             </td>
             <td class="controls ${bgcolor}">
-              <ww:a href="#" title="Remove [${escapedPattern}] Pattern from [${filetypeId}]"
+              <s:a href="#" title="Remove [${escapedPattern}] Pattern from [${filetypeId}]"
                     onclick="removeFiletypePattern( '${filetypeId}', '${escapedPattern}' )" 
                     theme="simple">
                 <img src="${iconDeleteUrl}" />
-              </ww:a>
+              </s:a>
             </td>
           </tr>
         </c:forEach>
         <tr>
           <td>
-            <ww:textfield size="40" 
+            <s:textfield size="40" 
                           id="newpattern_${j.index}"
                           theme="simple" />
           </td>
           <td>
-            <ww:a href="#" 
+            <s:a href="#" 
                   title="Add Pattern to [${filetypeId}]"
                   onclick="addFiletypePattern( '${filetypeId}', 'newpattern_${j.index}' )"
                   theme="simple">
               <img src="${iconCreateUrl}" />
-            </ww:a>
+            </s:a>
           </td>
         </tr>
       </table>
@@ -154,7 +154,7 @@
   <c:otherwise>
     <%-- Display the consumers. --%>
 
-    <ww:form method="post" action="repositoryScanning!updateKnownConsumers" 
+    <s:form method="post" action="repositoryScanning!updateKnownConsumers" 
              namespace="/admin" validate="false" theme="simple">
     <table class="consumers">
       <tr>
@@ -190,11 +190,11 @@
       </c:forEach>
       <tr>
         <td colspan="4">
-          <ww:submit value="Update Consumers" />
+          <s:submit value="Update Consumers" />
         </td>
       </tr>
     </table>
-    </ww:form>
+    </s:form>
 
   </c:otherwise>
 </c:choose>
@@ -210,7 +210,7 @@
   <c:otherwise>
     <%-- Display the consumers. --%>
 
-    <ww:form method="post" action="repositoryScanning!updateInvalidConsumers" 
+    <s:form method="post" action="repositoryScanning!updateInvalidConsumers" 
              namespace="/admin" validate="false" theme="simple">
     <table class="consumers">
       <tr>
@@ -246,11 +246,11 @@
       </c:forEach>
       <tr>
         <td colspan="4">
-          <ww:submit value="Update Consumers" />
+          <s:submit value="Update Consumers" />
         </td>
       </tr>
     </table>
-    </ww:form>
+    </s:form>
 
   </c:otherwise>
 </c:choose></div>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp Wed Oct  1 02:11:06 2008
@@ -17,16 +17,16 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
   <title>Advanced Search</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
-<ww:if test="%{infoMessage != null}">
+<s:if test="%{infoMessage != null}">
   <p>${infoMessage}</p>
-</ww:if>
+</s:if>
 
 <body>
 
@@ -37,29 +37,29 @@
 
   <div id="searchBox">
   
-    <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="${completeQueryString}"/>
+      <s:hidden name="fromFilterSearch" value="${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>
 
   </div>
 
   <script type="text/javascript">
     document.getElementById("filteredSearch_groupId").focus();
   </script>
-  <ww:actionerror/>
+  <s:actionerror/>
 
 </div> 
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp Wed Oct  1 02:11:06 2008
@@ -17,13 +17,13 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <html>
 <head>
   <title>Security Alert Page</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp Wed Oct  1 02:11:06 2008
@@ -17,7 +17,7 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
 <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0"  %>
@@ -25,7 +25,7 @@
 <html>
 <head>
   <title>Browse Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -48,9 +48,9 @@
       <ul>
         <c:forEach items="${results.groupIds}" var="groupId">
           <c:set var="url">
-            <ww:url action="browseGroup" namespace="/">
-              <ww:param name="groupId" value="%{'${groupId}'}"/>
-            </ww:url>
+            <s:url action="browseGroup" namespace="/">
+              <s:param name="groupId" value="%{'${groupId}'}"/>
+            </s:url>
           </c:set>
           <li><a href="${url}">${groupId}/</a></li>
         </c:forEach>
@@ -65,10 +65,10 @@
         <c:url var="rssFeedIconUrl" value="/images/icons/rss-feed.png"/>
         <c:forEach items="${results.artifacts}" var="artifactId">
           <c:set var="url">
-            <ww:url action="browseArtifact" namespace="/">
-              <ww:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
-              <ww:param name="artifactId" value="%{'${artifactId}'}"/>
-            </ww:url>
+            <s:url action="browseArtifact" namespace="/">
+              <s:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
+              <s:param name="artifactId" value="%{'${artifactId}'}"/>
+            </s:url>
           </c:set>
           <c:url var="rssUrl" value="/feeds/${groupId}/${artifactId}"/>
           <li>
@@ -88,11 +88,11 @@
       <ul>
         <c:forEach items="${results.versions}" var="version">
           <c:set var="url">
-            <ww:url action="showArtifact" namespace="/">
-              <ww:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
-              <ww:param name="artifactId" value="%{'${results.selectedArtifactId}'}"/>
-              <ww:param name="version" value="%{'${version}'}"/>
-            </ww:url>
+            <s:url action="showArtifact" namespace="/">
+              <s:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
+              <s:param name="artifactId" value="%{'${results.selectedArtifactId}'}"/>
+              <s:param name="version" value="%{'${version}'}"/>
+            </s:url>
           </c:set>
           <li><a href="${url}">${version}/</a></li>
         </c:forEach>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp Wed Oct  1 02:11:06 2008
@@ -17,14 +17,14 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
 
 <html>
 <head>
   <title>Browse Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -40,14 +40,14 @@
 
     <h2>Versions</h2>
     <ul>
-      <ww:set name="versions" value="versions"/>
+      <s:set name="versions" value="versions"/>
       <c:forEach items="${versions}" var="version">
         <c:set var="url">
-          <ww:url action="showArtifact" namespace="/">
-            <ww:param name="groupId" value="%{'${groupId}'}"/>
-            <ww:param name="artifactId" value="%{'${artifactId}'}"/>
-            <ww:param name="version" value="%{'${version}'}"/>
-          </ww:url>
+          <s:url action="showArtifact" namespace="/">
+            <s:param name="groupId" value="%{'${groupId}'}"/>
+            <s:param name="artifactId" value="%{'${artifactId}'}"/>
+            <s:param name="version" value="%{'${version}'}"/>
+          </s:url>
         </c:set>
         <li><a href="${url}">${version}/</a></li>
       </c:forEach>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp Wed Oct  1 02:11:06 2008
@@ -17,14 +17,14 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
 
 <html>
 <head>
   <title>Browse Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -41,9 +41,9 @@
     <ul>
       <c:forEach items="${results.groupIds}" var="groupId">
         <c:set var="url">
-          <ww:url action="browseGroup" namespace="/">
-            <ww:param name="groupId" value="%{'${groupId}'}"/>
-          </ww:url>
+          <s:url action="browseGroup" namespace="/">
+            <s:param name="groupId" value="%{'${groupId}'}"/>
+          </s:url>
         </c:set>
         <li><a href="${url}">${groupId}/</a></li>
       </c:forEach>
@@ -56,10 +56,10 @@
       <ul>
         <c:forEach items="${results.versions}" var="version">
           <c:set var="url">
-            <ww:url action="browseVersion" namespace="/">
-              <ww:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
-              <ww:param name="version" value="%{'${version}'}"/>
-            </ww:url>
+            <s:url action="browseVersion" namespace="/">
+              <s:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
+              <s:param name="version" value="%{'${version}'}"/>
+            </s:url>
           </c:set>
           <li><a href="${url}">${version}/</a></li>
         </c:forEach>
@@ -73,10 +73,10 @@
       <ul>
         <c:forEach items="${results.artifacts}" var="artifactId">
           <c:set var="url">
-            <ww:url action="browseArtifact" namespace="/">
-              <ww:param name="groupId" value="%{'${groupId}'}"/>
-              <ww:param name="artifactId" value="%{'${artifactId}'}"/>
-            </ww:url>
+            <s:url action="browseArtifact" namespace="/">
+              <s:param name="groupId" value="%{'${groupId}'}"/>
+              <s:param name="artifactId" value="%{'${artifactId}'}"/>
+            </s:url>
           </c:set>
           <li><a href="${url}">${artifactId}/</a></li>
         </c:forEach>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Wed Oct  1 02:11:06 2008
@@ -17,10 +17,10 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <c:if test="${!empty (organisationLogo)}">
-  <ww:set name="organisationUrl" value="organisationUrl"/>
+  <s:set name="organisationUrl" value="organisationUrl"/>
   <c:choose>
     <c:when test="${!empty (organisationUrl)}">
       <a href="${companyUrl}">

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp Wed Oct  1 02:11:06 2008
@@ -19,7 +19,7 @@
 
 <%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
 <%@ taglib prefix="page"      uri="http://www.opensymphony.com/sitemesh/page" %>
-<%@ taglib prefix="ww"        uri="/webwork" %>
+<%@ taglib prefix="s"        uri="/struts-tags" %>
 <%@ taglib prefix="c"         uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="redback"   uri="http://plexus.codehaus.org/redback/taglib-1.0"  %>
 <%@ taglib prefix="my"        tagdir="/WEB-INF/tags" %>
@@ -30,12 +30,12 @@
 <html>
 <head>
   <title>Browse Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
-<ww:set name="model" value="model"/>
+<s:set name="model" value="model"/>
 <c:choose>
   <c:when test="${model.packaging == 'maven-plugin'}">
     <c:url var="imageUrl" value="/images/mavenplugin.gif"/>
@@ -81,53 +81,53 @@
   <div id="tabs">
     <span>
       <c:set var="url">
-        <ww:url action="showArtifact">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifact">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Info</my:currentWWUrl>
       <c:set var="url">
-        <ww:url action="showArtifactDependencies">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactDependencies">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependencies</my:currentWWUrl>
       <c:set var="url">
-        <ww:url action="showArtifactDependencyTree">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactDependencyTree">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependency Tree</my:currentWWUrl>
       <c:set var="url">
-        <ww:url action="showArtifactDependees">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactDependees">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Used By</my:currentWWUrl>
       <c:set var="url">
-        <ww:url action="showArtifactMailingLists">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactMailingLists">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Mailing Lists</my:currentWWUrl>
       <%-- POSTPONED to 1.0-alpha-2
       <redback:ifAnyAuthorized permissions="archiva-access-reports">
         <c:set var="url">
-        <ww:url action="showArtifactReports">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactReports">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Reports</my:currentWWUrl>
       </redback:ifAnyAuthorized>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Wed Oct  1 02:11:06 2008
@@ -20,7 +20,7 @@
   --%>
 
 <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
@@ -52,7 +52,7 @@
     </my:currentWWUrl>
   </span>
   <span id="bannerRight">
-    <ww:action namespace="/components" name="companyInfo" executeResult="true"/>
+    <s:action namespace="/components" name="companyInfo" executeResult="true"/>
   </span>
 
   <div class="clear">
@@ -86,11 +86,11 @@
         <my:currentWWUrl action="index" namespace="/">Search</my:currentWWUrl>
       </li>
 
-      <ww:if test="${applicationScope.uiOptions.showFindArtifacts}">
+      <s:if test="%{applicationScope.uiOptions.showFindArtifacts}">
         <li class="none">
           <my:currentWWUrl action="findArtifact" namespace="/">Find Artifact</my:currentWWUrl>
         </li>
-      </ww:if>
+      </s:if>
 
       <li class="none">
         <my:currentWWUrl action="browse" namespace="/">Browse</my:currentWWUrl>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp Wed Oct  1 02:11:06 2008
@@ -17,12 +17,12 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Find Artifact</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body onload="document.checksumSearch.file.disabled = false">
@@ -31,7 +31,7 @@
 
 <div id="contentArea">
   <div id="searchBox">
-    <ww:if test="${applicationScope.uiOptions.appletFindEnabled}">
+    <s:if test="${applicationScope.uiOptions.appletFindEnabled}">
       <script type="text/javascript">
         function generateMd5( file, defVal )
         {
@@ -55,18 +55,18 @@
         <span class="errorMessage">JavaScript is disabled: using the file browser will not work.</span>
       </noscript>
 
-      <ww:form method="POST" action="checksumSearch" namespace="/"
+      <s:form method="POST" action="checksumSearch" namespace="/"
                onsubmit="this.q.value = generateMd5(this.file.value,this.md5.value); this.file.disabled = true;">
-        <ww:hidden name="q"/>
+        <s:hidden name="q"/>
         <tr>
           <td class="tdLabel"><label for="checksumSearch_file" class="label">Search for:</label></td>
           <td>
             <input type="file" name="file" size="50" value="" id="checksumSearch_file"/>
           </td>
         </tr>
-        <ww:textfield label="Checksum" size="50" name="md5"/>
-        <ww:submit value="Search"/>
-      </ww:form>
+        <s:textfield label="Checksum" size="50" name="md5"/>
+        <s:submit value="Search"/>
+      </s:form>
 
       <p>
         This allows you to search the repository using the checksum of an artifact that you are trying to identify.
@@ -79,7 +79,7 @@
         <b>not</b>
         be uploaded to the server. See the progress bar below for progress of
         locally creating a checksum that is uploaded to the server after you hit "Search".
-        <ww:actionerror/>
+        <s:actionerror/>
       </p>
 
       <p>
@@ -88,17 +88,17 @@
                 width="400" height="20" name="ChecksumApplet">
         </applet>
       </p>
-    </ww:if>
-    <ww:else>
-      <ww:form method="POST" action="checksumSearch" namespace="/">
-        <ww:textfield label="Checksum" size="50" name="q"/>
-        <ww:submit value="Search"/>
-      </ww:form>
+    </s:if>
+    <s:else>
+      <s:form method="POST" action="checksumSearch" namespace="/">
+        <s:textfield label="Checksum" size="50" name="q"/>
+        <s:submit value="Search"/>
+      </s:form>
 
       <p>
-        <ww:actionerror/>
+        <s:actionerror/>
       </p>
-    </ww:else>
+    </s:else>
   </div>
 </div>
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp Wed Oct  1 02:11:06 2008
@@ -17,20 +17,20 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <html>
 <head>
   <title>Error Occurred</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Error Occurred</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 </body>
 </html>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp Wed Oct  1 02:11:06 2008
@@ -17,16 +17,16 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
   <title>Quick Search</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
-<ww:if test="%{infoMessage != null}">
+<s:if test="%{infoMessage != null}">
   <p>${infoMessage}</p>
-</ww:if>
+</s:if>
 
 <body>
 
@@ -34,23 +34,23 @@
 
 <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 label="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: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>
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp Wed Oct  1 02:11:06 2008
@@ -17,14 +17,14 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
 
 <html>
 <head>
   <title>Reports</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -32,7 +32,7 @@
 
 <div id="contentArea">
 
-  <ww:set name="reports" value="reports"/>  
+  <s:set name="reports" value="reports"/>  
     
   <c:forEach var="repository" items="${repositoriesMap}">
 	<strong>Repository: ${repository.key}</strong>
@@ -41,10 +41,10 @@
 	    <p>
       	<archiva:groupIdLink var="${report.groupId}" includeTop="true"/>
       	<c:set var="url">
-        <ww:url action="browseArtifact" namespace="/">
-          <ww:param name="groupId" value="%{'${report.groupId}'}"/>
-          <ww:param name="artifactId" value="%{'${report.artifactId}'}"/>
-        </ww:url>
+        <s:url action="browseArtifact" namespace="/">
+          <s:param name="groupId" value="%{'${report.groupId}'}"/>
+          <s:param name="artifactId" value="%{'${report.artifactId}'}"/>
+        </s:url>
       	</c:set>
       	<a href="${url}">${report.artifactId}</a> /
       	<strong>${report.version}</strong>
@@ -54,11 +54,11 @@
 	</c:forEach>
   </c:forEach>
 
-  <ww:set name="page" value="page"/>
-  <c:if test="${page > 1}"><a href="<ww:property value='prev' />">&lt;&lt;</a></c:if>
+  <s:set name="page" value="page"/>
+  <c:if test="${page > 1}"><a href="<s:property value='prev' />">&lt;&lt;</a></c:if>
   Page: ${page}
-  <ww:set name="isLastPage" value="isLastPage"/>
-  <c:if test="${!isLastPage}"><a href="<ww:property value='next' />">&gt;&gt;</a></c:if>
+  <s:set name="isLastPage" value="isLastPage"/>
+  <c:if test="${!isLastPage}"><a href="<s:property value='next' />">&gt;&gt;</a></c:if>
 
 </div>
 </body>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/blankReport.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/blankReport.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/blankReport.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/blankReport.jsp Wed Oct  1 02:11:06 2008
@@ -17,12 +17,12 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Reports</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -30,7 +30,7 @@
 
 <div id="contentArea">
 
-  <ww:text name="The operation generated an empty report."/>
+  <s:text name="The operation generated an empty report."/>
 
 </div>
 </body>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/pickReport.jsp Wed Oct  1 02:11:06 2008
@@ -17,12 +17,12 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Reports</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -30,12 +30,12 @@
 
 <div id="contentArea">
 
-  <ww:form action="generateReport" namespace="/report" 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"/>
-    <ww:submit value="Show Report"/>
-  </ww:form>
+  <s:form action="generateReport" namespace="/report" 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"/>
+    <s:submit value="Show Report"/>
+  </s:form>
 
 </div>
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp Wed Oct  1 02:11:06 2008
@@ -17,7 +17,7 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
@@ -25,7 +25,7 @@
 <html>
 <head>
   <title>Search Results</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -46,40 +46,40 @@
   <div id="searchBox">
 
     <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="${completeQueryString}"/>
+        <s:hidden name="fromFilterSearch" value="${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>
       </c:if>
     <c:if test="${fromFilterSearch == false}">
-      <ww:form method="get" action="quickSearch" validate="true">
-        <ww:textfield label="Search for" size="50" name="q"/>
-        <ww:checkbox label="Search within results" name="searchResultsOnly"/>        
-        <ww:hidden name="completeQueryString" value="${completeQueryString}"/>        
-        <ww:submit label="Go!"/>
-      </ww:form> 
+      <s:form method="get" action="quickSearch" validate="true">
+        <s:textfield label="Search for" size="50" name="q"/>
+        <s:checkbox label="Search within results" name="searchResultsOnly"/>        
+        <s:hidden name="completeQueryString" value="${completeQueryString}"/>        
+        <s:submit label="Go!"/>
+      </s:form> 
       <script type="text/javascript">
         document.getElementById("quickSearch_q").focus();
       </script>
     </c:if>
 
   <p>
-    <ww:actionerror/>
+    <s:actionerror/>
   </p>
 
   </div>
@@ -111,51 +111,51 @@
             <%-- Prev & Next icons --%>
               <c:if test="${fromFilterSearch == false}">
                <c:set var="prevPageUrl">
-                 <ww:url action="quickSearch" namespace="/">
-                   <ww:param name="q" value="%{'${q}'}"/>                
-                   <ww:param name="currentPage" value="%{'${currentPage - 1}'}"/>
-                 </ww:url>
+                 <s:url action="quickSearch" namespace="/">
+                   <s:param name="q" value="%{'${q}'}"/>                
+                   <s:param name="currentPage" value="%{'${currentPage - 1}'}"/>
+                 </s:url>
        	      </c:set>
        	      <c:set var="nextPageUrl">
-                 <ww:url action="quickSearch" namespace="/">
-                   <ww:param name="q" value="%{'${q}'}"/>                
-                   <ww:param name="currentPage" value="%{'${currentPage + 1}'}"/>
-                 </ww:url>
+                 <s:url action="quickSearch" namespace="/">
+                   <s:param name="q" value="%{'${q}'}"/>                
+                   <s:param name="currentPage" value="%{'${currentPage + 1}'}"/>
+                 </s:url>
        	      </c:set>    
               </c:if>
 
               <c:if test="${fromFilterSearch == true}">
                <c:set var="prevPageUrl">
-                 <ww:url action="filteredSearch" namespace="/">
- <%-- 		  <ww:param name="q" value="%{'${q}'}"/>   --%>
-                   <ww:param name="rowCount" value="%{'${rowCount}'}"/>  
-                   <ww:param name="groupId" value="%{'${groupId}'}"/>
-                   <ww:param name="artifactId" value="%{'${artifactId}'}"/>
-                   <ww:param name="version" value="%{'${version}'}"/>
-                   <ww:param name="className" value="%{'${className}'}"/>
-                   <ww:param name="repositoryId" value="%{'${repositoryId}'}"/>
-                   <ww:param name="filterSearch" value="%{'${filterSearch}'}"/>
-  		   <ww:param name="fromResultsPage" value="true"/>
-                   <ww:param name="currentPage" value="%{'${currentPage - 1}'}"/>
- 		  <ww:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
- 		  <ww:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
-                 </ww:url>
+                 <s:url action="filteredSearch" namespace="/">
+ <%-- 		  <s:param name="q" value="%{'${q}'}"/>   --%>
+                   <s:param name="rowCount" value="%{'${rowCount}'}"/>  
+                   <s:param name="groupId" value="%{'${groupId}'}"/>
+                   <s:param name="artifactId" value="%{'${artifactId}'}"/>
+                   <s:param name="version" value="%{'${version}'}"/>
+                   <s:param name="className" value="%{'${className}'}"/>
+                   <s:param name="repositoryId" value="%{'${repositoryId}'}"/>
+                   <s:param name="filterSearch" value="%{'${filterSearch}'}"/>
+  		   <s:param name="fromResultsPage" value="true"/>
+                   <s:param name="currentPage" value="%{'${currentPage - 1}'}"/>
+ 		  <s:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
+ 		  <s:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
+                 </s:url>
        	      </c:set>
        	      <c:set var="nextPageUrl">
-                <ww:url action="filteredSearch" namespace="/">
-<%-- 		 <ww:param name="q" value="%{'${q}'}"/> --%>
-                  <ww:param name="rowCount" value="%{'${rowCount}'}"/>  
-                  <ww:param name="groupId" value="%{'${groupId}'}"/>
-                  <ww:param name="artifactId" value="%{'${artifactId}'}"/>
-                  <ww:param name="version" value="%{'${version}'}"/>
-                  <ww:param name="className" value="%{'${className}'}"/>
-                  <ww:param name="repositoryId" value="%{'${repositoryId}'}"/>
-                  <ww:param name="filterSearch" value="%{'${filterSearch}'}"/>
-  		  <ww:param name="fromResultsPage" value="true"/>
-                  <ww:param name="currentPage" value="%{'${currentPage + 1}'}"/>
- 		  <ww:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
-		  <ww:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
-                </ww:url>
+                <s:url action="filteredSearch" namespace="/">
+<%-- 		 <s:param name="q" value="%{'${q}'}"/> --%>
+                  <s:param name="rowCount" value="%{'${rowCount}'}"/>  
+                  <s:param name="groupId" value="%{'${groupId}'}"/>
+                  <s:param name="artifactId" value="%{'${artifactId}'}"/>
+                  <s:param name="version" value="%{'${version}'}"/>
+                  <s:param name="className" value="%{'${className}'}"/>
+                  <s:param name="repositoryId" value="%{'${repositoryId}'}"/>
+                  <s:param name="filterSearch" value="%{'${filterSearch}'}"/>
+  		  <s:param name="fromResultsPage" value="true"/>
+                  <s:param name="currentPage" value="%{'${currentPage + 1}'}"/>
+ 		  <s:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
+		  <s:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
+                </s:url>
       	      </c:set>    
              </c:if>
             
@@ -199,12 +199,12 @@
                             <c:choose>                   			    
 		              <c:when test="${i != currentPage}">
 		                <c:set var="specificPageUrl">
-		                  <ww:url action="quickSearch" namespace="/">
-		                    <ww:param name="q" value="%{'${q}'}"/>
-		                    <ww:param name="currentPage" value="%{'${i}'}"/>
-		                    <ww:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
-		                    <ww:param name="completeQueryString" value="%{'${completeQueryString}'}"/>  
-  		                  </ww:url>
+		                  <s:url action="quickSearch" namespace="/">
+		                    <s:param name="q" value="%{'${q}'}"/>
+		                    <s:param name="currentPage" value="%{'${i}'}"/>
+		                    <s:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
+		                    <s:param name="completeQueryString" value="%{'${completeQueryString}'}"/>  
+  		                  </s:url>
 		      	        </c:set>
 			          <a href="${specificPageUrl}">${i + 1}</a>
 			      </c:when>
@@ -218,20 +218,20 @@
                             <c:choose>                  			    
 		              <c:when test="${i != currentPage}">
 		                <c:set var="specificPageUrl">
-		                  <ww:url action="filteredSearch" namespace="/">
-<%-- 		                    <ww:param name="q" value="%{'${q}'}"/>   --%>
-                                    <ww:param name="rowCount" value="%{'${rowCount}'}"/>  
-                                    <ww:param name="groupId" value="%{'${groupId}'}"/>
-                                    <ww:param name="artifactId" value="%{'${artifactId}'}"/>
-                                    <ww:param name="version" value="%{'${version}'}"/>
-                                    <ww:param name="className" value="%{'${className}'}"/>
-                                    <ww:param name="repositoryId" value="%{'${repositoryId}'}"/>
-                                    <ww:param name="filterSearch" value="%{'${filterSearch}'}"/>
-		                    <ww:param name="fromResultsPage" value="true"/>
-		                    <ww:param name="currentPage" value="%{'${i}'}"/>
-		                    <ww:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
-		                    <ww:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
-		                  </ww:url>
+		                  <s:url action="filteredSearch" namespace="/">
+<%-- 		                    <s:param name="q" value="%{'${q}'}"/>   --%>
+                                    <s:param name="rowCount" value="%{'${rowCount}'}"/>  
+                                    <s:param name="groupId" value="%{'${groupId}'}"/>
+                                    <s:param name="artifactId" value="%{'${artifactId}'}"/>
+                                    <s:param name="version" value="%{'${version}'}"/>
+                                    <s:param name="className" value="%{'${className}'}"/>
+                                    <s:param name="repositoryId" value="%{'${repositoryId}'}"/>
+                                    <s:param name="filterSearch" value="%{'${filterSearch}'}"/>
+		                    <s:param name="fromResultsPage" value="true"/>
+		                    <s:param name="currentPage" value="%{'${i}'}"/>
+		                    <s:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
+		                    <s:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
+		                  </s:url>
 		      	        </c:set>
 				<a href="${specificPageUrl}">${i + 1}</a>
 			      </c:when>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp Wed Oct  1 02:11:06 2008
@@ -17,7 +17,7 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
@@ -26,12 +26,12 @@
 <html>
 <head>
   <title>Browse Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
-<ww:set name="model" value="model"/>
+<s:set name="model" value="model"/>
 <c:choose>
   <c:when test="${model.packaging == 'maven-plugin'}">
     <c:url var="imageUrl" value="/images/mavenplugin.gif"/>
@@ -77,53 +77,53 @@
   <div id="tabs">
     <span>
       <c:set var="url">
-        <ww:url action="showArtifact">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifact">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Info</my:currentWWUrl>
       <c:set var="url">
-        <ww:url action="showArtifactDependencies">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactDependencies">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependencies</my:currentWWUrl>
       <c:set var="url">
-        <ww:url action="showArtifactDependencyTree">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactDependencyTree">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependency Tree</my:currentWWUrl>
       <c:set var="url">
-        <ww:url action="showArtifactDependees">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactDependees">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Used By</my:currentWWUrl>
       <c:set var="url">
-        <ww:url action="showArtifactMailingLists">
-          <ww:param name="groupId" value="%{groupId}"/>
-          <ww:param name="artifactId" value="%{artifactId}"/>
-          <ww:param name="version" value="%{version}"/>
-        </ww:url>
+        <s:url action="showArtifactMailingLists">
+          <s:param name="groupId" value="%{groupId}"/>
+          <s:param name="artifactId" value="%{artifactId}"/>
+          <s:param name="version" value="%{version}"/>
+        </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Mailing Lists</my:currentWWUrl>
       <%-- POSTPONED to 1.0-alpha-2
       <redback:ifAnyAuthorized permissions="archiva-access-reports">
         <c:set var="url">
-	      <ww:url action="showArtifactReports">
-	        <ww:param name="groupId" value="%{groupId}"/>
-	        <ww:param name="artifactId" value="%{artifactId}"/>
-	        <ww:param name="version" value="%{version}"/>
-	      </ww:url>
+	      <s:url action="showArtifactReports">
+	        <s:param name="groupId" value="%{groupId}"/>
+	        <s:param name="artifactId" value="%{artifactId}"/>
+	        <s:param name="version" value="%{version}"/>
+	      </s:url>
 	    </c:set>
 	    <my:currentWWUrl url="${url}">Reports</my:currentWWUrl>
       </redback:ifAnyAuthorized>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp Wed Oct  1 02:11:06 2008
@@ -19,13 +19,13 @@
 
 <%-- http://www.opensymphony.com/webwork/wikidocs/File%20Upload%20Interceptor.html --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <html>
 <head>
   <title>Upload Artifact</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -33,13 +33,13 @@
 
 <div id="contentArea">
 
-  <ww:actionerror/>
-  <ww:actionmessage/>
+  <s:actionerror/>
+  <s:actionmessage/>
 
-  <ww:form action="upload!doUpload" method="post" enctype="multipart/form-data" validate="true">    
+  <s:form action="upload!doUpload" method="post" enctype="multipart/form-data" validate="true">    
     <%@ include file="/WEB-INF/jsp/include/uploadForm.jspf" %>
-    <ww:submit/>
-  </ww:form>
+    <s:submit/>
+  </s:form>
 </div>
 
 </body>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag Wed Oct  1 02:11:06 2008
@@ -17,18 +17,18 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ attribute name="action" %>
 <%@ attribute name="namespace" %>
 <%@ attribute name="url" %>
 
 <c:set var="currentUrl">
-  <ww:url/>
+  <s:url/>
 </c:set>
 <c:if test="${!empty (action) && !empty (namespace)}">
   <c:set var="url">
-    <ww:url action="${action}" namespace="${namespace}"/>
+    <s:url action="%{action}" namespace="%{namespace}"/>
   </c:set>
 </c:if>
 <c:set var="text">

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml Wed Oct  1 02:11:06 2008
@@ -26,7 +26,7 @@
 
   <filter>
     <filter-name>webwork-cleanup</filter-name>
-    <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
+    <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
   </filter>
 
   <filter>
@@ -36,7 +36,7 @@
 
   <filter>
     <filter-name>webwork</filter-name>
-    <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+    <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
   </filter>
 
   <!-- this must be before the sitemesh filter -->

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/archiva/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/archiva/checkboxlist.ftl?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/archiva/checkboxlist.ftl (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/archiva/checkboxlist.ftl Wed Oct  1 02:11:06 2008
@@ -1,4 +1,4 @@
-<@ww.iterator value="parameters.list">
+<@s.iterator value="parameters.list">
     <#if parameters.listKey?exists>
         <#assign itemKey = stack.findValue(parameters.listKey)/>
     <#else>
@@ -36,4 +36,4 @@
 <label for="${parameters.id?html}${itemKey?html}"><#rt/>
     ${itemValue}<#t/>
 </label><br/>
-</@ww.iterator>
+</@s.iterator>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/archiva/radiomap.ftl
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/archiva/radiomap.ftl?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/archiva/radiomap.ftl (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/archiva/radiomap.ftl Wed Oct  1 02:11:06 2008
@@ -1,4 +1,4 @@
-<@ww.iterator value="parameters.list">
+<@s.iterator value="parameters.list">
     <#if parameters.listKey?exists>
         <#assign itemKey = stack.findValue(parameters.listKey)/>
     <#else>
@@ -36,4 +36,4 @@
 <label for="${parameters.id?html}${itemKey?html}"><#rt/>
     ${itemValue}<#t/>
 </label><br/>
-</@ww.iterator>
+</@s.iterator>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl Wed Oct  1 02:11:06 2008
@@ -1,7 +1,7 @@
 <input type="hidden"<#rt/>
  name="${parameters.name?default("")?html}"<#rt/>
 <#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@s.property value="parameters.nameValue"/>"<#rt/>
 </#if>
 <#if parameters.id?exists>
  id="${parameters.id?html}"<#rt/>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractWebworkTestCase.java Wed Oct  1 02:11:06 2008
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,12 +19,8 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.Configuration;
+import com.opensymphony.xwork2.Action;
 import org.apache.maven.archiva.configuration.OrganisationInformation;
-import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.easymock.MockControl;
 
 /**
  * @author <a href="mailto:james@atlassian.com">James William Dumay</a>

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.OrganisationInformation;
 import org.apache.maven.archiva.configuration.Configuration;

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
@@ -33,7 +33,7 @@
 import org.apache.maven.archiva.policies.ReleasesPolicy;
 import org.apache.maven.archiva.policies.SnapshotsPolicy;
 import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
 import org.codehaus.plexus.registry.RegistryException;
 import org.easymock.MockControl;
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
@@ -28,7 +28,7 @@
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
 import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
 import org.codehaus.plexus.registry.RegistryException;
 import org.easymock.MockControl;
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java Wed Oct  1 02:11:06 2008
@@ -17,7 +17,7 @@
 
 package org.apache.maven.archiva.web.action.admin.connectors.proxy;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
@@ -25,7 +25,7 @@
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
 import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
 import org.codehaus.plexus.registry.RegistryException;
 import org.easymock.MockControl;
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
@@ -33,7 +33,7 @@
 import org.apache.maven.archiva.policies.ReleasesPolicy;
 import org.apache.maven.archiva.policies.SnapshotsPolicy;
 import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
 import org.codehaus.plexus.registry.RegistryException;
 import org.easymock.MockControl;
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java Wed Oct  1 02:11:06 2008
@@ -17,7 +17,7 @@
 
 package org.apache.maven.archiva.web.action.admin.connectors.proxy;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
@@ -25,7 +25,7 @@
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
 import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
 import org.codehaus.plexus.registry.RegistryException;
 import org.easymock.MockControl;
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
@@ -28,7 +28,7 @@
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
 import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
 import org.codehaus.plexus.registry.RegistryException;
 import org.easymock.MockControl;
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
@@ -30,7 +30,7 @@
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
 import org.apache.maven.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator;
 import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
 import org.codehaus.plexus.registry.RegistryException;
 import org.easymock.MockControl;
 

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,15 +19,15 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.security.ArchivaRoleConstants;
 import org.codehaus.plexus.redback.role.RoleManager;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.easymock.MockControl;
 
@@ -63,6 +63,7 @@
         return AbstractManagedRepositoriesAction.class.getName().replace( '.', '/' ) + "Test.xml";
     }
     
+    @Override
     protected void setUp()
         throws Exception
     {

Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java?rev=700721&r1=700720&r2=700721&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java (original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java Wed Oct  1 02:11:06 2008
@@ -19,12 +19,12 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.easymock.MockControl;
 



Mime
View raw message