nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/src/NHibernate.Examples - New directory

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

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

Log Message:
Directory /cvsroot/nhibernate/nhibernate/src/NHibernate.Examples added to the repository

[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.");
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test App.config,1.4,1.5

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

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

Modified Files:
	App.config 
Log Message:
updated app.config to have a better logging level for the test during 
the build. 

Index: App.config
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/App.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** App.config	2 Apr 2004 14:35:44 -0000	1.4
--- App.config	23 Jul 2004 15:50:59 -0000	1.5
***************
*** 8,19 ****
  	<nhibernate>
  		<add 
- 			key="hibernate.show_sql"
- 			value="true"
- 		/>
- 		<add 
  			key="hibernate.connection.provider"          
  			value="NHibernate.Connection.DriverConnectionProvider" 
  		/>
  		
  		
  		<add 
--- 8,16 ----
  	<nhibernate>
  		<add 
  			key="hibernate.connection.provider"          
  			value="NHibernate.Connection.DriverConnectionProvider" 
  		/>
  		
+ 		<!-- This is the SqlClient configuration -->
  		
  		<add 
***************
*** 21,26 ****
  			value="NHibernate.Dialect.MsSql2000Dialect" 
  		/>
- 		<!-- This is the SqlClient configuration -->
- 		
  		<add 
  			key="hibernate.connection.driver_class"          
--- 18,21 ----
***************
*** 29,67 ****
  		<add 
  			key="hibernate.connection.connection_string" 
! 			value="Server=localhost;initial catalog=nhibernate;User ID=someuser;Password=somepwd;Min Pool Size=2" 
! 		/>
! 		
! 		<!-- This is the ODBC configuration with MsSql2000 -->
! 		<!--
! 		<add 
! 			key="hibernate.connection.driver_class"          
! 			value="NHibernate.Driver.OdbcDriver" 
! 		/>
! 		<add 
! 			key="hibernate.connection.connection_string" 
! 			value="DRIVER={SQL Server};SERVER=localhost;DATABASE=nhibernate;UID=someuser;PWD=somepwd" 
  		/>
! 		-->
! 		<!-- This is the OleDb configuration with MsSql2000 -->
  		<!--
  		<add 
  			key="hibernate.connection.driver_class"          
- 			value="NHibernate.Driver.OleDbDriver" 
- 		/>
- 		<add 
- 			key="hibernate.connection.connection_string" 
- 			value="Provider=SQLOLEDB.1;Persist Security Info=False;User ID=someuser;Password=somepwd;Initial Catalog=nhibernate;Data Source=localhost" 
- 		/>
- 		-->
- 		
- 		<!-- This is the ByteFX.Data.dll provider for MySql -->
- 		<!-- 
- 		<add 
- 			key="hibernate.connection.driver_class"          
  			value="NHibernate.Driver.ByteFXDataDriver" 
  		/>
  		<add 
  			key="hibernate.connection.connection_string" 
! 			value="Database=test;Data Source=192.168.7.10;User Id=someuser;Password=somepwd" 
  		/>
  		<add 
--- 24,38 ----
  		<add 
  			key="hibernate.connection.connection_string" 
! 			value="Server=localhost;initial catalog=nhibernate;Integrated Security=SSPI" 
  		/>
! 		<!-- This is the ByteFX.MySql.dll provider for MySql -->
  		<!--
  		<add 
  			key="hibernate.connection.driver_class"          
  			value="NHibernate.Driver.ByteFXDataDriver" 
  		/>
  		<add 
  			key="hibernate.connection.connection_string" 
! 			value="Database=test;Data Source=someip;User Id=someuser;Password=somepwd" 
  		/>
  		<add 
***************
*** 72,75 ****
--- 43,47 ----
  		
  		
+ 		
  	</nhibernate>
  
***************
*** 95,99 ****
  		
  		<root>
! 			<priority value="ALL" />
  			<appender-ref ref="rollingFile" />
  		</root>
--- 67,71 ----
  		
  		<root>
! 			<priority value="ERROR" />
  			<appender-ref ref="rollingFile" />
  		</root>

[Nhibernate-commit] nhibernate/src/NHibernate.Test hibernate.cfg.xml,1.2,1.3 NHibernate.Test-1.1.csproj,1.30,1.31 NHibernate.Test.build,1.4,1.5

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

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

Modified Files:
	hibernate.cfg.xml NHibernate.Test-1.1.csproj 
	NHibernate.Test.build 
Log Message:
updated build file and csproj to copy the ABC.hbm.xml to the bin directory
so NHibernate can easily load the file.

Index: NHibernate.Test.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test.build,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NHibernate.Test.build	23 Jul 2004 14:51:15 -0000	1.4
--- NHibernate.Test.build	23 Jul 2004 15:46:32 -0000	1.5
***************
*** 41,44 ****
--- 41,48 ----
  			tofile="${build.dir}/bin/hibernate.cfg.xml" 
  		/>
+ 		<copy
+ 			file="../NHibernate.DomainModel/ABC.hbm.xml"
+ 			tofile="${build.dir}/bin/ABC.hbm.xml"
+ 		/>
  			
  	</target>

Index: hibernate.cfg.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/hibernate.cfg.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hibernate.cfg.xml	12 Jul 2004 02:26:29 -0000	1.2
--- hibernate.cfg.xml	23 Jul 2004 15:46:31 -0000	1.3
***************
*** 11,15 ****
  		<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
  		<!-- mapping files -->
! 		<mapping file="../../../NHibernate.DomainModel/ABC.hbm.xml" />
  	</session-factory>
  	
--- 11,15 ----
  		<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
  		<!-- mapping files -->
! 		<mapping file="ABC.hbm.xml" />
  	</session-factory>
  	

Index: NHibernate.Test-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** NHibernate.Test-1.1.csproj	23 Jul 2004 14:51:14 -0000	1.30
--- NHibernate.Test-1.1.csproj	23 Jul 2004 15:46:32 -0000	1.31
***************
*** 17,21 ****
                  DelaySign = "false"
                  OutputType = "Library"
!                 PreBuildEvent = 'copy /y "$(ProjectDir)App.config" "$(TargetPath).config"&#xd;&#xa;copy /y "$(ProjectDir)hibernate.cfg.xml" "hibernate.cfg.xml"'
                  PostBuildEvent = ""
                  RootNamespace = "NHibernate.Test"
--- 17,21 ----
                  DelaySign = "false"
                  OutputType = "Library"
!                 PreBuildEvent = 'copy /y "$(ProjectDir)App.config" "$(TargetPath).config"&#xd;&#xa;copy /y "$(ProjectDir)hibernate.cfg.xml" "hibernate.cfg.xml"&#xd;&#xa;copy /y "..\..\..\NHibernate.DomainModel\ABC.hbm.xml" "ABC.hbm.xml"'
                  PostBuildEvent = ""
                  RootNamespace = "NHibernate.Test"

[Nhibernate-commit] nhibernate/src/NHibernate.Test NHibernate.Test-1.1.csproj,1.29,1.30 NHibernate.Test.build,1.3,1.4

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

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

Modified Files:
	NHibernate.Test-1.1.csproj NHibernate.Test.build 
Log Message:
removed copying of hibernate.cfg.xml from TestFixture to the prebuild event
and to the "build" target in nant.

Index: NHibernate.Test.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test.build,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NHibernate.Test.build	14 May 2004 12:08:58 -0000	1.3
--- NHibernate.Test.build	23 Jul 2004 14:51:15 -0000	1.4
***************
*** 37,40 ****
--- 37,44 ----
  			tofile="${build.dir}/bin/NHibernate.Test.dll.config" 
  		/>
+ 		<copy 
+ 			file="hibernate.cfg.xml"
+ 			tofile="${build.dir}/bin/hibernate.cfg.xml" 
+ 		/>
  			
  	</target>

Index: NHibernate.Test-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NHibernate.Test-1.1.csproj	12 Jul 2004 21:18:17 -0000	1.29
--- NHibernate.Test-1.1.csproj	23 Jul 2004 14:51:14 -0000	1.30
***************
*** 17,21 ****
                  DelaySign = "false"
                  OutputType = "Library"
!                 PreBuildEvent = 'copy /y "$(ProjectDir)App.config" "$(TargetPath).config"'
                  PostBuildEvent = ""
                  RootNamespace = "NHibernate.Test"
--- 17,21 ----
                  DelaySign = "false"
                  OutputType = "Library"
!                 PreBuildEvent = 'copy /y "$(ProjectDir)App.config" "$(TargetPath).config"&#xd;&#xa;copy /y "$(ProjectDir)hibernate.cfg.xml" "hibernate.cfg.xml"'
                  PostBuildEvent = ""
                  RootNamespace = "NHibernate.Test"

[Nhibernate-commit] nhibernate/src/NHibernate.Test/CfgTest ConfigurationFixture.cs,1.4,1.5

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

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24005/CfgTest

Modified Files:
	ConfigurationFixture.cs 
Log Message:
removed copying of hibernate.cfg.xml from TestFixture to the prebuild event
and to the "build" target in nant.

Index: ConfigurationFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConfigurationFixture.cs	20 Jul 2004 13:52:52 -0000	1.4
--- ConfigurationFixture.cs	23 Jul 2004 14:51:14 -0000	1.5
***************
*** 13,29 ****
  	public class ConfigurationFixture
  	{
- 		
- 		[SetUp]
- 		public void SetUp() 
- 		{
- 			System.IO.File.Copy("..\\..\\hibernate.cfg.xml", "hibernate.cfg.xml", true);
- 		}
- 
- 		[TearDown]
- 		public void TearDown() 
- 		{
- 			System.IO.File.Delete("hibernate.cfg.xml");
- 		}
- 		
  		/// <summary>
  		/// Verify that NHibernate can read the configuration from a hibernate.cfg.xml
--- 13,16 ----

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.6,1.7

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

Update of /cvsroot/nhibernate/nhibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19648

Modified Files:
	NHibernateSolution.build 
Log Message:
Preparing for build 6.

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NHibernateSolution.build	22 Jul 2004 13:36:43 -0000	1.6
--- NHibernateSolution.build	23 Jul 2004 14:23:31 -0000	1.7
***************
*** 9,13 ****
  	<!-- global project settings -->
  	<property name="project.name" value="nhibernate" />
! 	<property name="project.version" value="0.0.5000.5" />
  	
  	<!-- default configuration -->
--- 9,13 ----
  	<!-- global project settings -->
  	<property name="project.name" value="nhibernate" />
! 	<property name="project.version" value="0.0.5000.6" />
  	
  	<!-- default configuration -->

[Nhibernate-commit] nhibernate readme.html,1.9,1.10 releasenotes.txt,1.3,1.4

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

Update of /cvsroot/nhibernate/nhibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7220

Modified Files:
	readme.html releasenotes.txt 
Log Message:
Preparing for build 6.

Index: readme.html
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/readme.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** readme.html	5 Apr 2004 15:55:53 -0000	1.9
--- readme.html	23 Jul 2004 13:21:49 -0000	1.10
***************
*** 1,38 ****
  <html>
! <body>
! 
! <h1>Welcome to NHibernate.</h1>
! <hr />
! <p>
! NHibernate is a .NET based object persistence library for relational databases.  NHibernate is a port of the excellent Java <a href="http://hibernate.org">Hibernate</a> relational persistence tool.
! </p>
! 
! <h2>Latest Version</h2>
! <p>
! Details of the latest version of NHibernate can be found on SourceForge at <a href="http://sourceforge.net/projects/nhibernate">http://sourceforge.net/projects/nhibernate</a>. 
! </p>
! 
! <h2>Documentation</h2>
! <p>
! Documentation is very thin right now.  We are working on documenting the code as it is being developed.  We are going to add a step in our <a href="http://sourceforge.net/projects/nant">NAnt</a> build files to build the API documentation in MSDN format thanks to <a href="http://sourceforge.net/projects/ndoc">NDoc</a>.  
! </p>
! <p>
! We will ride the coat tails of Hibernate's excellent documentation for a while.  The first few docs will be describing the subtle differences between NHibernate and Hibernate - including the features found in Hibernate that have not been developed in NHibernate (yet).
! </p>
! 
! <h2>Bug Reports</h2>
! <p>
! As we mentioned before, this software is still being developed.  So if you do find any bugs please use the <a href="http://jira.nhibernate.org:8080/">JIRA bug tracker</a> .
! </p>
  
- <h2>Licenses</h2>
- <p>
- This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).
- </p>
- <p>
- This product includes software developed by the Apache Software Foundation (http://www.apache.org/).
- <ul>
-   <li>log4net</li>
- </ul>
- </body>
- </html>
\ No newline at end of file
--- 1,59 ----
  <html>
! 	<body>
! 		<h1>Welcome to NHibernate.</h1>
! 		<hr>
! 		<p>
! 			NHibernate is a .NET based object persistence library for relational databases. 
! 			NHibernate is a port of the excellent Java <a href="http://hibernate.org">Hibernate</a>
! 			relational persistence tool.
! 		</p>
! 		<h2>Latest Version</h2>
! 		<p>
! 			Details of the latest version of NHibernate can be found on SourceForge at <a href="http://sourceforge.net/projects/nhibernate">
! 				http://sourceforge.net/projects/nhibernate</a>.
! 		</p>
! 		<h2>Documentation</h2>
! 		<p>
! 			Documentation is very thin right now. We are working on documenting the code as 
! 			it is being developed. The API documentation is in MSDN format thanks to <a href="http://sourceforge.net/projects/ndoc">
! 				NDoc</a>.
! 		</p>
! 		<p>
! 			We will ride the coat tails of Hibernate's excellent documentation for a while. 
! 			The Hibernate documentation for the version we are porting can be found at
! 			<a href="http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/"> http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/ </a>.  
! 			The first few docs will be describing the subtle differences 
! 			between NHibernate and Hibernate - including the features found in Hibernate 
! 			that have not been developed in NHibernate (yet).
! 		</p>
! 		<h2>Bug Reports</h2>
! 		<p>
! 			As we mentioned before, this software is still being developed. So if you do 
! 			find any bugs please use the <a href="http://jira.nhibernate.org:8080/">JIRA bug 
! 				tracker</a> .
! 		</p>
! 		<h2>Licenses</h2>
! 		<p>
! 			This software is distributed under the terms of the FSF Lesser Gnu Public 
! 			License (see lgpl.txt).
! 		</p>
! 		<p>
! 			This product includes software developed by the Apache Software Foundation 
! 			(http://www.apache.org/).
! 		</p>
! 		<ul>
! 			<li>
! 				log4net</li>
! 		</ul>
! 		<p>
! 			This product includes source code derived from a sample written by Mattias 
! 			Sjogren.
! 		</p>
! 		<ul>
! 			<li>
! 				HashCodeProvider - original code can be found at <a href="http://www.msjogren.net/dotnet/eng/samples/misc.asp">
! 					http://www.msjogren.net/dotnet/eng/samples/misc.asp</a></li>
! 		</ul>
! 	</body>
! </html>
  

Index: releasenotes.txt
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/releasenotes.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** releasenotes.txt	8 Jul 2004 12:49:52 -0000	1.3
--- releasenotes.txt	23 Jul 2004 13:21:50 -0000	1.4
***************
*** 1,3 ****
! PreAlpah Build 5
  ======================== 
  - Added check in Configuration for 1.1 version of runtime.
--- 1,19 ----
! PreAlpha Build 6
! ======================== 
! - Fixed Configuration so app.config/web.config behaives like hibernate.properties and a hibernate.cfg.xml.  Settings in app.confg/web.config are no longer required if a cfg.xml file is used.
! - Dialects now set default values for outer joins.  
! - Fixed bug in ArrayHolder with null elements.
! - Added IDisposable to ISession
! - Fixed bug with lazy loaded SortedSet during Flush().
! - Fixed problem with Loading using LockModes because of missing columns with Forumlas.
! - Added SetAnsiString to IQuery
! - Fixed bug with IDbCommands used in a Session that is Disconnected and Reconnected not being associated with the correct IDbTransaction.
! - Driver can disable calls to IDbCommand.Prepare() for Data Providers that don't support it.
! - Removed requirement to set length with type attribute - ie, can use type="String" instead of type="String(50)".
! - schema-export now functions just like it does with hibernate 2.0.3
! - Converting a SqlString to an IDbCommand is now a Driver specific function because different Driver's have different requirements for IDbCommands.
! - Added HashCodeProvider.dll to remove problems with RuntimeHelpers.GetHashCode causing MissingMethodException with App Domain reloading with ASP.NET and NUnit.
! 
! PreAlpha Build 5
  ======================== 
  - Added check in Configuration for 1.1 version of runtime.

[Nhibernate-commit] nhibernate/src/NHibernate.Test AssemblyInfo.cs,1.5,1.6

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
Preparing for build 6.

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/AssemblyInfo.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssemblyInfo.cs	8 Jul 2004 12:41:35 -0000	1.5
--- AssemblyInfo.cs	23 Jul 2004 13:17:07 -0000	1.6
***************
*** 21,27 ****
  // You can specify all the values or you can default the Revision and Build Numbers 
  // by using the '*' as shown below:
! [assembly: AssemblyVersionAttribute("0.0.5000.5")]
  [assembly: AssemblyInformationalVersionAttribute("0.0")]
! [assembly: AssemblyFileVersionAttribute("0.0000.5")]
  
  [assembly: AssemblyDelaySignAttribute(false)]
\ No newline at end of file
--- 21,27 ----
  // You can specify all the values or you can default the Revision and Build Numbers 
  // by using the '*' as shown below:
! [assembly: AssemblyVersionAttribute("0.0.5000.6")]
  [assembly: AssemblyInformationalVersionAttribute("0.0")]
! [assembly: AssemblyFileVersionAttribute("0.0000.6")]
  
  [assembly: AssemblyDelaySignAttribute(false)]
\ No newline at end of file

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel AssemblyInfo.cs,1.5,1.6

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
Preparing for build 6.

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/AssemblyInfo.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssemblyInfo.cs	8 Jul 2004 12:41:35 -0000	1.5
--- AssemblyInfo.cs	23 Jul 2004 13:17:07 -0000	1.6
***************
*** 21,27 ****
  // You can specify all the values or you can default the Revision and Build Numbers 
  // by using the '*' as shown below:
! [assembly: AssemblyVersionAttribute("0.0.5000.5")]
  [assembly: AssemblyInformationalVersionAttribute("0.0")]
! [assembly: AssemblyFileVersionAttribute("0.0000.5")]
  
  [assembly: AssemblyDelaySignAttribute(false)]
--- 21,27 ----
  // You can specify all the values or you can default the Revision and Build Numbers 
  // by using the '*' as shown below:
! [assembly: AssemblyVersionAttribute("0.0.5000.6")]
  [assembly: AssemblyInformationalVersionAttribute("0.0")]
! [assembly: AssemblyFileVersionAttribute("0.0000.6")]
  
  [assembly: AssemblyDelaySignAttribute(false)]

[Nhibernate-commit] nhibernate/src/NHibernate AssemblyInfo.cs,1.6,1.7

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
Preparing for build 6.

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/AssemblyInfo.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AssemblyInfo.cs	8 Jul 2004 12:41:34 -0000	1.6
--- AssemblyInfo.cs	23 Jul 2004 13:17:06 -0000	1.7
***************
*** 21,27 ****
  // You can specify all the values or you can default the Revision and Build Numbers 
  // by using the '*' as shown below:
! [assembly: AssemblyVersionAttribute("0.0.5000.5")]
  [assembly: AssemblyInformationalVersionAttribute("0.0")]
! [assembly: AssemblyFileVersionAttribute("0.0000.5")]
  
  [assembly: AssemblyDelaySignAttribute(false)]
--- 21,27 ----
  // You can specify all the values or you can default the Revision and Build Numbers 
  // by using the '*' as shown below:
! [assembly: AssemblyVersionAttribute("0.0.5000.6")]
  [assembly: AssemblyInformationalVersionAttribute("0.0")]
! [assembly: AssemblyFileVersionAttribute("0.0000.6")]
  
  [assembly: AssemblyDelaySignAttribute(false)]

[Nhibernate-commit] nhibernate/external-bin HashCodeProvider.dll,NONE,1.1 HashCodeProvider.license.txt,NONE,1.1

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

Update of /cvsroot/nhibernate/nhibernate/external-bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12532/external-bin

Added Files:
	HashCodeProvider.dll HashCodeProvider.license.txt 
Log Message:
New HashCodeProvider for IdentityMap.

--- NEW FILE: HashCodeProvider.license.txt ---
Copyright (c) 2002 Mattias Sjogren

This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.

Permission is granted to anyone to use this software for any purpose, including commercial applications, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.

2. No substantial portion of the source code may be redistributed without the express written permission of the copyright holders, where "substantial" is defined as enough code to be recognizably from this library.

--- NEW FILE: HashCodeProvider.dll ---
(This appears to be a binary file; contents omitted.)

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.5,1.6

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

Update of /cvsroot/nhibernate/nhibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12306

Modified Files:
	NHibernateSolution.build 
Log Message:
Added tasks to build HashCodeProvider seperate from the main build and
to copy the dll to the correct folders during the build.

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NHibernateSolution.build	8 Jul 2004 12:49:52 -0000	1.5
--- NHibernateSolution.build	22 Jul 2004 13:36:43 -0000	1.6
***************
*** 46,49 ****
--- 46,56 ----
  	</target>
  	
+ 	<target name="build-external" depends="init" description="Builds code that NHibernate depends on but is not a core peice of NHibernate.  The built dll/exes will be distributed in the external-bin folder so there should be no need for a user to build it.">
+ 		<nant 
+ 			buildfile="src/HashCodeProvider/HashCodeProvider.build" 
+ 			target="build"
+ 		/>
+ 	</target>
+ 	
  	<target name="build" depends="init" description="Builds current configuration">
  		<echo message="Current Directory is ${nant.project.basedir}" />
***************
*** 60,63 ****
--- 67,71 ----
  				<includes name="DotNetMock.*" />
  				<includes name="nunit.framework.*" />
+ 				<includes name="HashCodeProvider.*" />
  			</fileset>
  		</copy>

[Nhibernate-commit] nhibernate/src/NHibernate nhibernate.build,1.11,1.12

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

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

Modified Files:
	nhibernate.build 
Log Message:
Added reference to HashCodeProvider.dll

Index: nhibernate.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/nhibernate.build,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** nhibernate.build	18 May 2004 05:05:09 -0000	1.11
--- nhibernate.build	22 Jul 2004 13:35:02 -0000	1.12
***************
*** 49,52 ****
--- 49,53 ----
  				<includes name="System.Data.dll" />
  				<includes name="log4net.dll" />
+ 				<includes name="HashCodeProvider.dll" />
  			</references>
  	

[Nhibernate-commit] nhibernate/src/NHibernate/Util IdentityMap.cs,1.9,1.10

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

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

Modified Files:
	IdentityMap.cs 
Log Message:
Added HashCodeProvider.dll reference to project and using it in IdentityMap.

Index: IdentityMap.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/IdentityMap.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IdentityMap.cs	28 Jun 2004 03:41:34 -0000	1.9
--- IdentityMap.cs	22 Jul 2004 13:31:37 -0000	1.10
***************
*** 13,20 ****
  	/// </summary>
  	/// <remarks>
! 	/// Do NOT use a struct/System.Value type as the key for this Hashtable - only classes.  See
  	/// the google thread 
  	/// http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=bds2rm%24ruc%241%40charly.heeg.de&rnum=1&prev=/groups%3Fhl%3Den%26lr%3D%26ie%3DUTF-8%26oe%3DUTF-8%26q%3DSystem.Runtime.CompilerServices.RuntimeHelpers.GetHashCode%26sa%3DN%26tab%3Dwg
! 	/// about why using Structs is a bad thing.
  	/// <p>
  	/// If I understand it correctly, the first call to get an object defined by a DateTime("2003-01-01")
--- 13,20 ----
  	/// </summary>
  	/// <remarks>
! 	/// Do NOT use a System.Value type as the key for this Hashtable - only classes.  See
  	/// the google thread 
  	/// http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=bds2rm%24ruc%241%40charly.heeg.de&rnum=1&prev=/groups%3Fhl%3Den%26lr%3D%26ie%3DUTF-8%26oe%3DUTF-8%26q%3DSystem.Runtime.CompilerServices.RuntimeHelpers.GetHashCode%26sa%3DN%26tab%3Dwg
! 	/// about why using System.Value is a bad thing.
  	/// <p>
  	/// If I understand it correctly, the first call to get an object defined by a DateTime("2003-01-01")
***************
*** 28,31 ****
--- 28,32 ----
  	public sealed class IdentityMap : IDictionary 
  	{
+ 		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(IdentityMap));
  		
  		// key = IdentityKey of the passed in Key
***************
*** 33,39 ****
  		IDictionary map;
  
! 		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(IdentityMap));
! 		
! 		
  		/// <summary>
  		/// Create a new instance of the IdentityMap that has no 
--- 34,38 ----
  		IDictionary map;
  
! 	
  		/// <summary>
  		/// Create a new instance of the IdentityMap that has no 
***************
*** 43,47 ****
  		public static IDictionary Instantiate() 
  		{
! 			return new IdentityMap(new Hashtable());
  		}
  
--- 42,48 ----
  		public static IDictionary Instantiate() 
  		{
! 			IHashCodeProvider ihcp = new HashCodeProvider.IdentityHashCodeProvider(); 
! 			IComparer comp = new IdentityMap.IdentityComparer();
! 			return new IdentityMap(new Hashtable(ihcp,  comp));
  		}
  
***************
*** 54,58 ****
  		public static IDictionary InstantiateSequenced() 
  		{
! 			return new IdentityMap(new SequencedHashMap());
  		}
  		
--- 55,61 ----
  		public static IDictionary InstantiateSequenced() 
  		{
! 			IHashCodeProvider ihcp = new HashCodeProvider.IdentityHashCodeProvider(); 
! 			IComparer comp = new IdentityMap.IdentityComparer();
! 			return new IdentityMap(new SequencedHashMap(ihcp, comp));
  		}
  		
***************
*** 109,114 ****
  		public void Add(object key, object val) 
  		{
! 			IdentityKey identityKey = new IdentityMap.IdentityKey(key);
! 			map.Add(identityKey, val);
  		}
  
--- 112,116 ----
  		public void Add(object key, object val) 
  		{
! 			map.Add(VerifyValidKey(key), val);
  		}
  
***************
*** 126,131 ****
  		public bool Contains(object key) 
  		{
! 			IdentityKey identityKey = new IdentityMap.IdentityKey(key);
! 			return map.Contains(identityKey);
  		}
  
--- 128,133 ----
  		public bool Contains(object key) 
  		{
! 			if(key==null) return false;
! 			return map.Contains(VerifyValidKey(key));
  		}
  
***************
*** 170,180 ****
  			get 
  			{
! 				ArrayList keyObjects = new ArrayList(map.Keys.Count);
! 				foreach(IdentityKey key in map.Keys) 
! 				{
! 					keyObjects.Add(key.Key);
! 				}
! 
! 				return keyObjects;
  			}
  		}
--- 172,176 ----
  			get 
  			{
! 				return map.Keys;
  			}
  		}
