Return-Path: Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: (qmail 70739 invoked from network); 29 May 2009 18:52:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 May 2009 18:52:42 -0000 Received: (qmail 3225 invoked by uid 500); 29 May 2009 18:52:54 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 3165 invoked by uid 500); 29 May 2009 18:52:54 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 3156 invoked by uid 99); 29 May 2009 18:52:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 May 2009 18:52:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 May 2009 18:52:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1F0C8238886D; Fri, 29 May 2009 18:52:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780066 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java Date: Fri, 29 May 2009 18:52:29 -0000 To: commits@struts.apache.org From: wesw@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090529185230.1F0C8238886D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wesw Date: Fri May 29 18:52:29 2009 New Revision: 780066 URL: http://svn.apache.org/viewvc?rev=780066&view=rev Log: WW-3137 adding consistency by making DefaultActionMapper understand redirectAction rather than redirect-action Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=780066&r1=780065&r2=780066&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java Fri May 29 18:52:29 2009 @@ -58,7 +58,7 @@ * *
  • Redirect prefix - redirect:cancel.jsp
    • * - *
  • Redirect-action prefix - redirect-action:cancel
    • + *
  • Redirect-action prefix - redirectAction:cancel
    • * * * @@ -151,7 +151,7 @@ * <s:form action="baz"> * <s:textfield label="Enter your name" name="person.name"/> * <s:submit value="Create person"/> - * <s:submit name="redirect-action:dashboard" value="Cancel"/> + * <s:submit name="redirectAction:dashboard" value="Cancel"/> * </s:form> * <!-- END SNIPPET: redirect-action-example --> * @@ -165,7 +165,7 @@ protected static final String REDIRECT_PREFIX = "redirect:"; - protected static final String REDIRECT_ACTION_PREFIX = "redirect-action:"; + protected static final String REDIRECT_ACTION_PREFIX = "redirectAction:"; protected boolean allowDynamicMethodCalls = true;