+ add XML support for cache abstraction (cache-advice) - DRAFT

org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTests.java

@@ -86,7 +86,7 @@ public abstract class AbstractAnnotationTests {
 		Object r2 = service.cache(o1);
 
 		assertSame(r1, r2);
-		service.invalidate(o1, null);
+		service.evict(o1, null);
 		Object r3 = service.cache(o1);
 		Object r4 = service.cache(o1);
 		assertNotSame(r1, r3);

org.springframework.context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java

@@ -43,7 +43,7 @@ public class AnnotatedClassCacheableService implements CacheableService {
 	}
 
 	@CacheEvict(value = "default", key = "#p0")
-	public void invalidate(Object arg1, Object arg2) {
+	public void evict(Object arg1, Object arg2) {
 	}
 
 	@Cacheable(value = "default", key = "#p0")

org.springframework.context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2011 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.config;
+
+
+/**
+ * @author Costin Leau
+ */
+public class CacheAdviceNamespaceTests extends AbstractAnnotationTests {
+
+
+	@Override
+	protected String getConfig() {
+		return "/org/springframework/cache/config/cache-advice.xml";
+	}
+}

org.springframework.context/src/test/java/org/springframework/cache/config/CacheableService.java

@@ -28,7 +28,7 @@ public interface CacheableService<T> {
 
 	void invalidate(Object arg1);
 
-	void invalidate(Object arg1, Object arg2);
+	void evict(Object arg1, Object arg2);
 
 	T conditional(int field);
 

org.springframework.context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java

@@ -41,7 +41,7 @@ public class DefaultCacheableService implements CacheableService<Long> {
 	}
 
 	@CacheEvict(value = "default", key = "#p0")
-	public void invalidate(Object arg1, Object arg2) {
+	public void evict(Object arg1, Object arg2) {
 	}
 
 	@Cacheable(value = "default", condition = "#classField == 3")