Return-Path: 
 <commits-return-3436-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
Delivered-To: apmail-struts-commits-archive@locus.apache.org
Received: (qmail 22679 invoked from network); 12 Mar 2007 19:13:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Mar 2007 19:13:58 -0000
Received: (qmail 95697 invoked by uid 500); 12 Mar 2007 19:14:04 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 95646 invoked by uid 500); 12 Mar 2007 19:14:04 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 95637 invoked by uid 99); 12 Mar 2007 19:14:04 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2007 12:14:04 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2007 12:13:55 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 42A701A9844; Mon, 12 Mar 2007 12:13:35 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r517343 -
 /struts/struts2/trunk/core/src/main/resources/struts-default.xml
Date: Mon, 12 Mar 2007 19:13:35 -0000
To: commits@struts.apache.org
From: husted@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070312191335.42A701A9844@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: husted
Date: Mon Mar 12 12:13:34 2007
New Revision: 517343

URL: http://svn.apache.org/viewvc?view=rev&rev=517343
Log:
WW-1707 Apply consistent naming for the results in struts-default.xml

Modified:
    struts/struts2/trunk/core/src/main/resources/struts-default.xml

Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?view=diff&rev=517343&r1=517342&r2=517343
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Mon Mar 12 12:13:34 2007
@@ -38,7 +38,7 @@
 
     <bean type="com.opensymphony.xwork2.TextProvider" name="xwork1" class="com.opensymphony.xwork2.TextProviderSupport" />
     <bean type="com.opensymphony.xwork2.TextProvider" name="struts" class="com.opensymphony.xwork2.TextProviderSupport" />
-    
+
     <!--  Only have static injections -->
     <bean class="com.opensymphony.xwork2.util.OgnlValueStack" static="true" />
     <bean class="org.apache.struts2.dispatcher.Dispatcher" static="true" />
@@ -56,11 +56,11 @@
             <result-type name="freemarker" class="org.apache.struts2.views.freemarker.FreemarkerResult"/>
             <result-type name="httpheader" class="org.apache.struts2.dispatcher.HttpHeaderResult"/>
             <result-type name="redirect" class="org.apache.struts2.dispatcher.ServletRedirectResult"/>
-            <result-type name="redirect-action" class="org.apache.struts2.dispatcher.ServletActionRedirectResult"/>
+            <result-type name="redirectAction" class="org.apache.struts2.dispatcher.ServletActionRedirectResult"/>
             <result-type name="stream" class="org.apache.struts2.dispatcher.StreamResult"/>
             <result-type name="velocity" class="org.apache.struts2.dispatcher.VelocityResult"/>
             <result-type name="xslt" class="org.apache.struts2.views.xslt.XSLTResult"/>
-            <result-type name="plaintext" class="org.apache.struts2.dispatcher.PlainTextResult" />
+            <result-type name="plainText" class="org.apache.struts2.dispatcher.PlainTextResult" />
         </result-types>
 
         <interceptors>