Consistent formatting of license headers, package javadocs, and import declarations

spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support package for beans-style handling of Java 5 annotations.
- *
  */
 package org.springframework.beans.annotation;
-

spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java

@@ -22,6 +22,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;

spring-beans/src/main/java/org/springframework/beans/factory/access/el/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support classes for accessing a Spring BeanFactory from Unified EL.
- *
  */
 package org.springframework.beans.factory.access.el;
-

spring-beans/src/main/java/org/springframework/beans/factory/access/package-info.java

@@ -1,12 +1,8 @@
-
 /**
- *
  * Helper infrastructure to locate and access bean factories.
  *
  * <p><b>Note: This package is only relevant for special sharing of bean
  * factories, for example behind EJB facades. It is <i>not</i> used in a
  * typical web application or standalone application.</b>
- *
  */
 package org.springframework.beans.factory.access;
-

spring-beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support package for annotation-driven bean configuration.
- *
  */
 package org.springframework.beans.factory.annotation;
-

spring-beans/src/main/java/org/springframework/beans/factory/config/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * SPI interfaces and configuration-related convenience classes for bean factories.
- *
  */
 package org.springframework.beans.factory.config;
-

spring-beans/src/main/java/org/springframework/beans/factory/package-info.java

@@ -1,16 +1,12 @@
-
 /**
- *
  * The core package implementing Spring's lightweight Inversion of Control (IoC) container.
- * <p>
- * Provides an alternative to the Singleton and Prototype design
+ *
+ * <p>Provides an alternative to the Singleton and Prototype design
  * patterns, including a consistent approach to configuration management.
  * Builds on the org.springframework.beans package.
  *
  * <p>This package and related packages are discussed in Chapter 11 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
- *
  */
 package org.springframework.beans.factory;
-

spring-beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support infrastructure for bean definition parsing.
- *
  */
 package org.springframework.beans.factory.parsing;
-

spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
- * Support package for the JDK 1.6 ServiceLoader facility.
- *
+ * Support package for the Java 6 ServiceLoader facility.
  */
 package org.springframework.beans.factory.serviceloader;
-

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java

@@ -21,10 +21,11 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.EnvironmentCapable;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;

spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java

@@ -1,9 +1,5 @@
 /**
- *
  * Classes supporting the {@code org.springframework.beans.factory} package.
  * Contains abstract base classes for {@code BeanFactory} implementations.
- *
- *
  */
 package org.springframework.beans.factory.support;
-

spring-beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Mechanism to determine bean wiring metadata from a bean instance.
  * Foundation for aspect-driven bean configuration.
- *
  */
 package org.springframework.beans.factory.wiring;
-

spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java

@@ -1,8 +1,5 @@
 /**
- *
  * Contains an abstract XML-based {@code BeanFactory} implementation,
- * including a standard "spring-beans" DTD.
- *
+ * including a standard "spring-beans" XSD.
  */
 package org.springframework.beans.factory.xml;
-

spring-beans/src/main/java/org/springframework/beans/package-info.java

@@ -1,6 +1,4 @@
-
 /**
- *
  * This package contains interfaces and classes for manipulating Java beans.
  * It is used by most other Spring packages.
  *
@@ -10,7 +8,5 @@
  * <p>The classes in this package are discussed in Chapter 11 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
- *
  */
 package org.springframework.beans;
-

spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java

@@ -1,13 +1,9 @@
-
 /**
- *
  * Properties editors used to convert from String values to object
  * types such as java.util.Properties.
  *
  * <p>Some of these editors are registered automatically by BeanWrapperImpl.
  * "CustomXxxEditor" classes are intended for manual registration in
  * specific binding processes, as they are localized or the like.
- *
  */
 package org.springframework.beans.propertyeditors;
-

spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java

@@ -23,6 +23,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;
 import org.springframework.util.StringUtils;

spring-beans/src/main/java/org/springframework/beans/support/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Classes supporting the org.springframework.beans package,
  * such as utility classes for sorting and holding lists of beans.
- *
  */
 package org.springframework.beans.support;
-