archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdu...@apache.org
Subject svn commit: r706113 [2/4] - in /archiva/trunk: ./ archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apa...
Date Mon, 20 Oct 2008 03:10:13 GMT
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java Sun Oct 19 20:10:09 2008
@@ -19,8 +19,9 @@
  * under the License.
  */
 
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.dispatcher.mapper.DefaultActionMapper;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.mapper.DefaultActionMapper;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -69,7 +70,7 @@
 
     private static final String PARAM_VERSION = "version";
 
-    public ActionMapping getMapping( HttpServletRequest httpServletRequest )
+    public ActionMapping getMapping( HttpServletRequest httpServletRequest, ConfigurationManager manager )
     {
         String path = httpServletRequest.getServletPath();
 
@@ -141,9 +142,10 @@
             }
         }
 
-        return super.getMapping( httpServletRequest );
+        return super.getMapping( httpServletRequest, manager );
     }
 
+    @Override
     public String getUriFromActionMapping( ActionMapping actionMapping )
     {
         Map params = actionMapping.getParams();

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java Sun Oct 19 20:10:09 2008
@@ -52,7 +52,7 @@
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.system.SecuritySession;
 import org.codehaus.plexus.redback.users.UserNotFoundException;
-import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator;
+import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator;
 import org.codehaus.plexus.spring.PlexusToSpringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java Sun Oct 19 20:10:09 2008
@@ -51,12 +51,14 @@
     
     public static final String TOGGLE = "toggle";
     
+    @Override
     public void release()
     {
         object = null;
         super.release();
     }
 
+    @Override
     public int doEndTag()
         throws JspException
     {

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java Sun Oct 19 20:10:09 2008
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import com.opensymphony.webwork.WebWorkException;
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.components.Component;
 
+import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.database.ArchivaDAO;
@@ -51,7 +51,7 @@
  *
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @version $Id$
- * @plexus.component role="com.opensymphony.webwork.components.Component" role-hint="download-artifact"
+ * @plexus.component role="org.apache.struts2.components.Component" role-hint="download-artifact"
  * instantiation-strategy="per-lookup"
  */
 public class DownloadArtifact
@@ -82,7 +82,7 @@
 
     private DecimalFormat decimalFormat;
 
-    public DownloadArtifact( OgnlValueStack stack, PageContext pageContext )
+    public DownloadArtifact( ValueStack stack, PageContext pageContext )
     {
         super( stack );
         decimalFormat = new DecimalFormat( "#,#00" );
@@ -100,6 +100,7 @@
         }
     }
 
+    @Override
     public boolean end( Writer writer, String body )
     {
         StringBuffer sb = new StringBuffer();
@@ -109,7 +110,7 @@
             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 );
@@ -151,7 +152,7 @@
         }
         catch ( IOException e )
         {
-            throw new WebWorkException( "IOError: " + e.getMessage(), e );
+            throw new StrutsException( "IOError: " + e.getMessage(), e );
         }
 
         return super.end( writer, body );

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java Sun Oct 19 20:10:09 2008
@@ -19,10 +19,15 @@
  * under the License.
  */
 
-import com.opensymphony.webwork.views.jsp.TagUtils;
+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 @@
  * @version $Id$
  */
 public class DownloadArtifactTag
-    extends TagSupport
+    extends ComponentTagSupport
 {
     private String groupId_; // stores EL-based groupId property
 
@@ -49,19 +54,23 @@
 
     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();
     }
 

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java Sun Oct 19 20:10:09 2008
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import com.opensymphony.webwork.WebWorkException;
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.components.Component;
 
+import com.opensymphony.xwork2.util.ValueStack;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.StringTokenizer;
@@ -57,13 +57,14 @@
 
     private boolean includeTop = false;
 
-    public GroupIdLink( OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res )
+    public GroupIdLink( ValueStack stack, HttpServletRequest req, HttpServletResponse res )
     {
         super( stack );
         this.req = req;
         this.res = res;
     }
 
+    @Override
     public boolean end( Writer writer, String body )
     {
         StringBuffer sb = new StringBuffer();
@@ -105,7 +106,7 @@
         }
         catch ( IOException e )
         {
-            throw new WebWorkException( "IOError: " + e.getMessage(), e );
+            throw new StrutsException( "IOError: " + e.getMessage(), e );
         }
 
         return super.end( writer, body );
@@ -113,16 +114,14 @@
 
     private String determineBrowseActionUrl()
     {
-        return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext,
-                                   encode, true );
+        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, true );
+        return determineActionURL( ACTION, NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, encode, false, false );
     }
 
     public String getGroupId()

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java Sun Oct 19 20:10:09 2008
@@ -19,12 +19,13 @@
  * under the License.
  */
 
