nhibernate-commit

[Kevin W. <kev...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27563

Modified Files:
	Configuration.cs Environment.cs Mappings.cs Settings.cs 
	SettingsFactory.cs 
Log Message:
fixing xml comments and letting ReSharper do reformatting

Index: Mappings.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Mappings.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Mappings.cs	16 Dec 2004 04:54:07 -0000	1.10
--- Mappings.cs	31 Dec 2004 15:54:08 -0000	1.11
***************
*** 1,9 ****
- using System;
  using System.Collections;
! 
  using NHibernate.Cache;
  using NHibernate.Mapping;
  
! namespace NHibernate.Cfg 
  {
  	/// <summary>
--- 1,8 ----
  using System.Collections;
! using log4net;
  using NHibernate.Cache;
  using NHibernate.Mapping;
  
! namespace NHibernate.Cfg
  {
  	/// <summary>
***************
*** 11,17 ****
  	/// </summary>
  	/// <remarks>Represents a single <c>&lt;hibernate-mapping&gt;</c> element.</remarks>
! 	public class Mappings 
  	{
! 		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Mappings));
  
  		private IDictionary classes;
--- 10,16 ----
  	/// </summary>
  	/// <remarks>Represents a single <c>&lt;hibernate-mapping&gt;</c> element.</remarks>
! 	public class Mappings
  	{
! 		private static readonly ILog log = LogManager.GetLogger( typeof( Mappings ) );
  
  		private IDictionary classes;
***************
*** 27,31 ****
  		private IDictionary caches;
  
! 		internal Mappings(IDictionary classes, IDictionary collections, IDictionary tables, IDictionary queries, IDictionary imports, IDictionary caches, IList secondPasses) 
  		{
  			this.classes = classes;
--- 26,40 ----
  		private IDictionary caches;
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="classes"></param>
! 		/// <param name="collections"></param>
! 		/// <param name="tables"></param>
! 		/// <param name="queries"></param>
! 		/// <param name="imports"></param>
! 		/// <param name="caches"></param>
! 		/// <param name="secondPasses"></param>
! 		internal Mappings( IDictionary classes, IDictionary collections, IDictionary tables, IDictionary queries, IDictionary imports, IDictionary caches, IList secondPasses )
  		{
  			this.classes = classes;
***************
*** 44,51 ****
  		/// <param name="cache">The <see cref="ICacheConcurrencyStrategy"/> to use for caching.</param>
  		/// <exception cref="MappingException">Thrown when <c>name</c> already has a <c>cache</c> associated with it.</exception>
! 		public void AddCache(string name, ICacheConcurrencyStrategy cache) 
  		{
  			object old = caches[ name ];
! 			if( old!=null ) 
  			{
  				throw new MappingException( "duplicate cache region" );
--- 53,60 ----
  		/// <param name="cache">The <see cref="ICacheConcurrencyStrategy"/> to use for caching.</param>
  		/// <exception cref="MappingException">Thrown when <c>name</c> already has a <c>cache</c> associated with it.</exception>
! 		public void AddCache( string name, ICacheConcurrencyStrategy cache )
  		{
  			object old = caches[ name ];
! 			if( old != null )
  			{
  				throw new MappingException( "duplicate cache region" );
***************
*** 54,79 ****
  		}
  
! 		public void AddClass(PersistentClass persistentClass) 
  		{
! 			object old = classes[persistentClass.PersistentClazz];
! 			if (old!=null) log.Warn ( "duplicate class mapping: " + persistentClass.PersistentClazz.Name );
! 			classes[persistentClass.PersistentClazz] = persistentClass;
  		}
  
! 		public void AddCollection(Mapping.Collection collection) 
  		{
! 			object old = collections[collection.Role];
! 			if (old!=null) log.Warn ( "duplicate collection role: " + collection.Role );
! 			collections[collection.Role] = collection;
  		}
  
! 		public PersistentClass GetClass(System.Type type) 
  		{
! 			return (PersistentClass) classes[type];
  		}
  
! 		public Mapping.Collection GetCollection(string role) 
  		{
! 			return (Mapping.Collection) collections[role];
  		}
  
--- 63,112 ----
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="persistentClass"></param>
! 		public void AddClass( PersistentClass persistentClass )
  		{
! 			object old = classes[ persistentClass.PersistentClazz ];
! 			if( old != null )
! 			{
! 				log.Warn( "duplicate class mapping: " + persistentClass.PersistentClazz.Name );
! 			}
! 			classes[ persistentClass.PersistentClazz ] = persistentClass;
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="collection"></param>
! 		public void AddCollection( Mapping.Collection collection )
  		{
! 			object old = collections[ collection.Role ];
! 			if( old != null )
! 			{
! 				log.Warn( "duplicate collection role: " + collection.Role );
! 			}
! 			collections[ collection.Role ] = collection;
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="type"></param>
! 		/// <returns></returns>
! 		public PersistentClass GetClass( System.Type type )
  		{
! 			return ( PersistentClass ) classes[ type ];
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="role"></param>
! 		/// <returns></returns>
! 		public Mapping.Collection GetCollection( string role )
  		{
! 			return ( Mapping.Collection ) collections[ role ];
  		}
  
***************
*** 85,89 ****
  		/// <param name="rename">The new name to use in Hql for the class.</param>
  		/// <exception cref="MappingException">Thrown when the rename already identifies another Class.</exception>
! 		public void AddImport(string className, string rename) 
  		{
  			// if the imports dictionary already contains the rename, then make sure 
--- 118,122 ----
  		/// <param name="rename">The new name to use in Hql for the class.</param>
  		/// <exception cref="MappingException">Thrown when the rename already identifies another Class.</exception>
! 		public void AddImport( string className, string rename )
  		{
  			// if the imports dictionary already contains the rename, then make sure 
***************
*** 91,123 ****
  			// then we probably have 2 classes with the same name in a different namespace.  To 
  			// prevent this error one of the classes needs to have the attribute "
! 			if( imports.Contains(rename) && (string)imports[rename]!=className ) 
  			{
! 				throw new MappingException("duplicate import: " + rename);
  			}
! 			imports[rename] = className; 
  		}
  
! 		public Table AddTable(string schema, string name) 
  		{
  			string key = schema != null ? schema + "." + name : name;
! 			Table table = (Table) tables[key];
  
! 			if (table==null) 
  			{
  				table = new Table();
  				table.Name = name;
  				table.Schema = schema;
! 				tables[key] = table;
  			}
  			return table;
  		}
  
! 		public Table GetTable(string schema, string name) 
  		{
  			string key = schema != null ? schema + "." + name : name;
! 			return (Table) tables[key];
  		}
  
! 		public string SchemaName 
  		{
  			get { return schemaName; }
--- 124,169 ----
  			// then we probably have 2 classes with the same name in a different namespace.  To 
  			// prevent this error one of the classes needs to have the attribute "
! 			if( imports.Contains( rename ) && ( string ) imports[ rename ] != className )
  			{
! 				throw new MappingException( "duplicate import: " + rename );
  			}
! 			imports[ rename ] = className;
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="schema"></param>
! 		/// <param name="name"></param>
! 		/// <returns></returns>
! 		public Table AddTable( string schema, string name )
  		{
  			string key = schema != null ? schema + "." + name : name;
! 			Table table = ( Table ) tables[ key ];
  
! 			if( table == null )
  			{
  				table = new Table();
  				table.Name = name;
  				table.Schema = schema;
! 				tables[ key ] = table;
  			}
  			return table;
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="schema"></param>
! 		/// <param name="name"></param>
! 		/// <returns></returns>
! 		public Table GetTable( string schema, string name )
  		{
  			string key = schema != null ? schema + "." + name : name;
! 			return ( Table ) tables[ key ];
  		}
  
! 		/// <summary></summary>
! 		public string SchemaName
  		{
  			get { return schemaName; }
***************
*** 125,154 ****
  		}
  
! 		public string DefaultCascade 
  		{
! 			get {  return defaultCascade;  }
  			set { defaultCascade = value; }
  		}
  
! 		public string DefaultAccess 
  		{
  			get { return defaultAccess; }
  			set { defaultAccess = value; }
  		}
! 		public void AddQuery(string name, string query) 
  		{
! 			object old = queries[name];
! 			if (old!=null) log.Warn("duplicate query name: " + name);
! 			queries[name] = query;
  		}
  
! 		public string GetQuery(string name) 
  		{
! 			return (string) queries[name];
  		}
  
! 		internal void AddSecondPass(Binder.SecondPass sp) 
  		{
! 			secondPasses.Add(sp);
  		}
  
--- 171,220 ----
  		}
  
! 		/// <summary></summary>
! 		public string DefaultCascade
  		{
! 			get { return defaultCascade; }
  			set { defaultCascade = value; }
  		}
  
! 		/// <summary></summary>
! 		public string DefaultAccess
  		{
  			get { return defaultAccess; }
  			set { defaultAccess = value; }
  		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="name"></param>
! 		/// <param name="query"></param>
! 		public void AddQuery( string name, string query )
  		{
! 			object old = queries[ name ];
! 			if( old != null )
! 			{
! 				log.Warn( "duplicate query name: " + name );
! 			}
! 			queries[ name ] = query;
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="name"></param>
! 		/// <returns></returns>
! 		public string GetQuery( string name )
  		{
! 			return ( string ) queries[ name ];
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="sp"></param>
! 		internal void AddSecondPass( Binder.SecondPass sp )
  		{
! 			secondPasses.Add( sp );
  		}
  
***************
*** 165,173 ****
  		/// name of <c>MyClass</c>.
  		/// </remarks>
! 		public bool IsAutoImport 
  		{
! 			get { return autoImport;  }
  			set { autoImport = value; }
  		}
  	}
! }
--- 231,239 ----
  		/// name of <c>MyClass</c>.
  		/// </remarks>
! 		public bool IsAutoImport
  		{
! 			get { return autoImport; }
  			set { autoImport = value; }
  		}
  	}
! }
\ No newline at end of file

Index: Environment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Environment.cs,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Environment.cs	21 Dec 2004 20:43:41 -0000	1.21
--- Environment.cs	31 Dec 2004 15:54:08 -0000	1.22
***************
*** 1,11 ****
- using System;
  using System.Collections;
  using System.Collections.Specialized;
  using System.Configuration;
! using System.Xml;
! 
! using NHibernate.Util;
  
! namespace NHibernate.Cfg 
  {
  	/// <summary>
--- 1,9 ----
  using System.Collections;
  using System.Collections.Specialized;
  using System.Configuration;
! using log4net;
! using log4net.Config;
  
! namespace NHibernate.Cfg
  {
  	/// <summary>
***************
*** 26,69 ****
  	/// </list>
  	/// </remarks>
! 	public class Environment 
  	{
! 		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(Environment));
  
  		private static IDictionary properties = new Hashtable();
! 		
  		public const string ConnectionProvider = "hibernate.connection.provider";
  		public const string ConnectionDriver = "hibernate.connection.driver_class";
  		public const string ConnectionString = "hibernate.connection.connection_string";
  		public const string Isolation = "hibernate.connection.isolation";
  		public const string SessionFactoryName = "hibernate.session_factory_name";
  		public const string Dialect = "hibernate.dialect";
  		public const string DefaultSchema = "hibernate.default_schema";
  		public const string ShowSql = "hibernate.show_sql";
  		public const string OuterJoin = "hibernate.use_outer_join";
  		public const string OutputStylesheet = "hibernate.xml.output_stylesheet";
  		public const string TransactionStrategy = "hibernate.transaction.factory_class";
  		public const string TransactionManagerStrategy = "hibernate.transaction.manager_lookup_class";
  		public const string QuerySubstitutions = "hibernate.query.substitutions";
  		public const string QueryImports = "hibernate.query.imports";
  		public const string CacheProvider = "hibernate.cache.provider_class";
  		public const string PrepareSql = "hibernate.prepare_sql";
  
! 		static Environment() 
  		{
! 			log4net.Config.DOMConfigurator.Configure();
  
! 			NameValueCollection props = System.Configuration.ConfigurationSettings.GetConfig("nhibernate") as NameValueCollection;
! 			if (props==null) 
  			{
! 				log.Debug("no hibernate settings in app.config/web.config were found");
  				return;
  			}
! 			
! 			foreach(string key in props.Keys) 
  			{
! 				properties[key] = props[key];
  			}
  
! 			
  		}
  
--- 24,84 ----
  	/// </list>
  	/// </remarks>
! 	public class Environment
  	{
! 		private static readonly ILog log = LogManager.GetLogger( typeof( Environment ) );
  
  		private static IDictionary properties = new Hashtable();
! 
! 		/// <summary></summary>
  		public const string ConnectionProvider = "hibernate.connection.provider";
+ 		/// <summary></summary>
  		public const string ConnectionDriver = "hibernate.connection.driver_class";
+ 		/// <summary></summary>
  		public const string ConnectionString = "hibernate.connection.connection_string";
+ 		/// <summary></summary>
  		public const string Isolation = "hibernate.connection.isolation";
+ 		/// <summary></summary>
  		public const string SessionFactoryName = "hibernate.session_factory_name";
+ 		/// <summary></summary>
  		public const string Dialect = "hibernate.dialect";
+ 		/// <summary></summary>
  		public const string DefaultSchema = "hibernate.default_schema";
+ 		/// <summary></summary>
  		public const string ShowSql = "hibernate.show_sql";
+ 		/// <summary></summary>
  		public const string OuterJoin = "hibernate.use_outer_join";
+ 		/// <summary></summary>
  		public const string OutputStylesheet = "hibernate.xml.output_stylesheet";
+ 		/// <summary></summary>
  		public const string TransactionStrategy = "hibernate.transaction.factory_class";
+ 		/// <summary></summary>
  		public const string TransactionManagerStrategy = "hibernate.transaction.manager_lookup_class";
+ 		/// <summary></summary>
  		public const string QuerySubstitutions = "hibernate.query.substitutions";
+ 		/// <summary></summary>
  		public const string QueryImports = "hibernate.query.imports";
+ 		/// <summary></summary>
  		public const string CacheProvider = "hibernate.cache.provider_class";
+ 		/// <summary></summary>
  		public const string PrepareSql = "hibernate.prepare_sql";
  
! 		/// <summary></summary>
! 		static Environment()
  		{
! 			DOMConfigurator.Configure();
  
! 			NameValueCollection props = ConfigurationSettings.GetConfig( "nhibernate" ) as NameValueCollection;
! 			if( props == null )
  			{
! 				log.Debug( "no hibernate settings in app.config/web.config were found" );
  				return;
  			}
! 
! 			foreach( string key in props.Keys )
  			{
! 				properties[ key ] = props[ key ];
  			}
  
! 
  		}
  
***************
*** 74,85 ****
  		/// This is the replacement for hibernate.properties
  		/// </remarks>
! 		public static IDictionary Properties 
  		{
! 			get 
! 			{ 
! 				IDictionary copy = new Hashtable(properties.Count);
! 				foreach(DictionaryEntry de in properties) 
  				{
! 					copy[de.Key] = de.Value;
  				}
  				return copy;
--- 89,100 ----
  		/// This is the replacement for hibernate.properties
  		/// </remarks>
! 		public static IDictionary Properties
  		{
! 			get
! 			{
! 				IDictionary copy = new Hashtable( properties.Count );
! 				foreach( DictionaryEntry de in properties )
  				{
! 					copy[ de.Key ] = de.Value;
  				}
  				return copy;
***************
*** 87,94 ****
  		}
  
! 		public static bool UseStreamsForBinary 
  		{
! 			get { return true; }			
  		}
  	}
! }
--- 102,110 ----
  		}
  
! 		/// <summary></summary>
! 		public static bool UseStreamsForBinary
  		{
! 			get { return true; }
  		}
  	}
! }
\ No newline at end of file

Index: Configuration.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Configuration.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Configuration.cs	16 Dec 2004 04:54:07 -0000	1.25
--- Configuration.cs	31 Dec 2004 15:54:07 -0000	1.26
***************
*** 5,11 ****
  using System.Xml;
  using System.Xml.Schema;
! 
  using NHibernate.Cache;
- using NHibernate.Dialect;
  using NHibernate.Engine;
  using NHibernate.Id;
--- 5,10 ----
  using System.Xml;
  using System.Xml.Schema;
[...1500 lines suppressed...]
  		/// <returns></returns>
! 		public IDictionary Imports 
  		{
! 			get 
! 			{ 
! 				return imports; 
! 			}
  		}
  	}
! }
--- 900,907 ----
  		/// </summary>
  		/// <returns></returns>
! 		public IDictionary Imports
  		{
! 			get { return imports; }
  		}
  	}
! }
\ No newline at end of file

Index: Settings.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Settings.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Settings.cs	21 Dec 2004 20:43:41 -0000	1.3
--- Settings.cs	31 Dec 2004 15:54:08 -0000	1.4
***************
*** 1,9 ****
- using System;
  using System.Collections;
  using System.Data;
- 
  using NHibernate.Cache;
  using NHibernate.Connection;
- using NHibernate.Dialect;
  using NHibernate.Transaction;
  
--- 1,6 ----
***************
*** 26,30 ****
  		private string _defaultSchemaName;
  		private bool _prepareSql;
! 		
  		public bool IsShowSqlEnabled
  		{
--- 23,28 ----
  		private string _defaultSchemaName;
  		private bool _prepareSql;
! 
! 		/// <summary></summary>
  		public bool IsShowSqlEnabled
  		{
***************
*** 33,36 ****
--- 31,35 ----
  		}
  
+ 		/// <summary></summary>
  		public bool IsOuterJoinFetchEnabled
  		{
***************
*** 39,42 ****
--- 38,42 ----
  		}
  
+ 		/// <summary></summary>
  		public IDictionary QuerySubstitutions
  		{
***************
*** 45,48 ****
--- 45,49 ----
  		}
  
+ 		/// <summary></summary>
  		public Dialect.Dialect Dialect
  		{
***************
*** 51,54 ****
--- 52,56 ----
  		}
  
+ 		/// <summary></summary>
  		public string DefaultSchemaName
  		{
***************
*** 57,60 ****
--- 59,63 ----
  		}
  
+ 		/// <summary></summary>
  		public IsolationLevel IsolationLevel
  		{
***************
*** 62,66 ****
  			set { _isolationLevel = value; }
  		}
! 		
  		public IConnectionProvider ConnectionProvider
  		{
--- 65,70 ----
  			set { _isolationLevel = value; }
  		}
! 
! 		/// <summary></summary>
  		public IConnectionProvider ConnectionProvider
  		{
***************
*** 69,72 ****
--- 73,77 ----
  		}
  
+ 		/// <summary></summary>
  		public ITransactionFactory TransactionFactory
  		{
***************
*** 75,78 ****
--- 80,84 ----
  		}
  
+ 		/// <summary></summary>
  		public string SessionFactoryName
  		{
***************
*** 81,84 ****
--- 87,91 ----
  		}
  
+ 		/// <summary></summary> 
  		public ICacheProvider CacheProvider
  		{
***************
*** 87,90 ****
--- 94,98 ----
  		}
  
+ 		/// <summary></summary>
  		public bool PrepareSql
  		{
***************
*** 93,95 ****
  		}
  	}
! }
--- 101,103 ----
  		}
  	}
! }
\ No newline at end of file

Index: SettingsFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/SettingsFactory.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SettingsFactory.cs	21 Dec 2004 20:43:41 -0000	1.2
--- SettingsFactory.cs	31 Dec 2004 15:54:08 -0000	1.3
***************
*** 3,7 ****
  using System.Data;
  using System.Text;
! 
  using NHibernate.Cache;
  using NHibernate.Connection;
--- 3,7 ----
  using System.Data;
  using System.Text;
! using log4net;
  using NHibernate.Cache;
  using NHibernate.Connection;
***************
*** 17,21 ****
  	public sealed class SettingsFactory
  	{
! 		private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(SettingsFactory) );
  
  		private SettingsFactory()
--- 17,21 ----
  	public sealed class SettingsFactory
  	{
! 		private static readonly ILog log = LogManager.GetLogger( typeof( SettingsFactory ) );
  
  		private SettingsFactory()
***************
*** 24,48 ****
  		}
  
! 		public static Settings BuildSettings(IDictionary properties) 
  		{
  			Settings settings = new Settings();
  
  			Dialect.Dialect dialect = null;
! 			try 
  			{
  				dialect = Dialect.Dialect.GetDialect( properties );
  				IDictionary temp = new Hashtable();
! 				
! 				foreach( DictionaryEntry de in dialect.DefaultProperties ) 
  				{
  					temp[ de.Key ] = de.Value;
  				}
! 				foreach( DictionaryEntry de in properties ) 
  				{
  					temp[ de.Key ] = de.Value;
  				}
  				properties = temp;
! 			} 
! 			catch( HibernateException he ) 
  			{
  				log.Warn( "No dialect set - using GenericDialect: " + he.Message );
--- 24,53 ----
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="properties"></param>
! 		/// <returns></returns>
! 		public static Settings BuildSettings( IDictionary properties )
  		{
  			Settings settings = new Settings();
  
  			Dialect.Dialect dialect = null;
! 			try
  			{
  				dialect = Dialect.Dialect.GetDialect( properties );
  				IDictionary temp = new Hashtable();
! 
! 				foreach( DictionaryEntry de in dialect.DefaultProperties )
  				{
  					temp[ de.Key ] = de.Value;
  				}
! 				foreach( DictionaryEntry de in properties )
  				{
  					temp[ de.Key ] = de.Value;
  				}
  				properties = temp;
! 			}
! 			catch( HibernateException he )
  			{
  				log.Warn( "No dialect set - using GenericDialect: " + he.Message );
***************
*** 50,95 ****
  			}
  
! 			
! 			bool useOuterJoin = PropertiesHelper.GetBoolean(Cfg.Environment.OuterJoin, properties, true);
  			log.Info( "use outer join fetching: " + useOuterJoin );
  
! 			IConnectionProvider connectionProvider = ConnectionProviderFactory.NewConnectionProvider(properties);
  			ITransactionFactory transactionFactory = new TransactionFactory(); //Transaction BuildTransactionFactory(properties);
  
! 			string isolationString = PropertiesHelper.GetString( Cfg.Environment.Isolation, properties, String.Empty );
  			IsolationLevel isolation = IsolationLevel.Unspecified;
! 			if( isolationString.Length > 0) 
  			{
! 				try 
  				{
! 					isolation = (IsolationLevel)Enum.Parse( typeof(IsolationLevel), isolationString );
  					log.Info( "Using Isolation Level: " + isolation.ToString() );
  				}
! 				catch( ArgumentException ae ) 
  				{
  					log.Error( "error configuring IsolationLevel " + isolationString, ae );
! 					throw new HibernateException( 
  						"The isolation level of " + isolationString + " is not a valid IsolationLevel.  Please " +
! 						"use one of the Member Names from the IsolationLevel.", ae );
  				}
  			}
  
! 			string defaultSchema = properties[Cfg.Environment.DefaultSchema] as string;
! 			if ( defaultSchema!=null) log.Info ("Default schema set to: " + defaultSchema);
! 			
! 			bool showSql = PropertiesHelper.GetBoolean( Cfg.Environment.ShowSql, properties, false );
! 			if (showSql) log.Info("echoing all SQL to stdout");
  
  			// queries:
  
! 			IDictionary querySubstitutions = PropertiesHelper.ToDictionary( Cfg.Environment.QuerySubstitutions, " ,=;:\n\t\r\f", properties );
! 			if ( log.IsInfoEnabled ) 
  			{
! 				StringBuilder sb = new StringBuilder("Query language substitutions: ");
! 				foreach(DictionaryEntry entry in querySubstitutions) 
  				{
! 					sb.AppendFormat("{0}={1};", entry.Key, entry.Value);
  				}
! 				log.Info(sb.ToString());
  			}
  
--- 55,106 ----
  			}
  
! 
! 			bool useOuterJoin = PropertiesHelper.GetBoolean( Environment.OuterJoin, properties, true );
  			log.Info( "use outer join fetching: " + useOuterJoin );
  
! 			IConnectionProvider connectionProvider = ConnectionProviderFactory.NewConnectionProvider( properties );
  			ITransactionFactory transactionFactory = new TransactionFactory(); //Transaction BuildTransactionFactory(properties);
  
! 			string isolationString = PropertiesHelper.GetString( Environment.Isolation, properties, String.Empty );
  			IsolationLevel isolation = IsolationLevel.Unspecified;
! 			if( isolationString.Length > 0 )
  			{
! 				try
  				{
! 					isolation = ( IsolationLevel ) Enum.Parse( typeof( IsolationLevel ), isolationString );
  					log.Info( "Using Isolation Level: " + isolation.ToString() );
  				}
! 				catch( ArgumentException ae )
  				{
  					log.Error( "error configuring IsolationLevel " + isolationString, ae );
! 					throw new HibernateException(
  						"The isolation level of " + isolationString + " is not a valid IsolationLevel.  Please " +
! 							"use one of the Member Names from the IsolationLevel.", ae );
  				}
  			}
  
! 			string defaultSchema = properties[ Environment.DefaultSchema ] as string;
! 			if( defaultSchema != null )
! 			{
! 				log.Info( "Default schema set to: " + defaultSchema );
! 			}
! 
! 			bool showSql = PropertiesHelper.GetBoolean( Environment.ShowSql, properties, false );
! 			if( showSql )
! 			{
! 				log.Info( "echoing all SQL to stdout" );
! 			}
  
  			// queries:
  
! 			IDictionary querySubstitutions = PropertiesHelper.ToDictionary( Environment.QuerySubstitutions, " ,=;:\n\t\r\f", properties );
! 			if( log.IsInfoEnabled )
  			{
! 				StringBuilder sb = new StringBuilder( "Query language substitutions: " );
! 				foreach( DictionaryEntry entry in querySubstitutions )
  				{
! 					sb.AppendFormat( "{0}={1};", entry.Key, entry.Value );
  				}
! 				log.Info( sb.ToString() );
  			}
  
***************
*** 97,112 ****
  			ICacheProvider cacheProvider = null;
  			log.Info( "cache provider: " + cacheClassName );
! 			try 
  			{
! 				cacheProvider = (ICacheProvider) Activator.CreateInstance( ReflectHelper.ClassForName( cacheClassName ) );
  			}
! 			catch( Exception e ) 
  			{
  				throw new HibernateException( "could not instantiate CacheProvider: " + cacheClassName, e );
  			}
! 			
  			bool prepareSql = PropertiesHelper.GetBoolean( Environment.PrepareSql, properties, true );
  
! 			string sessionFactoryName = (string) properties[ Cfg.Environment.SessionFactoryName ];
  
  			settings.DefaultSchemaName = defaultSchema;
--- 108,123 ----
  			ICacheProvider cacheProvider = null;
  			log.Info( "cache provider: " + cacheClassName );
! 			try
  			{
! 				cacheProvider = ( ICacheProvider ) Activator.CreateInstance( ReflectHelper.ClassForName( cacheClassName ) );
  			}
! 			catch( Exception e )
  			{
  				throw new HibernateException( "could not instantiate CacheProvider: " + cacheClassName, e );
  			}
! 
  			bool prepareSql = PropertiesHelper.GetBoolean( Environment.PrepareSql, properties, true );
  
! 			string sessionFactoryName = ( string ) properties[ Environment.SessionFactoryName ];
  
  			settings.DefaultSchemaName = defaultSchema;
***************
*** 124,130 ****
  			return settings;
  
! 			
  		}
  
  	}
! }
--- 135,141 ----
  			return settings;
  
! 
  		}
  
  	}
! }
\ No newline at end of file