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

Use lookup instead if injection for this constants. This should work, but for some reason it fails in the apache zone and it was reported in dev@ also. I am clueless about it.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@817418 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Musachy Barroso
2009-09-21 21:36:17 +00:00
parent 9277a16673
commit 27f9f37eb7
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/spring/pom.xml
+7 -1
View File
@@ -84,7 +84,13 @@
<scope>test</scope>
<version>3.8.2</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
</dependencies>
plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
+6 -3
View File
@@ -21,6 +21,7 @@
package org.apache.struts2.spring;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.spring.SpringObjectFactory;
import com.opensymphony.xwork2.util.logging.Logger;
@@ -68,9 +69,7 @@ public class StrutsSpringObjectFactory extends SpringObjectFactory {
@Inject(value=StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_USE_CLASS_CACHE,required=false) String useClassCacheStr,
@Inject ServletContext servletContext,
@Inject(StrutsConstants.STRUTS_DEVMODE) String devMode,
@Inject(value = "struts.class.reloading.watchList", required = false) String watchList,
@Inject(value = "struts.class.reloading.acceptClasses", required = false) String acceptClasses,
@Inject(value = "struts.class.reloading.reloadConfig", required = false) String reloadConfig) {
@Inject Container container) {
super();
boolean useClassCache = "true".equals(useClassCacheStr);
@@ -97,6 +96,10 @@ public class StrutsSpringObjectFactory extends SpringObjectFactory {
LOG.fatal(message);
return;
}
String watchList = container.getInstance(String.class, "struts.class.reloading.watchList");
String acceptClasses = container.getInstance(String.class, "struts.class.reloading.acceptClasses");
String reloadConfig = container.getInstance(String.class, "struts.class.reloading.reloadConfig");
if ("true".equals(devMode)
&& StringUtils.isNotBlank(watchList)
plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
+10 -3
View File
@@ -25,12 +25,15 @@ import javax.servlet.ServletContext;
import junit.framework.TestCase;
import org.apache.struts2.StrutsConstants;
import org.easymock.EasyMock;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.mock.web.MockServletContext;
import org.springframework.web.context.ConfigurableWebApplicationContext;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.XmlWebApplicationContext;
import com.opensymphony.xwork2.inject.Container;
/**
* Unit test for {@link StrutsSpringObjectFactory}.
*
@@ -39,13 +42,17 @@ 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, null, new MockServletContext(), null, "false", null, null);
Container container = EasyMock.createNiceMock(Container.class);
EasyMock.replay(container);
StrutsSpringObjectFactory fac = new StrutsSpringObjectFactory(null, null, null, new MockServletContext(), null, container);
assertEquals(AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, fac.getAutowireStrategy());
}
public void testWithSpringContext() throws Exception {
Container container = EasyMock.createNiceMock(Container.class);
EasyMock.replay(container);
ConfigurableWebApplicationContext ac = new XmlWebApplicationContext();
ServletContext msc = (ServletContext) new MockServletContext();
@@ -53,7 +60,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, null, msc, null, "true", null, null);
StrutsSpringObjectFactory fac = new StrutsSpringObjectFactory("constructor", null, null, msc, null, container);
assertEquals(AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, fac.getAutowireStrategy());
}