svn commit: r735096 - /struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java

[musachy]

Author: musachy
Date: Fri Jan 16 11:37:42 2009
New Revision: 735096

URL: http://svn.apache.org/viewvc?rev=735096&view=rev
Log:
WW-2765 add setting for autowire=no

Modified:
    
struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java

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=735096&r1=735095&r2=735096&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
 Fri Jan 16 11:37:42 2009
@@ -21,18 +21,16 @@
 
 package org.apache.struts2.spring;
 
-import javax.servlet.ServletContext;
-
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.spring.SpringObjectFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import org.apache.struts2.StrutsConstants;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.spring.SpringObjectFactory;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import javax.servlet.ServletContext;
 
 
 
@@ -98,6 +96,8 @@
             type = AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT;
         } else if ("constructor".equals(autoWire)) {
             type = AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR;
+        } else if ("no".equals(autoWire)) {
+            type = AutowireCapableBeanFactory.AUTOWIRE_NO;
         }
         this.setAutowireStrategy(type);