From a4bbd9abda62e82db6187fe29f676dcff25028d7 Mon Sep 17 00:00:00 2001
From: Christian Dupuis <cdupuis@vmware.com>
Date: Wed, 22 Jul 2009 14:06:44 +0000
Subject: [PATCH] xsds now use schemaLocation attribute on xsd:import elements
 to specify the concrete schema version to import

---
 .../org/springframework/aop/config/spring-aop-2.0.xsd       | 6 +++---
 .../org/springframework/aop/config/spring-aop-2.5.xsd       | 4 ++--
 .../org/springframework/aop/config/spring-aop-3.0.xsd       | 4 ++--
 .../springframework/beans/factory/xml/spring-util-2.0.xsd   | 4 ++--
 .../springframework/beans/factory/xml/spring-util-2.5.xsd   | 4 ++--
 .../springframework/beans/factory/xml/spring-util-3.0.xsd   | 4 ++--
 .../springframework/context/config/spring-context-2.5.xsd   | 4 ++--
 .../springframework/context/config/spring-context-3.0.xsd   | 4 ++--
 .../org/springframework/ejb/config/spring-jee-2.0.xsd       | 4 ++--
 .../org/springframework/ejb/config/spring-jee-2.5.xsd       | 4 ++--
 .../org/springframework/ejb/config/spring-jee-3.0.xsd       | 4 ++--
 .../springframework/scheduling/config/spring-task-3.0.xsd   | 4 ++--
 .../springframework/scripting/config/spring-lang-2.0.xsd    | 4 ++--
 .../springframework/scripting/config/spring-lang-2.5.xsd    | 4 ++--
 .../springframework/scripting/config/spring-lang-3.0.xsd    | 4 ++--
 .../org/springframework/jdbc/config/spring-jdbc-3.0.xsd     | 4 ++--
 .../org/springframework/jms/config/spring-jms-2.5.xsd       | 2 +-
 .../org/springframework/jms/config/spring-jms-3.0.xsd       | 2 +-
 .../org/springframework/oxm/config/spring-oxm-3.0.xsd       | 4 ++--
 19 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
index 61ee2a589cc..22fd8fc5095 100644
--- a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
+++ b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
@@ -8,9 +8,9 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
-
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd"/>
+			
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
 	Defines the configuration elements for the Spring Framework's AOP support.
diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd
index 3ce4f780149..e6ba181ba4f 100644
--- a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd
+++ b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd
index 3ce4f780149..e7312e5ae49 100644
--- a/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd
+++ b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<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[
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
index dd990b0de7b..509c0eeaeee 100644
--- a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
+++ b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd"/>
 
 	<xsd:element name="constant">
 		<xsd:annotation>
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
index 68796d8b367..eb04ecff4a5 100644
--- a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
+++ b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>
 
 	<xsd:element name="constant">
 		<xsd:annotation>
diff --git a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
index 68796d8b367..287e31ba81c 100644
--- a/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
+++ b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<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:element name="constant">
 		<xsd:annotation>
diff --git a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
index fb8b1d6cc92..c5573a70b40 100644
--- a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
@@ -6,8 +6,8 @@
 		targetNamespace="http://www.springframework.org/schema/context" elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd
index e65ea3a2475..7a93ad49b24 100644
--- a/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd
@@ -6,8 +6,8 @@
 		targetNamespace="http://www.springframework.org/schema/context" elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<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[
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd
index 016bf17a547..89dc353dc81 100644
--- a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd
index 6b491cc753f..f7bbed10757 100644
--- a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd
index 6b491cc753f..12679174f45 100644
--- a/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd
@@ -8,8 +8,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<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[
diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
index 27bbfa1a60b..84deb60b21b 100644
--- a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
@@ -14,8 +14,8 @@
 		]]></xsd:documentation>
 	</xsd:annotation>
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<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:element name="annotation-driven">
 		<xsd:annotation>
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
index e671dfa5314..5ec021b695d 100644
--- a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
@@ -16,8 +16,8 @@
 		]]></xsd:documentation>
 	</xsd:annotation>
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd"/>
 
 	<xsd:element name="groovy" type="customizableScriptType">
 		<xsd:annotation>
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
index b0c6599f3d8..ac7c3174183 100644
--- a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
@@ -16,8 +16,8 @@
 		]]></xsd:documentation>
 	</xsd:annotation>
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>
 
 	<xsd:element name="defaults">
 		<xsd:annotation>
diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
index 0802f09d90c..928ca5c273e 100644
--- a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
@@ -16,8 +16,8 @@
 		]]></xsd:documentation>
 	</xsd:annotation>
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<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:element name="defaults">
 		<xsd:annotation>
diff --git a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd b/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
index 0fcab2cae40..2e8056441db 100644
--- a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
+++ b/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
@@ -7,8 +7,8 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<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:element name="embedded-database">
 		<xsd:annotation>
diff --git a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd b/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
index 728c7520e1c..7d50cd199b8 100644
--- a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
+++ b/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
@@ -8,7 +8,7 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd b/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd
index c57f6bc9a3a..c55297de2fa 100644
--- a/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd
+++ b/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd
@@ -8,7 +8,7 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<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[
diff --git a/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd b/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
index 2d7d0d2a75c..c8442c5a0b4 100644
--- a/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
+++ b/org.springframework.oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
@@ -5,8 +5,8 @@
 			targetNamespace="http://www.springframework.org/schema/oxm" elementFormDefault="qualified"
 			attributeFormDefault="unqualified">
 
-    <xsd:import namespace="http://www.springframework.org/schema/beans"/>
-    <xsd:import namespace="http://www.springframework.org/schema/tool"/>
+ 	<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>