From 6ef9c2d7101d26d84dac4d670bb587deb868fb39 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 12 Nov 2009 02:36:53 +0000 Subject: [PATCH] fixed validating to be true by default and to set namespaceAware accordingly --- .../context/support/AbstractXmlApplicationContext.java | 9 +++++---- .../context/support/GenericXmlApplicationContext.java | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java index d0f44e92bc..69adb4f48b 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java @@ -44,7 +44,7 @@ import org.springframework.core.io.Resource; */ 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 */ protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) { - beanDefinitionReader.setValidationMode(this.validating ? - XmlBeanDefinitionReader.VALIDATION_AUTO : XmlBeanDefinitionReader.VALIDATION_NONE); - + if (!this.validating) { + beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); + beanDefinitionReader.setNamespaceAware(true); + } } /** diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java index 6ae0d02444..59ad199c25 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java @@ -74,6 +74,7 @@ public class GenericXmlApplicationContext extends GenericApplicationContext { public void setValidating(boolean validating) { this.reader.setValidationMode(validating ? XmlBeanDefinitionReader.VALIDATION_AUTO : XmlBeanDefinitionReader.VALIDATION_NONE); + this.reader.setNamespaceAware(!validating); }