From 31de98e18423600c5a1f0e5e6e400d67cb7db239 Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Tue, 3 Nov 2009 23:58:53 +0000
Subject: [PATCH] Add flags and beans for parameter binder

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@832623 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/struts2/StrutsConstants.java | 3 +++
 .../org/apache/struts2/config/BeanSelectionProvider.java  | 4 ++++
 core/src/main/resources/struts-default.xml                | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 127e4b5ca..901a40ba4 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -212,4 +212,7 @@ public final class StrutsConstants {
 
     /** Enables caching of parsed OGNL expressions **/
     public static final String STRUTS_ENABLE_OGNL_EXPRESSION_CACHE = "struts.ognl.enableExpressionCache";
+
+    /** Enables experimental version of parameter binder **/
+    public static final String STRUTS_ENABLE_SIMPLE_PARAMETERS_BINDER = "struts.enableSimpleParametersBinder";
 }
diff --git a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
index 40e864376..10d6f7e2c 100644
--- a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
@@ -234,6 +234,10 @@ public class BeanSelectionProvider implements ConfigurationProvider {
         if (props.containsKey(StrutsConstants.STRUTS_ENABLE_OGNL_EXPRESSION_CACHE))
             props.setProperty("enableOGNLExpressionCache", props.getProperty(StrutsConstants.STRUTS_ENABLE_OGNL_EXPRESSION_CACHE));
 
+        if (props.containsKey(StrutsConstants.STRUTS_ENABLE_SIMPLE_PARAMETERS_BINDER))
+            props.setProperty("enableSimpleParametersBinder", props.getProperty(StrutsConstants.STRUTS_ENABLE_SIMPLE_PARAMETERS_BINDER));
+
+
         String val = props.getProperty(StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS);
         if (val != null) {
             props.setProperty("allowStaticMethodAccess", val);
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index fc06df11c..dd47fbb1c 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -51,6 +51,14 @@
 
     <bean type="org.apache.struts2.views.TagLibrary" name="s" class="org.apache.struts2.views.DefaultTagLibrary" />
 
+    <bean class="com.opensymphony.xwork2.parameters.XWorkParametersBinder" />
+    <bean class="com.opensymphony.xwork2.parameters.bytecode.AccessorBytecodeUtil" />
+    <bean type="com.opensymphony.xwork2.parameters.accessor.ParametersPropertyAccessor" name="java.util.List" class="com.opensymphony.xwork2.parameters.accessor.ParametersListPropertyAccessor" />
+    <bean type="com.opensymphony.xwork2.parameters.accessor.ParametersPropertyAccessor" name="java.util.Set" class="com.opensymphony.xwork2.parameters.accessor.ParametersCollectionPropertyAccessor" />
+    <bean type="com.opensymphony.xwork2.parameters.accessor.ParametersPropertyAccessor" name="java.util.Map" class="com.opensymphony.xwork2.parameters.accessor.ParametersMapPropertyAccessor" />
+    <bean type="com.opensymphony.xwork2.parameters.accessor.ParametersPropertyAccessor" name="com.opensymphony.xwork2.util.CompoundRoot" class="com.opensymphony.xwork2.parameters.accessor.ParametersCompoundRootAccessor" />
+    <bean type="com.opensymphony.xwork2.parameters.accessor.ParametersPropertyAccessor" name="java.lang.Object" class="com.opensymphony.xwork2.parameters.accessor.ParametersObjectPropertyAccessor" />
+
     <bean class="org.apache.struts2.views.freemarker.FreemarkerManager" name="struts" />
     <bean class="org.apache.struts2.views.velocity.VelocityManager" name="struts" optional="true" />