diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java index a41bd8b343..e8af9c6cd7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -19,15 +19,14 @@ package org.springframework.beans.factory.xml; import org.w3c.dom.Document; import org.springframework.beans.factory.BeanDefinitionStoreException; -import org.springframework.core.env.Environment; /** * SPI for parsing an XML document that contains Spring bean definitions. - * Used by XmlBeanDefinitionReader for actually parsing a DOM document. + * Used by {@link XmlBeanDefinitionReader} for actually parsing a DOM document. * - *

Instantiated per document to parse: Implementations can hold + *

Instantiated per document to parse: implementations can hold * state in instance variables during the execution of the - * {@code registerBeanDefinitions} method, for example global + * {@code registerBeanDefinitions} method — for example, global * settings that are defined for all bean definitions in the document. * * @author Juergen Hoeller diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java index 9a11d38a4c..494bcd39fd 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -32,22 +32,21 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.parsing.BeanComponentDefinition; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; -import org.springframework.core.env.Environment; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternUtils; import org.springframework.util.ResourceUtils; import org.springframework.util.StringUtils; /** - * Default implementation of the {@link BeanDefinitionDocumentReader} interface. - * Reads bean definitions according to the "spring-beans" DTD and XSD format + * Default implementation of the {@link BeanDefinitionDocumentReader} interface that + * reads bean definitions according to the "spring-beans" DTD and XSD format * (Spring's default XML bean definition format). * - *

The structure, elements and attribute names of the required XML document + *

The structure, elements, and attribute names of the required XML document * are hard-coded in this class. (Of course a transform could be run if necessary - * to produce this format). {@code <beans>} doesn't need to be the root - * element of the XML document: This class will parse all bean definition elements - * in the XML file, not regarding the actual root element. + * to produce this format). {@code } does not need to be the root + * element of the XML document: this class will parse all bean definition elements + * in the XML file, regardless of the actual root element. * * @author Rod Johnson * @author Juergen Hoeller