[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel ABCProxy.hbm.xml,1.8,1.9 C1.cs,1.5,1.6 C2.cs,1.3,1.4

[Sergey K. <jus...@us...>]

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

Modified Files:
	ABCProxy.hbm.xml C1.cs C2.cs 
Log Message:
ABCProxyTest.cs: added missing tests

Index: ABCProxy.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABCProxy.hbm.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ABCProxy.hbm.xml	26 Mar 2005 13:24:35 -0000	1.8
--- ABCProxy.hbm.xml	24 Apr 2005 10:14:14 -0000	1.9
***************
*** 1,20 ****
  <?xml version="1.0" ?>
! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class 
! 		name="NHibernate.DomainModel.A, NHibernate.DomainModel" 
! 		proxy="NHibernate.DomainModel.A, NHibernate.DomainModel"
! 		discriminator-value="0"
! 	>
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" />
  		</id>
! 		<discriminator column="clazz" type="Int32" force="true" not-null="false" />
  		<property name="Name" />
! 		<many-to-one name="Forward" class="NHibernate.DomainModel.E, NHibernate.DomainModel" cascade="save-update" />
! 		<subclass 
! 			name="NHibernate.DomainModel.B, NHibernate.DomainModel" 
! 			proxy="NHibernate.DomainModel.B, NHibernate.DomainModel"
! 			discriminator-value="null"
! 		>
  			<property name="Count" column="count_" type="Int32" />
  			<map name="Map">
--- 1,16 ----
  <?xml version="1.0" ?>
! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"
! 	assembly="NHibernate.DomainModel"
! 	namespace="NHibernate.DomainModel" >
! 
! 	<class name="A" lazy="true" discriminator-value="0">
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" />
  		</id>
! 		<discriminator column="clazz_discriminata" type="Int32" force="true" not-null="false" />
  		<property name="Name" />
! 		<many-to-one name="Forward" class="E" cascade="save-update" />
! 		
! 		<subclass name="B" lazy="true" discriminator-value="null">
  			<property name="Count" column="count_" type="Int32" />
  			<map name="Map">
***************
*** 23,48 ****
  				<element column="MAPVAL" type="Int32" />
  			</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"
! 				proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel" 
! 				discriminator-value="2"
! 			>
  				<property name="Address" column="c2" />
  			</subclass>
  		</subclass>
  	</class>
! 	<class 
! 		name="NHibernate.DomainModel.D, NHibernate.DomainModel" 
! 		proxy="NHibernate.DomainModel.D, NHibernate.DomainModel"
! 		discriminator-value="0" 
! 	>
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="assigned" />
--- 19,45 ----
  				<element column="MAPVAL" type="Int32" />
  			</map>
! 			
! 			<subclass name="C1" discriminator-value="1" lazy="true">
  				<property name="Address" column="c1" />
! 				<one-to-one name="D" class="D" />
! 				<many-to-one name="C2" column="c" class="C2" />
! 				<bag name="C2s" inverse="true" where="clazz_discriminata=2">
! 					<key column="c"/>
! 					<one-to-many class="C2" />
! 				</bag>
  			</subclass>
! 			
! 			<subclass name="C2" lazy="true" discriminator-value="2">
  				<property name="Address" column="c2" />
+ 				<many-to-one name="C1" column="c" class="C1" />
+ 				<bag name="C1s" inverse="true" where="clazz_discriminata=1" lazy="true">
+ 					<key column="c"/>
+ 					<one-to-many class="C1" />
+ 				</bag>
  			</subclass>
  		</subclass>
  	</class>
! 
! 	<class name="D" discriminator-value="0" lazy="true">
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="assigned" />
***************
*** 51,64 ****
  	</class>
  
! 	<class 
! 		name="NHibernate.DomainModel.E, NHibernate.DomainModel" 
! 		proxy="NHibernate.DomainModel.E, NHibernate.DomainModel"
! 		discriminator-value="0" 
! 	>
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" /> <!-- Hibernate 2.1 has class="increment" here -->
  		</id>
  		<property name="Amount" type="Double" />
! 		<one-to-one name="Reverse" class="NHibernate.DomainModel.A, NHibernate.DomainModel" property-ref="Forward" cascade="save-update" />
  	</class>
  
--- 48,57 ----
  	</class>
  
! 	<class name="E" discriminator-value="0" lazy="true">
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" /> <!-- Hibernate 2.1 has class="increment" here -->
  		</id>
  		<property name="Amount" type="Double" />
! 		<one-to-one name="Reverse" class="A" property-ref="Forward" cascade="save-update" />
  	</class>
  

Index: C2.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C2.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** C2.cs	9 Dec 2004 20:57:25 -0000	1.3
--- C2.cs	24 Apr 2005 10:14:14 -0000	1.4
***************
*** 1,67 ****
  using System;
  
  namespace NHibernate.DomainModel
  {
- 
-  /// <summary>
-  /// POJO for C2
-  /// </summary>
-  /// <remark>
-  /// This class is autogenerated
-  /// </remark>
-  [Serializable]
-  public class C2 : B
-  {
- 
- 	#region Fields
- 	/// <summary>
- 	/// Holder for address
- 	/// </summary>
- 	private String _address;
- 	
- 	#endregion
- 
- 	#region Constructors
- 	/// <summary>
- 	/// Default constructor for class C2
- 	/// </summary>
- 	public C2()
- 	{
- 	}
- 	
- 	/// <summary>
- 	/// Constructor for class C2
- 	/// </summary>
- 	/// <param name="name">Initial name value</param>
- 	/// <param name="count">Initial count value</param>
- 	/// <param name="map">Initial map value</param>
- 	/// <param name="address">Initial address value</param>
- 	public C2(String name, Int32 count, System.Collections.IDictionary map, String address)
- 		: base(name, count, map)
- 	{
- 		this._address = address;
- 	}
- 	
- 	/// <summary>
- 	/// Minimal constructor for class C2
- 	/// </summary>
- 	/// <param name="map">Initial map value</param>
- 	public C2(System.Collections.IDictionary map)
- 		: base(map)
- 	{
- 	}
- 	#endregion
- 	
- 	#region Properties
  	/// <summary>
! 	/// Get/set for address
  	/// </summary>
! 	public virtual String Address
  	{
! 		get { return _address; }
! 		set { _address = value; }
  	}
! 	
! 	#endregion
!  }
! }
\ No newline at end of file
--- 1,88 ----
  using System;
+ using System.Collections;
  
  namespace NHibernate.DomainModel
  {
  	/// <summary>
! 	/// POJO for C2
  	/// </summary>
! 	/// <remark>
! 	/// This class is autogenerated
! 	/// </remark>
! 	[Serializable]
! 	public class C2 : B
  	{
! 
! 		#region Fields
! 		/// <summary>
! 		/// Holder for address
! 		/// </summary>
! 		private String _address;
! 
! 		/// <summary>
! 		/// Holder for c1
! 		/// </summary>
! 		private C1 _c1;
! 
! 		/// <summary>
! 		/// Holder for c1s
! 		/// </summary>
! 		private IList _c1s = new ArrayList();
! 
! 		#endregion
! 
! 		#region Constructors
! 		/// <summary>
! 		/// Default constructor for class C2
! 		/// </summary>
! 		public C2()
! 		{
! 		}
! 
! 		/// <summary>
! 		/// Constructor for class C2
! 		/// </summary>
! 		/// <param name="name">Initial name value</param>
! 		/// <param name="count">Initial count value</param>
! 		/// <param name="map">Initial map value</param>
! 		/// <param name="address">Initial address value</param>
! 		public C2(String name, Int32 count, IDictionary map, String address)
! 			: base(name, count, map)
! 		{
! 			this._address = address;
! 		}
! 
! 		/// <summary>
! 		/// Minimal constructor for class C2
! 		/// </summary>
! 		/// <param name="map">Initial map value</param>
! 		public C2(System.Collections.IDictionary map)
! 			: base(map)
! 		{
! 		}
! 		#endregion
! 
! 		#region Properties
! 		/// <summary>
! 		/// Get/set for address
! 		/// </summary>
! 		public virtual String Address
! 		{
! 			get { return _address; }
! 			set { _address = value; }
! 		}
! 
! 		public virtual C1 C1
! 		{
! 			get { return _c1; }
! 			set { _c1 = value; }
! 		}
! 
! 		public virtual IList C1s
! 		{
! 			get { return _c1s; }
! 			set { _c1s = value; }
! 		}
! 		#endregion
  	}
! }

Index: C1.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C1.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** C1.cs	9 Dec 2004 20:57:25 -0000	1.5
--- C1.cs	24 Apr 2005 10:14:14 -0000	1.6
***************
*** 1,83 ****
  using System;
  
  namespace NHibernate.DomainModel
  {
! 
!  /// <summary>
!  /// POJO for C1
!  /// </summary>
!  /// <remark>
!  /// This class is autogenerated
!  /// </remark>
!  [Serializable]
!  public class C1 : B
!  {
! 
! 	#region Fields
! 	/// <summary>
! 	/// Holder for address
! 	/// </summary>
! 	private String _address;
  	
! 	/// <summary>
! 	/// Holder for d
! 	/// </summary>
! 	private D _d;
  	
! 	#endregion
  
! 	#region Constructors
! 	/// <summary>
! 	/// Default constructor for class C1
! 	/// </summary>
! 	public C1()
! 	{
! 	}
  	
! 	/// <summary>
! 	/// Constructor for class C1
! 	/// </summary>
! 	/// <param name="name">Initial name value</param>
! 	/// <param name="count">Initial count value</param>
! 	/// <param name="map">Initial map value</param>
! 	/// <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)
! 	{
! 		this._address = address;
! 		this._d = d;
! 	}
  	
! 	/// <summary>
! 	/// Minimal constructor for class C1
! 	/// </summary>
! 	/// <param name="map">Initial map value</param>
! 	public C1(System.Collections.IDictionary map)
! 		: base(map)
! 	{
! 	}
! 	#endregion
  	
! 	#region Properties
! 	/// <summary>
! 	/// Get/set for address
! 	/// </summary>
! 	public virtual String Address
  		{
! 		get { return _address; }
! 		set { _address = value; }
! 	}
  	
! 	/// <summary>
! 	/// Get/set for d
! 	/// </summary>
! 	public virtual D D
! 	{
! 		get { return _d; }
! 		set { _d = value; }
  	}
- 	
- 	#endregion
-  }
  }
\ No newline at end of file
--- 1,104 ----
  using System;
+ using System.Collections;
  
  namespace NHibernate.DomainModel
  {
! /// <summary>
! /// POJO for C1
! /// </summary>
! /// <remark>
! /// This class is autogenerated
! /// </remark>
! 	[Serializable]
! 	public class C1 : B
! 	{
! 		#region Fields
! 		/// <summary>
! 		/// Holder for address
! 		/// </summary>
! 		private String _address;
  	
! 		/// <summary>
! 		/// Holder for d
! 		/// </summary>
! 		private D _d;
  	
! 		/// <summary>
! 		/// Holder for c2
! 		/// </summary>
! 		private C2 _c2;
  
! 		/// <summary>
! 		/// Holder for c2s
! 		/// </summary>
! 		private IList _c2s = new ArrayList();
! 
! 		#endregion
! 
! 		#region Constructors
! 		/// <summary>
! 		/// Default constructor for class C1
! 		/// </summary>
! 		public C1()
! 		{
! 		}
  	
! 		/// <summary>
! 		/// Constructor for class C1
! 		/// </summary>
! 		/// <param name="name">Initial name value</param>
! 		/// <param name="count">Initial count value</param>
! 		/// <param name="map">Initial map value</param>
! 		/// <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)
! 		{
! 			this._address = address;
! 			this._d = d;
! 		}
  	
! 		/// <summary>
! 		/// Minimal constructor for class C1
! 		/// </summary>
! 		/// <param name="map">Initial map value</param>
! 		public C1(System.Collections.IDictionary map)
! 			: base(map)
! 		{
! 		}
! 		#endregion
  	
! 		#region Properties
! 		/// <summary>
! 		/// Get/set for address
! 		/// </summary>
! 		public virtual String Address
  		{
! 			get { return _address; }
! 			set { _address = value; }
! 		}
  	
! 		/// <summary>
! 		/// Get/set for d
! 		/// </summary>
! 		public virtual D D
! 		{
! 			get { return _d; }
! 			set { _d = value; }
! 		}
! 
! 		public virtual C2 C2
! 		{
! 			get { return _c2; }
! 			set { _c2 = value; }
! 		}
! 
! 		public virtual IList C2s
! 		{
! 			get { return _c2s; }
! 			set { _c2s = value; }
! 		}
! 
! 		#endregion
  	}
  }
\ No newline at end of file