archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r706118 [3/5] - in /archiva/branches/MRM-124: ./ archiva-docs/ archiva-docs/src/site/ archiva-docs/src/site/apt/ archiva-docs/src/site/apt/adminguide/ archiva-jetty/ archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven...
Date Mon, 20 Oct 2008 04:17:22 GMT
Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp Sun Oct 19 21:17:16 2008
@@ -17,12 +17,12 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Add Legacy Artifact Path</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -65,17 +65,17 @@
   }
   </script>
 
-  <ww:actionmessage/>
-  <ww:actionerror/>
-  <ww:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">
-    <ww:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>
-    <ww:textfield name="groupId" label="GroupId" size="20" required="true"/>
-    <ww:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>
-    <ww:textfield name="version" label="Version" size="20" required="true"/>
-    <ww:textfield name="classifier" label="Classifier" size="20" required="false"/>
-    <ww:textfield name="type" label="Type" size="20" required="true"/>
-    <ww:submit value="Add Legacy Artifact Path"/>
-  </ww:form>
+  <s:actionmessage/>
+  <s:actionerror/>
+  <s:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">
+    <s:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>
+    <s:textfield name="groupId" label="GroupId" size="20" required="true"/>
+    <s:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>
+    <s:textfield name="version" label="Version" size="20" required="true"/>
+    <s:textfield name="classifier" label="Classifier" size="20" required="false"/>
+    <s:textfield name="type" label="Type" size="20" required="true"/>
+    <s:submit value="Add Legacy Artifact Path"/>
+  </s:form>
 
   <script type="text/javascript">
     var ref = document.getElementById("addLegacyArtifactPath_legacyArtifactPath_artifact").value;

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxyConnector.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxyConnector.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxyConnector.jsp Sun Oct 19 21:17:16 2008
@@ -17,12 +17,12 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Add Proxy Connector</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -31,13 +31,13 @@
 
 <div id="contentArea">
 
-  <ww:actionerror/>
-  <ww:actionmessage/>
+  <s:actionerror/>
+  <s:actionmessage/>
   
-  <ww:form name="saveProxyConnector" method="post" action="addProxyConnector!commit" namespace="/admin" validate="true">
+  <s:form name="saveProxyConnector" method="post" action="addProxyConnector!commit" namespace="/admin" validate="true">
     <%@ include file="/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf" %>
-    <ww:submit value="Add Proxy Connector"/>
-  </ww:form>
+    <s:submit value="Add Proxy Connector"/>
+  </s:form>
 
 </div>
 

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp Sun Oct 19 21:17:16 2008
@@ -17,12 +17,12 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Add Remote Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -31,12 +31,12 @@
 
 <div id="contentArea">
 
-  <ww:actionmessage/>
-  <ww:form method="post" action="addRemoteRepository!commit" namespace="/admin" validate="true">
-    <ww:textfield name="repository.id" label="Identifier" size="10" required="true"/>
+  <s:actionmessage/>
+  <s:form method="post" action="addRemoteRepository!commit" namespace="/admin" validate="true">
+    <s:textfield name="repository.id" label="Identifier" size="10" required="true"/>
     <%@ include file="/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf" %>
-    <ww:submit value="Add Repository"/>
-  </ww:form>
+    <s:submit value="Add Repository"/>
+  </s:form>
 
   <script type="text/javascript">
     document.getElementById("addRemoteRepository_id").focus();

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp Sun Oct 19 21:17:16 2008
@@ -17,12 +17,12 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Add Managed Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -30,13 +30,13 @@
 <h1>Admin: Add Managed Repository</h1>
 
 <div id="contentArea">
-  <ww:actionerror/>
-  <ww:actionmessage/>
-  <ww:form method="post" action="addRepository!commit" namespace="/admin" validate="true">
-    <ww:textfield name="repository.id" label="Identifier" size="10" required="true"/>
+  <s:actionerror/>
+  <s:actionmessage/>
+  <s:form method="post" action="addRepository!commit" namespace="/admin" validate="true">
+    <s:textfield name="repository.id" label="Identifier" size="10" required="true"/>
     <%@ include file="/WEB-INF/jsp/admin/include/repositoryForm.jspf" %>
-    <ww:submit value="Add Repository"/>
-  </ww:form>
+    <s:submit value="Add Repository"/>
+  </s:form>
 
   <script type="text/javascript">
     document.getElementById("addRepository_repository_id").focus();

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Sun Oct 19 21:17:16 2008
@@ -17,26 +17,26 @@
   ~ 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>Configure Appearance</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 <h1>Appearance</h1>
 
 <div style="float: right">
-  <a href="<ww:url action='editAppearance' />">Edit</a>
+  <a href="<s:url action='editAppearance' />">Edit</a>
 </div>
 <h2>Organization Details</h2>
 
 <p>
   The logo in the top right of the screen is controlled by the following settings.
-  <a href="<ww:url action='editAppearance' />">Change your appearence</a>
+  <a href="<s:url action='editAppearance' />">Change your appearence</a>
 </p>
 
 <h3>Organization Information</h3>
@@ -60,7 +60,7 @@
         <tr>
           <th>&nbsp;</th>
           <td>
-      <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
+            <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
           </td>
         </tr>
       </table>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp Sun Oct 19 21:17:16 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>Admin: Add Managed Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -103,33 +103,33 @@
     </table>
   </div>
   	
-  <ww:form method="post" action="${action}" namespace="/admin" validate="true" theme="simple">
+  <s:form method="post" action="%{action}" namespace="/admin" validate="true" theme="simple">
     <div class="buttons">      