***************
*** 185,190 ****
  		public void Remove(object key) 
  		{
! 			IdentityKey identityKey = new IdentityMap.IdentityKey(key);
! 			map.Remove(identityKey);
  		}
  
--- 181,186 ----
  		public void Remove(object key) 
  		{
! 			if(key==null) return;
! 			map.Remove(VerifyValidKey(key));
  		}
  
***************
*** 196,206 ****
  			get 
  			{ 
! 				IdentityKey identityKey = new IdentityMap.IdentityKey(key);
! 				return map[identityKey];
  			}
  			set 
  			{
! 				IdentityKey identityKey = new IdentityMap.IdentityKey(key);
! 				map[identityKey] = value;
  			}
  		}
--- 192,201 ----
  			get 
  			{ 
! 				if(key==null) return null;
! 				return map[VerifyValidKey(key)];
  			}
  			set 
  			{
! 				map[VerifyValidKey(key)] = value;
  			}
  		}
***************
*** 238,244 ****
  				foreach(DictionaryEntry de in map)
  				{
! 					// add the underlying Key behind the IdentityKey.Key and the Value (the value
! 					// is not wrapping anything) to the List
! 					DictionaryEntry newEntry = new DictionaryEntry(((IdentityKey)de.Key).Key, de.Value);
  					list.Add(newEntry);
  				}
