You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by he...@apache.org on 2008/06/18 16:47:55 UTC
svn commit: r669193 - in /struts/struts2/trunk/plugins:
portlet/src/main/resources/ spring/src/main/java/org/apache/struts2/spring/
spring/src/test/java/org/apache/struts2/spring/
Author: hermanns
Date: Wed Jun 18 07:47:55 2008
New Revision: 669193
URL: http://svn.apache.org/viewvc?rev=669193&view=rev
Log:
WW-2479 Adding new setting to force spring object factory to use configured autowire strategy
o fixing build by commenting "old" constructor in StrutsSpringObjectFactory
o adding missing param to struts-plugin.xml in portlet-plugin
NOTE: This needs to be reviewed again!
Modified:
struts/struts2/trunk/plugins/portlet/src/main/resources/struts-plugin.xml
struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
struts/struts2/trunk/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
Modified: struts/struts2/trunk/plugins/portlet/src/main/resources/struts-plugin.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/resources/struts-plugin.xml?rev=669193&r1=669192&r2=669193&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/resources/struts-plugin.xml (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/resources/struts-plugin.xml Wed Jun 18 07:47:55 2008
@@ -32,7 +32,8 @@
<constant name="struts.urlRenderer" value="portlet" />
<constant name="struts.portlet.useDispatcherServlet" value="false" />
<constant name="struts.portlet.dispatcherServletName" value="Struts2PortletDispatcherServlet" />
-
+ <constant name="struts.objectFactory.spring.autoWire.alwaysRespect" value="false" />
+
<package name="struts-portlet-default" extends="struts-default">
<result-types>
Modified: struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java?rev=669193&r1=669192&r2=669193&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java (original)
+++ struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java Wed Jun 18 07:47:55 2008
@@ -45,13 +45,13 @@
public class StrutsSpringObjectFactory extends SpringObjectFactory {
private static final Logger LOG = LoggerFactory.getLogger(StrutsSpringObjectFactory.class);
- @Inject
- public StrutsSpringObjectFactory(
- @Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE,required=false) String autoWire,
- @Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_USE_CLASS_CACHE,required=false) String useClassCacheStr,
- @Inject ServletContext servletContext) {
- this(autoWire, "false", useClassCacheStr, servletContext);
- }
+ //@Inject
+ //public StrutsSpringObjectFactory(
+ // @Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE,required=false) String autoWire,
+ // @Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_USE_CLASS_CACHE,required=false) String useClassCacheStr,
+ // @Inject ServletContext servletContext) {
+ // this(autoWire, "false", useClassCacheStr, servletContext);
+ //}
/**
* Constructs the spring object factory
Modified: struts/struts2/trunk/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java?rev=669193&r1=669192&r2=669193&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java (original)
+++ struts/struts2/trunk/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java Wed Jun 18 07:47:55 2008
@@ -39,7 +39,7 @@
public void testNoSpringContext() throws Exception {
// to cover situations where there will be logged an error
- StrutsSpringObjectFactory fac = new StrutsSpringObjectFactory(null, null, new MockServletContext());
+ StrutsSpringObjectFactory fac = new StrutsSpringObjectFactory(null, null, null, new MockServletContext());
assertEquals(AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, fac.getAutowireStrategy());
}
@@ -53,7 +53,7 @@
ac.setServletContext(msc);
ac.setConfigLocations(new String[] {"org/apache/struts2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"});
ac.refresh();
- StrutsSpringObjectFactory fac = new StrutsSpringObjectFactory("constructor", null, msc);
+ StrutsSpringObjectFactory fac = new StrutsSpringObjectFactory("constructor", null, null, msc);
assertEquals(AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, fac.getAutowireStrategy());
}