-      <ww:hidden name="repository.id" value="${repository.id}"/>
-      <ww:hidden name="repository.name" value="${repository.name}"/>
-      <ww:hidden name="repository.location" value="${repository.location}"/>
-      <ww:hidden name="repository.indexDir" value="${repository.indexDir}"/>
-      <ww:hidden name="repository.layout" value="${repository.layout}"/>
-      <ww:hidden name="repository.refreshCronExpression" value="${repository.refreshCronExpression}"/>
-      <ww:hidden name="repository.daysOlder" value="${repository.daysOlder}"/>
-      <ww:hidden name="repository.retentionCount" value="${repository.retentionCount}"/>
-      <ww:hidden name="repository.releases" value="${repository.releases}"/>
-      <ww:hidden name="repository.snapshots" value="${repository.snapshots}"/>
-      <ww:hidden name="repository.scanned" value="${repository.scanned}"/>
-      <ww:hidden name="repository.deleteReleasedSnapshots" value="${repository.deleteReleasedSnapshots}"/>
+      <s:hidden name="repository.id" value="%{#attr.repository.id}"/>
+      <s:hidden name="repository.name" value="%{#attr.repository.name}"/>
+      <s:hidden name="repository.location" value="%{#attr.repository.location}"/>
+      <s:hidden name="repository.indexDir" value="%{#attr.repository.indexDir}"/>
+      <s:hidden name="repository.layout" value="%{#attr.repository.layout}"/>
+      <s:hidden name="repository.refreshCronExpression" value="%{#attr.repository.refreshCronExpression}"/>
+      <s:hidden name="repository.daysOlder" value="%{#attr.repository.daysOlder}"/>
+      <s:hidden name="repository.retentionCount" value="%{#attr.repository.retentionCount}"/>
+      <s:hidden name="repository.releases" value="%{#attr.repository.releases}"/>
+      <s:hidden name="repository.snapshots" value="%{#attr.repository.snapshots}"/>
+      <s:hidden name="repository.scanned" value="%{#attr.repository.scanned}"/>
+      <s:hidden name="repository.deleteReleasedSnapshots" value="%{#attr.repository.deleteReleasedSnapshots}"/>
       
       <c:choose>      
         <c:when test="${action == 'addRepository'}">
-      	  <ww:submit value="Save" method="confirmAdd"/>
+      	  <s:submit value="Save" method="confirmAdd"/>
       	</c:when>
       	<c:otherwise>
-      	  <ww:submit value="Save" method="confirmUpdate"/>
+      	  <s:submit value="Save" method="confirmUpdate"/>
       	</c:otherwise>
      </c:choose>
       
-      <ww:submit value="Cancel" method="execute"/>
+      <s:submit value="Cancel" method="execute"/>
     </div>
-  </ww:form>
+  </s:form>
   
 </body>
 </html>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp Sun Oct 19 21:17:16 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 - Database</title>
-<ww:head />
+<s:head />
 </head>
 
 <body>
@@ -35,8 +35,8 @@
 
 <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" /> 
@@ -45,21 +45,21 @@
 
 <h2>Database - Unprocessed Artifacts Scanning</h2>
 
-  <ww:form method="post" action="database!updateSchedule" 
+  <s:form method="post" action="database!updateSchedule" 
              namespace="/admin" validate="false" theme="simple">
     <table>
-      <ww:textfield name="cron" label="Cron" size="40" theme="xhtml" />
+      <s:textfield name="cron" label="Cron" size="40" theme="xhtml" />
       <tr>
         <td colspan="2">
-          <ww:submit value="Update Cron" />
+          <s:submit value="Update Cron" />
         </td>
       </tr>
     </table>                 
-  </ww:form>
+  </s:form>
   
-  <ww:form action="updateDatabase" theme="simple">
-    <ww:submit value="Update Database Now"/>
-  </ww:form>
+  <s:form action="updateDatabase" theme="simple">
+    <s:submit value="Update Database Now"/>
+  </s:form>
 
 <h2>Database - Unprocessed Artifacts Scanning</h2>
 
@@ -71,7 +71,7 @@
   <c:otherwise>
     <%-- Display the consumers. --%>
 
-    <ww:form method="post" action="database!updateUnprocessedConsumers" 
+    <s:form method="post" action="database!updateUnprocessedConsumers" 
              namespace="/admin" validate="false" theme="simple">
     <table class="consumers">
       <tr>
@@ -107,11 +107,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>
@@ -126,7 +126,7 @@
   <c:otherwise>
     <%-- Display the consumers. --%>
 
-    <ww:form method="post" action="database!updateCleanupConsumers" 
+    <s:form method="post" action="database!updateCleanupConsumers" 
              namespace="/admin" validate="false" theme="simple">
     <table class="consumers">
       <tr>
@@ -162,11 +162,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>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp Sun Oct 19 21:17:16 2008
@@ -17,19 +17,19 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Delete Network Proxy</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Delete Network Proxy</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
@@ -43,10 +43,10 @@
     Are you sure you want to delete network proxy <code>${proxyid}</code> ?
   </p>
 
-  <ww:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">
-    <ww:hidden name="proxyid"/>
-    <ww:submit value="Delete"/>
-  </ww:form>
+  <s:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">
+    <s:hidden name="proxyid"/>
+    <s:submit value="Delete"/>
+  </s:form>
 </div>
 
 </body>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp Sun Oct 19 21:17:16 2008
@@ -17,19 +17,19 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Delete Proxy Connector</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Delete Proxy Connector</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
@@ -43,11 +43,11 @@
     Are you sure you want to delete proxy connector <code>[ ${source} , ${target} ]</code> ?
   </p>
 
-  <ww:form method="post" action="deleteProxyConnector!delete" namespace="/admin" validate="true">
-    <ww:hidden name="target"/>
-    <ww:hidden name="source"/>
-    <ww:submit value="Delete"/>
-  </ww:form>
+  <s:form method="post" action="deleteProxyConnector!delete" namespace="/admin" validate="true">
+    <s:hidden name="target"/>
+    <s:hidden name="source"/>
+    <s:submit value="Delete"/>
+  </s:form>
 </div>
 
 </body>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp Sun Oct 19 21:17:16 2008
@@ -17,19 +17,19 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Delete Remote Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Delete Remote Repository</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
@@ -60,13 +60,13 @@
     </table>
   </div>
 
-  <ww:form method="post" action="deleteRemoteRepository" namespace="/admin" validate="true" theme="simple">
-    <ww:hidden name="repoid"/>
+  <s:form method="post" action="deleteRemoteRepository" namespace="/admin" validate="true" theme="simple">
+    <s:hidden name="repoid"/>
     <div class="buttons">
-      <ww:submit value="Confirm" method="delete"/>
-      <ww:submit value="Cancel" method="execute"/>
+      <s:submit value="Confirm" method="delete"/>
+      <s:submit value="Cancel" method="execute"/>
     </div>