-import com.opensymphony.webwork.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 @@
  * @version $Id$
  */
 public class GroupIdLinkTag
-    extends TagSupport
+    extends ComponentTagSupport
 {
     private String var_; // stores EL-based property
 
@@ -41,6 +42,12 @@
 
     private boolean includeTop = false;
 
+    @Override
+    public Component getBean(ValueStack valueStack, HttpServletRequest request, HttpServletResponse response) {
+        return new GroupIdLink( valueStack, request, response );
+    }
+
+    @Override
     public void release()
     {
         var_ = null;
@@ -50,18 +57,16 @@
         super.release();
     }
 
+    @Override
     public int doEndTag()
         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();
     }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java Sun Oct 19 20:10:09 2008
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.validator.ValidationException;
-import com.opensymphony.xwork.validator.ValidatorContext;
-import com.opensymphony.xwork.validator.validators.FieldValidatorSupport;
+import com.opensymphony.xwork2.validator.ValidationException;
+import com.opensymphony.xwork2.validator.ValidatorContext;
+import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
 
 /**
  * Reused from Continuum crontab validator
@@ -44,4 +44,4 @@
             return;
         }
     }
-}
\ No newline at end of file
+}

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java Sun Oct 19 20:10:09 2008
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.validator.ValidationException;
-import com.opensymphony.xwork.validator.ValidatorContext;
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
+import com.opensymphony.xwork2.validator.ValidationException;
+import com.opensymphony.xwork2.validator.ValidatorContext;
+import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
 
 /**
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java Sun Oct 19 20:10:09 2008
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import com.opensymphony.xwork.validator.ValidationException;
-import com.opensymphony.xwork.validator.ValidatorContext;
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
+import com.opensymphony.xwork2.validator.ValidationException;
+import com.opensymphony.xwork2.validator.ValidatorContext;
+import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
 
 /**
  * Validator for synced repository form. The values to be validated depends on the

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml Sun Oct 19 20:10:09 2008
@@ -202,7 +202,7 @@
     <component>
       <role>org.codehaus.plexus.redback.system.check.EnvironmentCheck</role>
       <role-hint>locked-admin-check</role-hint>
-      <implementation>org.codehaus.plexus.redback.xwork.checks.security.LockedAdminEnvironmentCheck</implementation>
+      <implementation>org.codehaus.plexus.redback.struts2.checks.security.LockedAdminEnvironmentCheck</implementation>
       <description>LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked
         and unlocks them on startup.
       </description>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml Sun Oct 19 20:10:09 2008
@@ -73,12 +73,12 @@
     <appender-ref ref="rolling" />
   </logger>
 
-  <logger name="com.opensymphony.xwork">
+  <logger name="com.opensymphony.xwork2">
     <level value="info"/>
     <appender-ref ref="rolling" />
   </logger>
 
-  <logger name="com.opensymphony.webwork">
+  <logger name="org.apache.struts2">
     <level value="info"/>
     <appender-ref ref="rolling" />
   </logger>

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Oct 19 20:10:09 2008
@@ -0,0 +1,2 @@
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties:686983-687034
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:699795-705848

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Oct 19 20:10:09 2008
@@ -0,0 +1,2 @@
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml:686983-687034
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:699795-705848

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml Sun Oct 19 20:10:09 2008
@@ -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
@@ -19,19 +24,19 @@
   -->
 
 <validators>
-  <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
-  <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
-  <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
-  <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
-  <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
-  <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
-  <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
-  <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
-  <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
-  <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
-  <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
-  <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
-  <validator name="regex" class="com.opensymphony.xwork.validator.validators.RegexFieldValidator"/>
+  <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+  <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+  <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+  <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+  <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+  <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+  <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+  <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+  <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+  <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+  <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+  <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
+  <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
   <validator name="interval" class="org.apache.maven.archiva.web.validator.IntervalValidator"/>
   <validator name="syncedrepo" class="org.apache.maven.archiva.web.validator.SyncedRepositoryValidator"/>
   <validator name="crontab" class="org.apache.maven.archiva.web.validator.CronExpressionValidator"/>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp Sun Oct 19 20:10:09 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>You have access to no repositories</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxyConnector.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxyConnector.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxyConnector.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/enableProxyConnector.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/enableProxyConnector.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/enableProxyConnector.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/enableProxyConnector.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp Sun Oct 19 20:10:09 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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp?rev=706113&r1=706112&r2=706113&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp Sun Oct 19 20:10:09 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">



Mime
View raw message