--- 233,237 ----
  				foreach(DictionaryEntry de in map)
  				{
! 					DictionaryEntry newEntry = new DictionaryEntry(de.Key, de.Value);
  					list.Add(newEntry);
  				}
***************
*** 248,289 ****
  		}
  
! 
! 		[Serializable]
! 		public sealed class IdentityKey  
  		{
! 			private object key;
! 
! 			internal IdentityKey(Object key) 
  			{
! 				if(key is System.ValueType) {
! 					throw new ArgumentException("A ValueType can not be used with IdentityKey.  " + 
! 						"The thread at google has a good description about what happens with boxing " + 
! 						"and unboxing ValueTypes and why they can not be used as an IdentityKey: " + 
! 						"http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=bds2rm%24ruc%241%40charly.heeg.de&rnum=1&prev=/groups%3Fhl%3Den%26lr%3D%26ie%3DUTF-8%26oe%3DUTF-8%26q%3DSystem.Runtime.CompilerServices.RuntimeHelpers.GetHashCode%26sa%3DN%26tab%3Dwg"
! 						,"key");
  
- 				}
- 				this.key=key;
  			}
  
! 			public override bool Equals(Object other) 
! 			{
! 				return key == ((IdentityKey) other).Key;
! 			}
  
! 			public override int GetHashCode() 
! 			{
! 				return System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(key);
! 			}
  
! 			public object Key 
  			{
! 				get {return key;}
  			}
  
  		}
- 		
- 	
- 		
  	}
  }
--- 241,316 ----
  		}
  
! 		/// <summary>
! 		/// Verifies that we are not using a System.ValueType as the Key in the Dictionary
! 		/// </summary>
! 		/// <param name="obj">The object that will be the key.</param>
! 		/// <returns>An object that is safe to be a key.</returns>
! 		/// <exception cref="ArgumentException">Thrown when the obj is a System.ValueType</exception>
! 		private object VerifyValidKey(object obj) 
  		{
! 			if(obj is System.ValueType) 
  			{
! 				throw new ArgumentException("A ValueType can not be used with IdentityKey.  " + 
! 					"The thread at google has a good description about what happens with boxing " + 
! 					"and unboxing ValueTypes and why they can not be used as an IdentityKey: " + 
! 					"http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=bds2rm%24ruc%241%40charly.heeg.de&rnum=1&prev=/groups%3Fhl%3Den%26lr%3D%26ie%3DUTF-8%26oe%3DUTF-8%26q%3DSystem.Runtime.CompilerServices.RuntimeHelpers.GetHashCode%26sa%3DN%26tab%3Dwg"
! 					,"key");
  
  			}
  
! 			return obj;
! 		}
  
! 		/// <summary>
! 		/// Compares two objects for Equality using "==" instead of Object.Equals
! 		/// </summary>
! 		/// <remarks>
! 		/// Only for use in IdentityMap.
! 		/// </remarks>
! 		private class IdentityComparer : IComparer
! 		{
! 			#region IComparer Members
  
! 			/// <summary>
! 			/// Performs a null safe comparison using "==" instead of Object.Equals()
! 			/// </summary>
! 			/// <param name="x">First object to compare.</param>
! 			/// <param name="y">Second object to compare.</param>
! 			/// <remarks>
! 			/// This is Lazy collection safe since it uses <c>==</c>, unlike <c>Object.Equals()</c> 
! 			/// which currently causes NHibernate to load up the collection.  This behaivior of 
! 			/// Collections is likely to change because Java's collections override Equals() and 
! 			/// .net's collections don't.  So in .net there is no need to override Equals() and 
! 			/// GetHashCode() on the NHibernate Collection implementations.
! 			/// </remarks>
! 			/// <returns>
! 			/// Unlike the standard IComparer interface this will not return a <c>1</c> or <c>-1</c>
! 			/// to indicate which is Greater Than or Less Than.  It always returns <c>-1</c> to 
! 			/// indicate the two are not Equal.
! 			/// </returns>
! 			public int Compare(object x, object y)
  			{
! 				if(x==null && y==null) 
! 				{
! 					return 0;
! 				}
! 
! 				if(x==null || y==null) 
! 				{
! 					return -1;
! 				}
! 
! 				if(x==y) 
! 				{ 
! 					return 0;
! 				}
! 				else 
! 				{
! 					return -1;
! 				}
  			}
  
+ 			#endregion
  		}
  	}
  }

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.31,1.32

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

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

