diff --git a/org.springframework.context.support/.classpath b/org.springframework.context.support/.classpath index 18ca47c31c..c0294288a6 100644 --- a/org.springframework.context.support/.classpath +++ b/org.springframework.context.support/.classpath @@ -26,7 +26,6 @@ - diff --git a/org.springframework.context.support/.project b/org.springframework.context.support/.project index d628161885..11eeef809b 100644 --- a/org.springframework.context.support/.project +++ b/org.springframework.context.support/.project @@ -1,17 +1,23 @@ - - - org.springframework.context.support - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + org.springframework.context.support + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/org.springframework.context.support/context-support.iml b/org.springframework.context.support/context-support.iml index 2aaa1613cb..8112ea4071 100644 --- a/org.springframework.context.support/context-support.iml +++ b/org.springframework.context.support/context-support.iml @@ -55,17 +55,6 @@ - - - - - - - - - - - diff --git a/org.springframework.context.support/ivy.xml b/org.springframework.context.support/ivy.xml index 39cb5831a2..4d1473ac9d 100644 --- a/org.springframework.context.support/ivy.xml +++ b/org.springframework.context.support/ivy.xml @@ -14,7 +14,6 @@ - @@ -35,7 +34,6 @@ - diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml index 6588fe19c7..9a4eb62d39 100644 --- a/org.springframework.context.support/pom.xml +++ b/org.springframework.context.support/pom.xml @@ -44,12 +44,6 @@ 1.4 true - - net.sf.ehcache - ehcache - 1.6.2 - true - jasperreports jasperreports diff --git a/org.springframework.context.support/src/main/resources/META-INF/spring.handlers b/org.springframework.context.support/src/main/resources/META-INF/spring.handlers deleted file mode 100644 index 56f14af426..0000000000 --- a/org.springframework.context.support/src/main/resources/META-INF/spring.handlers +++ /dev/null @@ -1 +0,0 @@ -http\://www.springframework.org/schema/cache=org.springframework.cache.config.CacheNamespaceHandler diff --git a/org.springframework.context.support/src/main/resources/META-INF/spring.schemas b/org.springframework.context.support/src/main/resources/META-INF/spring.schemas deleted file mode 100644 index bb49cc5019..0000000000 --- a/org.springframework.context.support/src/main/resources/META-INF/spring.schemas +++ /dev/null @@ -1,2 +0,0 @@ -http\://www.springframework.org/schema/cache/spring-cache-3.1.xsd=org/springframework/cache/config/spring-cache-3.1.xsd -http\://www.springframework.org/schema/cache/spring-cache.xsd=org/springframework/cache/config/spring-cache-3.1.xsd diff --git a/org.springframework.context.support/src/main/resources/META-INF/spring.tooling b/org.springframework.context.support/src/main/resources/META-INF/spring.tooling deleted file mode 100644 index 2db6d54b1f..0000000000 --- a/org.springframework.context.support/src/main/resources/META-INF/spring.tooling +++ /dev/null @@ -1,4 +0,0 @@ -# Tooling related information for the cache namespace -http\://www.springframework.org/schema/cache@name=cache Namespace -http\://www.springframework.org/schema/cache@prefix=cache -http\://www.springframework.org/schema/cache@icon=org/springframework/cache/config/spring-cache.gif diff --git a/org.springframework.context.support/template.mf b/org.springframework.context.support/template.mf index 67efc8652e..fc73c07a72 100644 --- a/org.springframework.context.support/template.mf +++ b/org.springframework.context.support/template.mf @@ -9,7 +9,6 @@ Import-Template: javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, javax.naming.*;version="0";resolution:=optional, javax.sql.*;version="0";resolution:=optional, - net.sf.ehcache.*;version="[1.3.0, 3.0.0)";resolution:=optional, net.sf.jasperreports.*;version="[2.0.5, 4.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)", org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, diff --git a/org.springframework.context/.classpath b/org.springframework.context/.classpath index 99e0813c42..5d06b345a5 100644 --- a/org.springframework.context/.classpath +++ b/org.springframework.context/.classpath @@ -20,6 +20,7 @@ + diff --git a/org.springframework.context/context.iml b/org.springframework.context/context.iml index ffb4a4cadc..aa82b9252b 100644 --- a/org.springframework.context/context.iml +++ b/org.springframework.context/context.iml @@ -155,6 +155,17 @@ + + + + + + + + + + + diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml index b4e00afea0..a2ea663b51 100644 --- a/org.springframework.context/ivy.xml +++ b/org.springframework.context/ivy.xml @@ -18,6 +18,7 @@ + @@ -43,6 +44,7 @@ + diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml index 82e2d36f0f..146aac9ff2 100644 --- a/org.springframework.context/pom.xml +++ b/org.springframework.context/pom.xml @@ -160,6 +160,12 @@ 1.1 true + + net.sf.ehcache + ehcache + 1.6.2 + true + javax.xml jaxrpc-api diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/Cache.java b/org.springframework.context/src/main/java/org/springframework/cache/Cache.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/Cache.java rename to org.springframework.context/src/main/java/org/springframework/cache/Cache.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/CacheManager.java b/org.springframework.context/src/main/java/org/springframework/cache/CacheManager.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/CacheManager.java rename to org.springframework.context/src/main/java/org/springframework/cache/CacheManager.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/KeyGenerator.java b/org.springframework.context/src/main/java/org/springframework/cache/KeyGenerator.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/KeyGenerator.java rename to org.springframework.context/src/main/java/org/springframework/cache/KeyGenerator.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/AnnotationCacheDefinitionSource.java b/org.springframework.context/src/main/java/org/springframework/cache/annotation/AnnotationCacheDefinitionSource.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/annotation/AnnotationCacheDefinitionSource.java rename to org.springframework.context/src/main/java/org/springframework/cache/annotation/AnnotationCacheDefinitionSource.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java b/org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java rename to org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/CacheEvict.java b/org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheEvict.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/annotation/CacheEvict.java rename to org.springframework.context/src/main/java/org/springframework/cache/annotation/CacheEvict.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/Cacheable.java b/org.springframework.context/src/main/java/org/springframework/cache/annotation/Cacheable.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/annotation/Cacheable.java rename to org.springframework.context/src/main/java/org/springframework/cache/annotation/Cacheable.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/SpringCachingAnnotationParser.java b/org.springframework.context/src/main/java/org/springframework/cache/annotation/SpringCachingAnnotationParser.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/annotation/SpringCachingAnnotationParser.java rename to org.springframework.context/src/main/java/org/springframework/cache/annotation/SpringCachingAnnotationParser.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/annotation/package-info.java b/org.springframework.context/src/main/java/org/springframework/cache/annotation/package-info.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/annotation/package-info.java rename to org.springframework.context/src/main/java/org/springframework/cache/annotation/package-info.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/ConcurrentCache.java b/org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentCache.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/ConcurrentCache.java rename to org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentCache.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/ConcurrentCacheFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentCacheFactoryBean.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/ConcurrentCacheFactoryBean.java rename to org.springframework.context/src/main/java/org/springframework/cache/concurrent/ConcurrentCacheFactoryBean.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/package-info.java b/org.springframework.context/src/main/java/org/springframework/cache/concurrent/package-info.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/concurrent/package-info.java rename to org.springframework.context/src/main/java/org/springframework/cache/concurrent/package-info.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java rename to org.springframework.context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java b/org.springframework.context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java rename to org.springframework.context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/config/package-info.java b/org.springframework.context/src/main/java/org/springframework/cache/config/package-info.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/config/package-info.java rename to org.springframework.context/src/main/java/org/springframework/cache/config/package-info.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java b/org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java rename to org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java rename to org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java rename to org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/EhcacheCacheManager.java b/org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhcacheCacheManager.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/EhcacheCacheManager.java rename to org.springframework.context/src/main/java/org/springframework/cache/ehcache/EhcacheCacheManager.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/package-info.java b/org.springframework.context/src/main/java/org/springframework/cache/ehcache/package-info.java similarity index 95% rename from org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/package-info.java rename to org.springframework.context/src/main/java/org/springframework/cache/ehcache/package-info.java index 101caa7de7..03d3f6294a 100644 --- a/org.springframework.context.support/src/main/java/org/springframework/cache/ehcache/package-info.java +++ b/org.springframework.context/src/main/java/org/springframework/cache/ehcache/package-info.java @@ -1,11 +1,11 @@ - -/** - * - * Support classes for the open source cache - * Ehcache, - * allowing to set up an EHCache CacheManager and Caches - * as beans in a Spring context. - * - */ -package org.springframework.cache.ehcache; - + +/** + * + * Support classes for the open source cache + * Ehcache, + * allowing to set up an EHCache CacheManager and Caches + * as beans in a Spring context. + * + */ +package org.springframework.cache.ehcache; + diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/AbstractCacheDefinition.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractCacheDefinition.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/AbstractCacheDefinition.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractCacheDefinition.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheDefinitionSource.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheDefinitionSource.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheDefinitionSource.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheDefinitionSource.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheDefinitionSourceAdvisor.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheDefinitionSourceAdvisor.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheDefinitionSourceAdvisor.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheDefinitionSourceAdvisor.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheDefinition.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinition.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheDefinition.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinition.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSource.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSource.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSource.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSource.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSourcePointcut.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSourcePointcut.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSourcePointcut.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSourcePointcut.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheInvalidateDefinition.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheInvalidateDefinition.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheInvalidateDefinition.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheInvalidateDefinition.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheUpdateDefinition.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheUpdateDefinition.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CacheUpdateDefinition.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CacheUpdateDefinition.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CompositeCacheDefinitionSource.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/CompositeCacheDefinitionSource.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/CompositeCacheDefinitionSource.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/CompositeCacheDefinitionSource.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/DefaultCacheExpressionRootObject.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultCacheExpressionRootObject.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/DefaultCacheExpressionRootObject.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultCacheExpressionRootObject.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/DefaultCacheInvalidateDefinition.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultCacheInvalidateDefinition.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/DefaultCacheInvalidateDefinition.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultCacheInvalidateDefinition.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/DefaultCacheUpdateDefinition.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultCacheUpdateDefinition.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/DefaultCacheUpdateDefinition.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/DefaultCacheUpdateDefinition.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/package-info.java b/org.springframework.context/src/main/java/org/springframework/cache/interceptor/package-info.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/interceptor/package-info.java rename to org.springframework.context/src/main/java/org/springframework/cache/interceptor/package-info.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/package-info.java b/org.springframework.context/src/main/java/org/springframework/cache/package-info.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/package-info.java rename to org.springframework.context/src/main/java/org/springframework/cache/package-info.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/support/AbstractCacheManager.java b/org.springframework.context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/support/AbstractCacheManager.java rename to org.springframework.context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/support/AbstractDelegatingCache.java b/org.springframework.context/src/main/java/org/springframework/cache/support/AbstractDelegatingCache.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/support/AbstractDelegatingCache.java rename to org.springframework.context/src/main/java/org/springframework/cache/support/AbstractDelegatingCache.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/support/CompositeCacheManager.java b/org.springframework.context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/support/CompositeCacheManager.java rename to org.springframework.context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/support/DefaultKeyGenerator.java b/org.springframework.context/src/main/java/org/springframework/cache/support/DefaultKeyGenerator.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/support/DefaultKeyGenerator.java rename to org.springframework.context/src/main/java/org/springframework/cache/support/DefaultKeyGenerator.java diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/support/MapCacheManager.java b/org.springframework.context/src/main/java/org/springframework/cache/support/MapCacheManager.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/support/MapCacheManager.java rename to org.springframework.context/src/main/java/org/springframework/cache/support/MapCacheManager.java diff --git a/org.springframework.context/src/main/java/org/springframework/cache/support/SimpleCacheManager.java b/org.springframework.context/src/main/java/org/springframework/cache/support/SimpleCacheManager.java new file mode 100644 index 0000000000..65a8c63200 --- /dev/null +++ b/org.springframework.context/src/main/java/org/springframework/cache/support/SimpleCacheManager.java @@ -0,0 +1,41 @@ +/* + * Copyright 2010 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cache.support; + +import java.util.Collection; + +import org.springframework.cache.Cache; + +/** + * Simple cache manager working against a given collection of caches. Useful for testing or simple + * caching declarations. + * + * @author Costin Leau + */ +public class SimpleCacheManager extends AbstractCacheManager { + + private Collection> caches; + + @Override + protected Collection> loadCaches() { + return caches; + } + + public void setCaches(Collection> caches) { + this.caches = caches; + } +} diff --git a/org.springframework.context.support/src/main/java/org/springframework/cache/support/package-info.java b/org.springframework.context/src/main/java/org/springframework/cache/support/package-info.java similarity index 100% rename from org.springframework.context.support/src/main/java/org/springframework/cache/support/package-info.java rename to org.springframework.context/src/main/java/org/springframework/cache/support/package-info.java diff --git a/org.springframework.context/src/main/resources/META-INF/spring.handlers b/org.springframework.context/src/main/resources/META-INF/spring.handlers index ffb273840d..10b4c8bc0d 100644 --- a/org.springframework.context/src/main/resources/META-INF/spring.handlers +++ b/org.springframework.context/src/main/resources/META-INF/spring.handlers @@ -2,3 +2,4 @@ http\://www.springframework.org/schema/context=org.springframework.context.confi http\://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler http\://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler http\://www.springframework.org/schema/task=org.springframework.scheduling.config.TaskNamespaceHandler +http\://www.springframework.org/schema/cache=org.springframework.cache.config.CacheNamespaceHandler diff --git a/org.springframework.context/src/main/resources/META-INF/spring.schemas b/org.springframework.context/src/main/resources/META-INF/spring.schemas index ec51d5eeea..c7b4da5238 100644 --- a/org.springframework.context/src/main/resources/META-INF/spring.schemas +++ b/org.springframework.context/src/main/resources/META-INF/spring.schemas @@ -15,3 +15,5 @@ http\://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/ http\://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd http\://www.springframework.org/schema/task/spring-task-3.1.xsd=org/springframework/scheduling/config/spring-task-3.1.xsd http\://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-3.1.xsd +http\://www.springframework.org/schema/cache/spring-cache-3.1.xsd=org/springframework/cache/config/spring-cache-3.1.xsd +http\://www.springframework.org/schema/cache/spring-cache.xsd=org/springframework/cache/config/spring-cache-3.1.xsd diff --git a/org.springframework.context/src/main/resources/META-INF/spring.tooling b/org.springframework.context/src/main/resources/META-INF/spring.tooling index f630c4e239..9c620f3498 100644 --- a/org.springframework.context/src/main/resources/META-INF/spring.tooling +++ b/org.springframework.context/src/main/resources/META-INF/spring.tooling @@ -18,3 +18,7 @@ http\://www.springframework.org/schema/lang@name=lang Namespace http\://www.springframework.org/schema/lang@prefix=lang http\://www.springframework.org/schema/lang@icon=org/springframework/scripting/config/spring-lang.gif +# Tooling related information for the cache namespace +http\://www.springframework.org/schema/cache@name=cache Namespace +http\://www.springframework.org/schema/cache@prefix=cache +http\://www.springframework.org/schema/cache@icon=org/springframework/cache/config/spring-cache.gif diff --git a/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd b/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd new file mode 100644 index 0000000000..6483791f7a --- /dev/null +++ b/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache.gif b/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache.gif new file mode 100644 index 0000000000..d9929998ab Binary files /dev/null and b/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache.gif differ diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTest.java b/org.springframework.context/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTest.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTest.java rename to org.springframework.context/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTest.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java b/org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java rename to org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/org.springframework.context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java rename to org.springframework.context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTest.java b/org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTest.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTest.java rename to org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTest.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/config/AnnotationTest.java b/org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationTest.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/config/AnnotationTest.java rename to org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationTest.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/config/CacheableService.java b/org.springframework.context/src/test/java/org/springframework/cache/config/CacheableService.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/config/CacheableService.java rename to org.springframework.context/src/test/java/org/springframework/cache/config/CacheableService.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/org.springframework.context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/config/DefaultCacheableService.java rename to org.springframework.context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTest.java b/org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTest.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTest.java rename to org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTest.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java b/org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java rename to org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTest.java b/org.springframework.context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTest.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTest.java rename to org.springframework.context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTest.java diff --git a/org.springframework.context.support/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml b/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml similarity index 100% rename from org.springframework.context.support/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml rename to org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml diff --git a/org.springframework.context.support/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml b/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml similarity index 100% rename from org.springframework.context.support/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml rename to org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml diff --git a/org.springframework.context.support/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml b/org.springframework.context/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml similarity index 100% rename from org.springframework.context.support/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml rename to org.springframework.context/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf index 0520294124..57850ae472 100644 --- a/org.springframework.context/template.mf +++ b/org.springframework.context/template.mf @@ -23,6 +23,7 @@ Import-Template: javax.validation.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.xml.*;version="0";resolution:=optional, net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional, + net.sf.ehcache.*;version="[1.3.0, 3.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.aspectj.weaver.*;version=${aj.osgi.range};resolution:=optional,