mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-05-02 20:09:31 +01:00
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:
+5
-4
@@ -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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user