-  </ww:form>
+  </s:form>
 </div>
 
 </body>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp Sun Oct 19 21:17:16 2008
@@ -17,19 +17,19 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Delete Managed Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Delete Managed Repository</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
@@ -60,14 +60,14 @@
     </table>
   </div>
 
-  <ww:form method="post" action="deleteRepository" namespace="/admin" validate="true" theme="simple">
-    <ww:hidden name="repoid"/>
+  <s:form method="post" action="deleteRepository" namespace="/admin" validate="true" theme="simple">
+    <s:hidden name="repoid"/>
     <div class="buttons">
-      <ww:submit value="Delete Configuration Only" method="deleteEntry" />
-      <ww:submit value="Delete Configuration and Contents" method="deleteContents" />
-      <ww:submit value="Cancel" method="execute"/>
+      <s:submit value="Delete Configuration Only" method="deleteEntry" />
+      <s:submit value="Delete Configuration and Contents" method="deleteContents" />
+      <s:submit value="Cancel" method="execute"/>
     </div>
-  </ww:form>
+  </s:form>
 </div>
 
 </body>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp Sun Oct 19 21:17:16 2008
@@ -17,19 +17,19 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Delete Repository Group</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Delete Repository Group</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
@@ -52,13 +52,13 @@
     </table>
   </div>
 
-  <ww:form method="post" action="deleteRepositoryGroup" namespace="/admin" validate="true" theme="simple">
-    <ww:hidden name="repoGroupId"/>
+  <s:form method="post" action="deleteRepositoryGroup" namespace="/admin" validate="true" theme="simple">
+    <s:hidden name="repoGroupId"/>
     <div class="buttons">
-      <ww:submit value="Confirm" method="delete"/>
-      <ww:submit value="Cancel" method="execute"/>
+      <s:submit value="Confirm" method="delete"/>
+      <s:submit value="Cancel" method="execute"/>
     </div>
-  </ww:form>
+  </s:form>
 </div>
 
 </body>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp Sun Oct 19 21:17:16 2008
@@ -17,19 +17,19 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Disable Proxy Connector</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Disable Proxy Connector</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
@@ -39,11 +39,11 @@
     Are you sure you want to disable proxy connector <code>[ ${source} , ${target} ]</code> ?
   </p>
 
-  <ww:form method="post" action="disableProxyConnector!disable" namespace="/admin" validate="true">
-    <ww:hidden name="target"/>
-    <ww:hidden name="source"/>
-    <ww:submit value="Disable"/>
-  </ww:form>
+  <s:form method="post" action="disableProxyConnector!disable" namespace="/admin" validate="true">
+    <s:hidden name="target"/>
+    <s:hidden name="source"/>
+    <s:submit value="Disable"/>
+  </s:form>
 </div>
 
 </body>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Sun Oct 19 21:17:16 2008
@@ -17,11 +17,11 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
   <title>Configure Appearance</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -33,14 +33,14 @@
   Enter the details of your organization below.
 </p>
 
-<ww:set name="editOrganisationInfo" value="editOrganisationInfo"/>
-<ww:actionmessage/>
-<ww:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
-    <ww:textfield name="organisationName" value="${organisationName}" label="Name" size="50"  />
-    <ww:textfield name="organisationUrl" value="${organisationUrl}" label="URL" size="50"/>
-    <ww:textfield name="organisationLogo" value="${organisationLogo}" label="Logo URL" size="50" />
-  <ww:submit value="Save"/>
-</ww:form>
+<s:set name="editOrganisationInfo" value="editOrganisationInfo"/>
+<s:actionmessage/>
+<s:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
+    <s:textfield name="organisationName" value="%{#attr.organisationName}" label="Name" size="50"  />
+    <s:textfield name="organisationUrl" value="%{#attr.organisationUrl}" label="URL" size="50"/>
+    <s:textfield name="organisationLogo" value="%{#attr.organisationLogo}" label="Logo URL" size="50" />
+  <s:submit value="Save"/>
+</s:form>
 </body>
 
 </html>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp Sun Oct 19 21:17:16 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" %>
 
 <c:choose>
@@ -33,7 +33,7 @@
 <html>
 <head>
   <title>Admin: ${addedit} Network Proxy</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -44,24 +44,24 @@
 
   <h2>${addedit} network proxy: ${networkProxyName}</h2>
 
-  <ww:actionerror/> 
-  <ww:actionmessage/>
+  <s:actionerror/> 
+  <s:actionmessage/>
   
-  <ww:form method="post" action="saveNetworkProxy" namespace="/admin">
-    <ww:hidden name="mode"/>
+  <s:form method="post" action="saveNetworkProxy" namespace="/admin">
+    <s:hidden name="mode"/>
     
 	<c:choose>
 	  <c:when test="${mode == 'edit'}">
-	    <ww:hidden name="proxy.id"/>
+	    <s:hidden name="proxy.id"/>
 	  </c:when>
 	  <c:otherwise>
-	    <ww:textfield name="proxy.id" label="Identifier" size="10" required="true"/>
+	    <s:textfield name="proxy.id" label="Identifier" size="10" required="true"/>
 	  </c:otherwise>
 	</c:choose>
     
     <%@ include file="/WEB-INF/jsp/admin/include/networkProxyForm.jspf" %>
-    <ww:submit value="Save Network Proxy"/>
-  </ww:form>
+    <s:submit value="Save Network Proxy"/>
+  </s:form>
 
   <script type="text/javascript">
     document.getElementById("saveNetworkProxy_host").focus();

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp Sun Oct 19 21:17:16 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>Admin : Edit Proxy Connector</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -32,13 +32,13 @@
 
 <div id="contentArea">
 
-  <ww:actionerror/>
-  <ww:actionmessage/>
+  <s:actionerror/>
+  <s:actionmessage/>
 
-  <ww:form name="saveProxyConnector" method="post" action="editProxyConnector!commit" namespace="/admin" validate="true">
+  <s:form name="saveProxyConnector" method="post" action="editProxyConnector!commit" namespace="/admin" validate="true">
     <%@ include file="/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf" %>
