You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jm...@apache.org on 2007/03/20 02:17:28 UTC
svn commit: r520201 - in
/struts/struts2/trunk/core/src/main/java/org/apache/struts2: config/
dispatcher/mapper/ interceptor/
Author: jmitchell
Date: Mon Mar 19 18:17:27 2007
New Revision: 520201
URL: http://svn.apache.org/viewvc?view=rev&rev=520201
Log:
WW-1767 Fix a few typos and change lingering <a:sometag/> action references
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?view=diff&rev=520201&r1=520200&r2=520201
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Mon Mar 19 18:17:27 2007
@@ -81,7 +81,7 @@
* <td>com.opensymphony.xwork2.util.ObjectTypeDeterminer</td>
* <td>struts.objectTypeDeterminer</td>
* <td>singleton</td>
- * <td>Determines what the key and and element class of a Map or Collection should be</td>
+ * <td>Determines what the key and element class of a Map or Collection should be</td>
* </tr>
* <tr>
* <td>org.apache.struts2.dispatcher.mapper.ActionMapper</td>
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java?view=diff&rev=520201&r1=520200&r2=520201
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java Mon Mar 19 18:17:27 2007
@@ -49,7 +49,7 @@
* }
* </code>
* <p/>
- * If the action URL is "foo!bar", the the "foo" action is invoked,
+ * If the action URL is "foo!bar", then the "foo" action is invoked,
* calling "bar" instead of "execute".
* <p/>
* Instead of scanning each request at runtime, the provider creates action mappings
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?view=diff&rev=520201&r1=520200&r2=520201
==============================================================================
--- 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 Mon Mar 19 18:17:27 2007
@@ -87,11 +87,11 @@
*
* <pre>
* <!-- START SNIPPET: method-example -->
- * <a:form action="baz">
- * <a:textfield label="Enter your name" name="person.name"/>
- * <a:submit value="Create person"/>
- * <a:submit name="method:anotherMethod" value="Cancel"/>
- * </a:form>
+ * <s:form action="baz">
+ * <s:textfield label="Enter your name" name="person.name"/>
+ * <s:submit value="Create person"/>
+ * <s:submit name="method:anotherMethod" value="Cancel"/>
+ * </s:form>
* <!-- END SNIPPET: method-example -->
* </pre>
*
@@ -108,11 +108,11 @@
*
* <pre>
* <!-- START SNIPPET: action-example -->
- * <a:form action="baz">
- * <a:textfield label="Enter your name" name="person.name"/>
- * <a:submit value="Create person"/>
- * <a:submit name="action:anotherAction" value="Cancel"/>
- * </a:form>
+ * <s:form action="baz">
+ * <s:textfield label="Enter your name" name="person.name"/>
+ * <s:submit value="Create person"/>
+ * <s:submit name="action:anotherAction" value="Cancel"/>
+ * </s:form>
* <!-- END SNIPPET: action-example -->
* </pre>
*
@@ -129,11 +129,11 @@
*
* <pre>
* <!-- START SNIPPET: redirect-example -->
- * <a:form action="baz">
- * <a:textfield label="Enter your name" name="person.name"/>
- * <a:submit value="Create person"/>
- * <a:submit name="redirect:www.google.com" value="Cancel"/>
- * </a:form>
+ * <s:form action="baz">
+ * <s:textfield label="Enter your name" name="person.name"/>
+ * <s:submit value="Create person"/>
+ * <s:submit name="redirect:www.google.com" value="Cancel"/>
+ * </s:form>
* <!-- END SNIPPET: redirect-example -->
* </pre>
*
@@ -151,11 +151,11 @@
*
* <pre>
* <!-- START SNIPPET: redirect-action-example -->
- * <a:form action="baz">
- * <a:textfield label="Enter your name" name="person.name"/>
- * <a:submit value="Create person"/>
- * <a:submit name="redirect-action:dashboard" value="Cancel"/>
- * </a:form>
+ * <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:form>
* <!-- END SNIPPET: redirect-action-example -->
* </pre>
*
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java?view=diff&rev=520201&r1=520200&r2=520201
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java Mon Mar 19 18:17:27 2007
@@ -117,11 +117,11 @@
* <html>
* <head>
* <title>Please wait</title>
- * <meta http-equiv="refresh" content="5;url=<a:url includeParams="all" />"/>
+ * <meta http-equiv="refresh" content="5;url=<s:url includeParams="all" />"/>
* </head>
* <body>
* Please wait while we process your request.
- * Click <a href="<a:url includeParams="all" />"></a> if this page does not reload automatically.
+ * Click <a href="<s:url includeParams="all" />"></a> if this page does not reload automatically.
* </body>
* </html>
* </pre>
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java?view=diff&rev=520201&r1=520200&r2=520201
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java Mon Mar 19 18:17:27 2007
@@ -125,10 +125,10 @@
*
* And then you need to set encoding <code>multipart/form-data</code> in the form where the user selects the file to upload.
* <pre>
- * <a:form action="doUpload" method="post" enctype="multipart/form-data">
- * <a:file name="upload" label="File"/>
- * <a:submit/>
- * </a:form>
+ * <s:form action="doUpload" method="post" enctype="multipart/form-data">
+ * <s:file name="upload" label="File"/>
+ * <s:submit/>
+ * </s:form>
* </pre>
*
* And then in your action code you'll have access to the File object if you provide setters according to the