Repository: struts Updated Branches: refs/heads/master 5a0f2e1aa -> 7fa41f188
WW-4110 Marks AOP support as deprecated Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7fa41f18 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7fa41f18 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7fa41f18 Branch: refs/heads/master Commit: 7fa41f1885cdde9487714c8170f090dc9d27c8ce Parents: 5a0f2e1 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri May 12 08:28:56 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri May 12 08:28:56 2017 +0200 ---------------------------------------------------------------------- .../java/com/opensymphony/xwork2/spring/SpringObjectFactory.java | 1 + core/src/main/java/org/apache/struts2/StrutsConstants.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/7fa41f18/core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java b/core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java index ebe08c2..51a4751 100644 --- a/core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java +++ b/core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java @@ -57,6 +57,7 @@ public class SpringObjectFactory extends ObjectFactory implements ApplicationCon * This is temporary solution, after validating can be removed * @since 2.3.18 */ + @Deprecated private boolean enableAopSupport = false; @Inject(value="applicationContextPath",required=false) http://git-wip-us.apache.org/repos/asf/struts/blob/7fa41f18/core/src/main/java/org/apache/struts2/StrutsConstants.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java index f9d9b24..87902cc 100644 --- a/core/src/main/java/org/apache/struts2/StrutsConstants.java +++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java @@ -159,6 +159,7 @@ public final class StrutsConstants { public static final String STRUTS_OBJECTFACTORY_SPRING_USE_CLASS_CACHE = "struts.objectFactory.spring.useClassCache"; /** Uses different logic to construct beans, see https://issues.apache.org/jira/browse/WW-4110 */ + @Deprecated public static final String STRUTS_OBJECTFACTORY_SPRING_ENABLE_AOP_SUPPORT = "struts.objectFactory.spring.enableAopSupport"; /** Whether or not XSLT templates should not be cached */
