Author: musachy
Date: Tue Nov 3 23:58:53 2009
New Revision: 832623
URL: http://svn.apache.org/viewvc?rev=832623&view=rev
Log:
Add flags and beans for parameter binder
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=832623&r1=832622&r2=832623&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
Tue Nov 3 23:58:53 2009
@@ -212,4 +212,7 @@
/** 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";
}
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?rev=832623&r1=832622&r2=832623&view=diff
==============================================================================
---
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
Tue Nov 3 23:58:53 2009
@@ -234,6 +234,10 @@
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);
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=832623&r1=832622&r2=832623&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Tue Nov 3
23:58:53 2009
@@ -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" />
