+ update aspectj cache aspects

+ update integration tests

Author: Costin Leau

org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj

@@ -18,7 +18,9 @@ package org.springframework.cache.aspectj;
 
 import org.springframework.cache.annotation.AnnotationCacheOperationSource;
 import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
 
 /**
  * Concrete AspectJ cache aspect using Spring's @{@link Cacheable} annotation.
@@ -59,6 +61,20 @@ public aspect AnnotationCacheAspect extends AbstractCacheAspect {
 	private pointcut executionOfAnyPublicMethodInAtCacheEvictType() :
 		execution(public * ((@CacheEvict *)+).*(..)) && @this(CacheEvict);
 
+	/**
+	 * Matches the execution of any public method in a type with the @{@link CachePut}
+	 * annotation, or any subtype of a type with the {@code CachePut} annotation.
+	 */
+	private pointcut executionOfAnyPublicMethodInAtCachePutType() :
+		execution(public * ((@CachePut *)+).*(..)) && @this(CachePut);
+
+	/**
+	 * Matches the execution of any public method in a type with the @{@link Caching}
+	 * annotation, or any subtype of a type with the {@code Caching} annotation.
+	 */
+	private pointcut executionOfAnyPublicMethodInAtCachingType() :
+		execution(public * ((@Caching *)+).*(..)) && @this(Caching);
+
 	/**
 	 * Matches the execution of any method with the @{@link Cacheable} annotation.
 	 */
@@ -71,15 +87,30 @@ public aspect AnnotationCacheAspect extends AbstractCacheAspect {
 	private pointcut executionOfCacheEvictMethod() :
 		execution(* *(..)) && @annotation(CacheEvict);
 
+	/**
+	 * Matches the execution of any method with the @{@link CachePut} annotation.
+	 */
+	private pointcut executionOfCachePutMethod() :
+		execution(* *(..)) && @annotation(CachePut);
+
+	/**
+	 * Matches the execution of any method with the @{@link Caching} annotation.
+	 */
+	private pointcut executionOfCachingMethod() :
+		execution(* *(..)) && @annotation(Caching);
+
 	/**
 	 * Definition of pointcut from super aspect - matched join points will have Spring
 	 * cache management applied.
 	 */
 	protected pointcut cacheMethodExecution(Object cachedObject) :
 		(executionOfAnyPublicMethodInAtCacheableType()
 				|| executionOfAnyPublicMethodInAtCacheEvictType()
+				|| executionOfAnyPublicMethodInAtCachePutType()
+				|| executionOfAnyPublicMethodInAtCachingType()
 				|| executionOfCacheableMethod()
-				|| executionOfCacheEvictMethod())
+				|| executionOfCacheEvictMethod()
+				|| executionOfCachePutMethod()
+				|| executionOfCachingMethod())
 			&& this(cachedObject);
-
-}
+}