fixed validating to be true by default and to set namespaceAware accordingly
This commit is contained in:
parent
e52e4c5717
commit
6ef9c2d710
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue