[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Baz.cs,NONE,1.1 CompositeElement.cs,NONE,1.1 DoubleStringType.cs,NONE,1.1 Fee.cs,NONE,1.1 Foo.cs,NONE,1.1 FooComponent.cs,NONE,1.1 FooProxy.cs,NONE,1.1 FooStatus.cs,NONE,1.1 Glarch.cs,NONE,1.1 GlarchProxy.cs,NONE,1.1 Multiplicity.cs,NONE,1.1 Qux.cs,NONE,1.1 Sortable.cs,NONE,1.1 Super.cs,NONE,1.1 Baz.hbm.xml,1.1,1.2 C1.cs,1.1,1.2 FooBar.hbm.xml,1.1,1.2 NHibernate.DomainModel-1.1.csproj,1.5,1.6

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

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

Modified Files:
	Baz.hbm.xml C1.cs FooBar.hbm.xml 
	NHibernate.DomainModel-1.1.csproj 
Added Files:
	Baz.cs CompositeElement.cs DoubleStringType.cs Fee.cs Foo.cs 
	FooComponent.cs FooProxy.cs FooStatus.cs Glarch.cs 
	GlarchProxy.cs Multiplicity.cs Qux.cs Sortable.cs Super.cs 
Log Message:
Added a few new entities.


--- NEW FILE: Glarch.cs ---
using System;
using System.Collections;

namespace NHibernate.DomainModel
{

	public class Glarch : Super, GlarchProxy, ILifecycle
	{
	
		private int _version;

		private int _x;
	
		public int x
		{
			get
			{
				return x;
			}
			set
			{
				this.x = value;
			}
		}
	
		public int version
		{
			get
			{
				return _version;
			}
			set
			{
				this.version = value;
			}
		}

		/// <summary>
		/// Holds the _next
		/// </summary> 
		private GlarchProxy _next;

		/// <summary>
		/// Gets or sets the _next
		/// </summary> 
		public GlarchProxy next
		{
			get 
			{
				return _next; 
			}
			set 
			{
				_next = value;
			}
		}

		/// <summary>
		/// Holds the _order
		/// </summary> 
		private short _order;

		/// <summary>
		/// Gets or sets the _order
		/// </summary> 
		public short order
		{
			get 
			{
				return _order; 
			}
			set 
			{
				_order = value;
			}
		}

		/// <summary>
		/// Holds the _strings
		/// </summary> 
		private IList _strings;

		/// <summary>
		/// Gets or sets the _strings
		/// </summary> 
		public IList strings
		{
			get 
			{
				return _strings; 
			}
			set 
			{
				_strings = value;
			}
		}

		/// <summary>
		/// Holds the _stringSets
		/// </summary> 
		private IDictionary _stringSets;

		/// <summary>
		/// Gets or sets the _stringSets
		/// </summary> 
		public IDictionary stringSets
		{
			get 
			{
				return _stringSets; 
			}
			set 
			{
				_stringSets = value;
			}
		}

		/// <summary>
		/// Holds the _fooComponents
		/// </summary> 
		private IList _fooComponents;

		/// <summary>
		/// Gets or sets the _fooComponents
		/// </summary> 
		public IList fooComponents
		{
			get 
			{
				return _fooComponents; 
			}
			set 
			{
				_fooComponents = value;
			}
		}

		/// <summary>
		/// Holds the _proxyArray
		/// </summary> 
		private GlarchProxy[] _proxyArray;

		/// <summary>
		/// Gets or sets the _proxyArray
		/// </summary> 
		public GlarchProxy[] proxyArray
		{
			get 
			{
				return _proxyArray; 
			}
			set 
			{
				_proxyArray = value;
			}
		}

		/// <summary>
		/// Holds the _proxySet
		/// </summary> 
		private IList _proxySet;

		/// <summary>
		/// Gets or sets the _proxySet
		/// </summary> 
		public IList proxySet
		{
			get 
			{
				return _proxySet; 
			}
			set 
			{
				_proxySet = value;
			}
		}
	
		public LifecycleVeto OnDelete(ISession s)
		{
			return LifecycleVeto.NoVeto;
		}
	
		public void OnLoad(ISession s, object id) 
		{
			if ( ! ( ( (String) id ).Length==32 ) ) throw new ArgumentException("id problem");
		}
	
		public LifecycleVeto OnSave(ISession s)
		{
			/*		DynaClass dc = new BasicDynaClass(
						"dyna", 
						BasicDynaBean.class,
						new DynaProperty[] {
							new DynaProperty("foo", tString.class),
							new DynaProperty("bar", Integer.class)
						} 
					);
					try {
						dynaBean = dc.newInstance();
					}
					catch (Exception e) {
						throw new CallbackException(e);
					}
					dynaBean.set("foo", "foo");
					dynaBean.set("bar", new Integer(66));
					immutable="never changes!";
			*/
			return LifecycleVeto.NoVeto;
		}
	
		public LifecycleVeto OnUpdate(ISession s) 
		{
			return LifecycleVeto.NoVeto;
		}
	
		/// <summary>
		/// Holds the _dynaBean
		/// </summary> 
		private object _dynaBean;

		/// <summary>
		/// Gets or sets the _dynaBean
		/// </summary> 
		public object dynaBean
		{
			get 
			{
				return _dynaBean; 
			}
			set 
			{
				_dynaBean = value;
			}
		}

		/// <summary>
		/// Holds the _immutable
		/// </summary> 
		private string _immutable;

		/// <summary>
		/// Gets or sets the _immutable
		/// </summary> 
		public string immutable
		{
			get 
			{
				return _immutable; 
			}
			set 
			{
				_immutable = value;
			}
		}

		/// <summary>
		/// Holds the _derivedVersion
		/// </summary> 
		private int _derivedVersion;

		/// <summary>
		/// Gets or sets the _derivedVersion
		/// </summary> 
		public int derivedVersion
		{
			get 
			{
				return _derivedVersion; 
			}
			set 
			{
				_derivedVersion = value;
			}
		}

		/// <summary>
		/// Holds the _any
		/// </summary> 
		private object _any;

		/// <summary>
		/// Gets or sets the _any
		/// </summary> 
		public object any
		{
			get 
			{
				return _any; 
			}
			set 
			{
				_any = value;
			}
		}

		/// <summary>
		/// Holds the _multiple
		/// </summary> 
		private Multiplicity _multiple;

		/// <summary>
		/// Gets or sets the _multiple
		/// </summary> 
		public Multiplicity multiple
		{
			get 
			{
				return _multiple; 
			}
			set 
			{
				_multiple = value;
			}
		}

		public new string name
		{
			get
			{
				return base.name;
			}
			set
			{
				this.name = value;
			}
		}

	}
}




Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NHibernate.DomainModel-1.1.csproj	6 Apr 2004 12:56:38 -0000	1.5
--- NHibernate.DomainModel-1.1.csproj	8 Apr 2004 14:59:32 -0000	1.6
***************
*** 80,83 ****
--- 80,88 ----
                      HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
                  />
+                 <Reference
+                     Name = "NHibernate-1.1"
+                     Project = "{0D8B57B0-1310-4EF0-B50C-DD22F37310C7}"
+                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                 />
              </References>
          </Build>
***************
*** 122,125 ****
--- 127,135 ----
                  />
                  <File
+                     RelPath = "Baz.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Baz.hbm.xml"
                      BuildAction = "EmbeddedResource"
***************
*** 154,157 ****
--- 164,172 ----
                  />
                  <File
+                     RelPath = "CompositeElement.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "CompositeId.cs"
                      SubType = "Code"
***************
*** 168,171 ****
--- 183,196 ----
                  />
                  <File
+                     RelPath = "DoubleStringType.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "Fee.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Fee.hbm.xml"
                      BuildAction = "EmbeddedResource"
***************
*** 176,183 ****
--- 201,228 ----
                  />
                  <File
+                     RelPath = "Foo.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "FooBar.hbm.xml"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
+                     RelPath = "FooComponent.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "FooProxy.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "FooStatus.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Fum.hbm.xml"
                      BuildAction = "EmbeddedResource"
***************
*** 188,195 ****
--- 233,250 ----
                  />
                  <File
+                     RelPath = "Glarch.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Glarch.hbm.xml"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
+                     RelPath = "GlarchProxy.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Holder.hbm.xml"
                      BuildAction = "EmbeddedResource"
***************
*** 222,225 ****
--- 277,285 ----
                  />
                  <File
+                     RelPath = "Multiplicity.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "NHibernate.DomainModel.build"
                      BuildAction = "None"
***************
*** 253,256 ****
--- 313,321 ----
                  />
                  <File
+                     RelPath = "Qux.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Qux.hbm.xml"
                      BuildAction = "EmbeddedResource"
***************
*** 284,287 ****
--- 349,357 ----
                  />
                  <File
+                     RelPath = "Sortable.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Stuff.hbm.xml"
                      BuildAction = "EmbeddedResource"
***************
*** 292,295 ****
--- 362,370 ----
                  />
                  <File
+                     RelPath = "Super.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Team.cs"
                      SubType = "Code"

Index: C1.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C1.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** C1.cs	6 Apr 2004 10:51:42 -0000	1.1
--- C1.cs	8 Apr 2004 14:59:32 -0000	1.2
***************
*** 33,37 ****
  	/// Holder for d
  	/// </summary>
! 	private NHibernate.DomainModel.D _d;
  	
  	#endregion
--- 33,37 ----
  	/// Holder for d
  	/// </summary>
! 	private D _d;
  	
  	#endregion
***************
*** 53,57 ****
  	/// <param name="address">Initial address value</param>
  	/// <param name="d">Initial d value</param>
! 	public C1(String name, Int32 count, System.Collections.IDictionary map, String address, NHibernate.DomainModel.D d)
  		: base(name, count, map)
  	{
--- 53,57 ----
  	/// <param name="address">Initial address value</param>
  	/// <param name="d">Initial d value</param>
! 	public C1(String name, Int32 count, System.Collections.IDictionary map, String address, D d)
  		: base(name, count, map)
  	{
***************
*** 89,93 ****
  	/// Get/set for d
  	/// </summary>
! 	public NHibernate.DomainModel.D d
  	{
  		get
--- 89,93 ----
  	/// Get/set for d
  	/// </summary>
! 	public D d
  	{
  		get

--- NEW FILE: Foo.cs ---
//------------------------------------------------------------------------------
// <autogenerated>
//     This code was generated by a tool.
//     Runtime Version: v1.1.4322
//
//     Changes to this file may cause incorrect behavior and will be lost if 
//     the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------

using System;

namespace NHibernate.DomainModel
{

	/// <summary>
	/// POJO for Foo
	/// </summary>
	/// <remark>
	/// This class is autogenerated
	/// </remark>
	[Serializable]
	public class Foo : FooProxy, ILifecycle
	{
		[Serializable]
			public class Struct
		{
			public string name;
			public int count;

			public override bool Equals(object obj)
			{
				Struct s = (Struct) obj;
				return ( s.name==name || s.name.Equals(name) ) && s.count==count;
			}
	 
			public override int GetHashCode()
			{
				return count;
			}
		}

		#region Fields
		/// <summary>
		/// Holder for key
		/// </summary>
		private string _key;
		/// <summary>
		/// Holds the component
		/// </summary> 
		private FooComponent _component;

		/// <summary>
		/// Gets or sets the component
		/// </summary> 
		public FooComponent component
		{
			get 
			{
				return component; 
			}
			set 
			{
				component = value;
			}
		}
	
		/// <summary>
		/// Holder for long
		/// </summary>
		private long _long;
	
		/// <summary>
		/// Holder for integer
		/// </summary>
		private int _integer;
	
		/// <summary>
		/// Holder for float
		/// </summary>
		private float _float;
	
		/// <summary>
		/// Holder for x
		/// </summary>
		private String _x;
	
		/// <summary>
		/// Holder for double
		/// </summary>
		private double _double;
	
		/// <summary>
		/// Holder for date
		/// </summary>
		private DateTime _date;
	
		/// <summary>
		/// Holder for timestamp
		/// </summary>
		private DateTime _timestamp;
	
		/// <summary>
		/// Holder for boolean
		/// </summary>
		private bool _boolean;
	
		/// <summary>
		/// Holder for bool
		/// </summary>
		private bool _bool;
	
		/// <summary>
		/// Holder for null
		/// </summary>
		private int _null;
	
		/// <summary>
		/// Holder for short
		/// </summary>
		private short _short;
	
		/// <summary>
		/// Holder for char
		/// </summary>
		private char _char;
	
		/// <summary>
		/// Holder for zero
		/// </summary>
		private float _zero;
	
		/// <summary>
		/// Holder for int
		/// </summary>
		private int _int;
	
		/// <summary>
		/// Holder for string
		/// </summary>
		private String _string;
	
		/// <summary>
		/// Holder for byte
		/// </summary>
		private byte _byte;
	
		/// <summary>
		/// Holder for yesno
		/// </summary>
		private bool _yesno;
	
		/// <summary>
		/// Holder for blob
		/// </summary>
		private Foo.Struct _blob;
	
		/// <summary>
		/// Holder for nullBlob
		/// </summary>
		private object _nullBlob;
	
		/// <summary>
		/// Holder for status
		/// </summary>
		private FooStatus _status;
	
		/// <summary>
		/// Holder for binary
		/// </summary>
		private byte[] _binary;
		private byte[] _bytes;
	
		/// <summary>
		/// Holder for locale
		/// </summary>
		private String _locale;
	
		/// <summary>
		/// Holder for formula
		/// </summary>
		private String _formula;
	
		/// <summary>
		/// Holder for custom
		/// </summary>
		private string[] _custom;
	
		/// <summary>
		/// Holder for version
		/// </summary>
		private String _version;
	
		/// <summary>
		/// Holder for foo
		/// </summary>
		private FooProxy _foo;
	
		/// <summary>
		/// Holder for dependent
		/// </summary>
		private Fee _dependent;
	
		#endregion

		#region Constructors
		/// <summary>
		/// Default constructor for class Foo
		/// </summary>
		public Foo()
		{
		}
	
		#endregion
	
		#region Properties
		/// <summary>
		/// Get/set for key
		/// </summary>
		public string key
		{
			get
			{
				return this._key;
			}
			set
			{
				this._key = value;
			}
		}
	
		/// <summary>
		/// Get/set for long
		/// </summary>
		public long @long
		{
			get
			{
				return this._long;
			}
			set
			{
				this._long = value;
			}
		}
	
		/// <summary>
		/// Get/set for integer
		/// </summary>
		public int integer
		{
			get
			{
				return this._integer;
			}
			set
			{
				this._integer = value;
			}
		}
	
		/// <summary>
		/// Get/set for float
		/// </summary>
		public float @float
		{
			get
			{
				return this._float;
			}
			set
			{
				this._float = value;
			}
		}
	
		/// <summary>
		/// Get/set for x
		/// </summary>
		public String x
		{
			get
			{
				return this._x;
			}
			set
			{
				this._x = value;
			}
		}
	
		/// <summary>
		/// Get/set for double
		/// </summary>
		public double @double
		{
			get
			{
				return this._double;
			}
			set
			{
				this._double = value;
			}
		}
	
		/// <summary>
		/// Get/set for date
		/// </summary>
		public DateTime date
		{
			get
			{
				return this._date;
			}
			set
			{
				this._date = value;
			}
		}
	
		/// <summary>
		/// Get/set for timestamp
		/// </summary>
		public DateTime timestamp
		{
			get
			{
				return this._timestamp;
			}
			set
			{
				this._timestamp = value;
			}
		}
	
		/// <summary>
		/// Get/set for boolean
		/// </summary>
		public bool boolean
		{
			get
			{
				return this._boolean;
			}
			set
			{
				this._boolean = value;
			}
		}
	
		/// <summary>
		/// Get/set for bool
		/// </summary>
		public bool @bool
		{
			get
			{
				return this._bool;
			}
			set
			{
				this._bool = value;
			}
		}
	
		/// <summary>
		/// Get/set for null
		/// </summary>
		public int @null
		{
			get
			{
				return this._null;
			}
			set
			{
				this._null = value;
			}
		}
	
		/// <summary>
		/// Get/set for short
		/// </summary>
		public short @short
		{
			get
			{
				return this._short;
			}
			set
			{
				this._short = value;
			}
		}
	
		/// <summary>
		/// Get/set for char
		/// </summary>
		public char @char
		{
			get
			{
				return this._char;
			}
			set
			{
				this._char = value;
			}
		}
	
		/// <summary>
		/// Get/set for zero
		/// </summary>
		public float zero
		{
			get
			{
				return this._zero;
			}
			set
			{
				this._zero = value;
			}
		}
	
		/// <summary>
		/// Get/set for int
		/// </summary>
		public int @int
		{
			get
			{
				return this._int;
			}
			set
			{
				this._int = value;
			}
		}
	
		/// <summary>
		/// Get/set for string
		/// </summary>
		public string @string
		{
			get
			{
				return this._string;
			}
			set
			{
				this._string = value;
			}
		}
	
		/// <summary>
		/// Get/set for byte
		/// </summary>
		public byte @byte
		{
			get
			{
				return this._byte;
			}
			set
			{
				this._byte = value;
			}
		}
	
		/// <summary>
		/// Get/set for yesno
		/// </summary>
		public bool yesno
		{
			get
			{
				return this._yesno;
			}
			set
			{
				this._yesno = value;
			}
		}
	
		/// <summary>
		/// Get/set for blob
		/// </summary>
		public Foo.Struct blob
		{
			get
			{
				return this._blob;
			}
			set
			{
				this._blob = value;
			}
		}
	
		/// <summary>
		/// Get/set for nullBlob
		/// </summary>
		public object nullBlob
		{
			get
			{
				return this._nullBlob;
			}
			set
			{
				this._nullBlob = value;
			}
		}
	
		/// <summary>
		/// Get/set for status
		/// </summary>
		public FooStatus status
		{
			get
			{
				return this._status;
			}
			set
			{
				this._status = value;
			}
		}
	
		/// <summary>
		/// Get/set for binary
		/// </summary>
		public byte[] binary
		{
			get
			{
				return this._binary;
			}
			set
			{
				this._binary = value;
			}
		}
		public byte[] bytes
		{
			get
			{
				return this._bytes;
			}
			set
			{
				this._bytes = value;
			}
		}
	
		/// <summary>
		/// Get/set for locale
		/// </summary>
		public String locale
		{
			get
			{
				return this._locale;
			}
			set
			{
				this._locale = value;
			}
		}
	
		/// <summary>
		/// Get/set for formula
		/// </summary>
		public String formula
		{
			get
			{
				return this._formula;
			}
			set
			{
				this._formula = value;
			}
		}
	
		/// <summary>
		/// Get/set for custom
		/// </summary>
		public string[] custom
		{
			get
			{
				return this._custom;
			}
			set
			{
				this._custom = value;
			}
		}
	
		/// <summary>
		/// Get/set for version
		/// </summary>
		public String version
		{
			get
			{
				return this._version;
			}
			set
			{
				this._version = value;
			}
		}
	
		/// <summary>
		/// Get/set for foo
		/// </summary>
		public FooProxy foo
		{
			get
			{
				return this._foo;
			}
			set
			{
				this._foo = value;
			}
		}
	
		/// <summary>
		/// Get/set for dependent
		/// </summary>
		public Fee dependent
		{
			get
			{
				return this._dependent;
			}
			set
			{
				this._dependent = value;
			}
		}
	
		#endregion

		#region ILifecycle Members

		public LifecycleVeto OnUpdate(ISession s)
		{
			return LifecycleVeto.NoVeto;
		}

		public void OnLoad(ISession s, object id)
		{
		}

		public LifecycleVeto OnSave(ISession s)
		{
			_string = "a string";
			_date = new DateTime(123);
			_timestamp = DateTime.Now;
			_integer = -666;
			_long = 696969696969696969L - count++;
			_short = 42;
			_float = 6666.66f;
			//_double = new Double( 1.33e-69 );  // this double is too big for the sap db jdbc driver
			_double = 1.12e-36;
			_boolean = true;
			_byte = 127;
			_int = 2;
			_char = '@';
			_bytes = System.Text.Encoding.ASCII.GetBytes(_string);
			Struct ss = new Struct();
			ss.name="name";
			ss.count = 69;
			blob = ss;
			status=FooStatus.ON;
			binary = System.Text.Encoding.ASCII.GetBytes( _string + "yada yada yada" );
			custom = new string[]
			  {
				  "foo", "bar" 
			  };
			component = new FooComponent("foo", 12, new DateTime[] { _date, _timestamp, DateTime.MinValue, new DateTime() }, new FooComponent("bar", 666, new DateTime[] { new DateTime(123456L), DateTime.MinValue }, null ) );
			component.Glarch = new Glarch();
			dependent = new Fee();
			dependent.Fi = "belongs to foo # " + key;
			locale = System.Threading.Thread.CurrentThread.CurrentCulture.Name;
			return LifecycleVeto.NoVeto;
		}

		public LifecycleVeto OnDelete(ISession s)
		{
			return LifecycleVeto.NoVeto;
		}

		#endregion

		public void disconnect() 
		{
			if ( _foo!=null) _foo.disconnect();
			_foo=null;
		}

		public override bool Equals(object obj)
		{
			Foo other = (Foo)obj;
			if ( _bytes!=other._bytes ) 
			{
				if ( _bytes==null || other._bytes==null ) return false;
				if ( _bytes.Length!=other._bytes.Length ) return false;
				for ( int i=0; i< _bytes.Length; i++) 
				{
					if ( _bytes[i] != other._bytes[i] ) return false;
				}
			}
		
			return ( this._bool == other._bool )
				&& ( ( this._boolean == other._boolean ) || ( this._boolean.Equals(other._boolean) ) )
				&& ( ( this._byte == other._byte ) || ( this._byte.Equals(other._byte) ) )
				//&& ( ( this._date == other._date ) || ( this._date.getDate() == other._date.getDate() && this._date.getMonth() == other._date.getMonth() && this._date.getYear() == other._date.getYear() ) )
				&& ( ( this._double == other._double ) || ( this._double.Equals(other._double) ) )
				&& ( ( this._float == other._float ) || ( this._float.Equals(other._float) ) )
				&& ( this._int == other._int )
				&& ( ( this._integer == other._integer ) || ( this._integer.Equals(other._integer) ) )
				&& ( ( this._long == other._long ) || ( this._long.Equals(other._long) ) )
				&& ( this._null == other._null )
				&& ( ( this._short == other._short ) || ( this._short.Equals(other._short) ) )
				&& ( ( this._string == other._string) || ( this._string.Equals(other._string) ) )
				//&& ( ( this._timestamp==other._timestamp) || ( this._timestamp.getDate() == other._timestamp.getDate() && this._timestamp.getYear() == other._timestamp.getYear() && this._timestamp.getMonth() == other._timestamp.getMonth() ) )
				&& ( this._zero == other._zero )
				&& ( ( this._foo == other._foo ) || ( this._foo.key.Equals( other._foo.key ) ) )
				&& ( ( this.blob == other.blob ) || ( this.blob.Equals(other.blob) ) )
				&& ( this.yesno == other.yesno )
				&& ( this.status == other.status )
				&& ( ( this.binary == other.binary ) || this.binary.Equals(other._binary))
				&& ( this.key.Equals(other.key) )
				&& ( this.locale.Equals(other.locale) )
				&& ( ( this.custom == other.custom ) || ( this.custom[0].Equals(other.custom[0]) && this.custom[1].Equals(other.custom[1]) ) );
		}
		public override int GetHashCode()
		{
			return key.GetHashCode() - _string.GetHashCode();
		}
		public FooComponent nullComponent
		{
			get
			{
				return null;
			}
			set
			{
				if (value!=null) throw new Exception("Null component");
			}
		}

		private static int count=0;
	}
}

--- NEW FILE: GlarchProxy.cs ---
using System;
using System.Collections;

namespace NHibernate.DomainModel
{
	public interface GlarchProxy 
	{
		int version
		{
			get;
			set;
		}
		int derivedVersion
		{
			get;
		}
	
		string name
		{
			get;
			set;
		}
	
		GlarchProxy next
		{
			get;
			set;
		}
	
		short order
		{
			get;
			set;
		}
	
		IList strings
		{
			get;
			set;
		}	
		object dynaBean
		{
			get;
			set;
		}	
		IDictionary stringSets
		{
			get;
			set;
		}	
		IList fooComponents
		{
			get;
			set;
		}	
		GlarchProxy[] proxyArray
		{
			get;
			set;
		}	
		IList proxySet
		{
			get;
			set;
		}	
		Multiplicity multiple
		{
			get;
			set;
		}	
		object any
		{
			get;
			set;
		}	
	}
}
--- NEW FILE: Baz.cs ---
//------------------------------------------------------------------------------
// <autogenerated>
//     This code was generated by a tool.
//     Runtime Version: v1.1.4322
//
//     Changes to this file may cause incorrect behavior and will be lost if 
//     the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------

using System;
using System.Collections;

namespace NHibernate.DomainModel
{

 /// <summary>
 /// POJO for Baz
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class Baz : IComparable
 {

	#region Fields
	/// <summary>
	/// Holder for code
	/// </summary>
	private String _code;


	 /// <summary>
	 /// Holds the _timeArray
	 /// </summary> 
	 private DateTime[] _timeArray;

	 /// <summary>
	 /// Gets or sets the _timeArray
	 /// </summary> 
	 public DateTime[] timeArray
	 {
		 get 
		 {
			 return _timeArray; 
		 }
		 set 
		 {
			 _timeArray = value;
		 }
	 }
	 /// <summary>
	 /// Holds the _components
	 /// </summary> 
	 private FooComponent[] _components;

	 /// <summary>
	 /// Gets or sets the _components
	 /// </summary> 
	 public FooComponent[] components
	 {
		 get 
		 {
			 return _components; 
		 }
		 set 
		 {
			 _components = value;
		 }
	 }
	 /// <summary>
	 /// Holds the stringArray
	 /// </summary> 
	 private string[] _stringArray;

	 /// <summary>
	 /// Gets or sets the stringArray
	 /// </summary> 
	 public string[] stringArray
	 {
		 get 
		 {
			 return _stringArray; 
		 }
		 set 
		 {
			 _stringArray = value;
		 }
	 }
	 
	 /// <summary>
	 /// Holds the intArray
	 /// </summary> 
	 private int[] _intArray;

	 /// <summary>
	 /// Gets or sets the intArray
	 /// </summary> 
	 public int[] intArray
	 {
		 get 
		 {
			 return _intArray; 
		 }
		 set 
		 {
			 _intArray = value;
		 }
	 }
	 /// <summary>
	 /// Holds the fooArray
	 /// </summary> 
	 private FooProxy[] _fooArray;

	 /// <summary>
	 /// Gets or sets the fooArray
	 /// </summary> 
	 public FooProxy[] fooArray
	 {
		 get 
		 {
			 return _fooArray; 
		 }
		 set 
		 {
			 _fooArray = value;
		 }
	 }

	/// <summary>
	/// Holder for count
	/// </summary>
	private Int32 _count;
	
	/// <summary>
	/// Holder for name
	/// </summary>
	private String _name;
	
	/// <summary>
	/// Holder for foo
	/// </summary>
	private Foo _foo;
	
	/// <summary>
	/// Holder for stringList
	/// </summary>
	private System.Collections.IList _stringList;
	
	/// <summary>
	/// Holder for fees
	/// </summary>
	private System.Collections.IList _fees;
	
	/// <summary>
	/// Holder for customs
	/// </summary>
	private System.Collections.IList _customs;
	
	/// <summary>
	/// Holder for topComponents
	/// </summary>
	private System.Collections.IList _topComponents;
	
	/// <summary>
	/// Holder for fooToGlarch
	/// </summary>
	private System.Collections.IDictionary _fooToGlarch;
	
	/// <summary>
	/// Holder for fooComponentToFoo
	/// </summary>
	private System.Collections.IDictionary _fooComponentToFoo;
	
	/// <summary>
	/// Holder for glarchToFoo
	/// </summary>
	private System.Collections.IDictionary _glarchToFoo;
	
	/// <summary>
	/// Holder for stringDateMap
	/// </summary>
	private System.Collections.SortedList _stringDateMap;
	
	/// <summary>
	/// Holder for topGlarchez
	/// </summary>
	private System.Collections.IDictionary _topGlarchez;
	
	/// <summary>
	/// Holder for cachedMap
	/// </summary>
	private System.Collections.SortedList _cachedMap;
	
	/// <summary>
	/// Holder for stringGlarchMap
	/// </summary>
	private System.Collections.IDictionary _stringGlarchMap;
	
	/// <summary>
	/// Holder for anyToAny
	/// </summary>
	private System.Collections.IDictionary _anyToAny;
	
	/// <summary>
	/// Holder for fooSet
	/// </summary>
	private System.Collections.IDictionary _fooSet;
	
	/// <summary>
	/// Holder for stringSet
	/// </summary>
	private System.Collections.IList _stringSet;
	
	/// <summary>
	/// Holder for topFoos
	/// </summary>
	private System.Collections.IDictionary _topFoos;
	
	/// <summary>
	/// Holder for cascadingBars
	/// </summary>
	private System.Collections.IDictionary _cascadingBars;
	
	/// <summary>
	/// Holder for cached
	/// </summary>
	private System.Collections.IList _cached;
	
	/// <summary>
	/// Holder for sortablez
	/// </summary>
	private System.Collections.IDictionary _sortablez;
	
	/// <summary>
	/// Holder for bag
	/// </summary>
	private System.Collections.IList _bag;
	
	/// <summary>
	/// Holder for fooBag
	/// </summary>
	private System.Collections.IList _fooBag;
	
	/// <summary>
	/// Holder for bazez
	/// </summary>
	private System.Collections.IList _bazez;
	
	/// <summary>
	/// Holder for idFooBag
	/// </summary>
	private System.Collections.IList _idFooBag;
	
	/// <summary>
	/// Holder for byteBag
	/// </summary>
	private System.Collections.IList _byteBag;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class Baz
	/// </summary>
	public Baz()
	{
	}
	
	
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for code
	/// </summary>
	public String code
	{
		get
		{
			return this._code;
		}
		set
		{
			this._code = value;
		}
	}
	
	/// <summary>
	/// Get/set for count
	/// </summary>
	public Int32 count
	{
		get
		{
			return this._count;
		}
		set
		{
			this._count = value;
		}
	}
	
	/// <summary>
	/// Get/set for name
	/// </summary>
	public String name
	{
		get
		{
			return this._name;
		}
		set
		{
			this._name = value;
		}
	}
	
	/// <summary>
	/// Get/set for foo
	/// </summary>
	public Foo foo
	{
		get
		{
			return this._foo;
		}
		set
		{
			this._foo = value;
		}
	}
	
	/// <summary>
	/// Get/set for stringList
	/// </summary>
	public System.Collections.IList stringList
	{
		get
		{
			return this._stringList;
		}
		set
		{
			this._stringList = value;
		}
	}
	
	/// <summary>
	/// Get/set for fees
	/// </summary>
	public System.Collections.IList fees
	{
		get
		{
			return this._fees;
		}
		set
		{
			this._fees = value;
		}
	}
	
	/// <summary>
	/// Get/set for customs
	/// </summary>
	public System.Collections.IList customs
	{
		get
		{
			return this._customs;
		}
		set
		{
			this._customs = value;
		}
	}
	
	/// <summary>
	/// Get/set for topComponents
	/// </summary>
	public System.Collections.IList topComponents
	{
		get
		{
			return this._topComponents;
		}
		set
		{
			this._topComponents = value;
		}
	}
	
	/// <summary>
	/// Get/set for fooToGlarch
	/// </summary>
	public System.Collections.IDictionary fooToGlarch
	{
		get
		{
			return this._fooToGlarch;
		}
		set
		{
			this._fooToGlarch = value;
		}
	}
	
	/// <summary>
	/// Get/set for fooComponentToFoo
	/// </summary>
	public System.Collections.IDictionary fooComponentToFoo
	{
		get
		{
			return this._fooComponentToFoo;
		}
		set
		{
			this._fooComponentToFoo = value;
		}
	}
	
	/// <summary>
	/// Get/set for glarchToFoo
	/// </summary>
	public System.Collections.IDictionary glarchToFoo
	{
		get
		{
			return this._glarchToFoo;
		}
		set
		{
			this._glarchToFoo = value;
		}
	}
	
	/// <summary>
	/// Get/set for stringDateMap
	/// </summary>
	public System.Collections.SortedList stringDateMap
	{
		get
		{
			return this._stringDateMap;
		}
		set
		{
			this._stringDateMap = value;
		}
	}
	
	/// <summary>
	/// Get/set for topGlarchez
	/// </summary>
	public System.Collections.IDictionary topGlarchez
	{
		get
		{
			return this._topGlarchez;
		}
		set
		{
			this._topGlarchez = value;
		}
	}
	
	/// <summary>
	/// Get/set for cachedMap
	/// </summary>
	public System.Collections.SortedList cachedMap
	{
		get
		{
			return this._cachedMap;
		}
		set
		{
			this._cachedMap = value;
		}
	}
	
	/// <summary>
	/// Get/set for stringGlarchMap
	/// </summary>
	public System.Collections.IDictionary stringGlarchMap
	{
		get
		{
			return this._stringGlarchMap;
		}
		set
		{
			this._stringGlarchMap = value;
		}
	}
	
	/// <summary>
	/// Get/set for anyToAny
	/// </summary>
	public System.Collections.IDictionary anyToAny
	{
		get
		{
			return this._anyToAny;
		}
		set
		{
			this._anyToAny = value;
		}
	}
	
	/// <summary>
	/// Get/set for fooSet
	/// </summary>
	public System.Collections.IDictionary fooSet
	{
		get
		{
			return this._fooSet;
		}
		set
		{
			this._fooSet = value;
		}
	}
	
	/// <summary>
	/// Get/set for stringSet
	/// </summary>
	public System.Collections.IList stringSet
	{
		get
		{
			return this._stringSet;
		}
		set
		{
			this._stringSet = value;
		}
	}
	
	/// <summary>
	/// Get/set for topFoos
	/// </summary>
	public System.Collections.IDictionary topFoos
	{
		get
		{
			return this._topFoos;
		}
		set
		{
			this._topFoos = value;
		}
	}
	
	/// <summary>
	/// Get/set for cascadingBars
	/// </summary>
	public System.Collections.IDictionary cascadingBars
	{
		get
		{
			return this._cascadingBars;
		}
		set
		{
			this._cascadingBars = value;
		}
	}
	
	/// <summary>
	/// Get/set for cached
	/// </summary>
	public System.Collections.IList cached
	{
		get
		{
			return this._cached;
		}
		set
		{
			this._cached = value;
		}
	}
	
	/// <summary>
	/// Get/set for sortablez
	/// </summary>
	public System.Collections.IDictionary sortablez
	{
		get
		{
			return this._sortablez;
		}
		set
		{
			this._sortablez = value;
		}
	}
	
	/// <summary>
	/// Get/set for bag
	/// </summary>
	public System.Collections.IList bag
	{
		get
		{
			return this._bag;
		}
		set
		{
			this._bag = value;
		}
	}
	
	/// <summary>
	/// Get/set for fooBag
	/// </summary>
	public System.Collections.IList fooBag
	{
		get
		{
			return this._fooBag;
		}
		set
		{
			this._fooBag = value;
		}
	}
	
	/// <summary>
	/// Get/set for bazez
	/// </summary>
	public System.Collections.IList bazez
	{
		get
		{
			return this._bazez;
		}
		set
		{
			this._bazez = value;
		}
	}
	
	/// <summary>
	/// Get/set for idFooBag
	/// </summary>
	public System.Collections.IList idFooBag
	{
		get
		{
			return this._idFooBag;
		}
		set
		{
			this._idFooBag = value;
		}
	}
	
	/// <summary>
	/// Get/set for byteBag
	/// </summary>
	public System.Collections.IList byteBag
	{
		get
		{
			return this._byteBag;
		}
		set
		{
			this._byteBag = value;
		}
	}
	
	#endregion

	 public void setDefaults() 
	 {
		 stringSet = new ArrayList();
		 stringSet.Add("foo"); stringSet.Add("bar"); stringSet.Add("baz");
		 stringDateMap = new SortedList();
		 stringDateMap.Add( "now", DateTime.Now );
		 stringDateMap.Add( "never", null );
		 stringDateMap.Add( "big bang", new DateTime(0) );
		 ArrayList list = new ArrayList();
		 list.AddRange(stringSet);
		 stringList = list;
		 intArray = new int[] { 1,3,3,7 };
		 fooArray =new Foo[0];
		 stringArray = (String[]) list.ToArray(typeof(string) );
		 customs = new ArrayList();
		 customs.Add( new String[] { "foo", "bar" } );
		 customs.Add( new String[] { "A", "B" } );
		 customs.Add( new String[] { "1", "2" } );
		
		 fooSet = new Hashtable();
		 components = new FooComponent[] {
											 new FooComponent("foo", 42, null, null),
											 new FooComponent("bar", 88, null, new FooComponent("sub", 69, null, null) )
										 };
		 timeArray = new DateTime[] { new DateTime(), new DateTime(), DateTime.MinValue, new DateTime(0) };
		
		 count = 667;
		 name="Bazza";
		 topComponents = new ArrayList();
		 topComponents.Add( new FooComponent("foo", 11, new DateTime[] { new DateTime(), new DateTime(123) }, null) );
		 topComponents.Add( new FooComponent("bar", 22, new DateTime[] { new DateTime(7), new DateTime(456) }, null) );
		 topComponents.Add( null );
		 bag = new ArrayList();
		 bag.Add("duplicate");
		 bag.Add("duplicate");
		 bag.Add("duplicate");
		 bag.Add("unique");
		 cached = new ArrayList();
		 CompositeElement ce = new CompositeElement();
		 ce.foo = "foo";
		 ce.bar = "bar";
		 CompositeElement ce2 = new CompositeElement();
		 ce2.foo = "fooxxx";
		 ce2.bar = "barxxx";
		 cached.Add(ce);
		 cached.Add(ce2);
		 cachedMap = new SortedList();
		 cachedMap.Add(this, ce);
	 }
	 #region IComparable Members

	 public int CompareTo(object obj)
	 {
		 return ( (Baz) obj ).code.CompareTo(code);
	 }

	 #endregion
 }
}
--- NEW FILE: Qux.cs ---
using System;
using System.Collections;

namespace NHibernate.DomainModel
{

	public class Qux : ILifecycle 
	{
	
		private ISession session;
	
		public Qux() { }
	
		public Qux(String s) 
		{
			stuff=s;
		}
	
		public LifecycleVeto OnSave(ISession session) 
		{
			created=true;
			try 
			{
				foo = new Foo();
				session.Save(foo);
			}
			catch (Exception e) 
			{
				throw new CallbackException(e);
			}
			foo.@string = "child of a qux";
			return LifecycleVeto.NoVeto;
		}
	
		public LifecycleVeto OnDelete(ISession session) 
		{
			deleted=true;
			try 
			{
				session.Delete(foo);
			}
			catch (Exception e) 
			{
				throw new CallbackException(e);
			}
			//if (child!=null) session.delete(child);
			return LifecycleVeto.NoVeto;
		}
	
		public void OnLoad(ISession session, object id) 
		{
			loaded=true;
			this.session=session;
		}
	
		public void store() 
		{
		}

		/// <summary>
		/// Holds the _foo
		/// </summary> 
		private FooProxy _foo;

		/// <summary>
		/// Gets or sets the _foo
		/// </summary> 
		public FooProxy foo
		{
			get 
			{
				return _foo; 
			}
			set 
			{
				_foo = value;
			}
		}

		/// <summary>
		/// Holds the _created
		/// </summary> 
		private bool _created;

		/// <summary>
		/// Gets or sets the _created
		/// </summary> 
		public bool created
		{
			get 
			{
				return _created; 
			}
			set 
			{
				_created = value;
			}
		}
		/// <summary>
		/// Holds the _deleted
		/// </summary> 
		private bool _deleted;

		/// <summary>
		/// Gets or sets the _deleted
		/// </summary> 
		public bool deleted
		{
			get 
			{
				return _deleted; 
			}
			set 
			{
				_deleted = value;
			}
		}

		/// <summary>
		/// Holds the _loaded
		/// </summary> 
		private bool _loaded;

		/// <summary>
		/// Gets or sets the _loaded
		/// </summary> 
		public bool loaded
		{
			get 
			{
				return _loaded; 
			}
			set 
			{
				_loaded = value;
			}
		}
	
		/// <summary>
		/// Holds the _stored
		/// </summary> 
		private bool _stored;

		/// <summary>
		/// Gets or sets the _stored
		/// </summary> 
		public bool stored
		{
			get 
			{
				return _stored; 
			}
			set 
			{
				_stored = value;
			}
		}
		/// <summary>
		/// Holds the _key
		/// </summary> 
		private long _key;

		/// <summary>
		/// Gets or sets the _key
		/// </summary> 
		public long key
		{
			get 
			{
				return _key; 
			}
			set 
			{
				_key = value;
			}
		}

	
		public long TheKey
		{
			set
			{
				this.key = value;
			}
		}

		/// <summary>
		/// Holds the _stuff
		/// </summary> 
		private string _stuff;

		/// <summary>
		/// Gets or sets the _stuff
		/// </summary> 
		public string stuff
		{
			get 
			{
				return _stuff; 
			}
			set 
			{
				_stuff = value;
			}
		}

		/// <summary>
		/// Holds the _fums
		/// </summary> 
		private IDictionary _fums;

		/// <summary>
		/// Gets or sets the _fums
		/// </summary> 
		public IDictionary fums
		{
			get 
			{
				return _fums; 
			}
			set 
			{
				_fums = value;
			}
		}

		/// <summary>
		/// Holds the _moreFums
		/// </summary> 
		private IList _moreFums;

		/// <summary>
		/// Gets or sets the _moreFums
		/// </summary> 
		public IList moreFums
		{
			get 
			{
				return _moreFums; 
			}
			set 
			{
				_moreFums = value;
			}
		}
	
		private Qux _child;
		public Qux child
		{
			get
			{
				stored=true;
				this.childKey = child==null ? 0 : child.key;
				if (childKey!=0 && child==null) child = (Qux) session.Load(typeof(Qux), childKey);
				return _child;
			}
			set
			{
				this._child = value;
			}
		}	

		/// <summary>
		/// Holds the _childKey
		/// </summary> 
		private long _childKey;

		/// <summary>
		/// Gets or sets the _childKey
		/// </summary> 
		public long childKey
		{
			get 
			{
				return _childKey; 
			}
			set 
			{
				_childKey = value;
			}
		}
	
		public LifecycleVeto OnUpdate(ISession s)
		{
			return LifecycleVeto.NoVeto;
		}
	}
}
--- NEW FILE: FooStatus.cs ---
using System;

namespace NHibernate.DomainModel
{
	public enum FooStatus 
	{
		OFF, 
		ON
	}
}
--- NEW FILE: Fee.cs ---
using System;

namespace NHibernate.DomainModel
{

	[Serializable]
	public class Fee
	{
		public Fee _fee;
		public Fee anotherFee;
		public String fi;
		public String key;
		public System.Collections.IDictionary fees;
		private Qux qux;
		private FooComponent compon;
		private int count;
	
		public Fee() 
		{
		}
	
		public Fee fee
		{
			get
			{
				return fee;
			}
			set
			{
	
				this.fee = value;
			}
		}	
		public string Fi
		{
			get

			{
				return fi;
			}
			set
			{
				this.fi = value;
			}
		}
		public string Key
		{
			get
			{
				return key;
			}
			set
			{
				this.key = value;
			}
		}
	
		public System.Collections.IDictionary Fees
		{
			get
			{
				return fees;
			}
			set
			{
				this.fees = value;
			}
		}
	
		public Fee AnotherFee
		{
			get
			{
				return anotherFee;
			}
			set
			{
				this.anotherFee = value;
			}
		}
	
		public Qux Qux
		{
			get
			{
				return qux;
			}
			set
			{
				this.qux = value;
			}
		}
	
		public FooComponent Compon
		{
			get
			{
				return compon;
			}
			set
			{
				this.compon = value;
			}
		}	
		public int Count
		{
			get
			{
				return count;
			}
			set
			{
				count = value;
			}
		}
	}
}
--- NEW FILE: Sortable.cs ---
//------------------------------------------------------------------------------
// <autogenerated>
//     This code was generated by a tool.
//     Runtime Version: v1.1.4322
//
//     Changes to this file may cause incorrect behavior and will be lost if 
//     the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------

using System;

namespace NHibernate.DomainModel
{

 /// <summary>
 /// POJO for Sortable
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class Sortable : IComparable
 {

	#region Fields
	/// <summary>
	/// Holder for id
	/// </summary>
	private Int32 _id;
	
	/// <summary>
	/// Holder for name
	/// </summary>
	private String _name;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class Sortable
	/// </summary>
	public Sortable()
	{
	}
	
	/// <summary>
	/// Constructor for class Sortable
	/// </summary>
	/// <param name="name">Initial name value</param>
	public Sortable(String name)
	{
		this._name = name;
	}
	
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for id
	/// </summary>
	public Int32 id
	{
		get
		{
			return this._id;
		}
		set
		{
			this._id = value;
		}
	}
	
	/// <summary>
	/// Get/set for name
	/// </summary>
	public String name
	{
		get
		{
			return this._name;
		}
		set
		{
			this._name = value;
		}
	}
	
	#endregion

	 #region IComparable Members

	 public int CompareTo(object obj)
	 {
			 return name.CompareTo( ( (Sortable) obj).name );
	 }

	 #endregion
 }
}
Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FooBar.hbm.xml	6 Apr 2004 12:56:38 -0000	1.1
--- FooBar.hbm.xml	8 Apr 2004 14:59:32 -0000	1.2
***************
*** 2,12 ****
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!   <import class="net.sf.hibernate.test.Result"/>
!   <import class="net.sf.hibernate.test.Named"/>
  
    <class 
!   	name="net.sf.hibernate.test.Foo"
    	table="`foos`"
!   	proxy="net.sf.hibernate.test.FooProxy"
    	discriminator-value="F"
    	dynamic-update="true"
--- 2,12 ----
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
!   <import class="NHibernate.DomainModel.Result, NHibernate.DomainModel"/>
!   <import class="NHibernate.DomainModel.Named, NHibernate.DomainModel"/>
  
    <class 
!   	name="NHibernate.DomainModel.Foo, NHibernate.DomainModel"
    	table="`foos`"
!   	proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel"
    	discriminator-value="F"
    	dynamic-update="true"
***************
*** 25,29 ****
      <!--<version name="versionCalendar" type="calendar"/>-->
      <!--<timestamp name="versionTimestamp"/>-->
!     <many-to-one name="foo" class="net.sf.hibernate.test.Foo">
          <column name="foo" length="36" index="fbmtoidx"/>
      </many-to-one>
--- 25,29 ----
      <!--<version name="versionCalendar" type="calendar"/>-->
      <!--<timestamp name="versionTimestamp"/>-->
!     <many-to-one name="foo" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel">
          <column name="foo" length="36" index="fbmtoidx"/>
      </many-to-one>
***************
*** 60,64 ****
      <property name="byte" column="byte_"/>
      <property name="yesno" type="yes_no"/>
!     <property name="blob" type="net.sf.hibernate.test.Foo$Struct" column="blobb_"/>
      <property name="nullBlob" type="serializable"/>
      <property name="status" column="`status_@###`"/>
--- 60,64 ----
      <property name="byte" column="byte_"/>
      <property name="yesno" type="yes_no"/>
!     <property name="blob" type="NHibernate.DomainModel.Foo$Struct, NHibernate.DomainModel" column="blobb_"/>
      <property name="nullBlob" type="serializable"/>
      <property name="status" column="`status_@###`"/>
***************
*** 68,76 ****
      <property name="formula" formula="1/2 * int_"/>
      
!     <property name="custom" type="net.sf.hibernate.test.DoubleStringType">
          <column name="first_name" length="66"/>
          <column name="surname" length="66"/>
      </property>
!     <many-to-one name="dependent" class="net.sf.hibernate.test.Fee" cascade="all" not-null="true"/>
      <component name="component">
        <property name="count" column="count_" type="int" not-null="true"/> 
--- 68,76 ----
      <property name="formula" formula="1/2 * int_"/>
      
!     <property name="custom" type="NHibernate.DomainModel.DoubleStringType, NHibernate.DomainModel">
          <column name="first_name" length="66"/>
          <column name="surname" length="66"/>
      </property>
!     <many-to-one name="dependent" class="NHibernate.DomainModel.Fee, NHibernate.DomainModel" cascade="all" not-null="true"/>
      <component name="component">
        <property name="count" column="count_" type="int" not-null="true"/> 
***************
*** 78,82 ****
          <column name="name_" length="32" not-null="true"/> 
        </property>
!       <many-to-one name="glarch" column="g__" cascade="all" class="net.sf.hibernate.test.Glarch" outer-join="true"/>
        <property name="null" column="cmpnt_null_"/>
        <component name="subcomponent">
--- 78,82 ----
          <column name="name_" length="32" not-null="true"/> 
        </property>
!       <many-to-one name="glarch" column="g__" cascade="all" class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" outer-join="true"/>
        <property name="null" column="cmpnt_null_"/>
        <component name="subcomponent">
***************
*** 88,92 ****
            <element column="date_" type="time"/>
          </array>
!         <many-to-one name="fee" column="fee_sub" cascade="all" class="net.sf.hibernate.test.Fee" outer-join="false"/>
        </component>
        <array name="importantDates" table="foo_dates">
--- 88,92 ----
            <element column="date_" type="time"/>
          </array>
!         <many-to-one name="fee" column="fee_sub" cascade="all" class="NHibernate.DomainModel.Fee, NHibernate.DomainModel" outer-join="false"/>
        </component>
        <array name="importantDates" table="foo_dates">
***************
*** 100,118 ****
      </component>
      <subclass
!     	name="net.sf.hibernate.test.Trivial"
!     	proxy="net.sf.hibernate.test.FooProxy" 
      	discriminator-value="T"/>
      <subclass 
!     	name="net.sf.hibernate.test.Abstract" 
!     	proxy="net.sf.hibernate.test.AbstractProxy" 
      	discriminator-value="null">
          <set name="abstracts">
              <key column="abstract_id"/>
!             <one-to-many class="net.sf.hibernate.test.Abstract"/>
          </set>
          <property name="time" column="the_time"/>
          <subclass 
!         	name="net.sf.hibernate.test.Bar" 
!         	proxy="net.sf.hibernate.test.BarProxy"
          	discriminator-value="B">
            <many-to-one name="baz"/>
--- 100,118 ----
      </component>
      <subclass
!     	name="NHibernate.DomainModel.Trivial, NHibernate.DomainModel"
!     	proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" 
      	discriminator-value="T"/>
      <subclass 
!     	name="NHibernate.DomainModel.Abstract, NHibernate.DomainModel" 
!     	proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel" 
      	discriminator-value="null">
          <set name="abstracts">
              <key column="abstract_id"/>
!             <one-to-many class="NHibernate.DomainModel.Abstract, NHibernate.DomainModel"/>
          </set>
          <property name="time" column="the_time"/>
          <subclass 
!         	name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" 
!         	proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel"
          	discriminator-value="B">
            <many-to-one name="baz"/>
***************
*** 121,125 ****
            </property>
            <property name="name" column="name_name"/>
!           <component name="barComponent" class="net.sf.hibernate.test.FooComponent">
              <parent name="parent"/>
              <property name="count" column="bar_count"/>
--- 121,125 ----
            </property>
            <property name="name" column="name_name"/>
!           <component name="barComponent" class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel">
              <parent name="parent"/>
              <property name="count" column="bar_count"/>

--- NEW FILE: DoubleStringType.cs ---
using System;
using System.Data;

namespace NHibernate.DomainModel
{
	public class DoubleStringType : ICompositeUserType 
	{
	
		public System.Type ReturnedClass
		{
			get
			{
				return typeof(String[]);
			}
		}
	
		public new bool Equals(object x, object y) 
		{
			if (x==y) return true;
			if (x==null || y==null) return false;
			return ((String[]) x)[0].Equals( ((String[]) y)[0] ) && ((String[]) x)[1].Equals( ((String[]) y)[1] );
		}
	
		public Object DeepCopy(Object x) 
		{
			if (x==null) return null;
			String[] result = new String[2];
			String[] input = (String[]) x;
			result[0] = input[0];
			result[1] = input[1];
			return result;
		}
	
		public bool IsMutable
		{
			get
			{ 
				return true; 
			}
		}
	
		public Object NullSafeGet(IDataReader rs, String[] names, Engine.ISessionImplementor session, Object owner)
		{
		
			String first = (String) Type.TypeFactory.Basic("String").NullSafeGet(rs, names[0], session, owner);
			String second = (String) Type.TypeFactory.Basic("String").NullSafeGet(rs, names[1], session, owner);
		
			return ( first==null && second==null ) ? null : new String[] { first, second };
		}

	
		public void NullSafeSet(IDbCommand st, Object value, int index, Engine.ISessionImplementor session)
		{		
			String[] strings = (value==null) ? new String[2] : (String[]) value;
		
			Type.TypeFactory.Basic("String").NullSafeSet(st, strings[0], index, session);
			Type.TypeFactory.Basic("String").NullSafeSet(st, strings[1], index+1, session);
		}
	
		public String[] PropertyNames
		{
			get
			{
				return new String[] { "s1", "s2" };
			}
		}

		public Type.IType[] PropertyTypes
		{
			get
			{
				return new Type.IType[] { Type.TypeFactory.Basic("String"), Type.TypeFactory.Basic("String") };
			}
		}

		public Object GetPropertyValue(Object component, int property) 
		{
			return ( (String[]) component )[property];
		}

		public void SetPropertyValue(
			Object component,
			int property,
			Object value) 
		{
		
			( (String[]) component )[property] = (String) value;
		}

		public object Assemble(
			object cached,
			Engine.ISessionImplementor session,
			object owner) 
		{
		
			return DeepCopy(cached);
		}

		public object Disassemble(Object value, Engine.ISessionImplementor session) 
		{
			return DeepCopy(value);
		}
	}
}
Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Baz.hbm.xml	6 Apr 2004 12:56:38 -0000	1.1
--- Baz.hbm.xml	8 Apr 2004 14:59:32 -0000	1.2
***************
*** 2,13 ****
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
! 	<class name="net.sf.hibernate.test.Baz" table="`baz baz baz`">
! 		<id name="code" type="string">
  			<column name="baz_id" length="32"/>
  			<generator class="uuid.hex"/>
  		</id>
! 		<property name="count" column="count_count"/>
  		<property name="name" column="name_b"/>
! 		<many-to-one name="foo" outer-join="true" class="net.sf.hibernate.test.Foo"/>
  
  		<list name="stringList" table="string_list">
--- 2,13 ----
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
  
! 	<class name="NHibernate.DomainModel.Baz, NHibernate.DomainModel" table="`baz baz baz`">
! 		<id name="code" type="String">
  			<column name="baz_id" length="32"/>
  			<generator class="uuid.hex"/>
  		</id>
! 		<property name="count" column="count_count" type="Int32"/>
  		<property name="name" column="name_b"/>
! 		<many-to-one name="foo" outer-join="true" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/>
  
  		<list name="stringList" table="string_list">
***************
*** 16,20 ****
  			</key>
  			<index column="`i`"/>
! 			<element column="element" type="string"/>
  		</list>
  		<primitive-array name="intArray" table="int_array">
--- 16,20 ----
  			</key>
  			<index column="`i`"/>
! 			<element column="element" type="String"/>
  		</list>
  		<primitive-array name="intArray" table="int_array">
***************
*** 29,33 ****
  				<column name="baz_id" length="16"/>
  			</key>
! 			<one-to-many class="net.sf.hibernate.test.Foo"/>
  		</set>
  		<array name="components" table="bazcomponents">
--- 29,33 ----
  				<column name="baz_id" length="16"/>
  			</key>
! 			<one-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/>
  		</set>
  		<array name="components" table="bazcomponents">
***************
*** 36,48 ****
  			</key>
  			<index column="i"/>
! 			<composite-element class="net.sf.hibernate.test.FooComponent">
  				<parent name="baz"/>
  				<property name="name">
  					<column name="name" length="56"/>
  				</property>
! 				<property name="count" column="count_"/>
! 				<nested-composite-element name="subcomponent" class="net.sf.hibernate.test.FooComponent">
  					<property name="name" column="x_"/>
! 					<property name="count" column="y_"/>
  				</nested-composite-element>
  			</composite-element>
--- 36,48 ----
  			</key>
  			<index column="i"/>
! 			<composite-element class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel">
  				<parent name="baz"/>
  				<property name="name">
  					<column name="name" length="56"/>
  				</property>
! 				<property name="count" column="count_" type="Int32"/>
! 				<nested-composite-element name="subcomponent" class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel">
  					<property name="name" column="x_"/>
! 					<property name="count" column="y_" type="Int32"/>
  				</nested-composite-element>
  			</composite-element>
***************
*** 59,63 ****
  				<column name="`baz_id@#$`" length="16"/>
  			</key>
! 			<element column="`name!`" type="string"/>
  		</bag>
  		<map name="fooToGlarch">
--- 59,63 ----
  				<column name="`baz_id@#$`" length="16"/>
  			</key>
! 			<element column="`name!`" type="String"/>
  		</bag>
  		<map name="fooToGlarch">
***************
*** 65,70 ****
  				<column name="baz_id" length="16"/>
  			</key>
! 			<index-many-to-many column="foo_id" class="net.sf.hibernate.test.Foo"/>
! 			<many-to-many column="glarch_id" class="net.sf.hibernate.test.Glarch"/>
  		</map>
  		<map name="fooComponentToFoo">
--- 65,70 ----
  				<column name="baz_id" length="16"/>
  			</key>
! 			<index-many-to-many column="foo_id" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/>
! 			<many-to-many column="glarch_id" class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel"/>
  		</map>
  		<map name="fooComponentToFoo">
***************
*** 73,81 ****
  				<column name="baz_id" length="16"/>
  			</key>
! 			<composite-index class="net.sf.hibernate.test.FooComponent">
  				<key-property name="name" length="32"/>
! 				<key-property name="count" column="count_"/>
  			</composite-index>
! 			<many-to-many column="foo_id" class="net.sf.hibernate.test.Foo" outer-join="true"/>
  		</map>
  		<map name="glarchToFoo">
--- 73,81 ----
  				<column name="baz_id" length="16"/>
  			</key>
! 			<composite-index class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel">
  				<key-property name="name" length="32"/>
! 				<key-property name="count" column="count_" type="Int32"/>
  			</composite-index>
! 			<many-to-many column="foo_id" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" outer-join="true"/>
  		</map>
  		<map name="glarchToFoo">
***************
*** 83,107 ****
  				<column name="gtf_baz_id" length="16"/>
  			</key>
! 			<index-many-to-many column="gtf_foo_id" class="net.sf.hibernate.test.Foo"/>
! 			<one-to-many class="net.sf.hibernate.test.Glarch"/>
  		</map>
  		
! 		<set name="stringSet" lazy="true" sort="net.sf.hibernate.test.StringComparator">
  			<!--<jcs-cache usage="read-write"/>-->
  			<key column="id_"/>
! 			<element column="element" type="string" not-null="true" length="32"/>
  		</set>
  	
! 		<map name="stringDateMap" lazy="true" sort="net.sf.hibernate.test.ReverseComparator">
  			<key column="id_"/>
! 			<index column="map_key" type="string" length="32"/>
  			<element column="map_value" type="date"/>
  		</map>
  	
! 		<array name="fooArray" element-class="net.sf.hibernate.test.FooProxy" where="i&lt;8">
  			<jcs-cache usage="read-write"/>
  			<key column="id_"/>
  			<index column="i"/>
! 			<many-to-many class="net.sf.hibernate.test.Foo">
  				<column name="foo" length="36"/>
  			</many-to-many>
--- 83,107 ----
  				<column name="gtf_baz_id" length="16"/>
  			</key>
! 			<index-many-to-many column="gtf_foo_id" class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/>
! 			<one-to-many class="NHibernate.DomainModel.Glarch, NHibernate.DomainModel"/>
  		</map>
  		
! 		<set name="stringSet" lazy="true" sort="NHibernate.DomainModel.StringComparator, NHibernate.DomainModel">
  			<!--<jcs-cache usage="read-write"/>-->
  			<key column="id_"/>
! 			<element column="element" type="String" not-null="true" length="32"/>
  		</set>
  	
! 		<map name="stringDateMap" lazy="true" sort="NHibernate.DomainModel.ReverseComparator, NHibernate.DomainModel">
  			<key column="id_"/>
! 			<index column="map_key" type="String" length="32"/>
  			<element column="map_value" type="date"/>
  		</map>
  	
! 		<array name="fooArray" element-class="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" where="i&lt;8">
  			<jcs-cache usage="read-write"/>
  			<key column="id_"/>
  			<index column="i"/>
! 			<many-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel">
  				<column name="foo" length="36"/>
  			</many-to-many>
***************
*** 110,114 ****
  		<bag ...
 
[truncated message content]