Modified Files:
	NHibernate-1.1.csproj 
Log Message:
Added HashCodeProvider.dll reference to project and using it in IdentityMap.

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** NHibernate-1.1.csproj	19 Jul 2004 03:24:34 -0000	1.31
--- NHibernate-1.1.csproj	22 Jul 2004 13:31:36 -0000	1.32
***************
*** 95,98 ****
--- 95,103 ----
                      HintPath = "..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
                  />
+                 <Reference
+                     Name = "HashCodeProvider"
+                     AssemblyName = "HashCodeProvider"
+                     HintPath = "..\..\external-bin\HashCodeProvider.dll"
+                 />
              </References>
          </Build>

[Nhibernate-commit] nhibernate/src/HashCodeProvider AssemblyInfo.cs,NONE,1.1 HashCodeProvider.build,NONE,1.1 HashCodeProvider.il,NONE,1.1 HashCodeProvider.license.txt,NONE,1.1

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

Update of /cvsroot/nhibernate/nhibernate/src/HashCodeProvider
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11400/HashCodeProvider

Added Files:
	AssemblyInfo.cs HashCodeProvider.build HashCodeProvider.il 
	HashCodeProvider.license.txt 
Log Message:
Replacement code for RuntimeHelpers.GetHashCode(object) that is causing
the MissingMethodException

--- NEW FILE: HashCodeProvider.license.txt ---
Copyright (c) 2002 Mattias Sjogren

This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.

Permission is granted to anyone to use this software for any purpose, including commercial applications, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.

2. No substantial portion of the source code may be redistributed without the express written permission of the copyright holders, where "substantial" is defined as enough code to be recognizably from this library.

