From f405f16e2d75b69dae7ccd56891122164559ab9e Mon Sep 17 00:00:00 2001
From: James William Dumay <jdumay@apache.org>
Date: Fri, 17 Oct 2008 08:35:26 +0000
Subject: [PATCH] Most jsp's working

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-struts2@705511 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-webapp/pom.xml        | 54 ------------
 .../action/reports/GenerateReportAction.java  |  1 +
 .../archiva/web/tags/CopyPasteSnippetTag.java |  2 +
 .../archiva/web/tags/DownloadArtifact.java    |  3 +-
 .../archiva/web/tags/DownloadArtifactTag.java | 17 +++-
 .../maven/archiva/web/tags/GroupIdLink.java   |  4 +-
 .../archiva/web/tags/GroupIdLinkTag.java      | 23 ++---
 .../src/main/resources/struts.properties      |  1 +
 .../src/main/resources/struts.xml             |  7 --
 .../src/main/resources/validators.xml         |  5 ++
 .../webapp/WEB-INF/jsp/admin/appearance.jsp   |  2 +-
 .../jsp/admin/confirmAddRepository.jsp        | 26 +++---
 .../WEB-INF/jsp/admin/editAppearance.jsp      |  6 +-
 .../jsp/admin/include/networkProxyForm.jspf   | 12 +--
 .../jsp/admin/include/proxyConnectorForm.jspf | 58 ++++++------
 .../admin/include/remoteRepositoryForm.jspf   | 14 +--
 .../WEB-INF/jsp/admin/legacyArtifactPath.jsp  |  2 +-
 .../WEB-INF/jsp/admin/networkProxies.jsp      |  4 +-
 .../WEB-INF/jsp/admin/proxyConnectors.jsp     | 26 +++---
 .../webapp/WEB-INF/jsp/admin/repositories.jsp | 10 +--
 .../WEB-INF/jsp/admin/repositoryScanning.jsp  | 10 +--
 .../webapp/WEB-INF/jsp/advancedSearch.jsp     |  4 +-
 .../src/main/webapp/WEB-INF/jsp/browse.jsp    | 12 +--
 .../webapp/WEB-INF/jsp/browseArtifact.jsp     |  6 +-
 .../main/webapp/WEB-INF/jsp/browseGroup.jsp   | 10 +--
 .../jsp/decorators/artifactDecorator.jsp      |  2 +-
 .../main/webapp/WEB-INF/jsp/findArtifact.jsp  |  2 +-
 .../jsp/include/artifactDependencies.jspf     |  2 +-
 .../WEB-INF/jsp/include/artifactInfo.jspf     | 20 ++---
 .../WEB-INF/jsp/include/artifactReports.jspf  |  2 +-
 .../WEB-INF/jsp/include/dependencyTree.jspf   |  2 +-
 .../WEB-INF/jsp/include/mailingLists.jspf     |  2 +-
 .../WEB-INF/jsp/include/projectDependees.jspf |  2 +-
 .../WEB-INF/jsp/include/uploadForm.jspf       | 20 ++---
 .../WEB-INF/jsp/reports/basicReport.jsp       |  4 +-
 .../src/main/webapp/WEB-INF/jsp/results.jsp   | 88 +++++++++----------
 .../main/webapp/WEB-INF/tags/currentWWUrl.tag |  2 +-
 .../webapp/WEB-INF/tags/showArtifactLink.tag  | 18 ++--
 .../webapp/WEB-INF/tags/showArtifactTitle.tag | 20 ++---
 pom.xml                                       |  2 +-
 40 files changed, 233 insertions(+), 274 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index eaccde728..5c6a5a8f7 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -284,8 +284,6 @@
                 <!-- Directory created by jetty:run -->
                 <include>WEB-INF/temp</include>
                 <!-- Directory created by jetty:run -->
-                <include>WEB-INF/jasperreports</include>
-                <!-- Directory created by jasperreports-maven-plugin -->
               </includes>
             </fileset>
           </filesets>
