From cae6a55f03f4a9de844a495bb9a2a7b68f7231f4 Mon Sep 17 00:00:00 2001
From: Rainer Hermanns <hermanns@apache.org>
Date: Fri, 28 Mar 2008 18:07:22 +0000
Subject: [PATCH] Update all S2 Wiki docs and S2/XW JavaDocs to reflect
 camelCase interceptor and result names.

Issue Number: WW-2491

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@642323 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/mailreader/src/main/webapp/tour.html                     | 2 +-
 .../java/org/apache/struts2/showcase/token/TokenAction.java   | 2 +-
 .../interceptor/ActionMappingParametersInteceptor.java        | 2 +-
 core/src/main/resources/struts-default.xml                    | 4 ++--
 .../java/org/apache/struts2/TestConfigurationProvider.java    | 2 +-
 plugins/config-browser/src/main/resources/struts-plugin.xml   | 4 ++--
 plugins/rest/src/main/resources/struts-plugin.xml             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/mailreader/src/main/webapp/tour.html b/apps/mailreader/src/main/webapp/tour.html
index 9b59a71fd..7dc29f0f2 100644
--- a/apps/mailreader/src/main/webapp/tour.html
+++ b/apps/mailreader/src/main/webapp/tour.html
@@ -1462,7 +1462,7 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
       &lt;interceptor-ref name="defaultStack"/>
   &lt;/interceptor-stack>
   &lt;interceptor-stack name="<strong>user-submit</strong>" >
-      &lt;interceptor-ref name="token-session" />
+      &lt;interceptor-ref name="tokenSession" />
       &lt;interceptor-ref name="user"/>
   &lt;/interceptor-stack>
   &lt;interceptor-stack name="<strong>guest</strong>" >
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
index 6ec8046eb..9d0aa8984 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
@@ -26,7 +26,7 @@ import com.opensymphony.xwork2.ActionContext;
 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 {
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
index b9f4ff48c..79c7dd4a5 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
@@ -63,7 +63,7 @@ import org.apache.struts2.dispatcher.mapper.ActionMapping;
  * <pre>
  * <!-- START SNIPPET: example -->
  * &lt;action name="someAction" class="com.examples.SomeAction"&gt;
- *     &lt;interceptor-ref name="mapping-params"/&gt;
+ *     &lt;interceptor-ref name="mappingParams"/&gt;
  *     &lt;result name="success"&gt;good_result.ftl&lt;/result&gt;
  * &lt;/action&gt;
  * <!-- END SNIPPET: example -->
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 94829dd2c..e7da607c2 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -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
diff --git a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index 24ca7c706..f0508f958 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -108,7 +108,7 @@ public class TestConfigurationProvider implements ConfigurationProvider {
         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("")
diff --git a/plugins/config-browser/src/main/resources/struts-plugin.xml b/plugins/config-browser/src/main/resources/struts-plugin.xml
index 463b2b736..47cc9b005 100644
--- a/plugins/config-browser/src/main/resources/struts-plugin.xml
+++ b/plugins/config-browser/src/main/resources/struts-plugin.xml
@@ -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>
diff --git a/plugins/rest/src/main/resources/struts-plugin.xml b/plugins/rest/src/main/resources/struts-plugin.xml
index fc714d5ff..306a6b92d 100644
--- a/plugins/rest/src/main/resources/struts-plugin.xml
+++ b/plugins/rest/src/main/resources/struts-plugin.xml
@@ -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