--- NEW FILE: HashCodeProvider.il ---
.assembly extern mscorlib
{
  .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
  .ver 1:0:5000:0
}
.assembly HashCodeProvider
{
  .custom instance void [mscorlib]System.Reflection.AssemblyKeyNameAttribute::.ctor(string) = ( 01 00 00 00 00 ) 
  .custom instance void [mscorlib]System.Reflection.AssemblyKeyFileAttribute::.ctor(string) = ( 01 00 00 00 00 ) 
  .custom instance void [mscorlib]System.Reflection.AssemblyDelaySignAttribute::.ctor(bool) = ( 01 00 00 00 00 ) 
  .custom instance void [mscorlib]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 05 31 2E 30 2E 30 00 00 )                   // ...1.0.0..
  .custom instance void [mscorlib]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 03 31 2E 30 00 00 )                         // ...1.0..
  .custom instance void [mscorlib]System.Reflection.AssemblyTrademarkAttribute::.ctor(string) = ( 01 00 00 00 00 ) 
  .custom instance void [mscorlib]System.Reflection.AssemblyCopyrightAttribute::.ctor(string) = ( 01 00 22 43 6F 70 79 72 69 67 68 74 20 28 63 29   // .."Copyright (c)
                                                                                                  20 32 30 30 32 20 4D 61 74 74 69 61 73 20 53 6A   //  2002 Mattias Sj
                                                                                                  6F 67 72 65 6E 00 00 )                            // ogren..
  .custom instance void [mscorlib]System.Reflection.AssemblyProductAttribute::.ctor(string) = ( 01 00 10 48 61 73 68 43 6F 64 65 50 72 6F 76 69   // ...HashCodeProvi
                                                                                                64 65 72 00 00 )                                  // der..
  .custom instance void [mscorlib]System.Reflection.AssemblyCompanyAttribute::.ctor(string) = ( 01 00 33 68 74 74 70 3A 2F 2F 77 77 77 2E 6D 73   // ..3http://www.ms
                                                                                                6A 6F 67 72 65 6E 2E 6E 65 74 2F 64 6F 74 6E 65   // jogren.net/dotne
                                                                                                74 2F 65 6E 67 2F 73 61 6D 70 6C 65 73 2F 6D 69   // t/eng/samples/mi
                                                                                                73 63 2E 61 73 70 00 00 )                         // sc.asp..
  .custom instance void [mscorlib]System.Reflection.AssemblyConfigurationAttribute::.ctor(string) = ( 01 00 00 00 00 ) 
  .custom instance void [mscorlib]System.Reflection.AssemblyDescriptionAttribute::.ctor(string) = ( 01 00 30 55 74 69 6C 69 74 79 20 74 6F 20 63 61   // ..0Utility to ca
                                                                                                    6C 6C 20 4F 62 6A 65 63 74 2E 47 65 74 48 61 73   // ll Object.GetHas
                                                                                                    68 43 6F 64 65 20 6E 6F 6E 76 69 72 74 75 61 6C   // hCode nonvirtual
                                                                                                    6C 79 2E 00 00 )                                  // ly...
  .custom instance void [mscorlib]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 10 48 61 73 68 43 6F 64 65 50 72 6F 76 69   // ...HashCodeProvi
                                                                                              64 65 72 00 00 )                                  // der..
  .hash algorithm 0x00008004
  .ver 1:0:0:0
}
.module HashCodeProvider.dll
// MVID: {52F1D165-1EC9-4B77-8031-3AAFBBC27452}
.imagebase 0x11000000
.subsystem 0x00000003
.file alignment 4096
.corflags 0x00000001
// Image base: 0x07b50000
.namespace HashCodeProvider 
{
  .class public IdentityHashCodeProvider
       implements [mscorlib]System.Collections.IHashCodeProvider
  {
    .method private hidebysig newslot final virtual 
          instance int32 System.Collections.IHashCodeProvider.GetHashCode(object obj)
    {
      .override [mscorlib]System.Collections.IHashCodeProvider::GetHashCode
      ldarg.1
      call      instance int32 [mscorlib]System.Object::GetHashCode()
      ret
    }

    .method public hidebysig specialname rtspecialname instance void .ctor()
    {
      ldarg.0
      call      instance void [mscorlib]System.Object::.ctor()
      ret
    }
  }
}

--- NEW FILE: HashCodeProvider.build ---
<?xml version="1.0" ?>

<project 
	name="HashCodeProvider" 
	default="build" 
	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
>

	<target name="build">
		<exec 
			program="${nant.settings.currentframework.frameworkdirectory}\ilasm" 
			commandline="HashCodeProvider.il /dll /output:..\..\external-bin\HashCodeProvider.dll" 
		/>	
		<copy file="HashCodeProvider.license.txt" todir="../../external-bin" />
	</target>
	
	
</project>
--- NEW FILE: AssemblyInfo.cs ---
using System.Reflection;
using System.Runtime.CompilerServices;

