NH-2958 - Move mappingDocumentSerializer field from Configuration to NamedXmlDocument.

This should delay creation of XmlSerializer assembly and reduce start time of when use only by code mappings.

Author: hazzik

src/NHibernate/Cfg/Configuration.cs

@@ -79,10 +79,8 @@ public class Configuration : ISerializable
 
 		private static readonly IInternalLogger log = LoggerProvider.LoggerFor(typeof(Configuration));
 
-		protected internal SettingsFactory settingsFactory;
-
-		private static readonly XmlSerializer mappingDocumentSerializer = new XmlSerializer(typeof(HbmMapping));
-
+		protected internal SettingsFactory settingsFactory;
+
 		#region ISerializable Members
 		public Configuration(SerializationInfo info, StreamingContext context)
 		{
@@ -1806,7 +1804,7 @@ public NamedXmlDocument LoadMappingDocument(XmlReader hbmReader, string name)
 				{
 					var hbmDocument = new XmlDocument();
 					hbmDocument.Load(reader);
-					return new NamedXmlDocument(name, hbmDocument, mappingDocumentSerializer);
+					return new NamedXmlDocument(name, hbmDocument);
 				}
 				catch (MappingException)
 				{
@@ -1893,8 +1891,8 @@ private XmlSchemas Schemas
 		{
 			get { return schemas = schemas ?? new XmlSchemas(); }
 			set { schemas = value; }
-		}
-
+		}
+
 		/// <summary>
 		/// Set or clear listener for a given <see cref="ListenerType"/>.
 		/// </summary>

src/NHibernate/Cfg/NamedXmlDocument.cs

@@ -8,10 +8,18 @@ namespace NHibernate.Cfg
 {
 	public class NamedXmlDocument
 	{
+		private static readonly XmlSerializer mappingDocumentSerializer = new XmlSerializer(typeof (HbmMapping));
 		private readonly string name;
 		private readonly HbmMapping document;
 
-		public NamedXmlDocument(string name, XmlDocument document, XmlSerializer mappingDocumentSerializer)
+		static NamedXmlDocument() { }
+
+		public NamedXmlDocument(string name, XmlDocument document)
+			: this(name, document, mappingDocumentSerializer)
+		{
+		}
+
+		public NamedXmlDocument(string name, XmlDocument document, XmlSerializer serializer)
 		{
 			if (document == null)
 			{
@@ -24,7 +32,7 @@ public NamedXmlDocument(string name, XmlDocument document, XmlSerializer mapping
 			}
 			using (var reader = new StringReader(document.DocumentElement.OuterXml))
 			{
-				this.document = (HbmMapping)mappingDocumentSerializer.Deserialize(reader);
+				this.document = (HbmMapping)serializer.Deserialize(reader);
 			}
 		}