Author: mrdon
Date: Tue Nov 14 22:26:03 2006
New Revision: 475136
URL: http://svn.apache.org/viewvc?view=rev&rev=475136
Log:
Enable injection of xworkconverter, better handle static injection of
objectfactory
WW-1498
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?view=diff&rev=475136&r1=475135&r2=475136
==============================================================================
---
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 14 22:26:03 2006
@@ -144,4 +144,7 @@
public static final String STRUTS_TEMPLATE_ENGINES =
"struts.templateEngines";
public static final String STRUTS_FREEMARKER_WRAPPER_ALT_MAP =
"struts.freemarker.wrapper.altMap";
+
+ /** The name of the xwork converter implementation */
+ public static final String STRUTS_XWORKCONVERTER = "struts.xworkConverter";
}
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=475136&r1=475135&r2=475136
==============================================================================
---
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 14 22:26:03 2006
@@ -45,6 +45,7 @@
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.ObjectTypeDeterminer;
import com.opensymphony.xwork2.util.ObjectTypeDeterminerFactory;
+import com.opensymphony.xwork2.util.XWorkConverter;
/**
* Selects the implementations of key framework extension points, using the
loaded
@@ -149,6 +150,7 @@
public void register(ContainerBuilder builder, Properties props) {
alias(ObjectFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY,
builder, props);
+ alias(XWorkConverter.class, StrutsConstants.STRUTS_XWORKCONVERTER,
builder, props);
alias(ActionProxyFactory.class,
StrutsConstants.STRUTS_ACTIONPROXYFACTORY, builder, props);
alias(ObjectTypeDeterminer.class,
StrutsConstants.STRUTS_OBJECTTYPEDETERMINER, builder, props);
alias(ActionMapper.class, StrutsConstants.STRUTS_MAPPER_CLASS,
builder, props);
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?view=diff&rev=475136&r1=475135&r2=475136
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Tue Nov 14
22:26:03 2006
@@ -30,14 +30,19 @@
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="ftl"
class="org.apache.struts2.components.template.FreemarkerTemplateEngine" />
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="vm" class="org.apache.struts2.components.template.VelocityTemplateEngine"
/>
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="jsp" class="org.apache.struts2.components.template.JspTemplateEngine" />
+
+ <bean type="com.opensymphony.xwork2.util.XWorkConverter" name="xwork1"
class="com.opensymphony.xwork2.util.XWorkConverter" />
+ <bean type="com.opensymphony.xwork2.util.XWorkConverter" name="struts"
class="com.opensymphony.xwork2.util.AnnotationXWorkConverter" />
- <!-- Only have static constant injections -->
+ <!-- Only have static injections -->
<bean class="com.opensymphony.xwork2.util.OgnlValueStack" static="true" />
<bean class="org.apache.struts2.dispatcher.Dispatcher" static="true" />
<bean class="org.apache.struts2.components.Include" static="true" />
<bean class="org.apache.struts2.dispatcher.FilterDispatcher" static="true"
/>
<bean class="org.apache.struts2.views.util.ContextUtil" static="true" />
<bean class="org.apache.struts2.views.util.UrlHelper" static="true" />
+ <bean class="com.opensymphony.xwork2.util.XWorkConverter" static="true" />
+ <bean class="com.opensymphony.xwork2.ObjectFactory" static="true" />
<package name="struts-default">
<result-types>
