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

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

@@ -1,9 +1,5 @@
-
 /**
- *
  * Annotation support for DAOs. Contains a bean post-processor for translating
  * persistence exceptions based on a repository stereotype annotation.
- *
  */
 package org.springframework.dao.annotation;
-

spring-tx/src/main/java/org/springframework/dao/package-info.java

@@ -1,6 +1,4 @@
-
 /**
- *
  * Exception hierarchy enabling sophisticated error handling independent
  * of the data access approach in use. For example, when DAOs and data
  * access frameworks use the exceptions in this package (and custom
@@ -14,7 +12,5 @@
  * <p>The classes in this package are discussed in Chapter 9 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.dao;
-

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

@@ -1,9 +1,5 @@
-
 /**
- *
  * Support classes for DAO implementations,
  * providing miscellaneous utility methods.
- *
  */
 package org.springframework.dao.support;
-

spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java

@@ -20,7 +20,6 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-
 import javax.resource.NotSupportedException;
 import javax.resource.ResourceException;
 import javax.resource.cci.Connection;

spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java

@@ -20,7 +20,6 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-
 import javax.resource.ResourceException;
 import javax.resource.cci.Connection;
 import javax.resource.cci.ConnectionFactory;

spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Provides a utility class for easy ConnectionFactory access,
  * a PlatformTransactionManager for local CCI transactions,
  * and various simple ConnectionFactory proxies/adapters.
- *
  */
 package org.springframework.jca.cci.connection;
-

spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java

@@ -17,7 +17,6 @@
 package org.springframework.jca.cci.core;
 
 import java.sql.SQLException;
-
 import javax.resource.ResourceException;
 import javax.resource.cci.Connection;
 import javax.resource.cci.ConnectionFactory;

spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java

@@ -17,7 +17,6 @@
 package org.springframework.jca.cci.core;
 
 import java.sql.SQLException;
-
 import javax.resource.ResourceException;
 import javax.resource.cci.ConnectionFactory;
 import javax.resource.cci.Interaction;

spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java

@@ -17,7 +17,6 @@
 package org.springframework.jca.cci.core;
 
 import java.sql.SQLException;
-
 import javax.resource.ResourceException;
 import javax.resource.cci.Record;
 

spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Provides the core JCA CCI support, based on CciTemplate
  * and its associated callback interfaces.
- *
  */
 package org.springframework.jca.cci.core;
-

spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java

@@ -19,7 +19,6 @@ package org.springframework.jca.cci.core.support;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
 import javax.resource.cci.Record;
 import javax.resource.cci.Streamable;
 

spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java

@@ -1,8 +1,5 @@
 /**
- *
  * Classes supporting the {@code org.springframework.jca.cci.core} package.
  * Contains a DAO base class for CciTemplate usage.
- *
  */
 package org.springframework.jca.cci.core.support;
-

spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java

@@ -17,7 +17,6 @@
 package org.springframework.jca.cci.object;
 
 import java.io.IOException;
-
 import javax.resource.cci.ConnectionFactory;
 import javax.resource.cci.InteractionSpec;
 import javax.resource.cci.Record;

spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java

@@ -17,7 +17,6 @@
 package org.springframework.jca.cci.object;
 
 import java.sql.SQLException;
-
 import javax.resource.ResourceException;
 import javax.resource.cci.ConnectionFactory;
 import javax.resource.cci.InteractionSpec;

spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java

@@ -1,11 +1,8 @@
 /**
- *
  * The classes in this package represent EIS operations as threadsafe,
  * reusable objects. This higher level of CCI abstraction depends on the
  * lower-level abstraction in the {@code org.springframework.jca.cci.core} package.
  * Exceptions thrown are as in the {@code org.springframework.dao} package,
  * meaning that code using this package does not need to worry about error handling.
- *
  */
 package org.springframework.jca.cci.object;
-

spring-tx/src/main/java/org/springframework/jca/cci/package-info.java

@@ -1,10 +1,7 @@
 /**
- *
  * This package contains Spring's support for the Common Client Interface (CCI),
  * as defined by the J2EE Connector Architecture. It is conceptually similar
  * to the {@code org.springframework.jdbc} package, providing the same
  * levels of data access abstraction.
- *
  */
 package org.springframework.jca.cci;
-

spring-tx/src/main/java/org/springframework/jca/context/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Integration package that allows for deploying a Spring application context
  * as a JCA 1.5 compliant RAR file.
- *
  */
 package org.springframework.jca.context;
-

