nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel/NHSpecific AvalonProxy.cs,NONE,1.1.2.1 AvalonProxyImpl.cs,NONE,1.1.2.1 AvalonProxyImpl.hbm.xml,NONE,1.1.2.1

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

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

Added Files:
      Tag: alpha_avalon-proxy
	AvalonProxy.cs AvalonProxyImpl.cs AvalonProxyImpl.hbm.xml 
Log Message:
commit on the avalon-proxy branch of a semi-working (no serialization) of 
proxies yet.

--- NEW FILE: AvalonProxyImpl.cs ---
using System;

namespace NHibernate.DomainModel.NHSpecific
{
	/// <summary>
	/// Summary description for AvalonProxyImpl.
	/// </summary>
	public class AvalonProxyImpl : AvalonProxy
	{
		private int _id;
		private string _name;

		#region AvalonProxy Members

		public int Id
		{
			get { return _id; }
			set { _id = value; }
		}

		public string Name
		{
			get { return _name; }
			set { _name = value; }
		}
		
		#endregion

	}
}

--- NEW FILE: AvalonProxy.cs ---
using System;

namespace NHibernate.DomainModel.NHSpecific
{
	/// <summary>
	/// Summary description for AvalonProxy.
	/// </summary>
	public interface AvalonProxy
	{
		
		int Id { get; set; }

		string Name { get; set; }

	}
}

--- NEW FILE: AvalonProxyImpl.hbm.xml ---
<?xml version="1.0" encoding="utf-8" ?> 
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
	<class
		name="NHibernate.DomainModel.NHSpecific.AvalonProxyImpl, NHibernate.DomainModel"
		table="avalon_p"
		proxy="NHibernate.DomainModel.NHSpecific.AvalonProxy, NHibernate.DomainModel"
	>
		<id	name="Id">
			<generator class="assigned" />
		</id>
		
		<property name="Name" />
	</class>
</hibernate-mapping>

[Nhibernate-commit] nhibernate/external-bin Apache.Avalon.DynamicProxy.dll,NONE,1.1.2.1 Apache.Avalon.DynamicProxy.license.txt,NONE,1.1.2.1

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

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

Added Files:
      Tag: alpha_avalon-proxy
	Apache.Avalon.DynamicProxy.dll 
	Apache.Avalon.DynamicProxy.license.txt 
Log Message:
commit on the avalon-proxy branch of a semi-working (no serialization) of 
proxies yet.

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

--- NEW FILE: Apache.Avalon.DynamicProxy.license.txt ---
Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.

[Nhibernate-commit] nhibernate/src/NHibernate/Engine ISessionImplementor.cs,1.21,1.22

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

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

Modified Files:
	ISessionImplementor.cs 
Log Message:
added some xml comments to a method.

Index: ISessionImplementor.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Engine/ISessionImplementor.cs,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ISessionImplementor.cs	14 Sep 2004 17:49:54 -0000	1.21
--- ISessionImplementor.cs	27 Sep 2004 01:55:35 -0000	1.22
***************
*** 273,280 ****
  		/// argument (the entity associated with the key) if no proxy exists.
  		/// </summary>
! 		/// <param name="persister"></param>
! 		/// <param name="key"></param>
  		/// <param name="impl"></param>
! 		/// <returns></returns>
  		object ProxyFor(IClassPersister persister, Key key, object impl);
  
--- 273,280 ----
  		/// argument (the entity associated with the key) if no proxy exists.
  		/// </summary>
! 		/// <param name="persister">The <see cref="IClassPersister"/> to see if it should be Proxied.</param>
! 		/// <param name="key">The <see cref="Key"/> that identifies the entity.</param>
  		/// <param name="impl"></param>
! 		/// <returns>Returns a the Proxy for the class or the parameter impl.</returns>
  		object ProxyFor(IClassPersister persister, Key key, object impl);
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test/UtilityTest SequencedHashMapFixture.cs,1.2,1.3

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

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

Modified Files:
	SequencedHashMapFixture.cs 
Log Message:
added some more test for empty sequenced hash maps.