-    <ww:submit value="Save Proxy Connector"/>
-  </ww:form>
+    <s:submit value="Save Proxy Connector"/>
+  </s:form>
   
 </div>
 

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp Sun Oct 19 21:17:16 2008
@@ -17,28 +17,28 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Edit Remote Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Edit Remote Repository</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
-  <ww:actionmessage/>
-  <ww:form method="post" action="editRemoteRepository!commit" namespace="/admin" validate="false">
-    <ww:hidden name="repository.id"/>
+  <s:actionmessage/>
+  <s:form method="post" action="editRemoteRepository!commit" namespace="/admin" validate="false">
+    <s:hidden name="repository.id"/>
     <%@ include file="/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf" %>
-    <ww:submit value="Update Repository"/>
-  </ww:form>
+    <s:submit value="Update Repository"/>
+  </s:form>
 
   <script type="text/javascript">
     document.getElementById("editRemoteRepository_repository_name").focus();

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp Sun Oct 19 21:17:16 2008
@@ -17,29 +17,29 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Edit Managed Repository</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Edit Managed Repository</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
-  <ww:actionmessage/>
-  <ww:form method="post" action="editRepository!commit" namespace="/admin" validate="false">
-    <ww:hidden name="repository.id"/>
-    <ww:label label="ID" name="repository.id" />
+  <s:actionmessage/>
+  <s:form method="post" action="editRepository!commit" namespace="/admin" validate="false">
+    <s:hidden name="repository.id"/>
+    <s:label label="ID" name="repository.id" />
     <%@ include file="/WEB-INF/jsp/admin/include/repositoryForm.jspf" %>
-    <ww:submit value="Update Repository"/>
-  </ww:form>
+    <s:submit value="Update Repository"/>
+  </s:form>
 
   <script type="text/javascript">
     document.getElementById("editRepository_repository_name").focus();

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/enableProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/enableProxyConnector.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/enableProxyConnector.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/enableProxyConnector.jsp Sun Oct 19 21:17:16 2008
@@ -17,19 +17,19 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
 <head>
   <title>Admin: Enable Proxy Connector</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 
 <h1>Admin: Enable Proxy Connector</h1>
 
-<ww:actionerror/>
+<s:actionerror/>
 
 <div id="contentArea">
 
@@ -39,11 +39,11 @@
     Are you sure you want to enable proxy connector <code>[ ${source} , ${target} ]</code> ?
   </p>
 
-  <ww:form method="post" action="enableProxyConnector!enable" namespace="/admin" validate="true">
-    <ww:hidden name="target"/>
-    <ww:hidden name="source"/>
-    <ww:submit value="Enable"/>
-  </ww:form>
+  <s:form method="post" action="enableProxyConnector!enable" namespace="/admin" validate="true">
+    <s:hidden name="target"/>
+    <s:hidden name="source"/>
+    <s:submit value="Enable"/>
+  </s:form>
 </div>
 
 </body>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp Sun Oct 19 21:17:16 2008
@@ -18,12 +18,12 @@
   --%>
 
 <p>
-  <ww:if test="hasActionErrors()">
+  <s:if test="hasActionErrors()">
     <b style="color: red;">Errors:</b>
-    <ww:iterator value="actionErrors">
+    <s:iterator value="actionErrors">
       <li style="color: red;">
-        <ww:property/>
+        <s:property/>
       </li>
-    </ww:iterator>
-  </ww:if>
+    </s:iterator>
+  </s:if>
 </p>
\ No newline at end of file

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf Sun Oct 19 21:17:16 2008
@@ -16,11 +16,11 @@
   ~ specific language governing permissions and limitations
   ~ 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" %>
 
-<ww:textfield name="proxy.protocol" label="Protocol" size="5" required="true"/>
-<ww:textfield name="proxy.host" label="Hostname" size="50" required="true"/>  
-<ww:textfield name="proxy.port" label="Port" size="5" required="true" />
-<ww:textfield name="proxy.username" label="Username" size="25" required="false" />
-<ww:password name="proxy.password" label="Password" size="25" required="false" />
+<s:textfield name="proxy.protocol" label="Protocol" size="5" required="true"/>
+<s:textfield name="proxy.host" label="Hostname" size="50" required="true"/>
+<s:textfield name="proxy.port" label="Port" size="5" required="true" />
+<s:textfield name="proxy.username" label="Username" size="25" required="false" />
+<s:password name="proxy.password" label="Password" size="25" required="false" />

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf Sun Oct 19 21:17:16 2008
@@ -16,21 +16,21 @@
   ~ specific language governing permissions and limitations
   ~ 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" %>
 
 <c:url var="iconDeleteUrl" value="/images/icons/delete.gif"/>
 <c:url var="iconCreateUrl" value="/images/icons/create.png"/>
 
 <%-- This hidden 'pattern' field is used by remove (white|black)list scripts --%>
-<ww:hidden name="pattern" />
+<s:hidden name="pattern" />
 
-<ww:hidden name="connector.order" />
+<s:hidden name="connector.order" />
 
-<ww:select name="connector.proxyId" list="proxyIdOptions" label="Network Proxy" required="true"/>
-<ww:select name="connector.sourceRepoId" list="managedRepoIdList"
+<s:select name="connector.proxyId" list="proxyIdOptions" label="Network Proxy" required="true"/>
+<s:select name="connector.sourceRepoId" list="managedRepoIdList"
            label="Managed Repository" required="true"/>
-<ww:select name="connector.targetRepoId" list="remoteRepoIdList"
+<s:select name="connector.targetRepoId" list="remoteRepoIdList"
            label="Remote Repository" required="true"/>
 
 <tr>
@@ -41,18 +41,18 @@
       <c:forEach items="${policyMap}" var="policy" varStatus="i">
         <tr>
           <td>
-            <ww:label for="policy_${policy.key}" required="true"
+            <s:label for="policy_%{#attr.policy.key}" required="true"
                       theme="simple">${policy.value.name}:
-            </ww:label>
+            </s:label>
           </td>
           <td>
             <c:set var="value">
-              <ww:property id="value" value="connector.policies['${policy.key}']" default="${policy.value.defaultOption}" />
+              <s:property id="value" value="%{#attr.connector.policies[#attr.policy.key]}" default="%{#attr.policy.value.defaultOption}" />
             </c:set>
