diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
index a179fdb9f..a0d95f242 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
@@ -318,8 +318,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
@@ -348,14 +348,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -363,22 +363,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -395,18 +395,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -430,14 +430,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -466,4 +466,4 @@ This controls if the driver is allowed to read from secondaries or replicas.  De
 		</xsd:attribute>
 	</xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
index 5c959b812..dd7287dab 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
@@ -316,8 +316,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
@@ -346,14 +346,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -361,22 +361,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -393,18 +393,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -428,14 +428,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -464,4 +464,4 @@ This controls if the driver is allowed to read from secondaries or replicas.  De
 		</xsd:attribute>
 	</xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
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 f73f940c7..cf995f23c 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
@@ -230,7 +230,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -331,8 +331,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -361,14 +361,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -376,22 +376,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -408,18 +408,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -443,14 +443,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -479,4 +479,4 @@ This controls if the driver is allowed to read from secondaries or replicas.  De
 		</xsd:attribute>
 	</xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
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 c9d1b0a25..c1b6b1df3 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
@@ -234,7 +234,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -346,8 +346,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -376,14 +376,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -391,22 +391,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -423,18 +423,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -458,14 +458,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -557,7 +557,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -598,4 +598,4 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd
index 541661c8c..78f1dabe1 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd
@@ -241,7 +241,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -300,7 +300,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="sslSocketFactoryRef">
 	<xsd:annotation>
 			<xsd:appinfo>
@@ -364,8 +364,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -394,14 +394,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -409,22 +409,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -441,18 +441,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -476,14 +476,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -589,7 +589,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -636,4 +636,4 @@ The GridFs bucket string.]]></xsd:documentation>
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.5.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.5.xsd
index 1363480b5..0b67ea4db 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.5.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.5.xsd
@@ -248,7 +248,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -318,7 +318,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="sslSocketFactoryRef">
 	<xsd:annotation>
 			<xsd:appinfo>
@@ -382,8 +382,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -412,14 +412,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -427,22 +427,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -459,18 +459,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -494,14 +494,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -607,7 +607,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.7.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.7.xsd
index 51ff5b3a1..13b444dd1 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.7.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.7.xsd
@@ -27,7 +27,7 @@ Deprecated since 1.7 - use mongo-client instead. Defines a Mongo instance used f
 			</xsd:appinfo>
 		</xsd:annotation>
 	</xsd:element>
