Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-2479 Adding new setting to force spring object factory to use configured autowire strategy

Browse Source 
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!


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@669193 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Hermanns
2008-06-18 14:47:55 +00:00
parent 6736da66a5
commit 9cbdb09169
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/portlet/src/main/resources/struts-plugin.xml
+2 -1
View File
@@ -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>
plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
+7 -7
View File
@@ -45,13 +45,13 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
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
plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
+2 -2
View File
@@ -39,7 +39,7 @@ public class StrutsSpringObjectFactoryTest extends TestCase {
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 @@ public class StrutsSpringObjectFactoryTest extends TestCase {
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());
}