[Nhibernate-commit] nhibernate/src/NHibernate/Connection ConnectionProvider.cs,1.4,1.5 ConnectionProviderFactory.cs,1.4,1.5

[Michael D. <mik...@us...>]

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

Modified Files:
	ConnectionProvider.cs ConnectionProviderFactory.cs 
Log Message:
using parameter settings instead of Cfg.Environment.Properties to initialize
the ConnectionProvider.

Index: ConnectionProvider.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Connection/ConnectionProvider.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConnectionProvider.cs	12 Jul 2004 01:31:09 -0000	1.4
--- ConnectionProvider.cs	24 Jul 2004 20:43:22 -0000	1.5
***************
*** 44,51 ****
  			// if the .net DataProvider did not provide their own connection pooling.  I don't know of
  			// any instances of this yet.
! 			poolSize = PropertiesHelper.GetInt32(Cfg.Environment.PoolSize, Cfg.Environment.Properties, 0);
  			log.Info("NHibernate connection pool size: " + poolSize);
  
! 			connString = Cfg.Environment.Properties[ Cfg.Environment.ConnectionString ] as string;
  			if (connString==null) throw new HibernateException("Could not find connection string setting");
  			
--- 44,51 ----
  			// if the .net DataProvider did not provide their own connection pooling.  I don't know of
  			// any instances of this yet.
! 			poolSize = PropertiesHelper.GetInt32(Cfg.Environment.PoolSize, settings, 0);
  			log.Info("NHibernate connection pool size: " + poolSize);
  
! 			connString = settings[ Cfg.Environment.ConnectionString ] as string;
  			if (connString==null) throw new HibernateException("Could not find connection string setting");
  			
***************
*** 60,64 ****
  		protected virtual void ConfigureDriver(IDictionary settings) 
  		{
! 			string driverClass = Cfg.Environment.Properties[ Cfg.Environment.ConnectionDriver] as string;
  			if(driverClass==null) 
  			{
--- 60,64 ----
  		protected virtual void ConfigureDriver(IDictionary settings) 
  		{
! 			string driverClass = settings[ Cfg.Environment.ConnectionDriver] as string;
  			if(driverClass==null) 
  			{
***************
*** 106,110 ****
  		#region IDisposable Members
  
- 		// equiv to java's object.finalize()
  		public void Dispose()
  		{
--- 106,109 ----

Index: ConnectionProviderFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Connection/ConnectionProviderFactory.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConnectionProviderFactory.cs	10 Mar 2004 15:36:45 -0000	1.4
--- ConnectionProviderFactory.cs	24 Jul 2004 20:43:22 -0000	1.5
***************
*** 18,22 ****
  		private ConnectionProviderFactory() 
  		{
! 			throw new InvalidOperationException();
  		}
  
--- 18,22 ----
  		private ConnectionProviderFactory() 
  		{
! 			throw new InvalidOperationException("ConnectionProviderFactory can not be instantiated.");
  		}