-	
+
 	<xsd:element name="mongo-client" type="mongoClientType">
 	  <xsd:annotation>
 		<xsd:documentation source="org.springframework.data.mongodb.core.MongoClientFactoryBean"><![CDATA[
@@ -37,7 +37,7 @@ Defines a MongoClient instance used for accessing MongoDB.
 				<tool:annotation>
 					<tool:exports type="com.mongodb.MongoClient"/>
 				</tool:annotation>
-			</xsd:appinfo>	  
+			</xsd:appinfo>
 	  </xsd:annotation>
 	</xsd:element>
 
@@ -261,7 +261,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -331,7 +331,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="sslSocketFactoryRef">
 	<xsd:annotation>
 			<xsd:appinfo>
@@ -354,7 +354,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			<xsd:enumeration value="MAJORITY" />
 		</xsd:restriction>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="readPreferenceEnumeration">
 		<xsd:restriction base="xsd:token">
 			<xsd:enumeration value="PRIMARY" />
@@ -384,7 +384,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 	<xsd:complexType name="mongoType">
 		<xsd:annotation>
 	    	<xsd:documentation><![CDATA[
-Deprecated since 1.7.    	
+Deprecated since 1.7.
 	    	]]></xsd:documentation>
 	    </xsd:annotation>
 		<xsd:sequence minOccurs="0" maxOccurs="1">
@@ -410,8 +410,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -440,19 +440,19 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:annotation>
 	    	<xsd:documentation><![CDATA[
-Deprecated since 1.7.    	
+Deprecated since 1.7.
 	    	]]></xsd:documentation>
 	    </xsd:annotation>
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -460,22 +460,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -492,18 +492,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -527,14 +527,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -550,11 +550,11 @@ The SSLSocketFactory to use for the SSL connection. If none is configured here,
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+
 	<xsd:complexType name="mongoClientType">
 		<xsd:annotation>
 	    	<xsd:documentation><![CDATA[
-Configuration options for 'MongoClient' - @since 1.7	    	
+Configuration options for 'MongoClient' - @since 1.7
 	    	]]></xsd:documentation>
 	    </xsd:annotation>
 		<xsd:sequence minOccurs="0" maxOccurs="1">
@@ -606,11 +606,11 @@ The comma delimited list of username:password@database entries to use for authen
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+
 	<xsd:complexType name="clientOptionsType">
 	    <xsd:annotation>
 	    	<xsd:documentation><![CDATA[
-Configuration options for 'MongoClientOptions' - @since 1.7	    	
+Configuration options for 'MongoClientOptions' - @since 1.7
 	    	]]></xsd:documentation>
 	    </xsd:annotation>
 		<xsd:attribute name="description" type="xsd:string">
@@ -626,11 +626,11 @@ The MongoClient description.
 The minimum number of connections per host.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -638,36 +638,36 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-connection-idle-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum idle time for a pooled connection.	
+The maximum idle time for a pooled connection.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-connection-life-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum life time for a pooled connection.	
+The maximum life time for a pooled connection.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -684,7 +684,7 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="read-preference">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -694,7 +694,7 @@ The read preference.
 			<xsd:simpleType>
 				<xsd:union memberTypes="readPreferenceEnumeration xsd:string"/>
 			</xsd:simpleType>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="write-concern">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -704,25 +704,25 @@ The WriteConcern that will be the default value used when asking the MongoDbFact
 			<xsd:simpleType>
 				<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 			</xsd:simpleType>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="heartbeat-frequency" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This is the frequency that the driver will attempt to determine the current state of each server in the cluster. 
+This is the frequency that the driver will attempt to determine the current state of each server in the cluster.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="min-heartbeat-frequency" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort. 
+In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="heartbeat-connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout for connections used for the cluster heartbeat. 
+The connect timeout for connections used for the cluster heartbeat.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -732,7 +732,7 @@ The connect timeout for connections used for the cluster heartbeat.
 The socket timeout for connections used for the cluster heartbeat.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -746,7 +746,7 @@ This controls if the driver should us an SSL connection.  Defaults to false.
 The SSLSocketFactory to use for the SSL connection. If none is configured here, SSLSocketFactory#getDefault() will be used.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>									
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -838,7 +838,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.8.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.8.xsd
index 40d6de36d..04413cc9a 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.8.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.8.xsd
@@ -27,7 +27,7 @@ Deprecated since 1.7 - use mongo-client instead. Defines a Mongo instance used f
 			</xsd:appinfo>
 		</xsd:annotation>
 	</xsd:element>
-	
+
 	<xsd:element name="mongo-client" type="mongoClientType">
 	  <xsd:annotation>
 		<xsd:documentation source="org.springframework.data.mongodb.core.MongoClientFactoryBean"><![CDATA[
@@ -267,7 +267,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -337,7 +337,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="sslSocketFactoryRef">
 	<xsd:annotation>
 			<xsd:appinfo>
@@ -360,7 +360,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			<xsd:enumeration value="MAJORITY" />
 		</xsd:restriction>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="readPreferenceEnumeration">
 		<xsd:restriction base="xsd:token">
 			<xsd:enumeration value="PRIMARY" />
@@ -416,8 +416,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -446,7 +446,7 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
@@ -466,22 +466,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -498,18 +498,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -533,14 +533,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -556,7 +556,7 @@ The SSLSocketFactory to use for the SSL connection. If none is configured here,
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+
 	<xsd:complexType name="mongoClientType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -612,7 +612,7 @@ The comma delimited list of username:password@database entries to use for authen
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+
 	<xsd:complexType name="clientOptionsType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -632,11 +632,11 @@ The MongoClient description.
 The minimum number of connections per host.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -644,36 +644,36 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-connection-idle-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum idle time for a pooled connection.	
+The maximum idle time for a pooled connection.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-connection-life-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum life time for a pooled connection.	
+The maximum life time for a pooled connection.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -690,7 +690,7 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="read-preference">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -700,7 +700,7 @@ The read preference.
 			<xsd:simpleType>
 				<xsd:union memberTypes="readPreferenceEnumeration xsd:string"/>
 			</xsd:simpleType>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="write-concern">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -710,25 +710,25 @@ The WriteConcern that will be the default value used when asking the MongoDbFact
 			<xsd:simpleType>
 				<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 			</xsd:simpleType>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="heartbeat-frequency" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This is the frequency that the driver will attempt to determine the current state of each server in the cluster. 
+This is the frequency that the driver will attempt to determine the current state of each server in the cluster.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="min-heartbeat-frequency" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort. 
+In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="heartbeat-connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout for connections used for the cluster heartbeat. 
+The connect timeout for connections used for the cluster heartbeat.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -738,7 +738,7 @@ The connect timeout for connections used for the cluster heartbeat.
 The socket timeout for connections used for the cluster heartbeat.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -844,7 +844,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/mongo.properties b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/mongo.properties
index ac0a3e904..a79c2c685 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/mongo.properties
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/mongo.properties
@@ -8,7 +8,6 @@ mongo.socketTimeout=1500
 mongo.threadsAllowedToBlockForConnectionMultiplier=4
 mongo.socketKeepAlive=true
 mongo.fsync=true
-mongo.slaveOk=true
 
 mongoSsl.ssl=true
 replicaSetName=rs0