|
|
|
|
@ -1,5 +1,5 @@
@@ -1,5 +1,5 @@
|
|
|
|
|
/* |
|
|
|
|
* Copyright 2002-2010 the original author or authors. |
|
|
|
|
* Copyright 2002-2011 the original author or authors. |
|
|
|
|
* |
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
|
@ -27,7 +27,6 @@ import java.util.Set;
@@ -27,7 +27,6 @@ import java.util.Set;
|
|
|
|
|
|
|
|
|
|
import org.apache.commons.logging.Log; |
|
|
|
|
import org.apache.commons.logging.LogFactory; |
|
|
|
|
|
|
|
|
|
import org.w3c.dom.Element; |
|
|
|
|
import org.w3c.dom.NamedNodeMap; |
|
|
|
|
import org.w3c.dom.Node; |
|
|
|
|
@ -59,8 +58,8 @@ import org.springframework.beans.factory.support.ManagedProperties;
@@ -59,8 +58,8 @@ import org.springframework.beans.factory.support.ManagedProperties;
|
|
|
|
|
import org.springframework.beans.factory.support.ManagedSet; |
|
|
|
|
import org.springframework.beans.factory.support.MethodOverrides; |
|
|
|
|
import org.springframework.beans.factory.support.ReplaceOverride; |
|
|
|
|
import org.springframework.core.env.StandardEnvironment; |
|
|
|
|
import org.springframework.core.env.Environment; |
|
|
|
|
import org.springframework.core.env.StandardEnvironment; |
|
|
|
|
import org.springframework.util.Assert; |
|
|
|
|
import org.springframework.util.ClassUtils; |
|
|
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
|
@ -383,19 +382,22 @@ public class BeanDefinitionParserDelegate {
@@ -383,19 +382,22 @@ public class BeanDefinitionParserDelegate {
|
|
|
|
|
|
|
|
|
|
if (root.hasAttribute(DEFAULT_AUTOWIRE_CANDIDATES_ATTRIBUTE)) { |
|
|
|
|
defaults.setAutowireCandidates(root.getAttribute(DEFAULT_AUTOWIRE_CANDIDATES_ATTRIBUTE)); |
|
|
|
|
} else if (parentDefaults != null) { |
|
|
|
|
} |
|
|
|
|
else if (parentDefaults != null) { |
|
|
|
|
defaults.setAutowireCandidates(parentDefaults.getAutowireCandidates()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (root.hasAttribute(DEFAULT_INIT_METHOD_ATTRIBUTE)) { |
|
|
|
|
defaults.setInitMethod(root.getAttribute(DEFAULT_INIT_METHOD_ATTRIBUTE)); |
|
|
|
|
} else if (parentDefaults != null) { |
|
|
|
|
} |
|
|
|
|
else if (parentDefaults != null) { |
|
|
|
|
defaults.setInitMethod(parentDefaults.getInitMethod()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (root.hasAttribute(DEFAULT_DESTROY_METHOD_ATTRIBUTE)) { |
|
|
|
|
defaults.setDestroyMethod(root.getAttribute(DEFAULT_DESTROY_METHOD_ATTRIBUTE)); |
|
|
|
|
} else if (parentDefaults != null) { |
|
|
|
|
} |
|
|
|
|
else if (parentDefaults != null) { |
|
|
|
|
defaults.setDestroyMethod(parentDefaults.getDestroyMethod()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|