From 9cbdb09169bc49545c60931c6effb363f462d894 Mon Sep 17 00:00:00 2001
From: Rainer Hermanns <hermanns@apache.org>
Date: Wed, 18 Jun 2008 14:47:55 +0000
Subject: [PATCH] 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!


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@669193 13f79535-47bb-0310-9956-ffa450edef68
---
 .../portlet/src/main/resources/struts-plugin.xml   |  3 ++-
 .../struts2/spring/StrutsSpringObjectFactory.java  | 14 +++++++-------
 .../spring/StrutsSpringObjectFactoryTest.java      |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/portlet/src/main/resources/struts-plugin.xml b/plugins/portlet/src/main/resources/struts-plugin.xml
index fd3f59f3e..29b99bc84 100644
--- a/plugins/portlet/src/main/resources/struts-plugin.xml
+++ b/plugins/portlet/src/main/resources/struts-plugin.xml
@@ -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>
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
index 3edb39fb4..47dded0f7 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
@@ -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
diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
index 3246adab3..1dda3be96 100644
--- a/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
+++ b/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
@@ -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());
     }