GitHub-Spring
/
spring-data-mongodb
mirror of https://github.com/spring-projects/spring-data-mongodb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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.
pull/32/head
Oliver Gierke 13 years ago
parent
04e0f5c4a7
commit
c07ad0fdf6
2 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
  2. 10
      spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd

6
spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
Unescape View File

@ -35,7 +35,7 @@ Defines a MongoDbFactory for connecting to a specific database
]]></xsd:documentation> ]]></xsd:documentation>
</xsd:annotation> </xsd:annotation>
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="id" type="xsd:ID" use="optional"> <xsd:attribute name="id" type="xsd:string" use="optional">
<xsd:annotation> <xsd:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation> The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
@ -156,7 +156,7 @@ The Mongo URI string.]]></xsd:documentation>
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="id" type="xsd:ID" use="optional"> <xsd:attribute name="id" type="xsd:string" use="optional">
<xsd:annotation> <xsd:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation> The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
@ -335,7 +335,7 @@ The Mongo driver options
<!-- MLP <!-- MLP
<xsd:attributeGroup ref="writeConcern" /> <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:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
The name of the mongo definition (by default "mongo").]]></xsd:documentation> The name of the mongo definition (by default "mongo").]]></xsd:documentation>

10
spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
Unescape View File

@ -35,7 +35,7 @@ Defines a MongoDbFactory for connecting to a specific database
]]></xsd:documentation> ]]></xsd:documentation>
</xsd:annotation> </xsd:annotation>
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="id" type="xsd:ID" use="optional"> <xsd:attribute name="id" type="xsd:string" use="optional">
<xsd:annotation> <xsd:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation> The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
@ -156,7 +156,7 @@ The Mongo URI string.]]></xsd:documentation>
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="id" type="xsd:ID" use="optional"> <xsd:attribute name="id" type="xsd:string" use="optional">
<xsd:annotation> <xsd:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation> The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
@ -346,7 +346,7 @@ The Mongo driver options
<!-- MLP <!-- MLP
<xsd:attributeGroup ref="writeConcern" /> <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:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
The name of the mongo definition (by default "mongo").]]></xsd:documentation> 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:documentation>
</xsd:annotation> </xsd:annotation>
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="id" type="xsd:ID" use="optional"> <xsd:attribute name="id" type="xsd:string" use="optional">
<xsd:annotation> <xsd:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation> 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:documentation>
</xsd:annotation> </xsd:annotation>
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="id" type="xsd:ID" use="optional"> <xsd:attribute name="id" type="xsd:string" use="optional">
<xsd:annotation> <xsd:annotation>
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation> The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>

Write Preview
Loading…
Cancel
Save