-            <ww:select name="connector.policies['${policy.key}']"
-                       list="policyMap['${policy.key}'].options"
-                       value="'${value}'"
-                       id="policy_${policy.key}"
+            <s:select name="connector.policies['%{#attr.policy.key}']"
+                       list="%{#attr.policyMap[#attr.policy.key].options}"
+                       value="%{#attr.value}"
+                       id="policy_%{#attr.policy.key}"
                        theme="simple"
                        cssStyle="width: 10em"/>
           </td>
@@ -67,10 +67,10 @@
     <label for="propertiesEntry">Properties:</label>
   </td>
   <td>
-    <ww:textfield name="propertyKey" size="15" id="propertiesEntry" theme="simple"
+    <s:textfield name="propertyKey" size="15" id="propertiesEntry" theme="simple"
                   onkeypress="submitenter(event, 'addProperty')"/>
     :
-    <ww:textfield name="propertyValue" size="15" id="propertiesValue" theme="simple"
+    <s:textfield name="propertyValue" size="15" id="propertiesValue" theme="simple"
                   onkeypress="submitenter(event, 'addProperty')"/>
     <input type="button" onclick="submitForm('addProperty')" value="Add Property" />
   </td>
@@ -89,20 +89,20 @@
           <c:forEach items="${connector.properties}" var="property" varStatus="i">
             <tr>
               <td>
-                <ww:label for="property_${property.key}"
-                          theme="simple">${property.key}</ww:label>
+                <s:label for="property_%{#attr.property.key}"
+                          theme="simple">${property.key}</s:label>
               </td>
               <td>
-                <ww:textfield name="connector.properties['${property.key}']"
+                <s:textfield name="connector.properties['%{#attr.property.key}']"
                               size="15"
-                              id="property_${property.key}"
+                              id="property_%{#attr.property.key}"
                               theme="simple"/>
               </td>
               <td>
-                <ww:a href="#" title="Remove [${property.key}] Property"
-                      onclick="setAndSubmit('propertyKey', '${property.key}', 'removeProperty')"
+                <s:a href="#" title="Remove [%{#attr.property.key}] Property"
+                      onclick="setAndSubmit('propertyKey', '%{#attr.property.key}', 'removeProperty')"
                       theme="simple">
-                  <img src="${iconDeleteUrl}"/></ww:a>
+                  <img src="${iconDeleteUrl}"/></s:a>
               </td>
             </tr>
           </c:forEach>
@@ -117,7 +117,7 @@
     <label for="blackListEntry">Black List:</label>
   </td>
   <td>
-    <ww:textfield name="blackListPattern" size="30" id="blackListEntry" theme="simple"
+    <s:textfield name="blackListPattern" size="30" id="blackListEntry" theme="simple"
                   onkeypress="submitenter(event, 'addBlackListPattern')"/>
     <input type="button" onclick="submitForm('addBlackListPattern')" value="Add Pattern" />
   </td>
@@ -136,7 +136,7 @@
           <c:forEach items="${connector.blackListPatterns}" var="pattern" varStatus="i">
             <tr>
               <td>
-                <ww:hidden name="connector.blackListPatterns" value="${pattern}"/>
+                <s:hidden name="connector.blackListPatterns" value="%{#attr.pattern}"/>
                 <code>"${pattern}"</code>
               </td>
               <td>
@@ -157,7 +157,7 @@
     <label for="whiteListEntry">White List:</label>
   </td>
   <td>
-    <ww:textfield name="whiteListPattern" size="30" id="whiteListEntry" theme="simple"
+    <s:textfield name="whiteListPattern" size="30" id="whiteListEntry" theme="simple"
                   onkeypress="submitenter(event, 'addWhiteListPattern')"/>
     <input type="button" onclick="submitForm('addWhiteListPattern')" value="Add Pattern" />
   </td>
@@ -175,14 +175,14 @@
           <c:forEach items="${connector.whiteListPatterns}" var="pattern" varStatus="i">
             <tr>
               <td>
-                <ww:hidden name="connector.whiteListPatterns" value="${pattern}"/>
+                <s:hidden name="connector.whiteListPatterns" value="%{#attr.pattern}"/>
                 <code>"${pattern}"</code>
               </td>
               <td>
-                <ww:a href="#" title="Remove [${pattern}] Pattern"
-                      onclick="setAndSubmit('pattern', '${pattern}', 'removeWhiteListPattern')"
+                <s:a href="#" title="Remove [%{#attr.pattern}] Pattern"
+                      onclick="setAndSubmit('pattern', '%{#attr.pattern}', 'removeWhiteListPattern')"
                       theme="simple">
-                  <img src="${iconDeleteUrl}"/></ww:a>
+                  <img src="${iconDeleteUrl}"/></s:a>
               </td>
             </tr>
           </c:forEach>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf Sun Oct 19 21:17:16 2008
@@ -17,12 +17,12 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 
-<ww:textfield name="repository.name" label="Name" size="50" required="true"/>
-<ww:textfield name="repository.url" label="URL" size="50" required="true"/>
-<ww:textfield name="repository.username" label="Username" size="25" required="false"/>
-<ww:password name="repository.password" label="Password" size="25" required="false"/>
-<ww:textfield name="repository.timeout" label="Timeout in seconds" size="3" required="false"/>
-<ww:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"
+<s:textfield name="repository.name" label="Name" size="50" required="true"/>
+<s:textfield name="repository.url" label="URL" size="50" required="true"/>
+<s:textfield name="repository.username" label="Username" size="25" required="false"/>
+<s:password name="repository.password" label="Password" size="25" required="false"/>
+<s:textfield name="repository.timeout" label="Timeout in seconds" size="3" required="false"/>
+<s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"
            name="repository.layout" label="Type"/>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf Sun Oct 19 21:17:16 2008
@@ -16,21 +16,21 @@
   ~ specific language governing permissions and limitations
   ~ 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" %>
 
-<ww:textfield name="repository.name" label="Name" size="50" required="true"/>
-<ww:textfield name="repository.location" label="Directory" size="50" required="true"/>
-<ww:textfield name="repository.indexDir" label="Index Directory" size="50"/>
-<ww:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"
+<s:textfield name="repository.name" label="Name" size="50" required="true"/>
+<s:textfield name="repository.location" label="Directory" size="50" required="true"/>
+<s:textfield name="repository.indexDir" label="Index Directory" size="50"/>
+<s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"
            name="repository.layout" label="Type"/>
