From c07ad0fdf612bbfc6c1b9db2b1b88c44f2d65b87 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Wed, 10 Apr 2013 20:33:31 +0200
Subject: [PATCH] DATAMONGO-648 - Replaced XSD ids with XSD strings.

This change allows usage of Spring Data MongoDB XML namespace elements with <bean /> element using a profile. This scenario creates the case of e.g. two <mongo:db-factory /> declarations in the same XML file.
---
 .../data/mongodb/config/spring-mongo-1.2.xsd           |  6 +++---
 .../data/mongodb/config/spring-mongo-1.3.xsd           | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
index 97e5a8e5b..9f51b778c 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
@@ -35,7 +35,7 @@ Defines a MongoDbFactory for connecting to a specific database
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
+			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
@@ -156,7 +156,7 @@ The Mongo URI string.]]></xsd:documentation>
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
+			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
@@ -335,7 +335,7 @@ The Mongo driver options
 		<!-- MLP 
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
-		<xsd:attribute name="id" type="xsd:ID" use="optional">
+		<xsd:attribute name="id" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The name of the mongo definition (by default "mongo").]]></xsd:documentation>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
index 9b647b62b..3b8ba7b18 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
@@ -35,7 +35,7 @@ Defines a MongoDbFactory for connecting to a specific database
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
+			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
@@ -156,7 +156,7 @@ The Mongo URI string.]]></xsd:documentation>
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
+			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
@@ -346,7 +346,7 @@ The Mongo driver options
 		<!-- MLP 
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
-		<xsd:attribute name="id" type="xsd:ID" use="optional">
+		<xsd:attribute name="id" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The name of the mongo definition (by default "mongo").]]></xsd:documentation>
@@ -508,7 +508,7 @@ Defines a MongoDbFactory for connecting to a specific database
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
+			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
@@ -561,7 +561,7 @@ Defines a MongoDbFactory for connecting to a specific database
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
+			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>