spring-tx/src/main/java/org/springframework/jca/endpoint/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * This package provides a facility for generic JCA message endpoint management.
- *
  */
 package org.springframework.jca.endpoint;
-

spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java

@@ -17,7 +17,6 @@
 package org.springframework.jca.support;
 
 import java.util.Timer;
-
 import javax.resource.spi.BootstrapContext;
 import javax.resource.spi.UnavailableException;
 import javax.resource.spi.XATerminator;

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

@@ -1,9 +1,5 @@
-
 /**
- *
  * Provides generic support classes for JCA usage within Spring,
  * mainly for local setup of a JCA ResourceAdapter and/or ConnectionFactory.
- *
  */
 package org.springframework.jca.support;
-

spring-tx/src/main/java/org/springframework/jca/work/glassfish/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Convenience package for obtaining a GlassFish JCA WorkManager for use in
  * web applications. Provides a Spring TaskExecutor adapter for GlassFish.
- *
  */
 package org.springframework.jca.work.glassfish;
-

spring-tx/src/main/java/org/springframework/jca/work/jboss/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Convenience package for obtaining a JBoss JCA WorkManager for use in
  * web applications. Provides a Spring TaskExecutor adapter for JBoss.
- *
  */
 package org.springframework.jca.work.jboss;
-

spring-tx/src/main/java/org/springframework/jca/work/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Convenience classes for scheduling based on the JCA 1.5 WorkManager facility,
  * as supported within JCA 1.5 ResourceAdapters.
- *
  */
 package org.springframework.jca.work;
-

spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java

@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.lang.reflect.AnnotatedElement;
 import java.util.ArrayList;
 
+import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.transaction.interceptor.NoRollbackRuleAttribute;
 import org.springframework.transaction.interceptor.RollbackRuleAttribute;
 import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute;

spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java

@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.lang.reflect.AnnotatedElement;
 import java.util.ArrayList;
 
+import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.transaction.interceptor.NoRollbackRuleAttribute;
 import org.springframework.transaction.interceptor.RollbackRuleAttribute;
 import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute;

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

@@ -1,10 +1,6 @@
-
 /**
- *
- * JDK 1.5+ annotation for transaction demarcation.
+ * Java 5 annotation for transaction demarcation.
  * Hooked into Spring's transaction interception infrastructure
  * via a special TransactionAttributeSource implementation.
- *
  */
 package org.springframework.transaction.annotation;
-

spring-tx/src/main/java/org/springframework/transaction/config/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Support package for declarative transaction configuration,
  * with XML schema being the primary configuration format.
- *
  */
 package org.springframework.transaction.config;
-

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java

@@ -16,8 +16,13 @@
 
 package org.springframework.transaction.interceptor;
 
+import java.lang.reflect.Method;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.InitializingBean;
@@ -31,10 +36,6 @@ import org.springframework.transaction.support.CallbackPreferringPlatformTransac
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.util.StringUtils;
 
-import java.lang.reflect.Method;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * Base class for transactional aspects, such as the {@link TransactionInterceptor}
  * or an AspectJ aspect.

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java

@@ -16,18 +16,19 @@
 
 package org.springframework.transaction.interceptor;
 
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.transaction.PlatformTransactionManager;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Properties;
 
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.transaction.PlatformTransactionManager;
+
 /**
  * AOP Alliance MethodInterceptor for declarative transaction
  * management using the common Spring transaction infrastructure

spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java

@@ -1,6 +1,4 @@
-
 /**
- *
  * AOP-based solution for declarative transaction demarcation.
  * Builds on the AOP infrastructure in org.springframework.aop.framework.
  * Any POJO can be transactionally advised with Spring.
@@ -12,7 +10,5 @@
  * delivers transactional advice, based on the Spring transaction abstraction.
  * This allows declarative transaction management in any environment,
  * even without JTA if an application uses only a single database.
- *
  */
 package org.springframework.transaction.interceptor;
-

spring-tx/src/main/java/org/springframework/transaction/jta/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Transaction SPI implementation for JTA.
- *
  */
 package org.springframework.transaction.jta;
-

spring-tx/src/main/java/org/springframework/transaction/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Exception hierarchy for Spring's transaction infrastructure,
  * independent of any specific transaction management system.
  * Contains transaction manager, definition, and status interfaces.
- *
  */
 package org.springframework.transaction;
-

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

@@ -1,10 +1,6 @@
-
 /**
- *
  * Support classes for the org.springframework.transaction package.
  * Provides an abstract base class for transaction manager implementations,
  * and a template plus callback for transaction demarcation.
- *
  */
 package org.springframework.transaction.support;
-