[maven-release-plugin] copy for tag ehcache-spring-annotations-1.0.4

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-ehcache-annotations</name>
+	<name>ehcache-spring-annotations_1.0-PATCHES</name>
 	<comment></comment>
 	<projects>
 	</projects>

NOTICE

@@ -22,7 +22,6 @@ This project includes:
         Ehcache Core
         Log4j
         Spring Framework
-        Code from Google Guice in the package com.googlecode.ehcache.annotations.util.guice
 
     Under the Public Domain License
         AOP Alliance

pom.xml

@@ -3,7 +3,7 @@
 	<groupId>com.googlecode.ehcache-spring-annotations</groupId>
 	<artifactId>ehcache-spring-annotations</artifactId>
 	<name>Ehcache Spring Annotations</name>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<description>Provides a simple model for integrating Ehcache in a Spring project via annotations.</description>
     <url>http://code.google.com/p/ehcache-spring-annotations/</url>
 
@@ -29,9 +29,9 @@
 	</licenses>
 
     <scm>
-        <connection>scm:svn:http://ehcache-spring-annotations.googlecode.com/svn/trunk/</connection>
-        <developerConnection>scm:svn:https://ehcache-spring-annotations.googlecode.com/svn/trunk/</developerConnection>
-        <url>http://ehcache-spring-annotations.googlecode.com/svn/trunk/</url>
+        <connection>scm:svn:http://ehcache-spring-annotations.googlecode.com/svn/tags/ehcache-spring-annotations-1.0.4</connection>
+        <developerConnection>scm:svn:https://ehcache-spring-annotations.googlecode.com/svn/tags/ehcache-spring-annotations-1.0.4</developerConnection>
+        <url>http://ehcache-spring-annotations.googlecode.com/svn/tags/ehcache-spring-annotations-1.0.4</url>
     </scm>
 
     <issueManagement>
@@ -352,7 +352,6 @@
 					<excludes>
 						<exclude>LICENSE</exclude>
 						<exclude>NOTICE</exclude>
-                        <exclude>src/main/java/com/googlecode/ehcache/annotations/util/guice/*</exclude>
 					</excludes>
 				</configuration>
 			</plugin>
@@ -398,14 +397,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.4</version>
-                <configuration>
-                    <instrumentation>
-                        <ignores>
-                            <ignore>com.googlecode.ehcache.annotations.util.guice.*</ignore>
-                        </ignores>
-                    </instrumentation>
-                </configuration>
+				<version>2.3</version>
 			</plugin>
 		</plugins>
 	</reporting>

src/main/java/com/googlecode/ehcache/annotations/Cacheable.java

@@ -47,9 +47,7 @@
     boolean selfPopulating() default false;
 
     /**
-     * The Spring Bean name of the {@link CacheKeyGenerator} to use.
-     * Ignored if {@link #keyGenerator()} is specified. 
-     * If this and {@link #keyGenerator()} are not specified the default generator will be used.
+     * The name of the {@link CacheKeyGenerator} to use. If not specified a default generator will be used.
      */
     String keyGeneratorName() default "";
 
@@ -58,10 +56,4 @@
      * exceptions will result in no caching taking place. 
      */
     String exceptionCacheName() default "";
-
-    /**
-     * Used the specify and configure the {@link CacheKeyGenerator} to use.
-     * If this and {@link #keyGeneratorName()} are not specified the default generator will be used.  
-     */
-    KeyGenerator keyGenerator() default @KeyGenerator(name = "");
 }

src/main/java/com/googlecode/ehcache/annotations/TriggersRemove.java

@@ -46,15 +46,7 @@
     boolean removeAll() default false;
 
     /**
-     * The Spring Bean name of the {@link CacheKeyGenerator} to use.
-     * Ignored if {@link #keyGenerator()} is specified. 
-     * If this and {@link #keyGenerator()} are not specified the default generator will be used.
+     * The name of the {@link CacheKeyGenerator} to use. If not specified a default generator will be used.
      */
     String keyGeneratorName() default "";
-
-    /**
-     * Used the specify and configure the {@link CacheKeyGenerator} to use.
-     * If this and {@link #keyGeneratorName()} are not specified the default generator will be used.  
-     */
-    KeyGenerator keyGenerator() default @KeyGenerator(name = "");
 }

src/main/java/com/googlecode/ehcache/annotations/config/AnnotationDrivenEhCacheBeanDefinitionParser.java

@@ -58,7 +58,6 @@
  * @author Nicholas Blair, [email protected]
  * @version $Id$
  */
-@SuppressWarnings("deprecation")
 public class AnnotationDrivenEhCacheBeanDefinitionParser implements BeanDefinitionParser {
     public static final String XSD_ATTR__CREATE_MISSING_CACHES = "create-missing-caches";
     public static final String XSD_ATTR__CACHE_MANAGER = "cache-manager";

src/main/java/com/googlecode/ehcache/annotations/config/AnnotationDrivenEhCacheNamespaceHandler.java

@@ -30,7 +30,6 @@ public class AnnotationDrivenEhCacheNamespaceHandler extends NamespaceHandlerSup
 	 */
 	public void init() {
 		this.registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenEhCacheBeanDefinitionParser());
-		this.registerBeanDefinitionParser("config", new EhCacheConfigBeanDefinitionParser());
 	}
 
 }