NH-3807 - Guard on XmlSchemas and Xml ValidationEventHandler

Author: ngbrown

src/NHibernate/Cfg/Configuration.cs

@@ -1242,8 +1242,10 @@ public ISessionFactory BuildSessionFactory()
 			Environment.VerifyProperties(properties);
 			Settings settings = BuildSettings();
 
+#if FEATURE_XML_SCHEMAS
 			// Ok, don't need schemas anymore, so free them
 			Schemas = null;
+#endif
 
 			return new SessionFactoryImpl(this, mapping, settings, GetInitializedEventListeners());
 		}
@@ -1769,8 +1771,16 @@ public void AddSqlFunction(string functionName, ISQLFunction sqlFunction)
 		/// <returns>NamedXmlDocument containing the validated XmlDocument built from the XmlReader.</returns>
 		public NamedXmlDocument LoadMappingDocument(XmlReader hbmReader, string name)
 		{
-			XmlReaderSettings settings = Schemas.CreateMappingReaderSettings();
+			XmlReaderSettings settings = 
+#if FEATURE_XML_SCHEMAS
+				Schemas.CreateMappingReaderSettings();
+#else
+				new XmlReaderSettings();
+#endif
+
+#if FEATURE_XML_VALIDATIONEVENTHANDLER
 			settings.ValidationEventHandler += ValidationHandler;
+#endif
 
 			using (XmlReader reader = XmlReader.Create(hbmReader, settings))
 			{
@@ -1841,12 +1851,14 @@ private void ProcessMappingsQueue()
 			}
 		}
 
+#if FEATURE_XML_VALIDATIONEVENTHANDLER
 		private void ValidationHandler(object o, ValidationEventArgs args)
 		{
 			string message = string.Format("{0}({1},{2}): XML validation error: {3}", currentDocumentName,
 										   args.Exception.LineNumber, args.Exception.LinePosition, args.Exception.Message);
 			LogAndThrow(new MappingException(message, args.Exception));
 		}
+#endif
 
 		protected virtual string GetDefaultConfigurationFilePath()
 		{
@@ -1862,13 +1874,15 @@ protected virtual string GetDefaultConfigurationFilePath()
 
 		#endregion
 
+#if FEATURE_XML_SCHEMAS
 		private XmlSchemas schemas;
 
 		private XmlSchemas Schemas
 		{
 			get { return schemas = schemas ?? new XmlSchemas(); }
 			set { schemas = value; }
 		}
+#endif
 
 		/// <summary>
 		/// Set or clear listener for a given <see cref="ListenerType"/>.

src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs

@@ -69,7 +69,12 @@ internal static HibernateConfiguration FromAppConfig(XmlNode node)
 
 		private XmlReaderSettings GetSettings()
 		{
-			XmlReaderSettings xmlrs = (new XmlSchemas()).CreateConfigReaderSettings();
+			XmlReaderSettings xmlrs =
+#if FEATURE_XML_SCHEMAS
+				(new XmlSchemas()).CreateConfigReaderSettings();
+#else
+				new XmlReaderSettings();
+#endif
 			return xmlrs;
 		}
 

src/NHibernate/Cfg/XmlSchemas.cs

@@ -1,3 +1,5 @@
+#if FEATURE_XML_SCHEMAS
+
 using System.IO;
 using System.Reflection;
 using System.Xml;
@@ -16,7 +18,9 @@ internal class XmlSchemas
 		public XmlReaderSettings CreateConfigReaderSettings()
 		{
 			XmlReaderSettings result = CreateXmlReaderSettings(ConfigSchemaSet);
+#if FEATURE_XML_VALIDATIONEVENTHANDLER
 			result.ValidationEventHandler += ConfigSettingsValidationEventHandler;
+#endif
 			result.IgnoreComments = true;
 			return result;
 		}
@@ -45,9 +49,13 @@ private static XmlReaderSettings CreateXmlReaderSettings(XmlSchemaSet xmlSchemaS
 			return new XmlReaderSettings {ValidationType = ValidationType.Schema, Schemas = xmlSchemaSet};
 		}
 
+#if FEATURE_XML_VALIDATIONEVENTHANDLER
 		private static void ConfigSettingsValidationEventHandler(object sender, ValidationEventArgs e)
 		{
 			throw new HibernateConfigException("An exception occurred parsing configuration :" + e.Message, e.Exception);
 		}
+#endif
 	}
-}
+}
+
+#endif