-<ww:textfield name="repository.refreshCronExpression" label="Cron" size="40" required="true"/>
-<ww:textfield name="repository.daysOlder" label="Repository Purge By Days Older Than" size="5"/>
-<ww:textfield name="repository.retentionCount" label="Repository Purge By Retention Count" size="5"/>
-<ww:checkbox name="repository.releases" value="repository.releases" label="Releases Included"/>
-<ww:checkbox name="repository.snapshots" value="repository.snapshots" label="Snapshots Included"/>
-<ww:checkbox name="repository.scanned" value="repository.scanned" label="Scannable"/>
-<ww:checkbox name="repository.deleteReleasedSnapshots" value="repository.deleteReleasedSnapshots"
+<s:textfield name="repository.refreshCronExpression" label="Cron" size="40" required="true"/>
+<s:textfield name="repository.daysOlder" label="Repository Purge By Days Older Than" size="5"/>
+<s:textfield name="repository.retentionCount" label="Repository Purge By Retention Count" size="5"/>
+<s:checkbox name="repository.releases" value="repository.releases" label="Releases Included"/>
+<s:checkbox name="repository.snapshots" value="repository.snapshots" label="Snapshots Included"/>
+<s:checkbox name="repository.scanned" value="repository.scanned" label="Scannable"/>
+<s:checkbox name="repository.deleteReleasedSnapshots" value="repository.deleteReleasedSnapshots"
              label="Delete Released Snapshots"/>
 
  

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp Sun Oct 19 21:17:16 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="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
@@ -25,7 +25,7 @@
 <html>
 <head>
   <title>Administration - Legacy support</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -34,17 +34,17 @@
 
 <div id="contentArea">
 
-<ww:actionerror/>
-<ww:actionmessage/>
+<s:actionerror/>
+<s:actionmessage/>
 
 <div class="admin">
 <div class="controls">
   <redback:ifAuthorized permission="archiva-manage-configuration">
-    <ww:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>
-    <ww:a href="%{addLegacyArtifactPathUrl}">
+    <s:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>
+    <s:a href="%{addLegacyArtifactPathUrl}">
       <img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
       Add
-    </ww:a>
+    </s:a>
   </redback:ifAuthorized>
 </div>
 <h2>Path Mappings</h2>
@@ -72,13 +72,13 @@
 <div class="controls">
     <%-- TODO: make some icons --%>
   <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
-    <ww:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">
-      <ww:param name="path" value="%{'${legacyArtifactPath.path}'}"/>
-    </ww:url>
-    <ww:a href="%{deleteLegacyArtifactPath}">
+    <s:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">
+      <s:param name="path" value="%{#attr.legacyArtifactPath.path}"/>
+    </s:url>
+    <s:a href="%{deleteLegacyArtifactPath}">
       <img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
       Delete
-    </ww:a>
+    </s:a>
   </redback:ifAnyAuthorized>
 </div>
 

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp Sun Oct 19 21:17:16 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="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org"%>
@@ -25,7 +25,7 @@
 <html>
 <head>
 <title>Administration - Network Proxies</title>
-<ww:head />
+<s:head />
 </head>
 
 <body>
@@ -34,16 +34,16 @@
 
 <div id="contentArea">
 
-<ww:actionerror /> <ww:actionmessage />
+<s:actionerror /> <s:actionmessage />
 
 <div class="admin">
 <div class="controls">
 <redback:ifAuthorized
   permission="archiva-manage-configuration">
-  <ww:url id="addNetworkProxyUrl" action="addNetworkProxy" />
-  <ww:a href="%{addNetworkProxyUrl}">
+  <s:url id="addNetworkProxyUrl" action="addNetworkProxy" />
+  <s:a href="%{addNetworkProxyUrl}">
     <img src="<c:url value="/images/icons/create.png" />" />
-        Add Network Proxy</ww:a>
+        Add Network Proxy</s:a>
 </redback:ifAuthorized></div>
 <h2>Network Proxies</h2>
 
@@ -70,18 +70,18 @@
       <div class="controls">
       <redback:ifAnyAuthorized
         permissions="archiva-manage-configuration">
-        <ww:url id="editNetworkProxyUrl" action="editNetworkProxy">
-          <ww:param name="proxyid" value="%{'${proxy.id}'}" />
-        </ww:url>
-        <ww:url id="deleteNetworkProxyUrl" action="deleteNetworkProxy" method="confirm">
-          <ww:param name="proxyid" value="%{'${proxy.id}'}" />
-        </ww:url>
-        <ww:a href="%{editNetworkProxyUrl}">
+        <s:url id="editNetworkProxyUrl" action="editNetworkProxy">
+          <s:param name="proxyid" value="%{#attr.proxy.id}" />
+        </s:url>
+        <s:url id="deleteNetworkProxyUrl" action="deleteNetworkProxy" method="confirm">
+          <s:param name="proxyid" value="%{#attr.proxy.id}" />
+        </s:url>
+        <s:a href="%{editNetworkProxyUrl}">
           <img src="<c:url value="/images/icons/edit.png" />" />
-            Edit Network Proxy</ww:a>
-        <ww:a href="%{deleteNetworkProxyUrl}">
+            Edit Network Proxy</s:a>
+        <s:a href="%{deleteNetworkProxyUrl}">
           <img src="<c:url value="/images/icons/delete.gif" />" />
-            Delete Network Proxy</ww:a>
+            Delete Network Proxy</s:a>
       </redback:ifAnyAuthorized></div>
 
       <table class="infoTable">

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp Sun Oct 19 21:17:16 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 - Proxy Connectors</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -43,18 +43,18 @@
 
 <div id="contentArea">
 
-<ww:actionerror/>
-<ww:actionmessage/>
+<s:actionerror/>
+<s:actionmessage/>
 
 <div style="float:right">  
   <c:choose>
 	<c:when test="${remoteRepoExists}">
 	  <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
