[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel SubDetail.cs,NONE,1.1 SubMulti.cs,NONE,1.1 TrivialClass.cs,NONE,1.1 Vetoer.cs,NONE,1.1 W.cs,NONE,1.1 X.cs,NONE,1.1 Y.cs,NONE,1.1 Z.cs,NONE,1.1 Glarch.cs,1.3,1.4 NHibernate.DomainModel-1.1.csproj,1.15,1.16 Parent.cs,1.1,1.2 Super.cs,1.1,1.2

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

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

Modified Files:
	Glarch.cs NHibernate.DomainModel-1.1.csproj Parent.cs Super.cs 
Added Files:
	SubDetail.cs SubMulti.cs TrivialClass.cs Vetoer.cs W.cs X.cs 
	Y.cs Z.cs 
Log Message:
Continued to add Domain Classes for test fixtures.

Index: Parent.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Parent.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Parent.cs	10 Feb 2004 19:12:58 -0000	1.1
--- Parent.cs	3 Jun 2004 14:54:40 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  namespace NHibernate.DomainModel
  {
+ 	//TODO: replace this with H2.0.3 version
  	/// <summary>
  	/// Summary description for Parent.

Index: Glarch.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Glarch.cs	3 Jun 2004 03:23:33 -0000	1.3
--- Glarch.cs	3 Jun 2004 14:54:39 -0000	1.4
***************
*** 9,43 ****
  	
  		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>
--- 9,39 ----
  	
  		private int _version;
! 		private GlarchProxy _next;
! 		private short _order;
! 		private IList _strings;
! 		private IDictionary _stringSets;
! 		private IList _fooComponents;
! 		private GlarchProxy[] _proxyArray;
! 		private IList _proxySet;
! 		private object _dynaBean;
! 		private string _immutable;
! 		private int _derivedVersion;
! 		private object _any;
  		private int _x;
! 		private Multiplicity _multiple;
! 
  		public int x
  		{
! 			get { return _x; }
! 			set { this._x = value; }
  		}
  	
  		public int version
  		{
! 			get { return _version; }
! 			set { this._version = value; }
  		}
  
! 		
  
  		/// <summary>
***************
*** 46,64 ****
  		public GlarchProxy next
  		{
! 			get 
! 			{
! 				return _next; 
! 			}
! 			set 
! 			{
! 				_next = value;
! 			}
  		}
  
! 		/// <summary>
! 		/// Holds the _order
! 		/// </summary> 
! 		private short _order;
! 
  		/// <summary>
  		/// Gets or sets the _order
--- 42,50 ----
  		public GlarchProxy next
  		{
! 			get { return _next;  }
! 			set { _next = value; }
  		}
  
! 		
  		/// <summary>
  		/// Gets or sets the _order
***************
*** 66,84 ****
  		public short order
  		{
! 			get 
! 			{
! 				return _order; 
! 			}
! 			set 
! 			{
! 				_order = value;
! 			}
  		}
  
! 		/// <summary>
! 		/// Holds the _strings
! 		/// </summary> 
! 		private IList _strings;
! 
  		/// <summary>
  		/// Gets or sets the _strings
--- 52,60 ----
  		public short order
  		{
! 			get { return _order; }
! 			set { _order = value; }
  		}
  
! 		
  		/// <summary>
  		/// Gets or sets the _strings
***************
*** 86,104 ****
  		public IList strings
  		{
! 			get 
! 			{
! 				return _strings; 
! 			}
! 			set 
! 			{
! 				_strings = value;
! 			}
  		}
  
! 		/// <summary>
! 		/// Holds the _stringSets
! 		/// </summary> 
! 		private IDictionary _stringSets;
! 
  		/// <summary>
  		/// Gets or sets the _stringSets
--- 62,70 ----
  		public IList strings
  		{
! 			get { return _strings;  }
! 			set { _strings = value; }
  		}
  
! 		
  		/// <summary>
  		/// Gets or sets the _stringSets
***************
*** 106,124 ****
  		public IDictionary stringSets
  		{
! 			get 
! 			{
! 				return _stringSets; 
! 			}
! 			set 
! 			{
! 				_stringSets = value;
! 			}
  		}
  
! 		/// <summary>
! 		/// Holds the _fooComponents
! 		/// </summary> 
! 		private IList _fooComponents;
! 
  		/// <summary>
  		/// Gets or sets the _fooComponents
--- 72,80 ----
  		public IDictionary stringSets
  		{
! 			get { return _stringSets; }
! 			set { _stringSets = value; }
  		}
  
! 		
  		/// <summary>
  		/// Gets or sets the _fooComponents
***************
*** 126,144 ****
  		public IList fooComponents
  		{
! 			get 
! 			{
! 				return _fooComponents; 
! 			}
! 			set 
! 			{
! 				_fooComponents = value;
! 			}
  		}
  
! 		/// <summary>
! 		/// Holds the _proxyArray
! 		/// </summary> 
! 		private GlarchProxy[] _proxyArray;
! 
  		/// <summary>
  		/// Gets or sets the _proxyArray
--- 82,90 ----
  		public IList fooComponents
  		{
! 			get { return _fooComponents;  }
! 			set { _fooComponents = value; }
  		}
  
! 		
  		/// <summary>
  		/// Gets or sets the _proxyArray
***************
*** 146,164 ****
  		public GlarchProxy[] proxyArray
  		{
! 			get 
! 			{
! 				return _proxyArray; 
! 			}
! 			set 
! 			{
! 				_proxyArray = value;
! 			}
  		}
  
! 		/// <summary>
! 		/// Holds the _proxySet
! 		/// </summary> 
! 		private IList _proxySet;
! 
  		/// <summary>
  		/// Gets or sets the _proxySet
--- 92,100 ----
  		public GlarchProxy[] proxyArray
  		{
! 			get { return _proxyArray; }
! 			set { _proxyArray = value; }
  		}
  
! 		
  		/// <summary>
  		/// Gets or sets the _proxySet
***************
*** 166,179 ****
  		public IList proxySet
  		{
! 			get 
! 			{
! 				return _proxySet; 
! 			}
! 			set 
! 			{
! 				_proxySet = value;
! 			}
  		}
  	
  		public LifecycleVeto OnDelete(ISession s)
  		{
--- 102,111 ----
  		public IList proxySet
  		{
! 			get { return _proxySet; }
! 			set { _proxySet = value; }
  		}
  	
+ 		#region NHibernate.ILifecycle Members
+ 
  		public LifecycleVeto OnDelete(ISession s)
  		{
***************
*** 214,221 ****
  		}
  	
! 		/// <summary>
! 		/// Holds the _dynaBean
! 		/// </summary> 
! 		private object _dynaBean;
  
  		/// <summary>
--- 146,150 ----
  		}
  	
! 		#endregion
  
  		/// <summary>
***************
*** 224,242 ****
  		public object dynaBean
  		{
! 			get 
! 			{
! 				return _dynaBean; 
! 			}
! 			set 
! 			{
! 				_dynaBean = value;
! 			}
  		}
  
! 		/// <summary>
! 		/// Holds the _immutable
! 		/// </summary> 
! 		private string _immutable;
! 
  		/// <summary>
  		/// Gets or sets the _immutable
--- 153,161 ----
  		public object dynaBean
  		{
! 			get { return _dynaBean; }
! 			set { _dynaBean = value; }
  		}
  
! 		
  		/// <summary>
  		/// Gets or sets the _immutable
***************
*** 244,301 ****
  		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>
--- 163,189 ----
  		public string immutable
  		{
! 			get { return _immutable; }
! 			set { _immutable = value; }
  		}
  
  		/// <summary>
  		/// Gets or sets the _derivedVersion
  		/// </summary> 
  		public int derivedVersion
  		{
! 			get { return _derivedVersion;  }
! 			set { _derivedVersion = value; }
  		}
  
  		/// <summary>
  		/// Gets or sets the _any
  		/// </summary> 
  		public object any
  		{
! 			get { return _any; }
! 			set { _any = value; }
  		}
  
! 		
  
  		/// <summary>
***************
*** 304,327 ****
  		public Multiplicity multiple
  		{
! 			get 
! 			{
! 				return _multiple; 
! 			}
! 			set 
! 			{
! 				_multiple = value;
! 			}
  		}
  
  		public new string name
  		{
! 			get
! 			{
! 				return base.name;
! 			}
! 			set
! 			{
! 				this.name = value;
! 			}
  		}
  
--- 192,203 ----
  		public Multiplicity multiple
  		{
! 			get  { return _multiple; }
! 			set  { _multiple = value; }
  		}
  
  		public new string name
  		{
! 			get { return base._name; }
! 			set { this._name = value; }
  		}
  

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

namespace NHibernate.DomainModel 
{
	/// <summary>
	/// Summary description for X.
	/// </summary>
	public class X 
	{
		private long _id;
		private Y _y;
		
		public long Id
		{
			get { return _id; }
			set { _id = value; }
		}

		public Y Y
		{
			get { return _y; }
			set { _y = value; }
		}
		
	}
}

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

using NHibernate;

namespace NHibernate.DomainModel 
{
	/// <summary>
	/// Summary description for Vetoer.
	/// </summary>
	public class Vetoer : ILifecycle
	{
		bool _onSaveCalled;
		bool _onUpdateCalled;
		bool _onDeleteCalled;

		private string _name;
		private string[] _strings;
		
		public string Name
		{
			get { return _name; }
			set { _name = value; }
		}

		public string[] Strings
		{
			get { return _strings; }
			set { _strings = value; }
		}

		#region ILifecycle Members

		public LifecycleVeto OnUpdate(ISession s)
		{
			bool result = !_onUpdateCalled;
			_onUpdateCalled = true;
			return ( result ? LifecycleVeto.Veto : LifecycleVeto.NoVeto );
		}

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

		public LifecycleVeto OnSave(ISession s)
		{
			bool result = !_onSaveCalled;
			_onSaveCalled = true;
			return ( result ? LifecycleVeto.Veto : LifecycleVeto.NoVeto );
		}

		public LifecycleVeto OnDelete(ISession s)
		{
			bool result = !_onDeleteCalled;
			_onDeleteCalled = true;
			return ( result ? LifecycleVeto.Veto : LifecycleVeto.NoVeto );
		}

		#endregion
	}
}

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

namespace NHibernate.DomainModel 
{
	/// <summary>
	/// Summary description for TrivialClass.
	/// </summary>
	public class TrivialClass : Simple
	{
	}
}

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

namespace NHibernate.DomainModel 
{
	/// <summary>
	/// Summary description for W.
	/// </summary>
	public class W 
	{
		private long _id;
		// <set> mapping
		private IDictionary _zeds;
		
		public long Id
		{
			get { return _id; }
			set { _id = value; }
		}

		public IDictionary Zeds
		{
			get { return _zeds; }
			set { _zeds = value; }
		}

	}
}

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

namespace NHibernate.DomainModel 
{
	/// <summary>
	/// Summary description for Y.
	/// </summary>
	public class Y 
	{
		private long _id;
		private string _x;
		private X _theX;
		
		public long Id
		{
			get { return _id; }
			set { _id = value; }
		}

		public string X
		{
			get { return _x; }
			set { _x = value; }
		}

		public X TheX
		{
			get { return _theX; }
			set { _theX = value; }
		}

	}
}

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

namespace NHibernate.DomainModel 
{
	/// <summary>
	/// Summary description for Z.
	/// </summary>
	public class Z 
	{
		private long _id;
		private W _w;
		
		public long Id
		{
			get { return _id; }
			set { _id = value; }
		}

		public W W
		{
			get { return _w; }
			set { _w = value; }
		}

	}
}

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

namespace NHibernate.DomainModel 
{
	/// <summary>
	/// Summary description for SubMulti.
	/// </summary>
	public class SubMulti : Multi
	{
		private float _amount;
		private SubMulti _parent;
		private IList _children;
		private IList _moreChildren;
		
		public float Amount
		{
			get { return _amount; }
			set { _amount = value; }
		}

		public SubMulti Parent
		{
			get { return _parent; }
			set { _parent = value; }
		}

		public IList Children
		{
			get { return _children; }
			set { _children = value; }
		}

		public IList MoreChildren
		{
			get { return _moreChildren; }
			set { _moreChildren = value; }
		}

	}
}

Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NHibernate.DomainModel-1.1.csproj	3 Jun 2004 14:29:00 -0000	1.15
--- NHibernate.DomainModel-1.1.csproj	3 Jun 2004 14:54:40 -0000	1.16
***************
*** 592,595 ****
--- 592,605 ----
                  />
                  <File
+                     RelPath = "SubDetail.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "SubMulti.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Super.cs"
                      SubType = "Code"
***************
*** 611,614 ****
--- 621,629 ----
                  />
                  <File
+                     RelPath = "TrivialClass.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "UnsavedType.cs"
                      SubType = "Code"
***************
*** 620,630 ****
--- 635,670 ----
                  />
                  <File
+                     RelPath = "Vetoer.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Vetoer.hbm.xml"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
+                     RelPath = "W.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "X.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "XY.hbm.xml"
                      BuildAction = "EmbeddedResource"
                  />
+                 <File
+                     RelPath = "Y.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "Z.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
              </Include>
          </Files>

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

namespace NHibernate.DomainModel 
{
	/// <summary>
	/// Summary description for SubDetail.
	/// </summary>
	public class SubDetail 
	{

		private string _name;
		private long _id;

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

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

	}
}

Index: Super.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Super.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Super.cs	8 Apr 2004 14:59:32 -0000	1.1
--- Super.cs	3 Jun 2004 14:54:40 -0000	1.2
***************
*** 1,13 ****
  namespace NHibernate.DomainModel
! {
  	public class Super 
! 	{
! 		protected string name;
  		public string Name
  		{
! 			get
! 			{
				return name;
			}
			set
! 			{
! 				this.name = value;
			}
		}
  	}
  }
\ No newline at end of file
--- 1,10 ----
  namespace NHibernate.DomainModel
! {
  	public class Super 
! 	{
! 		protected string _name;
  		public string Name
  		{
! 			get { return _name; }
			set { _name = value; }
		}
  	}
  }
\ No newline at end of file