fixed validating to be true by default and to set namespaceAware accordingly

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2378 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller
2009-11-12 02:36:53 +00:00
parent 6bd9c4001a
commit d101a5e8f4
2 changed files with 6 additions and 4 deletions
@@ -44,7 +44,7 @@ import org.springframework.core.io.Resource;
*/ */
public abstract class AbstractXmlApplicationContext extends AbstractRefreshableConfigApplicationContext { public abstract class AbstractXmlApplicationContext extends AbstractRefreshableConfigApplicationContext {
private boolean validating = false; private boolean validating = true;
/** /**
@@ -101,9 +101,10 @@ public abstract class AbstractXmlApplicationContext extends AbstractRefreshableC
* @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader#setDocumentReaderClass * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader#setDocumentReaderClass
*/ */
protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) { protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) {
beanDefinitionReader.setValidationMode(this.validating ? if (!this.validating) {
XmlBeanDefinitionReader.VALIDATION_AUTO : XmlBeanDefinitionReader.VALIDATION_NONE); beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE);
beanDefinitionReader.setNamespaceAware(true);
}
} }
/** /**
@@ -74,6 +74,7 @@ public class GenericXmlApplicationContext extends GenericApplicationContext {
public void setValidating(boolean validating) { public void setValidating(boolean validating) {
this.reader.setValidationMode(validating ? this.reader.setValidationMode(validating ?
XmlBeanDefinitionReader.VALIDATION_AUTO : XmlBeanDefinitionReader.VALIDATION_NONE); XmlBeanDefinitionReader.VALIDATION_AUTO : XmlBeanDefinitionReader.VALIDATION_NONE);
this.reader.setNamespaceAware(!validating);
} }