[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel A.cs,1.3,1.4 B.cs,1.3,1.4 Baz.cs,1.11,1.12 C1.cs,1.4,1.5 C2.cs,1.2,1.3 Contained.cs,1.1,1.2 Container.cs,1.3,1.4 D.cs,1.2,1.3 Qux.cs,1.6,1.7 Z.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-serv2622/NHibernate.DomainModel

Modified Files:
	A.cs B.cs Baz.cs C1.cs C2.cs Contained.cs Container.cs D.cs 
	Qux.cs Z.cs 
Log Message:
Modified DomainModel and Test classes with changes on proxy branch.

Index: A.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/A.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** A.cs	17 Jun 2004 21:17:13 -0000	1.3
--- A.cs	9 Dec 2004 20:57:25 -0000	1.4
***************
*** 1,3 ****
- 
  using System;
  
--- 1,2 ----
***************
*** 48,61 ****
  	/// Get/set for id
  	/// </summary>
! 	public Int64 Id
! 	{
! 		get
! 		{
! 			return _id;
! 		}
! 		set
  		{
! 			_id = value;
! 		}
  	}
  	
--- 47,54 ----
  	/// Get/set for id
  	/// </summary>
! 	public virtual Int64 Id
  		{
! 		get { return _id; }
! 		set	{ _id = value; }
  	}
  	
***************
*** 63,76 ****
  	/// Get/set for name
  	/// </summary>
! 	public String Name
  	{
! 		get
! 		{
! 			return _name;
! 		}
! 		set
! 		{
! 			_name = value;
! 		}
  	}
  	
--- 56,63 ----
  	/// Get/set for name
  	/// </summary>
! 	public virtual String Name
  	{
! 		get { return _name; }
! 		set { _name = value; }
  	}
  	

Index: Contained.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Contained.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Contained.cs	2 Jun 2004 04:53:24 -0000	1.1
--- Contained.cs	9 Dec 2004 20:57:25 -0000	1.2
***************
*** 29,33 ****
  		#endregion 
  
! 		public Container Container 
  		{
  			get { return _container; }
--- 29,33 ----
  		#endregion 
  
! 		public virtual Container Container 
  		{
  			get { return _container; }
***************
*** 35,39 ****
  		}
  
! 		public long Id 
  		{
  			get { return _id; }
--- 35,39 ----
  		}
  
! 		public virtual long Id 
  		{
  			get { return _id; }
***************
*** 41,45 ****
  		}
  
! 		public IList Bag 
  		{
  			get { return _bag; }
--- 41,45 ----
  		}
  
! 		public virtual IList Bag 
  		{
  			get { return _bag; }
***************
*** 47,51 ****
  		}
  
! 		public IList LazyBag 
  		{
  			get { return _lazyBag; }
--- 47,51 ----
  		}
  
! 		public virtual IList LazyBag 
  		{
  			get { return _lazyBag; }

Index: B.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/B.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** B.cs	4 Jun 2004 12:02:43 -0000	1.3
--- B.cs	9 Dec 2004 20:57:25 -0000	1.4
***************
*** 62,75 ****
  	/// Get/set for count
  	/// </summary>
! 	public Int32 Count
  	{
! 		get
! 		{
! 			return this._count;
! 		}
! 		set
! 		{
! 			this._count = value;
! 		}
  	}
  	
--- 62,69 ----
  	/// Get/set for count
  	/// </summary>
! 	public virtual Int32 Count
  	{
! 		get { return _count; }
! 		set { _count = value; }
  	}
  	
***************
*** 77,90 ****
  	/// Get/set for map
  	/// </summary>
! 	public System.Collections.IDictionary Map
  	{
! 		get
! 		{
! 			return this._map;
! 		}
! 		set
! 		{
! 			this._map = value;
! 		}
  	}
  	
--- 71,78 ----
  	/// Get/set for map
  	/// </summary>
! 	public virtual System.Collections.IDictionary Map
  	{
! 		get { return _map; }
! 		set { _map = value; }
  	}
  	

Index: Container.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Container.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Container.cs	18 Nov 2004 02:45:43 -0000	1.3
--- Container.cs	9 Dec 2004 20:57:25 -0000	1.4
***************
*** 97,101 ****
  
  		
! 		public IList OneToMany
  		{
  			get { return _oneToMany; }
--- 97,101 ----
  
  		
! 		public virtual IList OneToMany
  		{
  			get { return _oneToMany; }
***************
*** 103,107 ****
  		}
  
! 		public IList ManyToMany
  		{
  			get { return _manyToMany; }
--- 103,107 ----
  		}
  
! 		public virtual IList ManyToMany
  		{
  			get { return _manyToMany; }
***************
*** 109,113 ****
  		}
  
! 		public IList Components
  		{
  			get { return _components; }
--- 109,113 ----
  		}
  
! 		public virtual IList Components
  		{
  			get { return _components; }
***************
*** 115,119 ****
  		}
  
! 		public Iesi.Collections.ISet Composites
  		{
  			get { return _composites; }
--- 115,119 ----
  		}
  
! 		public virtual Iesi.Collections.ISet Composites
  		{
  			get { return _composites; }
***************
*** 121,125 ****
  		}
  
! 		public IList Cascades
  		{
  			get { return _cascades; }
--- 121,125 ----
  		}
  
! 		public virtual IList Cascades
  		{
  			get { return _cascades; }
***************
*** 127,131 ****
  		}
  
! 		public long Id
  		{
  			get { return _id; }
--- 127,131 ----
  		}
  
! 		public virtual long Id
  		{
  			get { return _id; }
***************
*** 133,137 ****
  		}
  
! 		public IList Bag
  		{
  			get { return _bag; }
--- 133,137 ----
  		}
  
! 		public virtual IList Bag
  		{
  			get { return _bag; }
***************
*** 139,143 ****
  		}
  
! 		public IList LazyBag
  		{
  			get { return _lazyBag; }
--- 139,143 ----
  		}
  
! 		public virtual IList LazyBag
  		{
  			get { return _lazyBag; }
***************
*** 145,149 ****
  		}
  
! 		public IDictionary TernaryMap
  		{
  			get { return _ternaryMap; }
--- 145,149 ----
  		}
  
! 		public virtual IDictionary TernaryMap
  		{
  			get { return _ternaryMap; }
***************
*** 151,155 ****
  		}
  
! 		public Iesi.Collections.ISet TernarySet
  		{
  			get { return _ternarySet; }
--- 151,155 ----
  		}
  
! 		public virtual Iesi.Collections.ISet TernarySet
  		{
  			get { return _ternarySet; }

Index: D.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/D.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** D.cs	17 Jun 2004 21:17:13 -0000	1.2
--- D.cs	9 Dec 2004 20:57:25 -0000	1.3
***************
*** 51,55 ****
  	/// Get/set for id
  	/// </summary>
! 	public Int64 Id
  	{
  		get { return _id; }
--- 51,55 ----
  	/// Get/set for id
  	/// </summary>
! 	public virtual Int64 Id
  	{
  		get { return _id; }
***************
*** 60,64 ****
  	/// Get/set for Amount
  	/// </summary>
! 	public Double Amount
  	{
  		get { return _amount; }
--- 60,64 ----
  	/// Get/set for Amount
  	/// </summary>
! 	public virtual Double Amount
  	{
  		get { return _amount; }

Index: Qux.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Qux.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Qux.cs	18 Nov 2004 02:45:43 -0000	1.6
--- Qux.cs	9 Dec 2004 20:57:25 -0000	1.7
***************
*** 16,20 ****
  		private bool _stored;
  		private string _stuff;
- 		// <set>
  		private Iesi.Collections.ISet _fums;
  		private IList _moreFums;
--- 16,19 ----
***************
*** 82,86 ****
  		/// Gets or sets the _foo
  		/// </summary> 
! 		public FooProxy Foo
  		{
  			get { return _foo; }
--- 81,85 ----
  		/// Gets or sets the _foo
  		/// </summary> 
! 		public virtual FooProxy Foo
  		{
  			get { return _foo; }
***************
*** 91,95 ****
  		/// Gets or sets the _created
  		/// </summary> 
! 		public bool Created
  		{
  			get { return _created;  }
--- 90,94 ----
  		/// Gets or sets the _created
  		/// </summary> 
! 		public virtual bool Created
  		{
  			get { return _created;  }
***************
*** 100,104 ****
  		/// Gets or sets the _deleted
  		/// </summary> 
! 		public bool Deleted
  		{
  			get { return _deleted; }
--- 99,103 ----
  		/// Gets or sets the _deleted
  		/// </summary> 
! 		public virtual bool Deleted
  		{
  			get { return _deleted; }
***************
*** 109,113 ****
  		/// Gets or sets the _loaded
  		/// </summary> 
! 		public bool Loaded
  		{
  			get { return _loaded; }
--- 108,112 ----
  		/// Gets or sets the _loaded
  		/// </summary> 
! 		public virtual bool Loaded
  		{
  			get { return _loaded; }
***************
*** 118,122 ****
  		/// Gets or sets the _stored
  		/// </summary> 
! 		public bool Stored
  		{
  			get { return _stored; }
--- 117,121 ----
  		/// Gets or sets the _stored
  		/// </summary> 
! 		public virtual bool Stored
  		{
  			get { return _stored; }
***************
*** 127,131 ****
  		/// Gets or sets the _key
  		/// </summary> 
! 		public long Key
  		{
  			get { return _key; }
--- 126,130 ----
  		/// Gets or sets the _key
  		/// </summary> 
! 		public virtual long Key
  		{
  			get { return _key; }
***************
*** 133,137 ****
  		}
  
! 		public long TheKey
  		{
  			set { _key = value; }
--- 132,136 ----
  		}
  
! 		public virtual long TheKey
  		{
  			set { _key = value; }
***************
*** 141,145 ****
  		/// Gets or sets the _stuff
  		/// </summary> 
! 		public string Stuff
  		{
  			get { return _stuff; }
--- 140,144 ----
  		/// Gets or sets the _stuff
  		/// </summary> 
! 		public virtual string Stuff
  		{
  			get { return _stuff; }
***************
*** 150,154 ****
  		/// Gets or sets the _fums (&lt;set&gt;)
  		/// </summary> 
! 		public Iesi.Collections.ISet Fums
  		{
  			get { return _fums; }
--- 149,153 ----
  		/// Gets or sets the _fums (&lt;set&gt;)
  		/// </summary> 
! 		public virtual Iesi.Collections.ISet Fums
  		{
  			get { return _fums; }
***************
*** 159,163 ****
  		/// Gets or sets the _moreFums
  		/// </summary> 
! 		public IList MoreFums
  		{
  			get { return _moreFums; }
--- 158,162 ----
  		/// Gets or sets the _moreFums
  		/// </summary> 
! 		public virtual IList MoreFums
  		{
  			get { return _moreFums; }
***************
*** 165,169 ****
  		}
  	
! 		public Qux Child
  		{
  			get
--- 164,168 ----
  		}
  	
! 		public virtual Qux Child
  		{
  			get
***************
*** 180,184 ****
  		/// Gets or sets the _childKey
  		/// </summary> 
! 		public long ChildKey
  		{
  			get { return _childKey;  }
--- 179,183 ----
  		/// Gets or sets the _childKey
  		/// </summary> 
! 		public virtual long ChildKey
  		{
  			get { return _childKey;  }

Index: Baz.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Baz.cs	18 Nov 2004 02:45:43 -0000	1.11
--- Baz.cs	9 Dec 2004 20:57:25 -0000	1.12
***************
*** 39,43 ****
  	private System.Collections.IDictionary _stringGlarchMap;
  	private System.Collections.IDictionary _anyToAny;
- 	//private System.Collections.IDictionary _fooSet;
  	private Iesi.Collections.ISet _fooSet;
  	private Iesi.Collections.ISet _stringSet;
--- 39,42 ----

Index: C2.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C2.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** C2.cs	3 Jun 2004 18:01:24 -0000	1.2
--- C2.cs	9 Dec 2004 20:57:25 -0000	1.3
***************
*** 1,12 ****
- //------------------------------------------------------------------------------
- // <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;
  
--- 1,2 ----
***************
*** 67,80 ****
  	/// Get/set for address
  	/// </summary>
! 	public String Address
  	{
! 		get
! 		{
! 			return this._address;
! 		}
! 		set
! 		{
! 			this._address = value;
! 		}
  	}
  	
--- 57,64 ----
  	/// Get/set for address
  	/// </summary>
! 	public virtual String Address
  	{
! 		get { return _address; }
! 		set { _address = value; }
  	}
  	

Index: Z.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Z.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Z.cs	3 Jun 2004 14:54:40 -0000	1.1
--- Z.cs	9 Dec 2004 20:57:25 -0000	1.2
***************
*** 11,15 ****
  		private W _w;
  		
! 		public long Id
  		{
  			get { return _id; }
--- 11,15 ----
  		private W _w;
  		
! 		public virtual long Id
  		{
  			get { return _id; }
***************
*** 17,21 ****
  		}
  
! 		public W W
  		{
  			get { return _w; }
--- 17,21 ----
  		}
  
! 		public virtual W W
  		{
  			get { return _w; }

Index: C1.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C1.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** C1.cs	17 Jun 2004 21:17:13 -0000	1.4
--- C1.cs	9 Dec 2004 20:57:25 -0000	1.5
***************
*** 1,12 ****
- //------------------------------------------------------------------------------
- // <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;
  
--- 1,2 ----
***************
*** 74,87 ****
  	/// Get/set for address
  	/// </summary>
! 	public String Address
! 	{
! 		get
! 		{
! 			return _address;
! 		}
! 		set
  		{
! 			_address = value;
! 		}
  	}
  	
--- 64,71 ----
  	/// Get/set for address
  	/// </summary>
! 	public virtual String Address
  		{
! 		get { return _address; }
! 		set { _address = value; }
  	}
  	
***************
*** 89,102 ****
  	/// Get/set for d
  	/// </summary>
! 	public D D
  	{
! 		get
! 		{
! 			return _d;
! 		}
! 		set
! 		{
! 			_d = value;
! 		}
  	}
  	
--- 73,80 ----
  	/// Get/set for d
  	/// </summary>
! 	public virtual D D
  	{
! 		get { return _d; }
! 		set { _d = value; }
  	}