Author: hermanns
Date: Fri Mar 28 11:07:22 2008
New Revision: 642323
URL: http://svn.apache.org/viewvc?rev=642323&view=rev
Log:
Update all S2 Wiki docs and S2/XW JavaDocs to reflect camelCase interceptor and
result names.
Issue Number: WW-2491
Modified:
struts/struts2/trunk/apps/mailreader/src/main/webapp/tour.html
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/tour.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/tour.html?rev=642323&r1=642322&r2=642323&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/tour.html (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/tour.html Fri Mar 28
11:07:22 2008
@@ -1462,7 +1462,7 @@
<interceptor-ref name="defaultStack"/>
</interceptor-stack>
<interceptor-stack name="<strong>user-submit</strong>" >
- <interceptor-ref name="token-session" />
+ <interceptor-ref name="tokenSession" />
<interceptor-ref name="user"/>
</interceptor-stack>
<interceptor-stack name="<strong>guest</strong>" >
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java?rev=642323&r1=642322&r2=642323&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
Fri Mar 28 11:07:22 2008
@@ -26,7 +26,7 @@
import com.opensymphony.xwork2.ActionSupport;
/**
- * Example to illustrate the <code>token</code> and <code>token-session</code>
interceptor.
+ * Example to illustrate the <code>token</code> and <code>tokenSession</code>
interceptor.
*
*/
public class TokenAction extends ActionSupport {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java?rev=642323&r1=642322&r2=642323&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
Fri Mar 28 11:07:22 2008
@@ -63,7 +63,7 @@
* <pre>
* <!-- START SNIPPET: example -->
* <action name="someAction" class="com.examples.SomeAction">
- * <interceptor-ref name="mapping-params"/>
+ * <interceptor-ref name="mappingParams"/>
* <result name="success">good_result.ftl</result>
* </action>
* <!-- END SNIPPET: example -->
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?rev=642323&r1=642322&r2=642323&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Fri Mar 28
11:07:22 2008
@@ -202,7 +202,7 @@
<interceptor-ref name="basicStack"/>
</interceptor-stack>
- <!-- An example of the params-prepare-params trick. This stack
+ <!-- An example of the paramsPrepareParams trick. This stack
is exactly the same as the defaultStack, except that it
includes one extra interceptor before the prepare interceptor:
the params interceptor.
@@ -242,7 +242,7 @@
may do more than you need. Also, the ordering can be
switched around (ex: if you wish to have your servlet-related
objects applied before prepare() is called, you'd need to move
- servlet-config interceptor up.
+ servletConfig interceptor up.
This stack also excludes from the normal validation and
workflow
the method names input, back, and cancel. These typically are
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java?rev=642323&r1=642322&r2=642323&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
Fri Mar 28 11:07:22 2008
@@ -108,7 +108,7 @@
ActionConfig tokenSessionActionConfig = new ActionConfig.Builder("",
"", TestAction.class.getName())
.addResultConfig(new ResultConfig.Builder("invalid.token",
MockResult.class.getName()).build())
.addResultConfig(new ResultConfig.Builder("success",
MockResult.class.getName()).build())
- .addInterceptor(new InterceptorMapping("token-session", new
TokenSessionStoreInterceptor()))
+ .addInterceptor(new InterceptorMapping("tokenSession", new
TokenSessionStoreInterceptor()))
.build();
PackageConfig defaultPackageConfig = new PackageConfig.Builder("")
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml?rev=642323&r1=642322&r2=642323&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
Fri Mar 28 11:07:22 2008
@@ -32,11 +32,11 @@
<package name="config-browser" extends="struts-default"
namespace="/config-browser">
<interceptors>
- <interceptor-stack name="config-browser-default">
+ <interceptor-stack name="configBrowserDefault">
<interceptor-ref name="validationWorkflowStack"/>
</interceptor-stack>
</interceptors>
- <default-interceptor-ref name="config-browser-default"/>
+ <default-interceptor-ref name="configBrowserDefault"/>
<global-results>
<result name="error"
type="freemarker">/config-browser/error.ftl</result>
Modified: struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml?rev=642323&r1=642322&r2=642323&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml
(original)
+++ struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml Fri
Mar 28 11:07:22 2008
@@ -44,7 +44,7 @@
may do more than you need. Also, the ordering can be
switched around (ex: if you wish to have your servlet-related
objects applied before prepare() is called, you'd need to move
- servlet-config interceptor up.
+ servletConfig interceptor up.
This stack also excludes from the normal validation and
workflow
the method names input, back, and cancel. These typically are
