diff --git a/spring-data-commons-core/pom.xml b/spring-data-commons-core/pom.xml index 0d311209e..48043299d 100644 --- a/spring-data-commons-core/pom.xml +++ b/spring-data-commons-core/pom.xml @@ -13,10 +13,13 @@ Spring Data Commons Core - 2.8.0 1.0 - 1.1.3 1.9.7 + 1.0.6 + 1.8.5 + 2.8.0 + 1.7.1 + 1.1.3 @@ -26,6 +29,12 @@ org.springframework spring-core ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework @@ -85,7 +94,7 @@ org.mockito mockito-core - 1.8.5 + ${mockito.version} test @@ -169,6 +178,28 @@ 1.8.6 test + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + runtime + + + + ch.qos.logback + logback-classic + ${logback.version} + test + + diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/crossstore/ChangeSetBackedTransactionSynchronization.java b/spring-data-commons-core/src/main/java/org/springframework/data/crossstore/ChangeSetBackedTransactionSynchronization.java index 3cc5cd3cc..320794ce1 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/crossstore/ChangeSetBackedTransactionSynchronization.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/crossstore/ChangeSetBackedTransactionSynchronization.java @@ -15,13 +15,13 @@ */ package org.springframework.data.crossstore; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.transaction.support.TransactionSynchronization; public class ChangeSetBackedTransactionSynchronization implements TransactionSynchronization { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); private final ChangeSetPersister changeSetPersister; private final ChangeSetBacked entity; diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java index cc54a7b86..6de2a7331 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java @@ -29,8 +29,8 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.util.Assert; /** @@ -41,7 +41,7 @@ import org.springframework.util.Assert; */ public abstract class CdiRepositoryBean implements Bean { - private static final Log LOG = LogFactory.getLog(CdiRepositoryBean.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CdiRepositoryBean.class); private final Set qualifiers; private final Class repositoryType; @@ -76,8 +76,8 @@ public abstract class CdiRepositoryBean implements Bean { interfaces.add(repositoryType); interfaces.addAll(Arrays.asList(repositoryType.getInterfaces())); - if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Declaring types '%s' for repository '%s'.", interfaces.toString(), + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(String.format("Declaring types '%s' for repository '%s'.", interfaces.toString(), repositoryType.getName())); } @@ -103,8 +103,8 @@ public abstract class CdiRepositoryBean implements Bean { */ public final T create(CreationalContext creationalContext) { - if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Creating bean instance for repository type '%s'.", repositoryType.getName())); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(String.format("Creating bean instance for repository type '%s'.", repositoryType.getName())); } return create(creationalContext, repositoryType); } @@ -115,8 +115,8 @@ public abstract class CdiRepositoryBean implements Bean { */ public void destroy(T instance, CreationalContext creationalContext) { - if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Destroying bean instance %s for repository type '%s'.", instance.toString(), + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(String.format("Destroying bean instance %s for repository type '%s'.", instance.toString(), repositoryType.getName())); } diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java index bfa89698f..6f964ec03 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java @@ -31,8 +31,8 @@ import javax.enterprise.inject.spi.ProcessAnnotatedType; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.repository.NoRepositoryBean; import org.springframework.data.repository.Repository; import org.springframework.data.repository.RepositoryDefinition; @@ -45,7 +45,7 @@ import org.springframework.data.repository.RepositoryDefinition; */ public abstract class CdiRepositoryExtensionSupport implements Extension { - private static final Log LOGGER = LogFactory.getLog(CdiRepositoryExtensionSupport.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CdiRepositoryExtensionSupport.class); private final Map, Set> repositoryTypes = new HashMap, Set>(); diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java index 2f00516d2..fd8c74638 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Set; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -40,7 +40,7 @@ import org.springframework.util.StringUtils; */ public class RepositoryBeanDefinitionBuilder { - private static final Log LOG = LogFactory.getLog(RepositoryBeanDefinitionBuilder.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RepositoryBeanDefinitionBuilder.class); private final RepositoryConfiguration configuration; private final RepositoryConfigurationExtension extension; @@ -118,8 +118,8 @@ public class RepositoryBeanDefinitionBuilder { return null; } - if (LOG.isDebugEnabled()) { - LOG.debug("Registering custom repository implementation: " + configuration.getImplementationBeanName() + " " + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Registering custom repository implementation: " + configuration.getImplementationBeanName() + " " + beanDefinition.getBeanClassName()); } diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java index ccb55f049..de0b20269 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java @@ -17,8 +17,8 @@ package org.springframework.data.repository.config; import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.parsing.BeanComponentDefinition; import org.springframework.beans.factory.parsing.ReaderContext; @@ -39,7 +39,7 @@ import org.w3c.dom.Element; */ public class RepositoryBeanDefinitionParser implements BeanDefinitionParser { - private static final Log LOG = LogFactory.getLog(RepositoryBeanDefinitionParser.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RepositoryBeanDefinitionParser.class); private final RepositoryConfigurationExtension extension; @@ -109,8 +109,8 @@ public class RepositoryBeanDefinitionParser implements BeanDefinitionParser { String beanName = generator.generateBeanName(beanDefinition, parser.getRegistry()); - if (LOG.isDebugEnabled()) { - LOG.debug("Registering repository: " + beanName + " - Interface: " + configuration.getRepositoryInterface() + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Registering repository: " + beanName + " - Interface: " + configuration.getRepositoryInterface() + " - Factory: " + extension.getRepositoryFactoryClassName()); } diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessor.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessor.java index 9fcd66809..88a00e6e4 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessor.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessor.java @@ -18,8 +18,8 @@ package org.springframework.data.repository.core.support; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -40,7 +40,7 @@ import org.springframework.util.ClassUtils; class RepositoryInterfaceAwareBeanPostProcessor extends InstantiationAwareBeanPostProcessorAdapter implements BeanFactoryAware { - private static final Log LOG = LogFactory.getLog(RepositoryInterfaceAwareBeanPostProcessor.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RepositoryInterfaceAwareBeanPostProcessor.class); private static final Class REPOSITORY_TYPE = RepositoryFactoryBeanSupport.class; private final Map> cache = new ConcurrentHashMap>(); @@ -109,7 +109,7 @@ class RepositoryInterfaceAwareBeanPostProcessor extends InstantiationAwareBeanPo try { return ClassUtils.resolveClassName(className, context.getBeanClassLoader()); } catch (IllegalArgumentException ex) { - LOG.warn(String.format("Couldn't load class %s referenced as repository interface in bean %s!", className, + LOGGER.warn(String.format("Couldn't load class %s referenced as repository interface in bean %s!", className, beanName)); return Void.class; } diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java index 808eadf0b..65d6eb01f 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryProxyPostProcessor.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.core.BridgeMethodResolver; @@ -34,6 +34,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslationIntercepto import org.springframework.transaction.annotation.Ejb3TransactionAnnotationParser; import org.springframework.transaction.annotation.SpringTransactionAnnotationParser; import org.springframework.transaction.annotation.TransactionAnnotationParser; +import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.DefaultTransactionAttribute; import org.springframework.transaction.interceptor.TransactionAttribute; import org.springframework.transaction.interceptor.TransactionAttributeSource; @@ -98,7 +99,6 @@ class TransactionalRepositoryProxyPostProcessor implements RepositoryProxyPostPr /** * Implementation of the {@link org.springframework.transaction.interceptor.TransactionAttributeSource} interface for * working with transaction metadata in JDK 1.5+ annotation format. - * *

* This class reads Spring's JDK 1.5+ {@link Transactional} annotation and exposes corresponding transaction * attributes to Spring's transaction infrastructure. Also supports EJB3's {@link javax.ejb.TransactionAttribute} @@ -216,13 +216,11 @@ class TransactionalRepositoryProxyPostProcessor implements RepositoryProxyPostPr /** * Abstract implementation of {@link TransactionAttributeSource} that caches attributes for methods and implements a * fallback policy: 1. specific target method; 2. target class; 3. declaring method; 4. declaring class/interface. - * *

* Defaults to using the target class's transaction attribute if none is associated with the target method. Any * transaction attribute associated with the target method completely overrides a class transaction attribute. If none * found on the target class, the interface that the invoked method has been called through (in case of a JDK proxy) * will be checked. - * *

* This implementation caches attributes by method after they are first used. If it is ever desirable to allow dynamic * changing of transaction attributes (which is very unlikely), caching could be made configurable. Caching is @@ -246,7 +244,7 @@ class TransactionalRepositoryProxyPostProcessor implements RepositoryProxyPostPr * As this base class is not marked Serializable, the logger will be recreated after serialization - provided that * the concrete subclass is Serializable. */ - protected final Log logger = LogFactory.getLog(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); /** * Cache of TransactionAttributes, keyed by DefaultCacheKey (Method + target Class). @@ -409,8 +407,8 @@ class TransactionalRepositoryProxyPostProcessor implements RepositoryProxyPostPr return false; } DefaultCacheKey otherKey = (DefaultCacheKey) other; - return (this.method.equals(otherKey.method) && ObjectUtils.nullSafeEquals(this.targetClass, - otherKey.targetClass)); + return this.method.equals(otherKey.method) + && ObjectUtils.nullSafeEquals(this.targetClass, otherKey.targetClass); } @Override diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java index d36f802c0..8a78a432c 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/init/ResourceReaderRepositoryPopulator.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.core.io.Resource; @@ -39,7 +39,7 @@ import org.springframework.util.Assert; */ public class ResourceReaderRepositoryPopulator implements RepositoryPopulator, ApplicationEventPublisherAware { - private static final Log LOG = LogFactory.getLog(ResourceReaderRepositoryPopulator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ResourceReaderRepositoryPopulator.class); private final ResourcePatternResolver resolver; private final ResourceReader reader; @@ -110,7 +110,7 @@ public class ResourceReaderRepositoryPopulator implements RepositoryPopulator, A for (Resource resource : resources) { - LOG.info(String.format("Reading resource: %s", resource)); + LOGGER.info(String.format("Reading resource: %s", resource)); Object result = readObjectFrom(resource); @@ -119,7 +119,7 @@ public class ResourceReaderRepositoryPopulator implements RepositoryPopulator, A if (element != null) { persist(element, repositories); } else { - LOG.info("Skipping null element found in unmarshal result!"); + LOGGER.info("Skipping null element found in unmarshal result!"); } } } else { @@ -155,7 +155,7 @@ public class ResourceReaderRepositoryPopulator implements RepositoryPopulator, A private void persist(Object object, Repositories repositories) { CrudRepository repository = repositories.getRepositoryFor(object.getClass()); - LOG.debug(String.format("Persisting %s using repository %s", object, repository)); + LOGGER.debug(String.format("Persisting %s using repository %s", object, repository)); repository.save(object); } } diff --git a/spring-data-commons-core/src/test/resources/log4j.xml b/spring-data-commons-core/src/test/resources/log4j.xml deleted file mode 100644 index 30d2d8ff4..000000000 --- a/spring-data-commons-core/src/test/resources/log4j.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-data-commons-core/src/test/resources/logback.xml b/spring-data-commons-core/src/test/resources/logback.xml new file mode 100644 index 000000000..fc4931c41 --- /dev/null +++ b/spring-data-commons-core/src/test/resources/logback.xml @@ -0,0 +1,16 @@ + + + + + + %d %5p %40.40c:%4L - %m%n + + + + + + + + + + \ No newline at end of file diff --git a/spring-data-commons-core/src/test/resources/mapping.xml b/spring-data-commons-core/src/test/resources/mapping.xml deleted file mode 100644 index dba24e9c4..000000000 --- a/spring-data-commons-core/src/test/resources/mapping.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/spring-data-commons-parent/pom.xml b/spring-data-commons-parent/pom.xml index 9866aafb5..e1ba107a8 100644 --- a/spring-data-commons-parent/pom.xml +++ b/spring-data-commons-parent/pom.xml @@ -12,8 +12,6 @@ UTF-8 4.10 - 1.2.16 - 1.8.5 3.0.7.RELEASE 3.1.2.RELEASE 0.3.0.RELEASE @@ -90,13 +88,6 @@ - - - log4j - log4j - ${log4j.version} - test - org.hamcrest