//
// General Information about an assembly is controlled through the following 
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("HashCodeProvider")]
[assembly: AssemblyDescription("Utility to call Object.GetHashCode nonvirtually.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("http://www.msjogren.net/dotnet/eng/samples/misc.asp")]
[assembly: AssemblyProduct("HashCodeProvider")]
[assembly: AssemblyCopyright(
"Copyright (c) 2002 Mattias Sjogren" + 
"\n\nThis software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software." + 
"\n\nPermission is granted to anyone to use this software for any purpose, including commercial applications, subject to the following restrictions:" + 
"\n\n1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required." + 
"\n\n2. No substantial portion of the source code may be redistributed without the express written permission of the copyright holders, where \"substantial\" is defined as enough code to be recognizably from this library.")]


//
// Version information for an assembly consists of the following four values:
//
//      Major Version
//      Minor Version 
//      Build Number
//      Revision
//
// You can specify all the values or you can default the Revision and Build Numbers 
// by using the '*' as shown below:

[assembly: AssemblyVersion("1.0.0.0")]

//
// In order to sign your assembly you must specify a key to use. Refer to the 
// Microsoft .NET Framework documentation for more information on assembly signing.
//
// Use the attributes below to control which key is used for signing. 
//
// Notes: 
//   (*) If no key is specified, the assembly is not signed.
//   (*) KeyName refers to a key that has been installed in the Crypto Service
//       Provider (CSP) on your machine. KeyFile refers to a file which contains
//       a key.
//   (*) If the KeyFile and the KeyName values are both specified, the 
//       following processing occurs:
//       (1) If the KeyName can be found in the CSP, that key is used.
//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
//           in the KeyFile is installed into the CSP and used.
//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
//       When specifying the KeyFile, the location of the KeyFile should be
//       relative to the project output directory which is
//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
//       located in the project directory, you would specify the AssemblyKeyFile 
//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
//       documentation for more information on this.
//
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

[Nhibernate-commit] nhibernate/src/HashCodeProvider - New directory

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

Update of /cvsroot/nhibernate/nhibernate/src/HashCodeProvider
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6189/HashCodeProvider

Log Message:
Directory /cvsroot/nhibernate/nhibernate/src/HashCodeProvider added to the repository

[Nhibernate-commit] nhibernate/src/NHibernate.Test FumTest.cs,1.7,1.8

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

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

Modified Files:
	FumTest.cs 
Log Message:
Wrapped a For Update in a Transaction - oracle requirement.

Index: FumTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FumTest.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FumTest.cs	15 Jul 2004 19:16:12 -0000	1.7
--- FumTest.cs	20 Jul 2004 13:58:55 -0000	1.8
***************
*** 121,124 ****
--- 121,125 ----
  		{
  			ISession s = sessions.OpenSession();
+ 			ITransaction t = s.BeginTransaction();
  			Fum fum = new Fum( FumTest.FumKey("fum") );
  			fum.FumString = "fee fi fo";
***************
*** 126,133 ****
  
  			Assert.AreSame( fum, s.Load( typeof(Fum), FumTest.FumKey("fum"), LockMode.Upgrade ) );
! 			s.Flush();
  			s.Close();
  
  			s = sessions.OpenSession();
  			fum = (Fum) s.Load( typeof(Fum), FumTest.FumKey("fum"), LockMode.Upgrade );
  			Assert.IsNotNull(fum, "Load by composite key");
--- 127,136 ----
  
  			Assert.AreSame( fum, s.Load( typeof(Fum), FumTest.FumKey("fum"), LockMode.Upgrade ) );
! 			//s.Flush();
! 			t.Commit();
  			s.Close();
  
  			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
  			fum = (Fum) s.Load( typeof(Fum), FumTest.FumKey("fum"), LockMode.Upgrade );
  			Assert.IsNotNull(fum, "Load by composite key");
***************
*** 145,152 ****
  
  			fum.Fo = null;
! 			s.Flush();
  			s.Close();
  
  			s = sessions.OpenSession();
  			IEnumerator enumerator = s.Enumerable("from fum in class NHibernate.DomainModel.Fum where not fum.FumString='FRIEND'").GetEnumerator();
  			int i = 0;
--- 148,157 ----
  
  			fum.Fo = null;
! 			//s.Flush();
! 			t.Commit();
  			s.Close();
  
  			s = sessions.OpenSession();
+ 			t = s.BeginTransaction();
  			IEnumerator enumerator = s.Enumerable("from fum in class NHibernate.DomainModel.Fum where not fum.FumString='FRIEND'").GetEnumerator();
  			int i = 0;
***************
*** 159,163 ****
  
  			Assert.AreEqual(2, i, "Iterate on Composite Key");
! 			s.Flush();
  			s.Close();
  
--- 164,169 ----
  
  			Assert.AreEqual(2, i, "Iterate on Composite Key");
! 			//s.Flush();
! 			t.Commit();
  			s.Close();
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test/CfgTest ConfigurationFixture.cs,1.3,1.4

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

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4705/NHibernate.Test/CfgTest

Modified Files:
	ConfigurationFixture.cs 
Log Message:
Fixed problem where Config.Configure() was overwriting 
Environment.properties because a reference to the IDictionary was being
returned, not a copy of the keys/values.

Index: ConfigurationFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConfigurationFixture.cs	19 Jul 2004 20:57:05 -0000	1.3
--- ConfigurationFixture.cs	20 Jul 2004 13:52:52 -0000	1.4
***************
*** 33,38 ****
  		public void ReadCfgXmlFromDefaultFile() 
  		{
- 			string origQuerySubst = Cfg.Environment.Properties[Cfg.Environment.QuerySubstitutions] as string;
- 			string origConnString = Cfg.Environment.Properties[Cfg.Environment.ConnectionString] as string;
  
  			Configuration cfg = new Configuration();
--- 33,36 ----
***************
*** 41,47 ****
  			Assert.AreEqual( "true 1, false 0, yes 'Y', no 'N'", cfg.Properties[Cfg.Environment.QuerySubstitutions]);
  			Assert.AreEqual( "Server=localhost;initial catalog=nhibernate;Integrated Security=SSPI", cfg.Properties[Cfg.Environment.ConnectionString]);
- 
- 			cfg.Properties[Cfg.Environment.QuerySubstitutions] = origQuerySubst;
- 			cfg.Properties[Cfg.Environment.ConnectionString] = origConnString;
  		}
  	}
--- 39,42 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Configuration.cs,1.17,1.18 Environment.cs,1.14,1.15

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

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

Modified Files:
	Configuration.cs Environment.cs 
Log Message:
Fixed problem where Config.Configure() was overwriting 
Environment.properties because a reference to the IDictionary was being
returned, not a copy of the keys/values.

Index: Configuration.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Configuration.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Configuration.cs	12 Jul 2004 02:26:28 -0000	1.17
--- Configuration.cs	20 Jul 2004 13:52:52 -0000	1.18
***************
*** 1,9 ****
  using System;
  using System.IO;
  using System.Xml;
  using System.Xml.Schema;
  
- using System.Reflection;
- using System.Collections;
  using NHibernate.Id;
  using NHibernate.Impl;
--- 1,10 ----
  using System;
+ using System.Collections;
+ using System.Collections.Specialized;
  using System.IO;
+ using System.Reflection;
  using System.Xml;
  using System.Xml.Schema;
  
  using NHibernate.Id;
  using NHibernate.Impl;
***************
*** 73,77 ****
  			mappingSchema = XmlSchema.Read(Assembly.GetExecutingAssembly().GetManifestResourceStream(MappingSchemaResource), null);
  			cfgSchema = XmlSchema.Read(Assembly.GetExecutingAssembly().GetManifestResourceStream(CfgSchemaResource), null);
- 
  		}
  
--- 74,77 ----
***************
*** 130,137 ****
  			try 
  			{
! 				AddXmlReader(new XmlTextReader(xmlFile));
! //				XmlDocument doc = new XmlDocument();
! //				doc.Load(xmlFile);
! //				Add ( doc );
  			} 
  			catch (Exception e) 
--- 130,134 ----
  			try 
  			{
! 				AddXmlReader( new XmlTextReader(xmlFile) );
  			} 
  			catch (Exception e) 
***************
*** 153,165 ****
  			try 
  			{
- 				
  				// make a StringReader for the string passed in - the StringReader
  				// inherits from TextReader.  We can use the XmlTextReader.ctor that
  				// takes the TextReader to build from a string...
! 				AddXmlReader(new XmlTextReader(new StringReader(xml)));
! 
! //				XmlDocument doc = new XmlDocument();
! //				doc.LoadXml(xml);
! //				Add ( doc );
  			} 
  			catch (Exception e) 
--- 150,157 ----
  			try 
  			{
  				// make a StringReader for the string passed in - the StringReader
  				// inherits from TextReader.  We can use the XmlTextReader.ctor that
  				// takes the TextReader to build from a string...
! 				AddXmlReader( new XmlTextReader(new StringReader(xml)) );
  			} 
  			catch (Exception e) 
***************
*** 180,185 ****
  			try 
  			{
! 				AddXmlReader(new XmlNodeReader(doc));
! //				Add ( doc );
  			} 
  			catch (Exception e) 
--- 172,176 ----
  			try 
  			{
! 				AddXmlReader( new XmlNodeReader(doc) );
  			} 
  			catch (Exception e) 
***************
*** 201,205 ****
  			{
  				Binder.dialect = Dialect.Dialect.GetDialect(properties);
! 				Binder.BindRoot( doc, CreateMappings());
  			} 
  			catch (MappingException me) 
--- 192,196 ----
  			{
  				Binder.dialect = Dialect.Dialect.GetDialect(properties);
! 				Binder.BindRoot( doc, CreateMappings() );
  			} 
  			catch (MappingException me) 
***************
*** 228,236 ****
  			try 
  			{
! 				AddXmlReader(new XmlTextReader(xmlInputStream));
! 				
! //				XmlDocument doc = new XmlDocument();
! //				doc.Load(xmlInputStream);
! //				Add( doc );
  				return this;
  			} 
--- 219,223 ----
  			try 
  			{
! 				AddXmlReader( new XmlTextReader(xmlInputStream) );
  				return this;
  			} 

Index: Environment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Environment.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Environment.cs	12 Jul 2004 01:28:50 -0000	1.14
--- Environment.cs	20 Jul 2004 13:52:52 -0000	1.15
***************
*** 1,7 ****
  using System;
- using System.Xml;
  using System.Collections;
  using System.Collections.Specialized;
  using System.Configuration;
  
  using NHibernate.Util;
--- 1,7 ----
  using System;
  using System.Collections;
  using System.Collections.Specialized;
  using System.Configuration;
+ using System.Xml;
  
  using NHibernate.Util;
***************
*** 84,90 ****
  		}
  
  		public static IDictionary Properties 
  		{
! 			get { return properties; }
  		}
  