-	    <ww:url id="addProxyConnectorUrl" action="addProxyConnector"/>
-	    <ww:a href="%{addProxyConnectorUrl}" cssClass="create">
+	    <s:url id="addProxyConnectorUrl" action="addProxyConnector"/>
+	    <s:a href="%{addProxyConnectorUrl}" cssClass="create">
 	      <img src="<c:url value="/images/icons/create.png" />"/>
 	      Add
-	    </ww:a>
+	    </s:a>
 	  </redback:ifAnyAuthorized>
 	</c:when>
 	<c:otherwise>
@@ -99,56 +99,56 @@
   <div class="connector ${rowColor}"> 
     <div class="controls">
       <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
-        <ww:url id="sortDownProxyConnectorUrl" action="sortDownProxyConnector">
-          <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
-          <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
-        </ww:url>
-        <ww:url id="sortUpProxyConnectorUrl" action="sortUpProxyConnector">
-          <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
-          <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
-        </ww:url>
-        <ww:url id="editProxyConnectorUrl" action="editProxyConnector">
-          <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
-          <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
-        </ww:url>
-        <ww:url id="deleteProxyConnectorUrl" action="deleteProxyConnector" method="confirmDelete">
-          <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
-          <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
-        </ww:url>
-        <ww:url id="enableProxyConnectorUrl" action="enableProxyConnector" method="confirmEnable">
-          <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
-          <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
-        </ww:url>
-        <ww:url id="disableProxyConnectorUrl" action="disableProxyConnector" method="confirmDisable">
-          <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
-          <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
-        </ww:url>
+        <s:url id="sortDownProxyConnectorUrl" action="sortDownProxyConnector">
+          <s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
+          <s:param name="target" value="%{#attr.connector.targetRepoId}"/>
+        </s:url>
+        <s:url id="sortUpProxyConnectorUrl" action="sortUpProxyConnector">
+          <s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
+          <s:param name="target" value="%{#attr.connector.targetRepoId}"/>
+        </s:url>
+        <s:url id="editProxyConnectorUrl" action="editProxyConnector">
+          <s:param name="target" value="%{#attr.connector.targetRepoId}"/>
+          <s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
+        </s:url>
+        <s:url id="deleteProxyConnectorUrl" action="deleteProxyConnector" method="confirmDelete">
+          <s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
+          <s:param name="target" value="%{#attr.connector.targetRepoId}"/>
+        </s:url>
+        <s:url id="enableProxyConnectorUrl" action="enableProxyConnector" method="confirmEnable">
+          <s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
+          <s:param name="target" value="%{#attr.connector.targetRepoId}"/>
+        </s:url>
+        <s:url id="disableProxyConnectorUrl" action="disableProxyConnector" method="confirmDisable">
+          <s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
+          <s:param name="target" value="%{#attr.connector.targetRepoId}"/>
+        </s:url>
         <c:if test="${connector.disabled}">
-            <ww:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
+            <s:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
 				<img src="${iconDisable}"/>
-			</ww:a>
+			</s:a>
         </c:if>
         <c:if test="${connector.disabled == false}">
-            <ww:a href="%{disableProxyConnectorUrl}" title="Disable Proxy Connector">
+            <s:a href="%{disableProxyConnectorUrl}" title="Disable Proxy Connector">
 				<img src="${iconEnable}"/>
-			</ww:a>
+			</s:a>
         </c:if>
         <c:if test="${pc.count > 1}">
-          <ww:a href="%{sortUpProxyConnectorUrl}" title="Move Proxy Connector Up">
+          <s:a href="%{sortUpProxyConnectorUrl}" title="Move Proxy Connector Up">
             <img src="${iconUpUrl}"/>
-          </ww:a>
+          </s:a>
         </c:if>
         <c:if test="${pc.count < numberOfRepos}">
-          <ww:a href="%{sortDownProxyConnectorUrl}" cssClass="down" title="Move Proxy Connector Down">
+          <s:a href="%{sortDownProxyConnectorUrl}" cssClass="down" title="Move Proxy Connector Down">
             <img src="${iconDownUrl}"/>
-          </ww:a>
+          </s:a>
         </c:if>
-        <ww:a href="%{editProxyConnectorUrl}" cssClass="edit" title="Edit Proxy Connector">
+        <s:a href="%{editProxyConnectorUrl}" cssClass="edit" title="Edit Proxy Connector">
           <img src="${iconEditUrl}"/>
-        </ww:a>
-        <ww:a href="%{deleteProxyConnectorUrl}" cssClass="delete" title="Delete Proxy Connector">
+        </s:a>
+        <s:a href="%{deleteProxyConnectorUrl}" cssClass="delete" title="Delete Proxy Connector">
           <img src="${iconDeleteUrl}"/>
-        </ww:a>
+        </s:a>
       </redback:ifAnyAuthorized>
     </div>
 
@@ -171,13 +171,13 @@
               <span class="directConnection">(Direct Connection)</span>
             </c:when>
             <c:otherwise>
-              <ww:url id="editProxyIdUrl" action="editNetworkProxy">
-                <ww:param name="proxyid" value="%{'${connector.proxyId}'}"/>
-              </ww:url>
-              <ww:a href="%{editProxyIdUrl}" cssClass="edit" title="Edit Network Proxy">
+              <s:url id="editProxyIdUrl" action="editNetworkProxy">
+                <s:param name="proxyid" value="%{'#attr.connector.proxyId'}"/>
+              </s:url>
+              <s:a href="%{editProxyIdUrl}" cssClass="edit" title="Edit Network Proxy">
                 ${connector.proxyId}
                 <img src="${iconEditUrl}"/>
-              </ww:a>
+              </s:a>
             </c:otherwise>
           </c:choose>
         </td>

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp Sun Oct 19 21:17:16 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="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
@@ -25,7 +25,7 @@
 <html>
 <head>
   <title>Administration - Repositories</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -34,17 +34,17 @@
 
 <div id="contentArea">
 
-<ww:actionerror/>
-<ww:actionmessage/>
+<s:actionerror/>
+<s:actionmessage/>
 
 <div class="admin">
 <div class="controls">
   <redback:ifAuthorized permission="archiva-manage-configuration">
-    <ww:url id="addRepositoryUrl" action="addRepository"/>
-    <ww:a href="%{addRepositoryUrl}">
+    <s:url id="addRepositoryUrl" action="addRepository"/>
+    <s:a href="%{addRepositoryUrl}">
       <img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
       Add
