Added "transactionAware" bean property to EhCacheCacheManager and JCacheCacheManager

In the course of this enhancement, the "cache.ehcache" and "cache.jcache" packages moved from spring-context to the spring-context-support module, expecting further transaction-related functionality. Also aligns with the presence of Spring's Quartz support in the spring-context-support module, since Quartz and EHCache are sort of sister projects at Terracotta now.

Issue: SPR-9966

Author: jhoeller

build.gradle

@@ -269,8 +269,6 @@ project('spring-context') {
         }
         compile("joda-time:joda-time:1.6", optional)
         compile("org.jruby:jruby:1.4.0", optional)
-        compile("javax.cache:cache-api:0.5", optional)
-        compile("net.sf.ehcache:ehcache-core:2.0.0", optional)
         compile("org.slf4j:slf4j-api:1.6.1", optional)
         compile("org.codehaus.jsr166-mirror:jsr166:1.7.0", provided)
         compile("org.aspectj:aspectjweaver:${aspectjVersion}", optional)
@@ -361,6 +359,8 @@ project('spring-context-support') {
         compile(project(":spring-jdbc"), optional) // for Quartz support
         compile(project(":spring-tx"), optional) // for Quartz support
         compile("org.codehaus.fabric3.api:commonj:1.1.0", optional)
+        compile("javax.cache:cache-api:0.5", optional)
+        compile("net.sf.ehcache:ehcache-core:2.0.0", optional)
         compile("opensymphony:quartz:1.6.2", optional)
         compile("javax.mail:mail:1.4", optional)
         compile("velocity:velocity:1.5", optional)

spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java renamed to spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java

@@ -23,7 +23,7 @@
 import net.sf.ehcache.Status;
 
 import org.springframework.cache.Cache;
-import org.springframework.cache.support.AbstractCacheManager;
+import org.springframework.cache.transaction.AbstractTransactionSupportingCacheManager;
 import org.springframework.util.Assert;
 
 /**
@@ -33,11 +33,27 @@
  * @author Juergen Hoeller
  * @since 3.1
  */
-public class EhCacheCacheManager extends AbstractCacheManager {
+public class EhCacheCacheManager extends AbstractTransactionSupportingCacheManager {
 
 	private net.sf.ehcache.CacheManager cacheManager;
 
 
+	/**
+	 * Create a new EhCacheCacheManager, setting the target EhCache CacheManager
+	 * through the {@link #setCacheManager} bean property.
+	 */
+	public EhCacheCacheManager() {
+	}
+
+	/**
+	 * Create a new EhCacheCacheManager for the given backing EhCache.
+	 * @param cacheManager the backing EhCache {@link net.sf.ehcache.CacheManager}
+	 */
+	public EhCacheCacheManager(net.sf.ehcache.CacheManager cacheManager) {
+		this.cacheManager = cacheManager;
+	}
+
+
 	/**
 	 * Set the backing EhCache {@link net.sf.ehcache.CacheManager}.
 	 */

spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java renamed to spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java

@@ -18,11 +18,11 @@
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
-
+import javax.cache.CacheManager;
 import javax.cache.Status;
 
 import org.springframework.cache.Cache;
-import org.springframework.cache.support.AbstractCacheManager;
+import org.springframework.cache.transaction.AbstractTransactionSupportingCacheManager;
 import org.springframework.util.Assert;
 
 /**
@@ -32,13 +32,29 @@
  * @author Juergen Hoeller
  * @since 3.2
  */
-public class JCacheCacheManager extends AbstractCacheManager {
+public class JCacheCacheManager extends AbstractTransactionSupportingCacheManager {
 
 	private javax.cache.CacheManager cacheManager;
 
 	private boolean allowNullValues = true;
 
 
+	/**
+	 * Create a new JCacheCacheManager, setting the target JCache CacheManager
+	 * through the {@link #setCacheManager} bean property.
+	 */
+	public JCacheCacheManager() {
+	}
+
+	/**
+	 * Create a new JCacheCacheManager for the given backing JCache.
+	 * @param cacheManager the backing JCache {@link javax.cache.CacheManager}
+	 */
+	public JCacheCacheManager(CacheManager cacheManager) {
+		this.cacheManager = cacheManager;
+	}
+
+
 	/**
 	 * Set the backing JCache {@link javax.cache.CacheManager}.
 	 */

spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java renamed to spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java

@@ -20,6 +20,7 @@
 import javax.cache.Caching;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -33,7 +34,8 @@
  * @see javax.cache.Caching#getCacheManager()
  * @see javax.cache.Caching#getCacheManager(String)
  */
-public class JCacheManagerFactoryBean implements FactoryBean<CacheManager>, BeanClassLoaderAware, InitializingBean {
+public class JCacheManagerFactoryBean
+		implements FactoryBean<CacheManager>, BeanClassLoaderAware, InitializingBean, DisposableBean {
 
 	private String cacheManagerName = Caching.DEFAULT_CACHE_MANAGER_NAME;
 
@@ -74,4 +76,9 @@ public boolean isSingleton() {
 		return true;
 	}
 
+
+	public void destroy() {
+		this.cacheManager.shutdown();
+	}
+
 }