From 7a71af29899c61f48b39c5d42894e0dfd977ecdb Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 16 Nov 2011 04:20:43 +0000
Subject: [PATCH] Remove stale duplicate copy of spring-cache XSD

This was removed once previously but accidentally re-introduced later.
The 'correct' version of spring-cache-3.1.xsd lives in spring-context
as opposed to here in spring-context-support.

Also placed .gitignore file within src/main/resources such that the
now-empty directory does not get pruned in git environments, which will
otherwise cause 'missing source folder' errors within Eclipse/IDEA.
---
 .../src/main/resources/.gitignore             |   0
 .../cache/config/spring-cache-3.1.xsd         | 107 ------------------
 2 files changed, 107 deletions(-)
 create mode 100644 org.springframework.context.support/src/main/resources/.gitignore
 delete mode 100644 org.springframework.context.support/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd

diff --git a/org.springframework.context.support/src/main/resources/.gitignore b/org.springframework.context.support/src/main/resources/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/org.springframework.context.support/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd b/org.springframework.context.support/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
deleted file mode 100644
index 076fdbc91c..0000000000
--- a/org.springframework.context.support/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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.0.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.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="key-generator" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation source="java:org.springframework.cache.interceptor.KeyGenerator"><![CDATA[
-	The bean name of the KeyGenerator that is to be used to retrieve the backing caches.
-	
-	This attribute is not required, and only needs to be specified
-	explicitly if the default strategy (DefaultKeyGenerator) is not sufficient.
-					]]></xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.cache.interceptor.KeyGenerator"/>
-						</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