-    </ww:a>
+    </s:a>
   </redback:ifAuthorized>
 </div>
 <h2>Managed Repositories</h2>
@@ -72,20 +72,20 @@
 <div class="controls">
     <%-- TODO: make some icons --%>
   <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
-    <ww:url id="editRepositoryUrl" action="editRepository">
-      <ww:param name="repoid" value="%{'${repository.id}'}"/>
-    </ww:url>
-    <ww:url id="deleteRepositoryUrl" action="confirmDeleteRepository">
-      <ww:param name="repoid" value="%{'${repository.id}'}"/>
-    </ww:url>
-    <ww:a href="%{editRepositoryUrl}">
+    <s:url id="editRepositoryUrl" action="editRepository">
+      <s:param name="repoid" value="%{#attr.repository.id}"/>
+    </s:url>
+    <s:url id="deleteRepositoryUrl" action="confirmDeleteRepository">
+      <s:param name="repoid" value="%{#attr.repository.id}"/>
+    </s:url>
+    <s:a href="%{editRepositoryUrl}">
       <img src="<c:url value="/images/icons/edit.png" />" alt="" width="16" height="16"/>
       Edit
-    </ww:a>
-    <ww:a href="%{deleteRepositoryUrl}">
+    </s:a>
+    <s:a href="%{deleteRepositoryUrl}">
       <img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
       Delete
-    </ww:a>
+    </s:a>
   </redback:ifAnyAuthorized>
   <c:url var="rssFeedIconUrl" value="/images/icons/rss-feed.png"/>
   <a href="/archiva/feeds/${repository.id}">
@@ -190,10 +190,10 @@
         <tr>
           <td>
             <redback:ifAuthorized permission="archiva-run-indexer">
-              <ww:form action="indexRepository" theme="simple">
-                <ww:hidden name="repoid" value="%{'${repository.id}'}"/>
-                <ww:submit value="Scan Repository Now"/>
-              </ww:form>
+              <s:form action="indexRepository" theme="simple">
+                <s:hidden name="repoid" value="%{#attr.repository.id}"/>
+                <s:submit value="Scan Repository Now"/>
+              </s:form>
             </redback:ifAuthorized>
           </td>
         </tr>
@@ -248,11 +248,11 @@
 
 <div class="controls">
   <redback:ifAuthorized permission="archiva-manage-configuration">
-    <ww:url id="addRepositoryUrl" action="addRemoteRepository"/>
-    <ww:a href="%{addRepositoryUrl}">
+    <s:url id="addRepositoryUrl" action="addRemoteRepository"/>
+    <s:a href="%{addRepositoryUrl}">
       <img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
       Add
-    </ww:a>
+    </s:a>
   </redback:ifAuthorized>
 </div>
 <h2>Remote Repositories</h2>
@@ -278,20 +278,20 @@
 
         <div class="controls">
           <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
-            <ww:url id="editRepositoryUrl" action="editRemoteRepository">
-              <ww:param name="repoid" value="%{'${repository.id}'}"/>
-            </ww:url>
-            <ww:a href="%{editRepositoryUrl}">
+            <s:url id="editRepositoryUrl" action="editRemoteRepository">
+              <s:param name="repoid" value="%{#attr.repository.id}"/>
+            </s:url>
+            <s:a href="%{editRepositoryUrl}">
               <img src="<c:url value="/images/icons/edit.png" />" alt="" width="16" height="16"/>
               Edit
-            </ww:a>
-            <ww:url id="deleteRepositoryUrl" action="confirmDeleteRemoteRepository">
-              <ww:param name="repoid" value="%{'${repository.id}'}"/>
-            </ww:url>
-            <ww:a href="%{deleteRepositoryUrl}">
+            </s:a>
+            <s:url id="deleteRepositoryUrl" action="confirmDeleteRemoteRepository">
+              <s:param name="repoid" value="%{#attr.repository.id}"/>
+            </s:url>
+            <s:a href="%{deleteRepositoryUrl}">
               <img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
               Delete
-            </ww:a>
+            </s:a>
           </redback:ifAnyAuthorized>
         </div>
 

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp Sun Oct 19 21:17:16 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="%{#attr.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%{#attr.i}" action="addRepositoryToGroup" namespace="/admin" validate="true">
+      <s:hidden name="repoGroupId" value="%{#attr.repositoryGroup.key}"/>
+      <s:select list="%{#attr.groupToRepositoryMap[#attr.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="%{#attr.repositoryGroup.key}"/>
+          <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="%{#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="%{#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>
   

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp Sun Oct 19 21:17:16 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}]"
-                    onclick="removeFiletypePattern( '${filetypeId}', '${escapedPattern}' )" 
+              <s:a href="#" title="Remove [%{#attr.escapedPattern}] Pattern from [%{#attr.filetypeId}]"
+                    onclick="removeFiletypePattern( '%{#attr.filetypeId}', '%{#attr.escapedPattern}' )" 
                     theme="simple">
                 <img src="${iconDeleteUrl}" />
-              </ww:a>
+              </s:a>
             </td>
           </tr>
         </c:forEach>
         <tr>
           <td>
-            <ww:textfield size="40" 
-                          id="newpattern_${j.index}"
+            <s:textfield size="40" 
+                          id="newpattern_%{#attr.j.index}"
                           theme="simple" />
           </td>
           <td>
-            <ww:a href="#" 
-                  title="Add Pattern to [${filetypeId}]"
-                  onclick="addFiletypePattern( '${filetypeId}', 'newpattern_${j.index}' )"
+            <s:a href="#" 
+                  title="Add Pattern to [%{#attr.filetypeId}]"
+                  onclick="addFiletypePattern( '%{#attr.filetypeId}', 'newpattern_%{#attr.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/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp Sun Oct 19 21:17:16 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="%{#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>
 
   </div>
 
   <script type="text/javascript">
     document.getElementById("filteredSearch_groupId").focus();
   </script>
-  <ww:actionerror/>
+  <s:actionerror/>
 
 </div> 
 

Modified: archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp?rev=706118&r1=706117&r2=706118&view=diff
==============================================================================
--- archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp (original)
+++ archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp Sun Oct 19 21:17:16 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>



Mime
View raw message