--- 84,104 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets a copy of the configuration found in app.config/web.config
+ 		/// </summary>
+ 		/// <remarks>
+ 		/// 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;
! 			}
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test/CfgTest ConfigurationFixture.cs,1.2,1.3

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

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19650/CfgTest

Modified Files:
	ConfigurationFixture.cs 
Log Message:
Test now restores Environment properties back to their original values.

Index: ConfigurationFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConfigurationFixture.cs	12 Jul 2004 02:26:29 -0000	1.2
--- ConfigurationFixture.cs	19 Jul 2004 20:57:05 -0000	1.3
***************
*** 13,16 ****
--- 13,17 ----
  	public class ConfigurationFixture
  	{
+ 		
  		[SetUp]
  		public void SetUp() 
***************
*** 32,35 ****
--- 33,39 ----
  		public void ReadCfgXmlFromDefaultFile() 
  		{
+ 			string origQuerySubst = Cfg.Environment.Properties[Cfg.Environment.QuerySubstitutions] as string;
+ 			string origConnString = Cfg.Environment.Properties[Cfg.Environment.ConnectionString] as string;
+ 
  			Configuration cfg = new Configuration();
  			cfg.Configure();
***************
*** 37,40 ****
--- 41,47 ----
  			Assert.AreEqual( "true 1, false 0, yes 'Y', no 'N'", cfg.Properties[Cfg.Environment.QuerySubstitutions]);
  			Assert.AreEqual( "Server=localhost;initial catalog=nhibernate;Integrated Security=SSPI", cfg.Properties[Cfg.Environment.ConnectionString]);
+ 
+ 			cfg.Properties[Cfg.Environment.QuerySubstitutions] = origQuerySubst;
+ 			cfg.Properties[Cfg.Environment.ConnectionString] = origConnString;
  		}
  	}

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect Oracle9Dialect.cs,1.10,1.11

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

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

Modified Files:
	Oracle9Dialect.cs 
Log Message:
Oracle doesn't have a varbinary - replaced with raw.

Index: Oracle9Dialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/Oracle9Dialect.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Oracle9Dialect.cs	19 Jul 2004 03:24:02 -0000	1.10
--- Oracle9Dialect.cs	19 Jul 2004 16:05:50 -0000	1.11
***************
*** 34,38 ****
  			Register( DbType.AnsiString, 2147483647, "CLOB"); // should use the IType.ClobType
  			Register( DbType.Binary, "RAW(2000)");
! 			Register( DbType.Binary, 2000, "VARBINARY($1)");
  			Register( DbType.Binary, 2147483647, "BLOB" );
  			Register( DbType.Boolean, "NUMBER(1,0)" ); 
--- 34,38 ----
  			Register( DbType.AnsiString, 2147483647, "CLOB"); // should use the IType.ClobType
  			Register( DbType.Binary, "RAW(2000)");
! 			Register( DbType.Binary, 2000, "RAW($1)");
  			Register( DbType.Binary, 2147483647, "BLOB" );
  			Register( DbType.Boolean, "NUMBER(1,0)" ); 

[Nhibernate-commit] nhibernate/src/NHibernate/Type NullableType.cs,1.7,1.8

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

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

Modified Files:
	NullableType.cs 
Log Message:
Added a catch for InvalidCastException to help catch when people are 
mapping the wrong db fields to NHibernate Type.

This was done to help with figuring out which Type was causing 
problems with MySql.

Index: NullableType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/NullableType.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NullableType.cs	10 Feb 2004 18:41:42 -0000	1.7
--- NullableType.cs	19 Jul 2004 13:54:24 -0000	1.8
***************
*** 203,206 ****
--- 203,207 ----
  		public virtual object NullSafeGet(IDataReader rs, string name) 
  		{
+ 			
  			int index = rs.GetOrdinal(name);
  
***************
*** 214,218 ****
  			else {
  				
! 				object val = Get(rs, index);
  				
  				if ( log.IsDebugEnabled )
--- 215,229 ----
  			else {
  				
! 				object val = null;
! 				try 
! 				{
! 					val = Get(rs, index);
! 				}
! 				catch(System.InvalidCastException ice) 
! 				{
! 					throw new ADOException(
! 						"Could not cast the value in field " + name + " to the Type " + this.GetType().Name + 
! 						".  Please check to make sure that the mapping is correct and that your DataProvider supports this Data Type.", ice);
! 				}
  				
  				if ( log.IsDebugEnabled )

[Nhibernate-commit] nhibernate/src/NHibernate/Driver ByteFXDataDriver.cs,1.2,1.3

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

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

Modified Files:
	ByteFXDataDriver.cs 
Log Message:
Fixed a few minor problems with using MySql database.  Still have not 
figured out why we can't write to a varchar(x) binary field.

Index: ByteFXDataDriver.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Driver/ByteFXDataDriver.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ByteFXDataDriver.cs	18 May 2004 05:02:27 -0000	1.2
--- ByteFXDataDriver.cs	19 Jul 2004 13:52:26 -0000	1.3
***************
*** 10,14 ****
  	/// <remarks>
  	/// <p>
! 	/// In order to use this Driver you must have the ByteFX.Data.dll Assembly available for 
  	/// NHibernate to load it.  The ICSharpCode.SharpZipLib.dll Assembly is also required by
  	/// the ByteFX.Data Assembly.
--- 10,14 ----
  	/// <remarks>
  	/// <p>
! 	/// In order to use this Driver you must have the ByteFX.MySqlClient.dll Assembly available for 
  	/// NHibernate to load it.  The ICSharpCode.SharpZipLib.dll Assembly is also required by
  	/// the ByteFX.Data Assembly.
***************
*** 30,35 ****
  		public ByteFXDataDriver()
  		{
! 			connectionType = System.Type.GetType("ByteFX.Data.MySqlClient.MySqlConnection, ByteFX.Data");
! 			commandType = System.Type.GetType("ByteFX.Data.MySqlClient.MySqlCommand, ByteFX.Data");
  		}
  
--- 30,35 ----
  		public ByteFXDataDriver()
  		{
! 			connectionType = System.Type.GetType("ByteFX.Data.MySqlClient.MySqlConnection, ByteFX.MySqlClient");
! 			commandType = System.Type.GetType("ByteFX.Data.MySqlClient.MySqlCommand, ByteFX.MySqlClient");
  		}
  
***************
*** 58,61 ****
--- 58,71 ----
  			get {return "@";}
  		}
+ 
+ 		/// <summary>
+ 		/// The ByteFX driver does NOT support more than 1 open IDataReader
+ 		/// with only 1 IDbConnection.
+ 		/// </summary>
+ 		/// <value><c>false</c> - it is not supported.</value>
+ 		public override bool SupportsMultipleOpenReaders
+ 		{
+ 			get { return false;	}
+ 		}
  	}
  }