[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel A.cs,1.3,1.3.2.1 ABC.hbm.xml,1.8,1.8.2.1 ABCProxy.hbm.xml,1.6,1.6.2.1 B.cs,1.3,1.3.2.1 C1.cs,1.4,1.4.2.1 C2.cs,1.2,1.2.2.1 Contained.cs,1.1,1.1.2.1 Container.cs,1.2,1.2.2.1 Container.hbm.xml,1.8,1.8.2.1 D.cs,1.2,1.2.2.1

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

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

Modified Files:
      Tag: alpha_avalon-proxy
	A.cs ABC.hbm.xml ABCProxy.hbm.xml B.cs C1.cs C2.cs 
	Contained.cs Container.cs Container.hbm.xml D.cs 
Log Message:
much work done to implement proxies with classes and virtual properties.

All test that are being run now pass with proxy="some class"

Index: Container.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Container.hbm.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** Container.hbm.xml	11 Jul 2004 21:07:24 -0000	1.8
--- Container.hbm.xml	5 Oct 2004 15:25:04 -0000	1.8.2.1
***************
*** 14,17 ****
--- 14,18 ----
  	<class 
  		name="NHibernate.DomainModel.Container, NHibernate.DomainModel" 
+ 		proxy="NHibernate.DomainModel.Container, NHibernate.DomainModel"
  	>
  	<!-- 
***************
*** 161,164 ****
--- 162,166 ----
  	<class 
  		name="NHibernate.DomainModel.Contained, NHibernate.DomainModel" 
+ 		proxy="NHibernate.DomainModel.Contained, NHibernate.DomainModel"
  	>
  	<!-- 

Index: A.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/A.cs,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** A.cs	17 Jun 2004 21:17:13 -0000	1.3
--- A.cs	5 Oct 2004 15:25:04 -0000	1.3.2.1
***************
*** 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: C1.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C1.cs,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** C1.cs	17 Jun 2004 21:17:13 -0000	1.4
--- C1.cs	5 Oct 2004 15:25:04 -0000	1.4.2.1
***************
*** 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; }
  	}
  	

Index: B.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/B.cs,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** B.cs	4 Jun 2004 12:02:43 -0000	1.3
--- B.cs	5 Oct 2004 15:25:04 -0000	1.3.2.1
***************
*** 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.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Container.cs	7 Jun 2004 20:41:30 -0000	1.2
--- Container.cs	5 Oct 2004 15:25:04 -0000	1.2.2.1
***************
*** 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 IDictionary Composites
  		{
  			get { return _composites; }
--- 115,119 ----
  		}
  
! 		public virtual IDictionary 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 IDictionary TernarySet
  		{
  			get { return _ternarySet; }
--- 151,155 ----
  		}
  
! 		public virtual IDictionary 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.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** D.cs	17 Jun 2004 21:17:13 -0000	1.2
--- D.cs	5 Oct 2004 15:25:04 -0000	1.2.2.1
***************
*** 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: ABCProxy.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABCProxy.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** ABCProxy.hbm.xml	11 Jul 2004 21:07:24 -0000	1.6
--- ABCProxy.hbm.xml	5 Oct 2004 15:25:04 -0000	1.6.2.1
***************
*** 1,9 ****
  <?xml version="1.0" ?>
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0">
! 		<!-- 
! 			proxy doesn't work yet
! 			proxy="NHibernate.DomainModel.A, NHibernate.DomainModel"
! 		-->
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" />
--- 1,7 ----
  <?xml version="1.0" ?>
  <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0"
! 		proxy="NHibernate.DomainModel.A, NHibernate.DomainModel"
! 	>
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" />
***************
*** 11,19 ****
  		<discriminator column="clazz" type="Int32" force="true" not-null="false" />
  		<property name="Name" />
- 		<subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="null">
  		<!--
! 			proxy doesn't work yet
! 			proxy="NHibernate.DomainModel.B, NHibernate.DomainModel"
  		-->
  			<property name="Count" column="count_" type="Int32" />
  			<map name="Map">
--- 9,19 ----
  		<discriminator column="clazz" type="Int32" force="true" not-null="false" />
  		<property name="Name" />
  		<!--
! 			the discriminator-value used to be "null", but there are null values
! 			for Int32 so I made it -2
  		-->
+ 		<subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="-2"
+ 			proxy="NHibernate.DomainModel.B, NHibernate.DomainModel"
+ 		>
  			<property name="Count" column="count_" type="Int32" />
  			<map name="Map">
***************
*** 23,44 ****
  			</map>
  			<subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="1"
! 				proxy="NHibernate.DomainModel.C1, NHibernate.DomainModel">
  				<property name="Address" column="c1" />
  				<one-to-one name="D" class="NHibernate.DomainModel.D, NHibernate.DomainModel" />
  			</subclass>
! 			<subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2">
! 				<!-- 
! 					proxy doesn't work yet
! 					proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel"
! 				-->
  				<property name="Address" column="c2" />
  			</subclass>
  		</subclass>
  	</class>
! 	<class name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" >
! 		<!-- 
! 			proxy doesn't work yet
! 			proxy="NHibernate.DomainModel.D, NHibernate.DomainModel"
! 		-->
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="assigned" />
--- 23,41 ----
  			</map>
  			<subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="1"
! 				proxy="NHibernate.DomainModel.C1, NHibernate.DomainModel"
! 			>
  				<property name="Address" column="c1" />
  				<one-to-one name="D" class="NHibernate.DomainModel.D, NHibernate.DomainModel" />
  			</subclass>
! 			<subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2"
! 				proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel"
! 			>
  				<property name="Address" column="c2" />
  			</subclass>
  		</subclass>
  	</class>
! 	<class name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" 
! 		proxy="NHibernate.DomainModel.D, NHibernate.DomainModel"
! 	>
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="assigned" />

Index: ABC.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABC.hbm.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** ABC.hbm.xml	27 Aug 2004 13:29:57 -0000	1.8
--- ABC.hbm.xml	5 Oct 2004 15:25:04 -0000	1.8.2.1
***************
*** 31,37 ****
  			/>
  			
  			<subclass 
  				name="NHibernate.DomainModel.C1, NHibernate.DomainModel" 
! 				discriminator-value="null"
  			>
  				<property 
--- 31,41 ----
  			/>
  			
+ 			<!--
+ 				the discriminator-value used to be "null", but there are null values
+ 				for Int32 so I made it -2
+ 			-->
  			<subclass 
  				name="NHibernate.DomainModel.C1, NHibernate.DomainModel" 
! 				discriminator-value="-2"
  			>
  				<property 

Index: C2.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C2.cs,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** C2.cs	3 Jun 2004 18:01:24 -0000	1.2
--- C2.cs	5 Oct 2004 15:25:04 -0000	1.2.2.1
***************
*** 67,80 ****
  	/// Get/set for address
  	/// </summary>
! 	public String Address
  	{
! 		get
! 		{
! 			return this._address;
! 		}
! 		set
! 		{
! 			this._address = value;
! 		}
  	}
  	
--- 67,74 ----
  	/// Get/set for address
  	/// </summary>
! 	public virtual String Address
  	{
! 		get { return _address; }
! 		set { _address = value; }
  	}
  	

Index: Contained.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Contained.cs,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** Contained.cs	2 Jun 2004 04:53:24 -0000	1.1
--- Contained.cs	5 Oct 2004 15:25:04 -0000	1.1.2.1
***************
*** 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; }