From 1f92a12c1e7685713778fa044c9ccf9985f8c843 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Mon, 7 Feb 2011 17:41:25 +0000
Subject: [PATCH] moved cache abstraction from context.support to context

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3947 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../.classpath                                |   1 -
 org.springframework.context.support/.project  |  40 ++++----
 .../context-support.iml                       |  11 ---
 org.springframework.context.support/ivy.xml   |   2 -
 org.springframework.context.support/pom.xml   |   6 --
 .../main/resources/META-INF/spring.handlers   |   1 -
 .../main/resources/META-INF/spring.schemas    |   2 -
 .../main/resources/META-INF/spring.tooling    |   4 -
 .../template.mf                               |   1 -
 org.springframework.context/.classpath        |   1 +
 org.springframework.context/context.iml       |  11 +++
 org.springframework.context/ivy.xml           |   2 +
 org.springframework.context/pom.xml           |   6 ++
 .../java/org/springframework/cache/Cache.java |   0
 .../springframework/cache/CacheManager.java   |   0
 .../springframework/cache/KeyGenerator.java   |   0
 .../AnnotationCacheDefinitionSource.java      |   0
 .../annotation/CacheAnnotationParser.java     |   0
 .../cache/annotation/CacheEvict.java          |   0
 .../cache/annotation/Cacheable.java           |   0
 .../SpringCachingAnnotationParser.java        |   0
 .../cache/annotation/package-info.java        |   0
 .../cache/concurrent/ConcurrentCache.java     |   0
 .../ConcurrentCacheFactoryBean.java           |   0
 .../cache/concurrent/package-info.java        |   0
 ...tationDrivenCacheBeanDefinitionParser.java |   0
 .../cache/config/CacheNamespaceHandler.java   |   0
 .../cache/config/package-info.java            |   0
 .../cache/ehcache/EhCacheCache.java           |   0
 .../cache/ehcache/EhCacheFactoryBean.java     |   0
 .../ehcache/EhCacheManagerFactoryBean.java    |   0
 .../cache/ehcache/EhcacheCacheManager.java    |   0
 .../cache/ehcache/package-info.java           |  22 ++---
 .../interceptor/AbstractCacheDefinition.java  |   0
 ...AbstractFallbackCacheDefinitionSource.java |   0
 ...anFactoryCacheDefinitionSourceAdvisor.java |   0
 .../cache/interceptor/CacheAspectSupport.java |   0
 .../cache/interceptor/CacheDefinition.java    |   0
 .../interceptor/CacheDefinitionSource.java    |   0
 .../CacheDefinitionSourcePointcut.java        |   0
 .../CacheExpressionRootObject.java            |   0
 .../cache/interceptor/CacheInterceptor.java   |   0
 .../CacheInvalidateDefinition.java            |   0
 .../interceptor/CacheProxyFactoryBean.java    |   0
 .../interceptor/CacheUpdateDefinition.java    |   0
 .../CompositeCacheDefinitionSource.java       |   0
 .../DefaultCacheExpressionRootObject.java     |   0
 .../DefaultCacheInvalidateDefinition.java     |   0
 .../DefaultCacheUpdateDefinition.java         |   0
 .../interceptor/ExpressionEvaluator.java      |   0
 .../LazyParamAwareEvaluationContext.java      |   0
 .../cache/interceptor/package-info.java       |   0
 .../springframework/cache/package-info.java   |   0
 .../cache/support/AbstractCacheManager.java   |   0
 .../support/AbstractDelegatingCache.java      |   0
 .../cache/support/CompositeCacheManager.java  |   0
 .../cache/support/DefaultKeyGenerator.java    |   0
 .../cache/support/MapCacheManager.java        |   0
 .../cache/support/SimpleCacheManager.java     |  41 ++++++++
 .../cache/support/package-info.java           |   0
 .../main/resources/META-INF/spring.handlers   |   1 +
 .../main/resources/META-INF/spring.schemas    |   2 +
 .../main/resources/META-INF/spring.tooling    |   4 +
 .../cache/config/spring-cache-3.1.xsd         |  92 ++++++++++++++++++
 .../cache/config/spring-cache.gif             | Bin 0 -> 592 bytes
 .../cache/concurrent/ConcurrentCacheTest.java |   0
 .../cache/config/AbstractAnnotationTest.java  |   0
 .../AnnotatedClassCacheableService.java       |   0
 .../config/AnnotationNamespaceDrivenTest.java |   0
 .../cache/config/AnnotationTest.java          |   0
 .../cache/config/CacheableService.java        |   0
 .../cache/config/DefaultCacheableService.java |   0
 .../cache/ehcache/EhCacheCacheTest.java       |   0
 .../cache/ehcache/EhCacheSupportTests.java    |   0
 .../cache/vendor/AbstractNativeCacheTest.java |   0
 .../config/annotationDrivenCacheConfig.xml    |   0
 .../config/annotationDrivenCacheNamespace.xml |   0
 .../cache/ehcache/testEhcache.xml             |   0
 org.springframework.context/template.mf       |   1 +
 79 files changed, 195 insertions(+), 56 deletions(-)
 delete mode 100644 org.springframework.context.support/src/main/resources/META-INF/spring.handlers
 delete mode 100644 org.springframework.context.support/src/main/resources/META-INF/spring.schemas
 delete mode 100644 org.springframework.context.support/src/main/resources/META-INF/spring.tooling
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/Cache.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/CacheManager.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/KeyGenerator.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/annotation/AnnotationCacheDefinitionSource.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/annotation/CacheEvict.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/annotation/Cacheable.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/annotation/SpringCachingAnnotationParser.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/annotation/package-info.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/concurrent/ConcurrentCache.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/concurrent/ConcurrentCacheFactoryBean.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/concurrent/package-info.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/config/package-info.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/ehcache/EhcacheCacheManager.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/ehcache/package-info.java (95%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/AbstractCacheDefinition.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheDefinitionSource.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheDefinitionSourceAdvisor.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheDefinition.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSource.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheDefinitionSourcePointcut.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheExpressionRootObject.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheInvalidateDefinition.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CacheUpdateDefinition.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/CompositeCacheDefinitionSource.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/DefaultCacheExpressionRootObject.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/DefaultCacheInvalidateDefinition.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/DefaultCacheUpdateDefinition.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/interceptor/package-info.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/package-info.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/support/AbstractCacheManager.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/support/AbstractDelegatingCache.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/support/CompositeCacheManager.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/support/DefaultKeyGenerator.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/support/MapCacheManager.java (100%)
 create mode 100644 org.springframework.context/src/main/java/org/springframework/cache/support/SimpleCacheManager.java
 rename {org.springframework.context.support => org.springframework.context}/src/main/java/org/springframework/cache/support/package-info.java (100%)
 create mode 100644 org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
 create mode 100644 org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache.gif
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTest.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTest.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/config/AnnotationTest.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/config/CacheableService.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/config/DefaultCacheableService.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTest.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTest.java (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml (100%)
 rename {org.springframework.context.support => org.springframework.context}/src/test/resources/org/springframework/cache/ehcache/testEhcache.xml (100%)

diff --git a/org.springframework.context.support/.classpath b/org.springframework.context.support/.classpath
index 18ca47c31cd..c0294288a60 100644
--- a/org.springframework.context.support/.classpath
+++ b/org.springframework.context.support/.classpath
@@ -26,7 +26,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.beanutils/1.7.0/com.springsource.org.apache.commons.beanutils-1.7.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.beanutils/1.7.0/com.springsource.org.apache.commons.beanutils-sources-1.7.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/com.lowagie.text/com.springsource.com.lowagie.text/2.0.8/com.springsource.com.lowagie.text-2.0.8.jar" sourcepath="/IVY_CACHE/com.lowagie.text/com.springsource.com.lowagie.text/2.0.8/com.springsource.com.lowagie.text-sources-2.0.8.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.digester/1.8.0/com.springsource.org.apache.commons.digester-1.8.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.digester/1.8.0/com.springsource.org.apache.commons.digester-sources-1.8.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.ehcache/com.springsource.net.sf.ehcache/1.6.2/com.springsource.net.sf.ehcache-1.6.2.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.expression"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar" sourcepath="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.8.RELEASE.jar"/>
diff --git a/org.springframework.context.support/.project b/org.springframework.context.support/.project
index d628161885f..11eeef809b1 100644
--- a/org.springframework.context.support/.project
+++ b/org.springframework.context.support/.project
@@ -1,17 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.springframework.context.support</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.context.support</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.springframework.context.support/context-support.iml b/org.springframework.context.support/context-support.iml
index 2aaa1613cb7..8112ea40715 100644
--- a/org.springframework.context.support/context-support.iml
+++ b/org.springframework.context.support/context-support.iml
@@ -55,17 +55,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$IVY_CACHE$/net.sourceforge.ehcache/com.springsource.net.sf.ehcache/1.6.2/com.springsource.net.sf.ehcache-1.6.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$IVY_CACHE$/net.sourceforge.ehcache/com.springsource.net.sf.ehcache/1.6.2/com.springsource.net.sf.ehcache-sources-1.6.2.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
diff --git a/org.springframework.context.support/ivy.xml b/org.springframework.context.support/ivy.xml
index 39cb5831a2b..4d1473ac9dc 100644
--- a/org.springframework.context.support/ivy.xml
+++ b/org.springframework.context.support/ivy.xml
@@ -14,7 +14,6 @@
 		<conf name="commonj" extends="runtime" description="JARs to compile against CommonJ"/>
 		<conf name="commons-collections" extends="runtime" description="JARs needed to run with Commons Collections"/>
 		<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
-		<conf name="ehcache" extends="runtime" description="JARs needed to run with EHCache"/>
 		<conf name="freemarker" extends="runtime" description="JARs needed to create beans for Freemarker"/>
 		<conf name="jasper-reports" extends="runtime" description="JARs needed to create beans for Jasper Reports"/>
 		<conf name="jdbc" extends="runtime" description="JARs needed to run against JDBC"/>
@@ -35,7 +34,6 @@
 		<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="optional, quartz->compile"/>
 		<dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/>
 		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, mail->compile"/>
-		<dependency org="net.sourceforge.ehcache" name="com.springsource.net.sf.ehcache" rev="1.6.2" conf="optional, ehcache->compile"/>
 		<dependency org="net.sourceforge.jasperreports" name="com.springsource.net.sf.jasperreports" rev="2.0.5" conf="optional, jasper-reports->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="optional, commons-collections->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index 6588fe19c70..9a4eb62d39d 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -44,12 +44,6 @@
       <version>1.4</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.6.2</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>jasperreports</groupId>
       <artifactId>jasperreports</artifactId>
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 56f14af426e..00000000000
--- 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 bb49cc50198..00000000000
--- 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 2db6d54b1f9..00000000000
--- 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 67efc8652e2..fc73c07a721 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 99e0813c42a..5d06b345a5f 100644
--- a/org.springframework.context/.classpath
+++ b/org.springframework.context/.classpath
@@ -20,6 +20,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.validation/com.springsource.javax.validation/1.0.0.GA/com.springsource.javax.validation-1.0.0.GA.jar" sourcepath="/IVY_CACHE/javax.validation/com.springsource.javax.validation/1.0.0/com.springsource.javax.validation-sources-1.0.0.GA.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.rpc/com.springsource.javax.xml.rpc/1.1.0/com.springsource.javax.xml.rpc-1.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.2.0/com.springsource.net.sf.cglib-2.2.0.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.ehcache/com.springsource.net.sf.ehcache/1.6.2/com.springsource.net.sf.ehcache-1.6.2.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-sources-1.2.2.osgi.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
diff --git a/org.springframework.context/context.iml b/org.springframework.context/context.iml
index ffb4a4cadcd..aa82b9252ba 100644
--- a/org.springframework.context/context.iml
+++ b/org.springframework.context/context.iml
@@ -155,6 +155,17 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/net.sourceforge.ehcache/com.springsource.net.sf.ehcache/1.6.2/com.springsource.net.sf.ehcache-1.6.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$IVY_CACHE$/net.sourceforge.ehcache/com.springsource.net.sf.ehcache/1.6.2/com.springsource.net.sf.ehcache-sources-1.6.2.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
   </component>
   <component name="copyright">
     <Base>
diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index b4e00afea05..a2ea663b518 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -18,6 +18,7 @@
 		<conf name="beanshell" extends="runtime" description="JARs needed to develop BeanShell beans"/>
 		<conf name="bytecode-proxy" extends="runtime" description="JARs needed to run with CGLIB bytecode proxies"/>
 		<conf name="ejb" extends="runtime" description="JARs needed to develop EJB3 beans"/>
+		<conf name="ehcache" extends="runtime" description="JARs needed to run with EHCache"/>
 		<conf name="jms" extends="runtime" description="JARs needed to develop JMS beans"/>
 		<conf name="groovy" extends="runtime" description="JARs needed to develop Groovy beans"/>
 		<conf name="instrumentation" extends="runtime" description="JARs needed to develop with Spring VM Instrumentation"/>
@@ -43,6 +44,7 @@
 		<dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="provided->compile"/>
 		<dependency org="javax.xml.ws" name="com.springsource.javax.xml.ws" rev="2.1.1" conf="provided, ws->compile"/>
 		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
+		<dependency org="net.sourceforge.ehcache" name="com.springsource.net.sf.ehcache" rev="1.6.2" conf="optional, ehcache->compile"/>
 		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile, aop->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 82e2d36f0fc..146aac9ff2c 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -160,6 +160,12 @@
 			<version>1.1</version>
 			<optional>true</optional>
 		</dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>1.6.2</version>
+      <optional>true</optional>
+    </dependency>
 		<dependency>
 			<groupId>javax.xml</groupId>
 			<artifactId>jaxrpc-api</artifactId>
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 101caa7de72..03d3f6294a4 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
- * <a href="http://ehcache.sourceforge.net">Ehcache</a>,
- * 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
+ * <a href="http://ehcache.sourceforge.net">Ehcache</a>,
+ * 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 00000000000..65a8c63200b
--- /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<Cache<?, ?>> caches;
+
+	@Override
+	protected Collection<Cache<?, ?>> loadCaches() {
+		return caches;
+	}
+
+	public void setCaches(Collection<Cache<?, ?>> 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 ffb273840d6..10b4c8bc0da 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 ec51d5eeea6..c7b4da5238f 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 f630c4e2390..9c620f34984 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 00000000000..6483791f7a5
--- /dev/null
+++ b/org.springframework.context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/cache"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/cache"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Defines the elements used in the Spring Framework's declarative
+	cache management infrastructure.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:element name="annotation-driven">
+		<xsd:complexType>
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.cache.annotation.AnnotationCacheOperationDefinitionSource"><![CDATA[
+	Indicates that cache configuration is defined by Java 5
+	annotations on bean classes, and that proxies are automatically
+	to be created for the relevant annotated beans.
+
+	The default annotations supported are Spring's @Cacheable and @CacheEvict.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:attribute name="cache-manager" type="xsd:string" default="cacheManager">
+				<xsd:annotation>
+					<xsd:documentation source="java:org.springframework.cache.CacheManager"><![CDATA[
+	The bean name of the CacheManager that is to be used to retrieve the backing caches.
+	
+	This attribute is not required, and only needs to be specified
+	explicitly if the bean name of the desired CacheManager
+	is not 'cacheManager'.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="org.springframework.cache.CacheManager"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mode" default="proxy">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Should annotated beans be proxied using Spring's AOP framework,
+	or should they rather be weaved with an AspectJ transaction aspect?
+
+	AspectJ weaving requires spring-aspects.jar on the classpath,
+	as well as load-time weaving (or compile-time weaving) enabled.
+
+	Note: The weaving-based aspect requires the @Cacheable and @CacheInvalidate
+	annotations to be defined on the concrete class. Annotations in interfaces
+	will not work in that case (they will rather only work with interface-based proxies)!
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="proxy"/>
+						<xsd:enumeration value="aspectj"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="false">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Are class-based (CGLIB) proxies to be created? By default, standard
+	Java interface-based proxies are created.
+
+	Note: Class-based proxies require the @Cacheable and @CacheInvalidate annotations
+	to be defined on the concrete class. Annotations in interfaces will not work
+	in that case (they will rather only work with interface-based proxies)!
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="order" type="xsd:int">
+				<xsd:annotation>
+					<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
+	Controls the ordering of the execution of the cache advisor
+	when multiple advice executes at a specific joinpoint.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+</xsd:schema>
\ 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 0000000000000000000000000000000000000000..d9929998ab98a96ecf76e4df275c5da7563a27b6
GIT binary patch
literal 592
zcmZ?wbhEHb6krfwIF`?lWG|Otqn_fZkY%Ty=b)bDs*&rdn&YWg;Hg&Vt6u1<SsGwo
z8LHh8X4x2PI4v-sHNj|FNYL~MpS~oEi3v76Y34Iy0;eR~^=4X3$hNF1_OC7us4nrZ
zE(xeB^_!pO+Fb6tJT<Jn%4cSw&jY{6HQ9bWwO%W8qLQ1}Osx0Vlov6*$!$|f$kvkJ
zZKVNoTU{4*I4^JWp4(cot}%Xjm(%OS^yS@7J8NT>cLuEKaX3;Nys9VoXhZ0Re!F80
z5nCqM)=b}Zyd`9BSMtiq&EJbkzZaKYofNxoVOYbimg_ST{@2%^T2L^3_3@i?QtmBE
zeX=<5`Fh<en=-C!%DlQMbN-3RD|TLZu(|lw-kMMQ+_zks`|eQEgA@I4k5|9BIOXNF
z1$Ul*zxU$D{g*!;zWVXx&Ch4=em;Nq^VNr+Z$JI|@a6Z1ufIQi{r&md?{7bT|M>am
z=dVBiNe7BQSr{1@>KSwxfB+OH4D4$g>YJKdTAS=UIy>6h^ZNRO?0al;r%nqGp44iY
zGk0Eec%WsgNtTzZsY>?hY_nE_%#2N&EF=UBTlLdJeH=8z{o=x`xLUN+PNZ4KDXV*X
z>ajIzrg*ueO8Uq089TYj8#SpVKS>tV@{QpTGq+=HQc8*p@o*P(w25L?)ZuPYNIby7
xa=5{%TPT9b#6sc3;py!H!afxWj9iV1O=cwz79=XWOENK>IB;Uck_8S7)&PbRE;IlD

literal 0
HcmV?d00001

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 0520294124d..57850ae472e 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,