@@ -478,57 +476,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <!--
-        Inclusion of this profile brings in Jasper, which is not distributed by default due to ASF licensing policy
-        regarding LGPL dependencies. A basic report is used instead.
-
-        Note: in the future, it may be better to use the jasperreports plugin at all times (so the compiled report is
-        included), so that we just require that the JAR be on the classpath to activate it. We haven't taken this step
-        here because the jasperreports plugin is not yet released.
-
-        See also: MRM-447
-      -->
-      <id>jasper</id>
-      <dependencies>
-        <dependency>
-          <groupId>jasperreports</groupId>
-          <artifactId>jasperreports</artifactId>
-          <version>1.2.0</version>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>jasperreports-maven-plugin</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <executions>
-              <execution>
-                <phase>compile</phase>
-                <goals>
-                  <goal>compile-reports</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <targetDirectory>src/main/webapp/WEB-INF/jasperreports</targetDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>Codehaus Snapshots</id>
-          <url>http://snapshots.repository.codehaus.org/</url>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
   </profiles>
 </project>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
index e65f3a181..cb90bc185 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
@@ -104,6 +104,7 @@ public class GenerateReportAction
         return repositoryIds;
     }
 
+    @Override
     public String execute()
         throws Exception
     {
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java
index 0a18effe6..61afc3fe4 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java
@@ -51,12 +51,14 @@ public class CopyPasteSnippetTag
     
     public static final String TOGGLE = "toggle";
     
+    @Override
     public void release()
     {
         object = null;
         super.release();
     }
 
+    @Override
     public int doEndTag()
         throws JspException
     {
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
index 8db360632..ff3b86ac4 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
@@ -21,7 +21,6 @@ package org.apache.maven.archiva.web.tags;
 
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.commons.lang.StringEscapeUtils;
@@ -111,7 +110,7 @@ public class DownloadArtifact
             Constraint constraint = new ArtifactsRelatedConstraint( groupId, artifactId, version );
             List<ArchivaArtifact> relatedArtifacts = dao.getArtifactDAO().queryArtifacts( constraint );
 
-            if ( relatedArtifacts != null )
+            if ( relatedArtifacts != null && relatedArtifacts.size() > 0 )
             {
                 String repoId = ( (ArchivaArtifact) relatedArtifacts.get( 0 ) ).getModel().getRepositoryId();
                 ManagedRepositoryContent repo = repositoryFactory.getManagedRepositoryContent( repoId );
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java
index 9b372cf5e..12dd48570 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java
@@ -19,10 +19,15 @@ package org.apache.maven.archiva.web.tags;
  * under the License.
  */
 
+import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Component;
 import org.apache.struts2.views.jsp.TagUtils;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.struts2.views.jsp.ComponentTagSupport;
 
 /**
  * DownloadArtifactTag 
@@ -31,7 +36,7 @@ import javax.servlet.jsp.tagext.TagSupport;
  * @version $Id$
  */
 public class DownloadArtifactTag
-    extends TagSupport
+    extends ComponentTagSupport
 {
     private String groupId_; // stores EL-based groupId property
 
@@ -49,19 +54,23 @@ public class DownloadArtifactTag
 
     private boolean mini; // stores the evaluated mini object.
 
+    @Override
+    public Component getBean(ValueStack valueStack, HttpServletRequest request, HttpServletResponse response) {
+        return new DownloadArtifact(valueStack, pageContext);
+    }
+
+    @Override
     public int doEndTag()
         throws JspException
     {
         evaluateExpressions();
 
-        DownloadArtifact download = new DownloadArtifact( TagUtils.getStack( pageContext ), pageContext );
+        DownloadArtifact download = (DownloadArtifact)component;
         download.setGroupId( groupId );
         download.setArtifactId( artifactId );
         download.setVersion( version );
         download.setMini( mini );
 
-        download.end( pageContext.getOut(), "" );
-
         return super.doEndTag();
     }
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
index 6593e1639..d92bb7fb5 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
@@ -114,14 +114,14 @@ public class GroupIdLink
 
     private String determineBrowseActionUrl()
     {
-        return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, encode );
+        return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, encode, false, false );
     }
 
     private String determineBrowseGroupActionUrl( String gid )
     {
         parameters.put( "groupId", gid );
 
-        return determineActionURL( ACTION, NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, encode );
+        return determineActionURL( ACTION, NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, encode, false, false );
     }
 
     public String getGroupId()
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java
index 39a8d0f40..b76ce44bd 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java
@@ -19,12 +19,13 @@ package org.apache.maven.archiva.web.tags;
  * under the License.
  */
 
-import org.apache.struts2.views.jsp.TagUtils;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.components.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.struts2.views.jsp.ComponentTagSupport;
 
 /**
  * GroupIdLink 
@@ -33,7 +34,7 @@ import javax.servlet.jsp.tagext.TagSupport;
  * @version $Id$
  */
 public class GroupIdLinkTag
-    extends TagSupport
+    extends ComponentTagSupport
 {
     private String var_; // stores EL-based property
 
@@ -41,6 +42,11 @@ public class GroupIdLinkTag
 
     private boolean includeTop = false;
 
+    @Override
+    public Component getBean(ValueStack valueStack, HttpServletRequest request, HttpServletResponse response) {
+        return new GroupIdLink( valueStack, request, response );
+    }
+
     @Override
     public void release()
     {
@@ -56,14 +62,11 @@ public class GroupIdLinkTag
         throws JspException
     {
         evaluateExpressions();
+        
+        GroupIdLink groupIdLink = (GroupIdLink)component;
 
-        GroupIdLink gidlink = new GroupIdLink( TagUtils.getStack( pageContext ), (HttpServletRequest) pageContext
-            .getRequest(), (HttpServletResponse) pageContext.getResponse() );
-
-        gidlink.setGroupId( var );
-        gidlink.setIncludeTop( includeTop );
-
-        gidlink.end( pageContext.getOut(), "" );
+        groupIdLink.setGroupId( var );
+        groupIdLink.setIncludeTop( includeTop );
 
         return super.doEndTag();
     }
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
index 524cdb3fe..6f76d3f89 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
@@ -23,6 +23,7 @@ struts.objectFactory =  org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFa
 struts.url.includeParams = none
 
 struts.devMode = true
+struts.configuration.xml.reload=true
 struts.multipart.parser=jakarta
 
 # TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
index b5fb01de7..8c867863c 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
@@ -493,23 +493,16 @@
 
   </package>
 
-<!--
   <package name="report" namespace="/report" extends="base">
     <action name="pickReport" class="generateReport" method="input">
       <result name="input">/WEB-INF/jsp/reports/pickReport.jsp</result>
     </action>
 
     <action name="generateReport" class="generateReport">
-      <result name="jasper" type="jasper">
-        <param name="location">/WEB-INF/jasperreports/report.jasper</param>
-        <param name="dataSource">reports</param>
-        <param name="format">HTML</param>
-      </result>
       <result name="input">/WEB-INF/jsp/reports/pickReport.jsp</result>
       <result name="blank">/WEB-INF/jsp/reports/blankReport.jsp</result>
       <result>/WEB-INF/jsp/reports/basicReport.jsp</result>
     </action>
   </package>
-  -->
 </struts>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml
index 65b4ca2c3..d126e2a3b 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE validators PUBLIC
+        "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+        "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
+
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
index 9fa7464ca..2ca2fe8db 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
@@ -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>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
index 132203e2c..f2d3a2f50 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
@@ -103,20 +103,20 @@
     </table>
   </div>
   	
-  <s: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">      
-      <s:hidden name="repository.id" value="${repository.id}"/>
-      <s:hidden name="repository.name" value="${repository.name}"/>
-      <s:hidden name="repository.location" value="${repository.location}"/>
-      <s:hidden name="repository.indexDir" value="${repository.indexDir}"/>
-      <s:hidden name="repository.layout" value="${repository.layout}"/>
-      <s:hidden name="repository.refreshCronExpression" value="${repository.refreshCronExpression}"/>
-      <s:hidden name="repository.daysOlder" value="${repository.daysOlder}"/>
-      <s:hidden name="repository.retentionCount" value="${repository.retentionCount}"/>
-      <s:hidden name="repository.releases" value="${repository.releases}"/>
-      <s:hidden name="repository.snapshots" value="${repository.snapshots}"/>
-      <s:hidden name="repository.scanned" value="${repository.scanned}"/>
-      <s: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'}">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
index 38d01615b..a0d6c0c5c 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
@@ -36,9 +36,9 @@
 <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="${organisationName}" label="Name" size="50"  />
-    <s:textfield name="organisationUrl" value="${organisationUrl}" label="URL" size="50"/>
-    <s:textfield name="organisationLogo" value="${organisationLogo}" label="Logo URL" size="50" />
+    <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>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
index 935c4b176..c08718b57 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
@@ -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" />
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
index 4a6b29101..4b586e4e1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
@@ -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="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['%{#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>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
index b59fa8f50..ea01c0835 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
@@ -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"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
index a64053c72..2d75e9d94 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
@@ -73,7 +73,7 @@
     <%-- TODO: make some icons --%>
   <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
     <s:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">
-      <s:param name="path" value="%{'${legacyArtifactPath.path}'}"/>
+      <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"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
index 07f3dcb74..fedb6a332 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
@@ -71,10 +71,10 @@
       <redback:ifAnyAuthorized
         permissions="archiva-manage-configuration">
         <s:url id="editNetworkProxyUrl" action="editNetworkProxy">
-          <s:param name="proxyid" value="%{'${proxy.id}'}" />
+          <s:param name="proxyid" value="%{#attr.proxy.id}" />
         </s:url>
         <s:url id="deleteNetworkProxyUrl" action="deleteNetworkProxy" method="confirm">
-          <s:param name="proxyid" value="%{'${proxy.id}'}" />
+          <s:param name="proxyid" value="%{#attr.proxy.id}" />
         </s:url>
         <s:a href="%{editNetworkProxyUrl}">
           <img src="<c:url value="/images/icons/edit.png" />" />
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
index 1095a609f..e1dcc38cc 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
@@ -100,28 +100,28 @@
     <div class="controls">
       <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
         <s:url id="sortDownProxyConnectorUrl" action="sortDownProxyConnector">
-          <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
-          <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+          <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="target" value="%{'${connector.targetRepoId}'}"/>
-          <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+          <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="%{'${connector.targetRepoId}'}"/>
-          <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+          <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="%{'${connector.sourceRepoId}'}"/>
-          <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+          <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="%{'${connector.sourceRepoId}'}"/>
-          <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+          <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="%{'${connector.sourceRepoId}'}"/>
-          <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+          <s:param name="source" value="%{#attr.connector.sourceRepoId}"/>
+          <s:param name="target" value="%{#attr.connector.targetRepoId}"/>
         </s:url>
         <c:if test="${connector.disabled}">
             <s:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
@@ -172,7 +172,7 @@
             </c:when>
             <c:otherwise>
               <s:url id="editProxyIdUrl" action="editNetworkProxy">
-                <s:param name="proxyid" value="%{'${connector.proxyId}'}"/>
+                <s:param name="proxyid" value="%{'#attr.connector.proxyId'}"/>
               </s:url>
               <s:a href="%{editProxyIdUrl}" cssClass="edit" title="Edit Network Proxy">
                 ${connector.proxyId}
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
index 28b803b8b..7bc4f4b52 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
@@ -73,10 +73,10 @@
     <%-- TODO: make some icons --%>
   <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
     <s:url id="editRepositoryUrl" action="editRepository">
-      <s:param name="repoid" value="%{'${repository.id}'}"/>
+      <s:param name="repoid" value="%{#attr.repository.id}"/>
     </s:url>
     <s:url id="deleteRepositoryUrl" action="confirmDeleteRepository">
-      <s:param name="repoid" value="%{'${repository.id}'}"/>
+      <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"/>
@@ -191,7 +191,7 @@
           <td>
             <redback:ifAuthorized permission="archiva-run-indexer">
               <s:form action="indexRepository" theme="simple">
-                <s:hidden name="repoid" value="%{'${repository.id}'}"/>
+                <s:hidden name="repoid" value="%{#attr.repository.id}"/>
                 <s:submit value="Scan Repository Now"/>
               </s:form>
             </redback:ifAuthorized>
@@ -279,14 +279,14 @@
         <div class="controls">
           <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
             <s:url id="editRepositoryUrl" action="editRemoteRepository">
-              <s:param name="repoid" value="%{'${repository.id}'}"/>
+              <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
             </s:a>
             <s:url id="deleteRepositoryUrl" action="confirmDeleteRemoteRepository">
-              <s:param name="repoid" value="%{'${repository.id}'}"/>
+              <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"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
index 2ca1362da..2c08f498e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
@@ -113,8 +113,8 @@
               <code>${escapedPattern}</code>
             </td>
             <td class="controls ${bgcolor}">
-              <s: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}" />
               </s:a>
@@ -124,13 +124,13 @@
         <tr>
           <td>
             <s:textfield size="40" 
-                          id="newpattern_${j.index}"
+                          id="newpattern_%{#attr.j.index}"
                           theme="simple" />
           </td>
           <td>
             <s:a href="#" 
-                  title="Add Pattern to [${filetypeId}]"
-                  onclick="addFiletypePattern( '${filetypeId}', 'newpattern_${j.index}' )"
+                  title="Add Pattern to [%{#attr.filetypeId}]"
+                  onclick="addFiletypePattern( '%{#attr.filetypeId}', 'newpattern_%{#attr.j.index}' )"
                   theme="simple">
               <img src="${iconCreateUrl}" />
             </s:a>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp
index 3db21844d..540e12ddf 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/advancedSearch.jsp
@@ -44,8 +44,8 @@
       <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:hidden name="completeQueryString" value="%{#attr.completeQueryString}"/>
+      <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}"/>
       <s:submit label="Go!"/>
     </s:form>
   
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
index 68d879e73..aebffbe2f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
@@ -49,7 +49,7 @@
         <c:forEach items="${results.groupIds}" var="groupId">
           <c:set var="url">
             <s:url action="browseGroup" namespace="/">
-              <s:param name="groupId" value="%{'${groupId}'}"/>
+              <s:param name="groupId" value="%{#attr.groupId}"/>
             </s:url>
           </c:set>
           <li><a href="${url}">${groupId}/</a></li>
@@ -66,8 +66,8 @@
         <c:forEach items="${results.artifacts}" var="artifactId">
           <c:set var="url">
             <s:url action="browseArtifact" namespace="/">
-              <s:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
-              <s:param name="artifactId" value="%{'${artifactId}'}"/>
+              <s:param name="groupId" value="%{#attr.results.selectedGroupId}"/>
+              <s:param name="artifactId" value="%{#attr.artifactId}"/>
             </s:url>
           </c:set>
           <c:url var="rssUrl" value="/feeds/${groupId}/${artifactId}"/>
@@ -89,9 +89,9 @@
         <c:forEach items="${results.versions}" var="version">
           <c:set var="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:param name="groupId" value="%{#attr.results.selectedGroupId}"/>
+              <s:param name="artifactId" value="%{#attr.results.selectedArtifactId}"/>
+              <s:param name="version" value="%{#attr.version}"/>
             </s:url>
           </c:set>
           <li><a href="${url}">${version}/</a></li>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
index 0968b3237..14cc95b22 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
@@ -44,9 +44,9 @@
       <c:forEach items="${versions}" var="version">
         <c:set var="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:param name="groupId" value="%{#attr.groupId}"/>
+            <s:param name="artifactId" value="%{#attr.artifactId}"/>
+            <s:param name="version" value="%{'#attr.version}"/>
           </s:url>
         </c:set>
         <li><a href="${url}">${version}/</a></li>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
index 2baf5ff0f..c81d5cf0e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
@@ -42,7 +42,7 @@
       <c:forEach items="${results.groupIds}" var="groupId">
         <c:set var="url">
           <s:url action="browseGroup" namespace="/">
-            <s:param name="groupId" value="%{'${groupId}'}"/>
+            <s:param name="groupId" value="%{#attr.groupId}"/>
           </s:url>
         </c:set>
         <li><a href="${url}">${groupId}/</a></li>
@@ -57,8 +57,8 @@
         <c:forEach items="${results.versions}" var="version">
           <c:set var="url">
             <s:url action="browseVersion" namespace="/">
-              <s:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
-              <s:param name="version" value="%{'${version}'}"/>
+              <s:param name="groupId" value="%{#attr.results.selectedGroupId}"/>
+              <s:param name="version" value="%{#attr.version}"/>
             </s:url>
           </c:set>
           <li><a href="${url}">${version}/</a></li>
@@ -74,8 +74,8 @@
         <c:forEach items="${results.artifacts}" var="artifactId">
           <c:set var="url">
             <s:url action="browseArtifact" namespace="/">
-              <s:param name="groupId" value="%{'${groupId}'}"/>
-              <s:param name="artifactId" value="%{'${artifactId}'}"/>
+              <s:param name="groupId" value="%{#attr.groupId}"/>
+              <s:param name="artifactId" value="%{#attr.artifactId}"/>
             </s:url>
           </c:set>
           <li><a href="${url}">${artifactId}/</a></li>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
index efec28fdd..0a25e9282 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
@@ -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="s"        uri="/struts-tags" %>
+<%@ 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" %>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
index 36139b75c..4890bec4f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
@@ -31,7 +31,7 @@
 
 <div id="contentArea">
   <div id="searchBox">
-    <s:if test="${applicationScope.uiOptions.appletFindEnabled}">
+    <s:if test="%{#attr.applicationScope.uiOptions.appletFindEnabled}">
       <script type="text/javascript">
         function generateMd5( file, defVal )
         {
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
index cbafc9829..60be65eae 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
@@ -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" %>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
index 309b8420f..ece904e1b 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
@@ -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" %>
 
@@ -25,10 +25,10 @@
   <archiva:groupIdLink var="${model.groupId}" includeTop="true" />
   
   <c:set var="url">
-    <ww:url action="browseArtifact" namespace="/">
-      <ww:param name="groupId" value="%{'${model.groupId}'}"/>
-      <ww:param name="artifactId" value="%{'${model.artifactId}'}"/>
-    </ww:url>
+    <s:url action="browseArtifact" namespace="/">
+      <s:param name="groupId" value="%{#attr.model.groupId}"/>
+      <s:param name="artifactId" value="%{#attr.model.artifactId}"/>
+    </s:url>
   </c:set>
   <a href="${url}">${model.artifactId}</a> /
   <strong>${version}</strong>
@@ -80,11 +80,11 @@
       <td>
           ${model.parentProject.groupId} ${model.parentProject.artifactId} ${model.parentProject.version}
         <c:set var="url">
-          <ww:url action="showArtifact" namespace="/">
-            <ww:param name="groupId" value="%{'${model.parentProject.groupId}'}"/>
-            <ww:param name="artifactId" value="%{'${model.parentProject.artifactId}'}"/>
-            <ww:param name="version" value="%{'${model.parentProject.version}'}"/>
-          </ww:url>
+          <s:url action="showArtifact" namespace="/">
+            <s:param name="groupId" value="%{#attr.model.parentProject.groupId}"/>
+            <s:param name="artifactId" value="%{#attr.model.parentProject.artifactId}"/>
+            <s:param name="version" value="%{#attr.model.parentProject.version}"/>
+          </s:url>
         </c:set>
         (<a href="${url}">View</a>)
       </td>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf
index e983a292d..4180f915d 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf
@@ -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" %>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
index 0d63005aa..cd70504bd 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
@@ -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" %>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf
index 949af7580..b344ea36d 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf
@@ -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" %>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
index 4287a26c9..fbf3ac074 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
@@ -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" %>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
index e44d0b162..eed720cf8 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
@@ -19,18 +19,18 @@
 
 <%-- 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" %>
 
-<ww:textfield name="groupId" label="Group Id" size="50" required="true"/>
-<ww:textfield name="artifactId" label="Artifact Id" size="50" required="true"/>
-<ww:textfield name="version" label="Version" size="50" required="true"/>
-<ww:textfield name="packaging" label="Packaging" size="50" required="true"/>
-<ww:textfield name="classifier" label="Classifier" size="50" required="false"/>
-<ww:checkbox name="generatePom" value="generatePom" 
+<s:textfield name="groupId" label="Group Id" size="50" required="true"/>
+<s:textfield name="artifactId" label="Artifact Id" size="50" required="true"/>
+<s:textfield name="version" label="Version" size="50" required="true"/>
+<s:textfield name="packaging" label="Packaging" size="50" required="true"/>
+<s:textfield name="classifier" label="Classifier" size="50" required="false"/>
+<s:checkbox name="generatePom" value="generatePom"
 	label="Generate Maven 2 POM"/> 
-<ww:file name="artifact" label="Artifact File" required="true"/>
-<ww:file name="pom" label="POM File"/>
-<ww:select name="repositoryId" list="managedRepoIdList" label="Repository Id"/>
+<s:file name="artifact" label="Artifact File" required="true"/>
+<s:file name="pom" label="POM File"/>
+<s:select name="repositoryId" list="managedRepoIdList" label="Repository Id"/>
 
 	
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
index 8364cf1d7..a95929753 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/basicReport.jsp
@@ -42,8 +42,8 @@
       	<archiva:groupIdLink var="${report.groupId}" includeTop="true"/>
       	<c:set var="url">
         <s:url action="browseArtifact" namespace="/">
-          <s:param name="groupId" value="%{'${report.groupId}'}"/>
-          <s:param name="artifactId" value="%{'${report.artifactId}'}"/>
+          <s:param name="groupId" value="%{#attr.report.groupId}"/>
+          <s:param name="artifactId" value="%{#attr.report.artifactId}"/>
         </s:url>
       	</c:set>
       	<a href="${url}">${report.artifactId}</a> /
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
index f7afd051d..b209557b5 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
@@ -53,8 +53,8 @@
         <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:hidden name="completeQueryString" value="%{#attr.completeQueryString}"/>
+        <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}"/>
         <s:submit label="Go!"/>
       </s:form>
   
@@ -70,7 +70,7 @@
       <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:hidden name="completeQueryString" value="%{#attr.completeQueryString}"/>        
         <s:submit label="Go!"/>
       </s:form> 
       <script type="text/javascript">
@@ -112,14 +112,14 @@
               <c:if test="${fromFilterSearch == false}">
                <c:set var="prevPageUrl">
                  <s:url action="quickSearch" namespace="/">
-                   <s:param name="q" value="%{'${q}'}"/>                
-                   <s:param name="currentPage" value="%{'${currentPage - 1}'}"/>
+                   <s:param name="q" value="%{#attr.q}"/>                
+                   <s:param name="currentPage" value="%{#attr.currentPage - 1}"/>
                  </s:url>
        	      </c:set>
        	      <c:set var="nextPageUrl">
                  <s:url action="quickSearch" namespace="/">
-                   <s:param name="q" value="%{'${q}'}"/>                
-                   <s:param name="currentPage" value="%{'${currentPage + 1}'}"/>
+                   <s:param name="q" value="%{#attr.q}"/>                
+                   <s:param name="currentPage" value="%{#attr.currentPage + 1}"/>
                  </s:url>
        	      </c:set>    
               </c:if>
@@ -127,34 +127,34 @@
               <c:if test="${fromFilterSearch == true}">
                <c:set var="prevPageUrl">
                  <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="q" value="%{#attr.q}"/>   --%>
+                   <s:param name="rowCount" value="%{#attr.rowCount}"/>
+                   <s:param name="groupId" value="%{#attr.groupId}"/>
+                   <s:param name="artifactId" value="%{#attr.artifactId}"/>
+                   <s:param name="version" value="%{#attr.version}"/>
+                   <s:param name="className" value="%{#attr.className}"/>
+                   <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
+                   <s:param name="filterSearch" value="%{#attr.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:param name="currentPage" value="%{#attr.currentPage - 1}"/>
+ 		  <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
+ 		  <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
                  </s:url>
        	      </c:set>
        	      <c:set var="nextPageUrl">
                 <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="q" value="%{#attr.q}"/> --%>
+                  <s:param name="rowCount" value="%{#attr.rowCount}"/>
+                  <s:param name="groupId" value="%{#attr.groupId}"/>
+                  <s:param name="artifactId" value="%{#attr.artifactId}"/>
+                  <s:param name="version" value="%{#attr.version}"/>
+                  <s:param name="className" value="%{#attr.className}"/>
+                  <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
+                  <s:param name="filterSearch" value="%{#attr.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:param name="currentPage" value="%{#attr.currentPage + 1}"/>
+ 		  <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
+		  <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
                 </s:url>
       	      </c:set>    
              </c:if>
@@ -200,10 +200,10 @@
 		              <c:when test="${i != currentPage}">
 		                <c:set var="specificPageUrl">
 		                  <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:param name="q" value="%{#attr.q}"/>
+		                    <s:param name="currentPage" value="%{#attr.i}"/>
+		                    <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
+		                    <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
   		                  </s:url>
 		      	        </c:set>
 			          <a href="${specificPageUrl}">${i + 1}</a>
@@ -219,18 +219,18 @@
 		              <c:when test="${i != currentPage}">
 		                <c:set var="specificPageUrl">
 		                  <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="q" value="%{#attr.q}"/>   --%>
+                                    <s:param name="rowCount" value="%{#attr.rowCount}"/>
+                                    <s:param name="groupId" value="%{#attr.groupId}"/>
+                                    <s:param name="artifactId" value="%{#attr.artifactId}"/>
+                                    <s:param name="version" value="%{#attr.version}"/>
+                                    <s:param name="className" value="%{#attr.className}"/>
+                                    <s:param name="repositoryId" value="%{#attr.repositoryId}"/>
+                                    <s:param name="filterSearch" value="%{#attr.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:param name="currentPage" value="%{#attr.i}"/>
+		                    <s:param name="searchResultsOnly" value="%{#attr.searchResultsOnly}"/>
+		                    <s:param name="completeQueryString" value="%{#attr.completeQueryString}"/>
 		                  </s:url>
 		      	        </c:set>
 				<a href="${specificPageUrl}">${i + 1}</a>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
index 8bcd489f4..4c6a69f64 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
@@ -28,7 +28,7 @@
 </c:set>
 <c:if test="${!empty (action) && !empty (namespace)}">
   <c:set var="url">
-    <s:url action="%{action}" namespace="%{namespace}"/>
+    <s:url action="%{#attr.action}" namespace="%{#attr.namespace}"/>
   </c:set>
 </c:if>
 <c:set var="text">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
index b2289e52e..e5260baba 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
@@ -17,7 +17,7 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
 
@@ -37,8 +37,8 @@
   <c:if test="${!empty (artifactId)}">    
     <c:set var="url">
       <ww:url action="browseArtifact" namespace="/">
-        <ww:param name="groupId" value="%{'${groupId}'}"/>
-        <ww:param name="artifactId" value="%{'${artifactId}'}"/>
+        <ww:param name="groupId" value="%{#attr.groupId}"/>
+        <ww:param name="artifactId" value="%{#attr.artifactId}"/>
       </ww:url>
     </c:set>
     <a href="${url}">${artifactId}</a>
@@ -48,10 +48,10 @@
     <c:when test="${!empty (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="groupId" value="%{#attr.groupId}"/>
+          <ww:param name="artifactId" value="%{#attr.artifactId}"/>
           <c:if test="${!empty (version)}">
-            <ww:param name="version" value="%{'${version}'}"/>
+            <ww:param name="version" value="%{#attr.version}"/>
           </c:if>
         </ww:url>
       </c:set>
@@ -61,9 +61,9 @@
       <c:forEach items="${versions}" var="v" varStatus="i">
         <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="%{'${v}'}"/>
+            <ww:param name="groupId" value="%{#attr.groupId}"/>
+            <ww:param name="artifactId" value="%{#attr.artifactId}"/>
+            <ww:param name="version" value="%{#attr.v}"/>
           </ww:url>
         </c:set>
         <a href="${url}">${v}</a>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag
index f11c0ee02..bfcb5e4d0 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag
@@ -17,7 +17,7 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ attribute name="groupId" required="true" %>
 <%@ attribute name="artifactId" %>
@@ -27,17 +27,17 @@
     <c:set var="url">
       <c:choose>
         <c:when test="${!empty (version)}">
-          <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="%{#attr.groupId}"/>
+            <s:param name="artifactId" value="%{#attr.artifactId}"/>
+            <s:param name="version" value="%{#attr.version}"/>
+          </s:url>
         </c:when>
         <c:otherwise>
-          <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="%{#attr.groupId}"/>
+            <s:param name="artifactId" value="%{#attr.artifactId}"/>
+          </s:url>
         </c:otherwise>
       </c:choose>
     </c:set>
diff --git a/pom.xml b/pom.xml
index b850fa627..56f36a460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,7 +390,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-spring</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
         <exclusions>
           <exclusion>
             <groupId>org.codehaus.plexus</groupId>
-- 
2.39.5