Index: SequencedHashMapFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/UtilityTest/SequencedHashMapFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SequencedHashMapFixture.cs	7 Aug 2004 04:57:45 -0000	1.2
--- SequencedHashMapFixture.cs	27 Sep 2004 01:50:05 -0000	1.3
***************
*** 103,106 ****
--- 103,119 ----
  
  		[Test]
+ 		public void GetEnumeratorEmpty() 
+ 		{
+ 			bool noEntries = true;
+ 
+ 			foreach( DictionaryEntry de in _emptyShm ) 
+ 			{
+ 				noEntries = false;
+ 			}
+ 
+ 			Assert.IsTrue( noEntries, "should not have any entries in the enumerator" );
+ 		}
+ 
+ 		[Test]
  		[ExpectedException(typeof(InvalidOperationException))]
  		public void GetEnumeratorModifyExceptionFromAdd() 
***************
*** 230,233 ****
--- 243,259 ----
  
  		[Test]
+ 		public void ValuesEmpty() 
+ 		{
+ 			bool noValues = true;
+ 
+ 			foreach( object obj in _emptyShm.Values ) 
+ 			{
+ 				noValues = false;
+ 			}
+ 
+ 			Assert.IsTrue( noValues, "should have no values." );
+ 		}
+ 
+ 		[Test]
  		public void FirstKey() 
  		{

[Nhibernate-commit] nhibernate/src/NHibernate.Test/UtilityTest ReflectHelperFixture.cs,NONE,1.1

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

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

Added Files:
	ReflectHelperFixture.cs 
Log Message:
test to verify that OverridesEquals actually works.  

--- NEW FILE: ReflectHelperFixture.cs ---
using System;

using NHibernate.Util;

using NUnit.Framework;

namespace NHibernate.Test.UtilityTest
{
	/// <summary>
	/// Summary description for ReflectHelperFixture.
	/// </summary>
	[TestFixture]
	public class ReflectHelperFixture
	{
		[Test]
		public void OverridesEquals() 
		{
			Assert.IsFalse( ReflectHelper.OverridesEquals( this.GetType() ), "ReflectHelperFixture does not override equals" );
			Assert.IsTrue( ReflectHelper.OverridesEquals( typeof(string) ), "String does override equals" );
			Assert.IsFalse( ReflectHelper.OverridesEquals( typeof(IDisposable) ), "IDisposable does not override equals" );
			Assert.IsTrue( ReflectHelper.OverridesEquals( typeof(BRhf) ), "Base class overrides equals" );
		}
	}

	public class ARhf 
	{
		public override bool Equals(object obj)
		{
			return base.Equals (obj);
		}

		public override int GetHashCode()
		{
			return base.GetHashCode ();
		}
	}

	public class BRhf : ARhf 
	{
	}

}

[Nhibernate-commit] nhibernate/src/NHibernate.Test NHibernate.Test-1.1.csproj,1.42,1.43

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

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

Modified Files:
	NHibernate.Test-1.1.csproj 
Log Message:
test to verify that OverridesEquals actually works.  

Index: NHibernate.Test-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** NHibernate.Test-1.1.csproj	22 Sep 2004 22:32:49 -0000	1.42
--- NHibernate.Test-1.1.csproj	27 Sep 2004 01:49:45 -0000	1.43
***************
*** 517,520 ****
--- 517,525 ----
                  />
                  <File
+                     RelPath = "UtilityTest\ReflectHelperFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "UtilityTest\SequencedHashMapFixture.cs"
                      SubType = "Code"

[Nhibernate-commit] nhibernate/src/NHibernate/Util ReflectHelper.cs,1.15,1.16

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

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

Modified Files:
	ReflectHelper.cs 
Log Message:
fixed OverridesEquals to actually work.

Index: ReflectHelper.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/ReflectHelper.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ReflectHelper.cs	13 Sep 2004 04:51:05 -0000	1.15
--- ReflectHelper.cs	27 Sep 2004 01:48:16 -0000	1.16
***************
*** 5,9 ****
  namespace NHibernate.Util 
  {
! 	
  	public sealed class ReflectHelper
  	{
--- 5,11 ----
  namespace NHibernate.Util 
  {
! 	/// <summary>
! 	/// Helper class for Reflection related code.
! 	/// </summary>
  	public sealed class ReflectHelper
  	{
***************
*** 13,44 ****
  		private static System.Type[] NoClasses = new System.Type[0];
  		private static System.Type[] Object = new System.Type[] { typeof(object) };
! 		private static MethodInfo ObjectEquals;
! 
! 		static ReflectHelper() 
  		{
- 			MethodInfo eq;
  			try 
  			{
! 				eq = typeof(object).GetMethod("Equals", BindingFlags.Instance | BindingFlags.Public );
  			} 
! 			catch (Exception e) 
  			{
! 				throw new AssertionFailure("Could not find Object.Equals()", e);
  			}
! 			ObjectEquals = eq;
! 		}
! 
! 		public static bool OverridesEquals(System.Type clazz) 
! 		{
! 			MethodInfo equals;
! 			try 
! 			{
! 				equals = clazz.GetMethod("Equals");
! 			} 
! 			catch (Exception) 
  			{
  				return false;
  			}
! 			return !ObjectEquals.Equals(equals);
  		}
  
--- 15,52 ----
  		private static System.Type[] NoClasses = new System.Type[0];
  		private static System.Type[] Object = new System.Type[] { typeof(object) };
! 		
! 		/// <summary>
! 		/// Determine if the specified <see cref="System.Type"/> overrides the
! 		/// implementation of Equals from <see cref="Object"/>
! 		/// </summary>
! 		/// <param name="clazz">The <see cref="System.Type"/> to reflect.</param>
! 		/// <returns><c>true</c> if any type in the heirarchy overrides Equals(object).</returns>
! 		public static bool OverridesEquals(System.Type clazz) 
  		{
  			try 
  			{
! 				MethodInfo equals = clazz.GetMethod("Equals", new System.Type[] { typeof(object) });
! 				if( equals==null ) 
! 				{
! 					return false;
! 				}
! 				else 
! 				{
! 					// make sure that the DeclaringType is not System.Object - if that is the
! 					// declaring type then there is no override.
! 					return !equals.DeclaringType.Equals( typeof(object) );
! 				}
  			} 
! 			catch( AmbiguousMatchException ) 
  			{
! 				// an ambigious match means that there is an override and it
! 				// can't determine which one to use.
! 				return true;
  			}
! 			catch (Exception ) 
  			{
  				return false;
  			}
! 			
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect PostgreSQLDialect.cs,1.9,1.10

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

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

Modified Files:
	PostgreSQLDialect.cs 
Log Message:
applied patch from Martijn

Index: PostgreSQLDialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PostgreSQLDialect.cs	24 Sep 2004 03:12:14 -0000	1.9
--- PostgreSQLDialect.cs	26 Sep 2004 22:12:31 -0000	1.10
***************
*** 83,86 ****
--- 83,91 ----
  		}
  
+ 		public override bool BindLimitParametersInReverseOrder               
+ 		{
+ 			get { return true; }
+ 		}
+ 
  		public override SqlString GetLimitString(SqlString querySqlString)
  		{

[Nhibernate-commit] nhibernate/src/NHibernate.Tool.hbm2net AssemblyInfo.cs,1.3,1.4

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
assemblyinfo's updated from build 0.3.0.0

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Tool.hbm2net/AssemblyInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssemblyInfo.cs	13 Sep 2004 12:47:59 -0000	1.3
--- AssemblyInfo.cs	24 Sep 2004 04:17:24 -0000	1.4
***************
*** 1,3 ****
--- 1,5 ----
  using System.Reflection;
+ using System.Runtime.CompilerServices;
+ 
  //------------------------------------------------------------------------------
  // <autogenerated>
***************
*** 10,21 ****
  //------------------------------------------------------------------------------
  
! [assembly: AssemblyTitle("NHibernate.Tool.hbm2net for Microsoft .NET Framework 1.1")]
! [assembly: AssemblyDescription("Tool to Generate Classes from hbm.xml files.")]
! [assembly: AssemblyCompany("nhibernate.sourceforge.net")]
! [assembly: AssemblyProduct("NHibernate.Tool.hbm2net")]
! [assembly: AssemblyCopyright("Licensed under LGPL.")]
! [assembly: AssemblyVersion("0.2.0.0")]
! [assembly: AssemblyInformationalVersion("0.2")]
! [assembly: AssemblyFileVersion("0.2.0.0")]
! [assembly: AssemblyDelaySign(false)]
  
--- 12,23 ----
  //------------------------------------------------------------------------------
  
! [assembly: AssemblyTitleAttribute("NHibernate.Tool.hbm2net for Microsoft .NET Framework 1.1")]
! [assembly: AssemblyDescriptionAttribute("Tool to Generate Classes from hbm.xml files.")]
! [assembly: AssemblyCompanyAttribute("nhibernate.sourceforge.net")]
! [assembly: AssemblyProductAttribute("NHibernate.Tool.hbm2net")]
! [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
! [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test AssemblyInfo.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-serv30529/NHibernate.Test

Modified Files:
	AssemblyInfo.cs 
Log Message:
assemblyinfo's updated from build 0.3.0.0

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/AssemblyInfo.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssemblyInfo.cs	2 Sep 2004 16:53:56 -0000	1.7
--- AssemblyInfo.cs	24 Sep 2004 04:17:24 -0000	1.8
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.Test")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.2.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.2")]
! [assembly: AssemblyFileVersionAttribute("0.2.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.Test")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Tasks AssemblyInfo.cs,1.2,1.3

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
assemblyinfo's updated from build 0.3.0.0

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Tasks/AssemblyInfo.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AssemblyInfo.cs	2 Sep 2004 16:53:55 -0000	1.2
--- AssemblyInfo.cs	24 Sep 2004 04:17:23 -0000	1.3
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.Tasks")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.2.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.2")]
! [assembly: AssemblyFileVersionAttribute("0.2.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.Tasks")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

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

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
assemblyinfo's updated from build 0.3.0.0

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/AssemblyInfo.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssemblyInfo.cs	2 Sep 2004 16:53:54 -0000	1.7
--- AssemblyInfo.cs	24 Sep 2004 04:17:23 -0000	1.8
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate.DomainModel")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.2.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.2")]
! [assembly: AssemblyFileVersionAttribute("0.2.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate.DomainModel")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
  [assembly: AssemblyDelaySignAttribute(false)]
  

[Nhibernate-commit] nhibernate/src/NHibernate AssemblyInfo.cs,1.8,1.9

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

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

Modified Files:
	AssemblyInfo.cs 
Log Message:
assemblyinfo's updated from build 0.3.0.0

Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/AssemblyInfo.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AssemblyInfo.cs	2 Sep 2004 16:53:53 -0000	1.8
--- AssemblyInfo.cs	24 Sep 2004 04:17:23 -0000	1.9
***************
*** 17,23 ****
  [assembly: AssemblyProductAttribute("NHibernate")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.2.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.2")]
! [assembly: AssemblyFileVersionAttribute("0.2.0.0")]
  //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  
--- 17,23 ----
  [assembly: AssemblyProductAttribute("NHibernate")]
  [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
! [assembly: AssemblyVersionAttribute("0.3.0.0")]
! [assembly: AssemblyInformationalVersionAttribute("0.3")]
! [assembly: AssemblyFileVersionAttribute("0.3.0.0")]
  //[assembly: AssemblyKeyFileAttribute("..\\NHibernate.snk")]
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test App.config,1.8,1.9

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

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

Modified Files:
	App.config 
Log Message:
prep for build 0.3

Index: App.config
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/App.config,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** App.config	1 Sep 2004 00:19:18 -0000	1.8
--- App.config	24 Sep 2004 03:31:24 -0000	1.9
***************
*** 17,21 ****
  			value="NHibernate.Connection.DriverConnectionProvider" 
  		/>
! 		<!--
  			The valid strings for Isolation can be found in the documentation for the System.Data.IsolationLevel
  			Enumeration documentation.  Use the member names - not the values.
--- 17,21 ----
  			value="NHibernate.Connection.DriverConnectionProvider" 
  		/>
! 		<!-- 
  			The valid strings for Isolation can be found in the documentation for the System.Data.IsolationLevel
  			Enumeration documentation.  Use the member names - not the values.
***************
*** 41,45 ****
  		
  		<!-- This is the System.Data.OracleClient.dll provider for Oracle from MS -->
! 		<!-- 
  		<add 
  			key="hibernate.dialect"                      
--- 41,45 ----
  		
  		<!-- This is the System.Data.OracleClient.dll provider for Oracle from MS -->
! 		<!--  
  		<add 
  			key="hibernate.dialect"                      
***************
*** 55,60 ****
  			value="Data Source=ora9i;User ID=scott;Password=tiger;" 
  		/>
  		
- 		 -->
  		
  		<!--
--- 55,60 ----
  			value="Data Source=ora9i;User ID=scott;Password=tiger;" 
  		/>
+ 		-->
  		
  		
  		<!--
***************
*** 83,87 ****
  		<!-- This is the Firebird configuration --> 
  		<!--
!          <add 
  			key="hibernate.dialect"                            
  			value="NHibernate.Dialect.FirebirdDialect" 
--- 83,87 ----
  		<!-- This is the Firebird configuration --> 
  		<!--
! 		<add 
  			key="hibernate.dialect"                            
  			value="NHibernate.Dialect.FirebirdDialect" 
***************
*** 127,131 ****
  		
  		<logger name="NHibernate.SqlCommand">
! 			<level value="DEBUG" />
  		</logger>
  		
--- 127,131 ----
  		
  		<logger name="NHibernate.SqlCommand">
! 			<level value="ERROR" />
  		</logger>
  		

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.11,1.12

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

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

Modified Files:
	NHibernateSolution.build 
Log Message:
prep for build 0.3

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NHibernateSolution.build	2 Sep 2004 15:41:30 -0000	1.11
--- NHibernateSolution.build	24 Sep 2004 03:31:27 -0000	1.12
***************
*** 19,23 ****
  	<property name="project.name" value="nhibernate" />
  	<property name="project.version.major" value="0" />
! 	<property name="project.version.minor" value="2" />
  	<property name="project.version.build" value="0" />
  	<property name="project.version.revision" value="0" />
--- 19,23 ----
  	<property name="project.name" value="nhibernate" />
  	<property name="project.version.major" value="0" />
! 	<property name="project.version.minor" value="3" />
  	<property name="project.version.build" value="0" />
  	<property name="project.version.revision" value="0" />

[Nhibernate-commit] nhibernate/src/NHibernate/Cfg Environment.cs,1.18,1.19

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

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

Modified Files:
	Environment.cs 
Log Message:
prep for build 0.3

Index: Environment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Environment.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Environment.cs	1 Sep 2004 03:28:28 -0000	1.18
--- Environment.cs	24 Sep 2004 03:31:25 -0000	1.19
***************
*** 32,37 ****
  		private static IDictionary properties = new Hashtable();
  		
- 		private const string Version = "prealpha";
- 
  		public const string ConnectionProvider = "hibernate.connection.provider";
  		public const string ConnectionDriver = "hibernate.connection.driver_class";
--- 32,35 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect PostgreSQLDialect.cs,1.8,1.9

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

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

Modified Files:
	PostgreSQLDialect.cs 
Log Message:
applied patch from Martijn

Index: PostgreSQLDialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PostgreSQLDialect.cs	19 Sep 2004 16:54:43 -0000	1.8
--- PostgreSQLDialect.cs	24 Sep 2004 03:12:14 -0000	1.9
***************
*** 25,30 ****
  			Register( DbType.Date, "date");
  			Register( DbType.DateTime, "timestamp" );
! 			Register( DbType.Decimal, "decimal(18,0)" ); // NUMERIC(18,0) is equivalent to DECIMAL(18,0)
! 			Register( DbType.Decimal, 18, "decimal(18, $1)");
  			Register( DbType.Double, "float8" ); 
  			Register( DbType.Int16, "int2" );
--- 25,30 ----
  			Register( DbType.Date, "date");
  			Register( DbType.DateTime, "timestamp" );
! 			Register( DbType.Decimal, "decimal(19,5)" );
! 			Register( DbType.Decimal, 19, "decimal(18, $1)");
  			Register( DbType.Double, "float8" ); 
  			Register( DbType.Int16, "int2" );

[Nhibernate-commit] nhibernate/src/NHibernate/Impl SessionImpl.cs,1.43,1.44

[Peter S. <sz...@us...>]

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

Modified Files:
	SessionImpl.cs 
Log Message:
Added check for out-of-session collections


Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** SessionImpl.cs	22 Sep 2004 21:56:02 -0000	1.43
--- SessionImpl.cs	23 Sep 2004 13:08:59 -0000	1.44
***************
*** 2986,2989 ****
--- 2986,2992 ----
  			CollectionEntry ce = GetCollectionEntry(coll);
  
+ 			if (ce == null)
+ 				throw new HibernateException("found reference to object that is not in session");
+ 
  			if (ce.reached) 
  			{

[Nhibernate-commit] nhibernate/src/NHibernate.Test NHibernate.Test-1.1.csproj,1.41,1.42 ODMGTest.cs,1.2,NONE

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

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

Modified Files:
	NHibernate.Test-1.1.csproj 
Removed Files:
	ODMGTest.cs 
Log Message:
Removed ODMG and JCollections namespace.

--- ODMGTest.cs DELETED ---

Index: NHibernate.Test-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** NHibernate.Test-1.1.csproj	9 Sep 2004 21:20:17 -0000	1.41
--- NHibernate.Test-1.1.csproj	22 Sep 2004 22:32:49 -0000	1.42
***************
*** 187,195 ****
                  />
                  <File
-                     RelPath = "ODMGTest.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "ParentChildTest.cs"
                      SubType = "Code"
--- 187,190 ----

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.47,1.48

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

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

Modified Files:
	NHibernate-1.1.csproj 
Log Message:
Removed ODMG and JCollections namespace.

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** NHibernate-1.1.csproj	20 Sep 2004 03:00:17 -0000	1.47
--- NHibernate-1.1.csproj	22 Sep 2004 22:32:49 -0000	1.48
***************
*** 411,419 ****
                  />
                  <File
-                     RelPath = "Collection\ODMGCollection.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "Collection\PersistentCollection.cs"
                      SubType = "Code"
--- 411,414 ----
***************
*** 1044,1057 ****
                  />
                  <File
-                     RelPath = "JCollections\HashSet.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "JCollections\ISet.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "Loader\AbstractEntityLoader.cs"
                      SubType = "Code"
--- 1039,1042 ----
***************
*** 1269,1297 ****
                  />
                  <File
-                     RelPath = "Odmg\IDCollection.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "Odmg\IDSet.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "Odmg\ODMGException.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "Odmg\QueryException.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
-                     RelPath = "Odmg\QueryInvalidException.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "Persister\AbstractEntityPersister.cs"
                      SubType = "Code"
--- 1254,1257 ----

[Nhibernate-commit] nhibernate/src/NHibernate/Collection Bag.cs,1.7,1.8 IdentifierBag.cs,1.4,1.5 List.cs,1.14,1.15 Map.cs,1.15,1.16 Set.cs,1.15,1.16 ODMGCollection.cs,1.9,NONE

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

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

Modified Files:
	Bag.cs IdentifierBag.cs List.cs Map.cs Set.cs 
Removed Files:
	ODMGCollection.cs 
Log Message:
Removed ODMG and JCollections namespace.

--- ODMGCollection.cs DELETED ---

Index: Bag.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Bag.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Bag.cs	22 Sep 2004 04:46:43 -0000	1.7
--- Bag.cs	22 Sep 2004 22:32:49 -0000	1.8
***************
*** 15,19 ****
  	/// </summary>
  	[Serializable]
! 	public class Bag : ODMGCollection, IList
  	{
  		private IList bag;
--- 15,19 ----
  	/// </summary>
  	[Serializable]
! 	public class Bag : PersistentCollection, IList
  	{
  		private IList bag;

Index: List.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/List.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** List.cs	22 Sep 2004 04:46:43 -0000	1.14
--- List.cs	22 Sep 2004 22:33:05 -0000	1.15
***************
*** 12,16 ****
  	/// </summary>
  	[Serializable]
! 	public class List : ODMGCollection , IList 
  	{
  		private IList list;
--- 12,16 ----
  	/// </summary>
  	[Serializable]
! 	public class List : PersistentCollection, IList 
  	{
  		private IList list;

Index: Map.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Map.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Map.cs	22 Sep 2004 04:46:43 -0000	1.15
--- Map.cs	22 Sep 2004 22:33:05 -0000	1.16
***************
*** 12,16 ****
  	/// </summary>
  	[Serializable]
! 	public class Map : PersistentCollection, IDictionary {
  		
  		protected IDictionary map;
--- 12,17 ----
  	/// </summary>
  	[Serializable]
! 	public class Map : PersistentCollection, IDictionary 
! 	{
  		
  		protected IDictionary map;

Index: Set.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Set.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Set.cs	22 Sep 2004 04:46:43 -0000	1.15
--- Set.cs	22 Sep 2004 22:33:05 -0000	1.16
***************
*** 25,30 ****
  	/// </summary>
  	[Serializable]
! 	public class Set : PersistentCollection, IDictionary {
! 		
  		protected IDictionary map;
  		
--- 25,30 ----
  	/// </summary>
  	[Serializable]
! 	public class Set : PersistentCollection, IDictionary 
! 	{
  		protected IDictionary map;
  		

Index: IdentifierBag.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/IdentifierBag.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IdentifierBag.cs	22 Sep 2004 04:46:43 -0000	1.4
--- IdentifierBag.cs	22 Sep 2004 22:33:05 -0000	1.5
***************
*** 25,29 ****
  	/// </remarks>
  	[Serializable]
! 	public class IdentifierBag : ODMGCollection, IList
  	{
  		private IList values;
--- 25,29 ----
  	/// </remarks>
  	[Serializable]
! 	public class IdentifierBag : PersistentCollection, IList
  	{
  		private IList values;

[Nhibernate-commit] nhibernate/src/NHibernate/JCollections HashSet.cs,1.1,NONE ISet.cs,1.1,NONE

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

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

Removed Files:
	HashSet.cs ISet.cs 
Log Message:
Removed ODMG and JCollections namespace.

--- HashSet.cs DELETED ---

--- ISet.cs DELETED ---

[Nhibernate-commit] nhibernate/src/NHibernate/Odmg IDCollection.cs,1.2,NONE IDSet.cs,1.2,NONE ODMGException.cs,1.1,NONE QueryException.cs,1.1,NONE QueryInvalidException.cs,1.1,NONE

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

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

Removed Files:
	IDCollection.cs IDSet.cs ODMGException.cs QueryException.cs 
	QueryInvalidException.cs 
Log Message:
Removed ODMG and JCollections namespace.

--- QueryInvalidException.cs DELETED ---

--- ODMGException.cs DELETED ---

--- QueryException.cs DELETED ---

--- IDCollection.cs DELETED ---

--- IDSet.cs DELETED ---

[Nhibernate-commit] nhibernate/src/NHibernate.Test/NHSpecificTest BasicClassFixture.cs,1.6,1.7

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

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

Modified Files:
	BasicClassFixture.cs 
Log Message:
Fix and test fixture for NH-52

Index: BasicClassFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHSpecificTest/BasicClassFixture.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BasicClassFixture.cs	20 Sep 2004 17:46:00 -0000	1.6
--- BasicClassFixture.cs	22 Sep 2004 21:56:02 -0000	1.7
***************
*** 749,752 ****
--- 749,778 ----
  		}
  
+ 		[Test]
+ 		public void TestWrapArrayInListProperty() 
+ 		{
+ 			
+ 			ISession s = sessions.OpenSession();
+ 			BasicClass bc = new BasicClass();
+ 
+ 			int id = 1;
+ 
+ 			bc.StringList = new string[] { "one", "two" };
+ 
+ 			s.Save( bc, id );
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			bc = (BasicClass)s.Load( typeof(BasicClass), id );
+ 
+ 			Assert.AreEqual( 2, bc.StringList.Count, "should have saved to StringList from an array" );
+ 			Assert.IsTrue( bc.StringList.Contains( "one" ), "'one' should be in there" );
+ 			Assert.IsTrue( bc.StringList.Contains( "two" ), "'two' should be in there" );
+ 
+ 			s.Delete( bc );
+ 			s.Flush();
+ 			s.Close();
+ 		}
  
  		internal void AssertDelete(int id) 

[Nhibernate-commit] nhibernate/src/NHibernate/Impl SessionImpl.cs,1.42,1.43

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

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

Modified Files:
	SessionImpl.cs 
Log Message:
Fix and test fixture for NH-52

Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** SessionImpl.cs	22 Sep 2004 04:46:44 -0000	1.42
--- SessionImpl.cs	22 Sep 2004 21:56:02 -0000	1.43
***************
*** 2894,2900 ****
  		/// return the wrapper
  		/// </summary>
! 		/// <param name="obj"></param>
! 		/// <param name="type"></param>
! 		/// <returns></returns>
  		private object Wrap(object obj, IType type) {
  
--- 2894,2902 ----
  		/// return the wrapper
  		/// </summary>
! 		/// <param name="obj">The <see cref="Object"/> to wrap.</param>
! 		/// <param name="type">The <see cref="IType"/> of the Property the obj came in for.</param>
! 		/// <returns>
! 		/// An <see cref="Object"/> that NHibernate has now been made aware of.
! 		/// </returns>
  		private object Wrap(object obj, IType type) {
  
***************
*** 2910,2913 ****
--- 2912,2917 ----
  			if ( type.IsPersistentCollectionType ) 
  			{
+ 				// a previously wrapped collection from another session has come back
+ 				// into NHibernate 
  				if ( obj is PersistentCollection ) 
  				{
***************
*** 2936,2957 ****
  					}
  				} 
! 				else if ( obj.GetType().IsArray ) 
  				{
! 					// TODO: we could really re-use the existing arrayholder
! 					// for this new array (if it exists)
! 					ArrayHolder ah = GetArrayHolder(obj);
! 					if (ah==null) 
  					{
! 						ah = new ArrayHolder(this, obj);
! 						AddNewCollection(ah);
! 						AddArrayHolder(ah);
  					}
- 				} 
- 				else 
- 				{
- 					PersistentCollection pc = ((PersistentCollectionType) type).Wrap(this, obj);
- 					if ( log.IsDebugEnabled ) log.Debug( "Wrapped collection in role: " + ((PersistentCollectionType) type).Role);
- 					AddNewCollection(pc);
- 					obj = pc;
  				}
  			}
--- 2940,2971 ----
  					}
  				} 
! 
! 				// used to be code here to see if the obj.GetType().IsArray but don't want it
! 				// here because in .net an array is an IList - not true in java so NHibernate can
! 				// have an array passed to a type that is a List.
! 
! 				// this is a new collection that NHibernate is not aware of.
! 				else 
  				{
! 					// if the Type of the collection is an ArrayType then we need to add it 
! 					// to an ArrayHolder - TODO: figure out if this is really necessary since
! 					// Java and .NET treat arrays differently.
! 					if( type is ArrayType ) 
  					{
! 						ArrayHolder ah = GetArrayHolder( obj );
! 						if( ah==null ) 
! 						{
! 							ah = new ArrayHolder( this, obj );
! 							AddNewCollection( ah );
! 							AddArrayHolder( ah );
! 						}
! 					}
! 					else 
! 					{
! 						PersistentCollection pc = ((PersistentCollectionType) type).Wrap(this, obj);
! 						if ( log.IsDebugEnabled ) log.Debug( "Wrapped collection in role: " + ((PersistentCollectionType) type).Role);
! 						AddNewCollection(pc);
! 						obj = pc;
  					}
  				}
  			}